From 5a31f240f14aa285bfc34300e13f90a425e555b3 Mon Sep 17 00:00:00 2001 From: Jatin_Chugh Date: Wed, 23 Aug 2023 17:07:06 +0530 Subject: [PATCH] migration of dependency from moment to date-fns in task-list.component --- .../components/start-task.component.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.ts b/lib/process-services/src/lib/task-list/components/start-task.component.ts index 24a6afda84..b22b6f0d97 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.ts +++ b/lib/process-services/src/lib/task-list/components/start-task.component.ts @@ -16,12 +16,10 @@ */ import { - LogService, UserPreferencesService, UserPreferenceValues, FormFieldModel, FormModel, - MOMENT_DATE_FORMATS, MomentDateAdapter + LogService, UserPreferencesService, UserPreferenceValues, FormFieldModel, FormModel, DateFnsUtils } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; -import moment, { Moment } from 'moment'; import { Observable, of, Subject } from 'rxjs'; import { Form } from '../models/form.model'; import { TaskDetailsModel } from '../models/task-details.model'; @@ -29,8 +27,10 @@ import { TaskListService } from './../services/tasklist.service'; import { switchMap, defaultIfEmpty, takeUntil } from 'rxjs/operators'; import { UntypedFormBuilder, AbstractControl, Validators, UntypedFormGroup, UntypedFormControl } from '@angular/forms'; import { UserProcessModel } from '../../common/models/user-process.model'; +import { format } from 'date-fns'; +import { DateFnsAdapter, MAT_DATE_FNS_FORMATS } from '@angular/material-date-fns-adapter'; -const FORMAT_DATE = 'DD/MM/YYYY'; +const FORMAT_DATE = 'dd/MM/yyyy'; const MAX_LENGTH = 255; @Component({ @@ -38,8 +38,8 @@ const MAX_LENGTH = 255; templateUrl: './start-task.component.html', styleUrls: ['./start-task.component.scss'], providers: [ - { provide: DateAdapter, useClass: MomentDateAdapter }, - { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }], + { provide: DateAdapter, useClass: DateFnsAdapter }, + { provide: MAT_DATE_FORMATS, useValue: MAT_DATE_FNS_FORMATS }], encapsulation: ViewEncapsulation.None }) export class StartTaskComponent implements OnInit, OnDestroy { @@ -75,7 +75,7 @@ export class StartTaskComponent implements OnInit, OnDestroy { private onDestroy$ = new Subject(); constructor(private taskService: TaskListService, - private dateAdapter: DateAdapter, + private dateAdapter: DateAdapter, private userPreferencesService: UserPreferencesService, private formBuilder: UntypedFormBuilder, private logService: LogService) { @@ -93,7 +93,7 @@ export class StartTaskComponent implements OnInit, OnDestroy { this.userPreferencesService .select(UserPreferenceValues.Locale) .pipe(takeUntil(this.onDestroy$)) - .subscribe(locale => this.dateAdapter.setLocale(locale)); + .subscribe(locale => this.dateAdapter.setLocale(DateFnsUtils.getLocaleFromString(locale))); this.loadFormsTask(); this.buildForm(); @@ -187,16 +187,16 @@ export class StartTaskComponent implements OnInit, OnDestroy { this.dateError = false; if (newDateValue) { - let momentDate: moment.Moment; + let date: string | Date; if (typeof newDateValue === 'string') { - momentDate = moment(newDateValue, FORMAT_DATE, true); + date = format(new Date(newDateValue), FORMAT_DATE); } else { - momentDate = newDateValue; + date = newDateValue; } - if (momentDate.isValid()) { - this.taskDetailsModel.dueDate = momentDate.toDate(); + if (date) { + this.taskDetailsModel.dueDate = new Date(date); } else { this.dateError = true; this.taskDetailsModel.dueDate = null;