From 59dc6cb1d1a469c43194816ac02b4a718bb84d14 Mon Sep 17 00:00:00 2001 From: Silviu Popa Date: Fri, 23 Apr 2021 10:49:51 +0300 Subject: [PATCH] [ACA-3700] - fix suspended data filter not preserving data (#6940) * [ACA-3700] - fix suspended data filter not preserving data * fix lint --- ...edit-process-filter-cloud.component.spec.ts | 18 +++++++++++++++--- .../edit-process-filter-cloud.component.ts | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts index b2d377c262..cfa1010b45 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts @@ -401,6 +401,18 @@ describe('EditProcessFilterCloudComponent', () => { }); it('should get form attributes for suspendedData', async() => { + const filter = new ProcessFilterCloudModel({ + id: 'filter-id', + name: 'ADF_CLOUD_PROCESS_FILTERS.RUNNING_PROCESSES', + sort: 'my-custom-sort', + processDefinitionId: 'process-definition-id', + priority: '12', + suspendedDateType: DateCloudFilterType.RANGE + }); + filter.suspendedFrom = new Date(2021, 1, 1).toString(); + filter.suspendedTo = new Date(2021, 1, 2).toString(); + getProcessFilterByIdSpy.and.returnValue(of(filter)); + fixture.detectChanges(); component.filterProperties = ['appName', 'suspendedDateRange']; fixture.detectChanges(); @@ -409,9 +421,9 @@ describe('EditProcessFilterCloudComponent', () => { fixture.detectChanges(); fixture.whenStable().then(() => { fixture.detectChanges(); - expect(component.editProcessFilterForm.get('_suspendedFrom')).toBeDefined(); - expect(component.editProcessFilterForm.get('_suspendedTo')).toBeDefined(); - expect(component.editProcessFilterForm.get('suspendedDateType')).toBeDefined(); + expect(component.editProcessFilterForm.get('_suspendedFrom').value).toEqual(new Date(2021, 1, 1).toString()); + expect(component.editProcessFilterForm.get('_suspendedTo').value).toEqual(new Date(2021, 1, 2).toString()); + expect(component.editProcessFilterForm.get('suspendedDateType').value).toEqual(DateCloudFilterType.RANGE); }); }); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts index 1097da3588..b361aee329 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts @@ -785,8 +785,8 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes attributes: { dateType: 'suspendedDateType', from: '_suspendedFrom', to: '_suspendedTo'}, value: { suspendedDateType: filterModel.suspendedDateType || null, - _startFrom: filterModel.suspendedFrom || null, - _startTo: filterModel.suspendedTo || null + _suspendedFrom: filterModel.suspendedFrom || null, + _suspendedTo: filterModel.suspendedTo || null } } ];