inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

date fns migrstion

Browse Source
This commit is contained in:
vijayanssettu
2023-08-30 18:23:46 +05:30
parent 0ef6b6ba21
commit 2b8e7bf18a
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts
+12 -8
View File
@@ -19,8 +19,8 @@ import { SearchDatetimeRangeComponent } from './search-datetime-range.component'
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ContentTestingModule } from '../../../testing/content.testing.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { parse, isValid } from 'date-fns';
declare let moment: any;
describe('SearchDatetimeRangeComponent', () => { describe('SearchDatetimeRangeComponent', () => {
let fixture: ComponentFixture<SearchDatetimeRangeComponent>; let fixture: ComponentFixture<SearchDatetimeRangeComponent>;
@@ -28,7 +28,7 @@ describe('SearchDatetimeRangeComponent', () => {
const fromDatetime = '2016-10-16 12:30'; const fromDatetime = '2016-10-16 12:30';
const toDatetime = '2017-10-16 20:00'; const toDatetime = '2017-10-16 20:00';
const maxDatetime = '10-Mar-20 20:00'; const maxDatetime = '10-Mar-20 20:00';
const datetimeFormatFixture = 'DD-MMM-YY HH:mm'; const datetimeFormatFixture = 'dd-MMM-yy HH:mm';
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@@ -59,13 +59,15 @@ describe('SearchDatetimeRangeComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const inputString = '20-feb-18 20:00'; const inputString = '20-feb-18 20:00';
const momentFromInput = moment(inputString, datetimeFormatFixture); const dateFromInput = parse(inputString, datetimeFormatFixture, new Date());
expect(momentFromInput.isValid()).toBeTruthy();
expect(isValid(dateFromInput)).toBeTruthy();
component.onChangedHandler({ value: inputString }, component.from); component.onChangedHandler({ value: inputString }, component.from);
expect(component.from.value.toString()).toEqual(momentFromInput.toString()); expect(component.form.value.toString()).toEqual(dateFromInput.toString());
}); });
it('should NOT setup form control with invalid datetime on change', async () => { it('should NOT setup form control with invalid datetime on change', async () => {
@@ -75,13 +77,15 @@ describe('SearchDatetimeRangeComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const inputString = '2017-10-16 20:f:00'; const inputString = '2017-10-16 20:f:00';
const momentFromInput = moment(inputString, datetimeFormatFixture); const dateFromInput = parse(inputString, datetimeFormatFixture, new Date());
expect(momentFromInput.isValid()).toBeFalsy();
expect(isValid(dateFromInput)).toBeFalsy();
component.onChangedHandler({ value: inputString }, component.from); component.onChangedHandler({ value: inputString }, component.from);
expect(component.from.value.toString()).not.toEqual(momentFromInput.toString()); expect(component.from.value.toString()).not.toEqual(dateFromInput.toString());
}); });
it('should reset form', async () => { it('should reset form', async () => {
lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts
+13 -12
View File
@@ -17,26 +17,27 @@
import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core'; import { DateFnsUtils, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
import { SearchWidget } from '../../models/search-widget.interface'; import { SearchWidget } from '../../models/search-widget.interface';
import { SearchWidgetSettings } from '../../models/search-widget-settings.interface'; import { SearchWidgetSettings } from '../../models/search-widget-settings.interface';
import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
import { LiveErrorStateMatcher } from '../../forms/live-error-state-matcher'; import { LiveErrorStateMatcher } from '../../forms/live-error-state-matcher';
import { Moment } from 'moment'; // import { Moment } from 'moment';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { DatetimeAdapter, MAT_DATETIME_FORMATS } from '@mat-datetimepicker/core'; import { DatetimeAdapter, MAT_DATETIME_FORMATS } from '@mat-datetimepicker/core';
import { MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetimepicker/moment'; import { MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetimepicker/moment';
import { DateFnsAdapter } from '@angular/material-date-fns-adapter';
import { startOfMinute, format, isBefore, isValid, endOfMinute } from 'date-fns';
export interface DatetimeRangeValue { export interface DatetimeRangeValue {
from: string; from: string;
to: string; to: string;
} }
declare let moment: any;
const DEFAULT_DATETIME_FORMAT: string = 'DD/MM/YYYY HH:mm'; const DEFAULT_DATETIME_FORMAT: string = 'dd/MM/yyyy HH:mm';
@Component({ @Component({
selector: 'adf-search-datetime-range', selector: 'adf-search-datetime-range',
@@ -69,7 +70,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
private onDestroy$ = new Subject<boolean>(); private onDestroy$ = new Subject<boolean>();
constructor(private dateAdapter: DatetimeAdapter<Moment>, constructor(private dateAdapter: DatetimeAdapter<DateFnsAdapter>,
private userPreferencesService: UserPreferencesService) { private userPreferencesService: UserPreferencesService) {
} }
@@ -101,7 +102,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
]); ]);
if (this.settings && this.settings.maxDatetime) { if (this.settings && this.settings.maxDatetime) {
this.maxDatetime = moment(this.settings.maxDatetime); this.maxDatetime = new Date(this.settings.maxDatetime);
} }
if (this.startValue) { if (this.startValue) {
@@ -133,8 +134,9 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
if (isValid && this.id && this.context && this.settings && this.settings.field) { if (isValid && this.id && this.context && this.settings && this.settings.field) {
this.isActive = true; this.isActive = true;
const start = moment.utc(model.from).startOf('minute').format(); const start = format(startOfMinute(new Date(model.from)),`yyyy-MM-dd'T'HH:mm:ss'Z'`);
const end = moment.utc(model.to).endOf('minute').format(); const end = format(endOfMinute(new Date(model.to)),`yyyy-MM-dd'T'HH:mm:ss'Z'`);
this.context.queryFragments[this.id] = `${this.settings.field}:['${start}' TO '${end}']`; this.context.queryFragments[this.id] = `${this.settings.field}:['${start}' TO '${end}']`;
this.updateDisplayValue(); this.updateDisplayValue();
@@ -210,7 +212,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
const inputValue = event.value; const inputValue = event.value;
const formatDate = this.dateAdapter.parse(inputValue, this.datetimePickerFormat); const formatDate = this.dateAdapter.parse(inputValue, this.datetimePickerFormat);
if (formatDate && formatDate.isValid()) { if (formatDate && isValid(formatDate)) {
formControl.setValue(formatDate); formControl.setValue(formatDate);
} else if (formatDate) { } else if (formatDate) {
formControl.setErrors({ formControl.setErrors({
@@ -222,8 +224,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
} }
setLocale(locale) { setLocale(locale) {
this.dateAdapter.setLocale(locale); this.dateAdapter.setLocale(DateFnsUtils.getLocaleFromString(locale));
moment.locale(locale);
} }
hasParseError(formControl): boolean { hasParseError(formControl): boolean {
@@ -235,6 +236,6 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
} }
setFromMaxDatetime() { setFromMaxDatetime() {
this.fromMaxDatetime = (!this.to.value || this.maxDatetime && (moment(this.maxDatetime).isBefore(this.to.value))) ? this.maxDatetime : moment(this.to.value); this.fromMaxDatetime = (!this.to.value || this.maxDatetime && (isBefore(this.maxDatetime, this.to.value))) ? this.maxDatetime : this.to.value;
} }
} }