[ACS-6189] broken decision table dates after deprecation of moment da…

…te adapter 3 (#9026) * ACS-6189 Fixed date format * ACS-6189 Fixed unit test * ACS-6189 Reverted unwanted changes * ACS-6189 Fixed date format
Alfresco · Oct 25, 2023 · 67f1a4c · 67f1a4c
1 parent e6bc457
commit 67f1a4c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 44 deletions.
diff --git a/lib/process-services-cloud/src/lib/common/process-common.module.ts b/lib/process-services-cloud/src/lib/common/process-common.module.ts
@@ -16,11 +16,12 @@
  */
 
 import { NgModule } from '@angular/core';
-import { CoreModule } from '@alfresco/adf-core';
+import { ADF_DATE_FORMATS, AdfDateFnsAdapter, CoreModule } from '@alfresco/adf-core';
 import { DateRangeFilterComponent } from './date-range-filter/date-range-filter.component';
 import { MaterialModule } from '../material.module';
 import { CommonModule } from '@angular/common';
 import { DateRangeFilterService } from './date-range-filter/date-range-filter.service';
+import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
 
 @NgModule({
     declarations: [ DateRangeFilterComponent ],
@@ -33,7 +34,9 @@ import { DateRangeFilterService } from './date-range-filter/date-range-filter.se
         DateRangeFilterComponent
     ],
     providers: [
-        DateRangeFilterService
+        DateRangeFilterService,
+        { provide: DateAdapter, useClass: AdfDateFnsAdapter },
+        { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS }
     ]
 })
 export class ProcessCommonModule {}
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.ts
@@ -20,15 +20,14 @@
 import { Component, OnInit, ViewEncapsulation, OnDestroy, Input } from '@angular/core';
 import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
 import { Subject } from 'rxjs';
-import { WidgetComponent, FormService, AdfDateFnsAdapter, DateFnsUtils } from '@alfresco/adf-core';
+import { WidgetComponent, FormService, AdfDateFnsAdapter, DateFnsUtils, ADF_DATE_FORMATS } from '@alfresco/adf-core';
 import { MatDatepickerInputEvent } from '@angular/material/datepicker';
-import { CLOUD_FORM_DATE_FORMATS } from '../../../date-formats';
 import { addDays, subDays } from 'date-fns';
 
 @Component({
     selector: 'date-widget',
     providers: [
-        { provide: MAT_DATE_FORMATS, useValue: CLOUD_FORM_DATE_FORMATS },
+        { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS },
         { provide: DateAdapter, useClass: AdfDateFnsAdapter }
     ],
     templateUrl: './date-cloud.widget.html',

diff --git a/lib/process-services-cloud/src/lib/form/date-formats.ts b/lib/process-services-cloud/src/lib/form/date-formats.ts
diff --git a/lib/process-services-cloud/src/lib/form/public-api.ts b/lib/process-services-cloud/src/lib/form/public-api.ts
@@ -40,4 +40,3 @@ export * from './services/content-cloud-node-selector.service';
 export * from './services/process-cloud-content.service';
 
 export * from './form-cloud.module';
-export * from './date-formats';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,3 @@ export * from './services/content-cloud-node-selector.service';
		export * from './services/process-cloud-content.service';

		export * from './form-cloud.module';
		export * from './date-formats';