From 54402f7ba4b449986c2a73661816ea59e4d45445 Mon Sep 17 00:00:00 2001 From: arditdomi <32884230+arditdomi@users.noreply.github.com> Date: Mon, 5 Jul 2021 17:30:57 +0100 Subject: [PATCH] [AAE-5458] - Reset filters when the filter input is not defined (rollback code causing regression) (#7151) * Reset filters when the new filter param is undefined * Rollback more code, fix unit tests * Fix spaces after comma --- .../components/process-filters-cloud.component.spec.ts | 5 +---- .../components/process-filters-cloud.component.ts | 5 +---- .../service-task-filters-cloud.component.spec.ts | 5 +---- .../components/service-task-filters-cloud.component.ts | 7 +++---- .../components/task-filters-cloud.component.spec.ts | 5 +---- .../components/task-filters-cloud.component.ts | 8 +++----- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts index 5a43ab41a8..1315de324f 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts @@ -231,14 +231,11 @@ describe('ProcessFiltersCloudComponent', () => { expect(filterClickedSpy).toHaveBeenCalledWith(mockProcessFilters[0]); }); - it('should reset the filter when the param is undefined', async () => { + it('should reset the filter when the param is undefined', () => { const change = new SimpleChange(mockProcessFilters[0], undefined, false); component.currentFilter = mockProcessFilters[0]; component.ngOnChanges({ 'filterParam': change }); - fixture.detectChanges(); - await fixture.whenStable(); - expect(component.currentFilter).toEqual(undefined); }); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts index cf5132872b..70bbca414b 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts @@ -95,10 +95,7 @@ export class ProcessFiltersCloudComponent implements OnInit, OnChanges, OnDestro (res: ProcessFilterCloudModel[]) => { this.resetFilter(); this.filters = res || []; - - if (this.filterParam) { - this.selectFilterAndEmit(this.filterParam); - } + this.selectFilterAndEmit(this.filterParam); this.success.emit(res); }, (err: any) => { diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts index a944b28c7b..a068cb56dd 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts @@ -231,14 +231,11 @@ describe('ServiceTaskFiltersCloudComponent', () => { expect(filterClickedSpy).not.toHaveBeenCalled(); }); - it('should reset the filter when the param is undefined', async () => { + it('should reset the filter when the param is undefined', () => { const change = new SimpleChange(null, undefined, false); component.currentFilter = fakeGlobalServiceFilters[0]; component.ngOnChanges({ 'filterParam': change }); - fixture.detectChanges(); - await fixture.whenStable(); - expect(component.currentFilter).toBe(undefined); }); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts index 7550c54509..dd376b49cc 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts @@ -70,10 +70,7 @@ export class ServiceTaskFiltersCloudComponent extends BaseTaskFiltersCloudCompon (res: ServiceTaskFilterCloudModel[]) => { this.resetFilter(); this.filters = res || []; - - if (this.filterParam) { - this.selectFilterAndEmit(this.filterParam); - } + this.selectFilterAndEmit(this.filterParam); this.success.emit(res); }, (err: any) => { @@ -101,6 +98,8 @@ export class ServiceTaskFiltersCloudComponent extends BaseTaskFiltersCloudCompon if (this.currentFilter) { this.filterSelected.emit(this.currentFilter); } + } else { + this.currentFilter = undefined; } } diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts index 8d07b8736f..b48d890871 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts @@ -248,14 +248,11 @@ describe('TaskFiltersCloudComponent', () => { expect(filterClickedSpy).not.toHaveBeenCalled(); }); - it('should reset the filter when the param is undefined', async () => { + it('should reset the filter when the param is undefined', () => { const change = new SimpleChange(fakeGlobalFilter[0], undefined, false); component.currentFilter = fakeGlobalFilter[0]; component.ngOnChanges({ 'filterParam': change }); - fixture.detectChanges(); - await fixture.whenStable(); - expect(component.currentFilter).toEqual(undefined); }); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts index 739beba7d8..fdffb7c5f4 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts @@ -80,11 +80,7 @@ export class TaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent imp (res: TaskFilterCloudModel[]) => { this.resetFilter(); this.filters = res || []; - - if (this.filterParam) { - this.selectFilterAndEmit(this.filterParam); - } - + this.selectFilterAndEmit(this.filterParam); this.updateFilterCounters(); this.success.emit(res); }, @@ -154,6 +150,8 @@ export class TaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent imp this.resetFilterCounter(this.currentFilter.key); this.filterSelected.emit(this.currentFilter); } + } else { + this.currentFilter = undefined; } }