Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APPS-2108] Switch search date range to the material date adapter #8973

Merged
merged 2 commits into from
Oct 6, 2023
Merged

[APPS-2108] Switch search date range to the material date adapter #8973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36b37e9
cleanup and setup testing
DenysVuika Oct 6, 2023
607fc30
switch to material adapter instead of adf one
DenysVuika Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions ...-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/

import { SearchDateRangeComponent } from './search-date-range.component';
import { MomentDateAdapter } from '@alfresco/adf-core';
import { DateAdapter } from '@angular/material/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentTestingModule } from '../../../testing/content.testing.module';
import { TranslateModule } from '@ngx-translate/core';
import { MomentDateAdapter } from '@angular/material-moment-adapter';

declare let moment: any;

Expand All @@ -47,13 +47,6 @@ describe('SearchDateRangeComponent', () => {

afterEach(() => fixture.destroy());

it('should use moment adapter', () => {
fixture.detectChanges();

expect(adapter instanceof MomentDateAdapter).toBe(true);
expect(component.datePickerFormat).toBe('DD/MM/YYYY');
});

it('should setup form elements on init', () => {
fixture.detectChanges();

Expand All @@ -62,13 +55,6 @@ describe('SearchDateRangeComponent', () => {
expect(component.form).toBeDefined();
});

it('should setup the format of the date from configuration', () => {
component.settings = { field: 'cm:created', dateFormat: dateFormatFixture };
fixture.detectChanges();

expect(adapter.overrideDisplayFormat).toBe(dateFormatFixture);
});

it('should setup form control with formatted valid date on change', () => {
component.settings = { field: 'cm:created', dateFormat: dateFormatFixture };
fixture.detectChanges();
Expand Down
39 changes: 18 additions & 21 deletions ...ntent-services/src/lib/search/components/search-date-range/search-date-range.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
*/

import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
import { MOMENT_DATE_FORMATS, MomentDateAdapter, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';

import { FormControl, FormGroup, Validators } from '@angular/forms';
import { DateAdapter } from '@angular/material/core';
import { UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
import { SearchWidget } from '../../models/search-widget.interface';
import { SearchWidgetSettings } from '../../models/search-widget-settings.interface';
import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
import { LiveErrorStateMatcher } from '../../forms/live-error-state-matcher';
import { Moment } from 'moment';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MomentDateAdapter } from '@angular/material-moment-adapter';

export interface DateRangeValue {
from: string;
Expand All @@ -42,17 +42,17 @@ const DEFAULT_FORMAT_DATE: string = 'DD/MM/YYYY';
templateUrl: './search-date-range.component.html',
styleUrls: ['./search-date-range.component.scss'],
providers: [
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }
{ provide: DateAdapter, useClass: MomentDateAdapter },
{ provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { strict: true } }
],
encapsulation: ViewEncapsulation.None,
host: { class: 'adf-search-date-range' }
})
export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy {
from: UntypedFormControl;
to: UntypedFormControl;
from: FormControl;
to: FormControl;

form: UntypedFormGroup;
form: FormGroup;
matcher = new LiveErrorStateMatcher();

id: string;
Expand Down Expand Up @@ -95,11 +95,8 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy
ngOnInit() {
this.datePickerFormat = this.settings?.dateFormat ? this.settings.dateFormat : DEFAULT_FORMAT_DATE;

const customDateAdapter = this.dateAdapter as MomentDateAdapter;
customDateAdapter.overrideDisplayFormat = this.datePickerFormat;

this.userPreferencesService
.select(UserPreferenceValues.Locale)
.select<string>(UserPreferenceValues.Locale)
.pipe(takeUntil(this.onDestroy$))
.subscribe((locale) => this.setLocale(locale));

Expand All @@ -117,14 +114,14 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy
const splitValue = this.startValue.split('||');
const fromValue = this.dateAdapter.parse(splitValue[0], this.datePickerFormat);
const toValue = this.dateAdapter.parse(splitValue[1], this.datePickerFormat);
this.from = new UntypedFormControl(fromValue, validators);
this.to = new UntypedFormControl(toValue, validators);
this.from = new FormControl(fromValue, validators);
this.to = new FormControl(toValue, validators);
} else {
this.from = new UntypedFormControl('', validators);
this.to = new UntypedFormControl('', validators);
this.from = new FormControl('', validators);
this.to = new FormControl('', validators);
}

this.form = new UntypedFormGroup({
this.form = new FormGroup({
from: this.from,
to: this.to
});
Expand Down Expand Up @@ -220,7 +217,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy
}
}

onChangedHandler(event: any, formControl: UntypedFormControl) {
onChangedHandler(event: any, formControl: FormControl) {
const inputValue = event.value;
const formatDate = this.dateAdapter.parse(inputValue, this.datePickerFormat);
if (formatDate?.isValid()) {
Expand All @@ -234,12 +231,12 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy
this.setFromMaxDate();
}

setLocale(locale) {
setLocale(locale: string) {
this.dateAdapter.setLocale(locale);
moment.locale(locale);
}

hasParseError(formControl): boolean {
hasParseError(formControl: FormControl): boolean {
return formControl.hasError('matDatepickerParse') && formControl.getError('matDatepickerParse').text;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/core/src/lib/common/services/user-preferences.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class UserPreferencesService {
* @param property The property to watch
* @returns Notification callback
*/
select(property: string): Observable<any> {
select<T = any>(property: string): Observable<T> {
return this.onChange
.pipe(
map((userPreferenceStatus) => userPreferenceStatus[property]),
Expand Down
Loading