From dd1bbdffd6a95b0aacbfd98ec2e09e0db02c5f3a Mon Sep 17 00:00:00 2001
From: Robert Duda <robert.duda@hyland.com>
Date: Fri, 24 Jan 2025 11:26:28 +0100
Subject: [PATCH] AAE-30162 Don't retreive task filter if present (#10575)

---
 .../base-edit-task-filter-cloud.component.ts              | 8 +++++++-
 .../edit-service-task-filter-cloud.component.spec.ts      | 1 +
 .../edit-task-filter-cloud.component.spec.ts              | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
index 33b137b144..f1589c2a45 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts
@@ -155,7 +155,13 @@ export abstract class BaseEditTaskFilterCloudComponent<T> implements OnInit, OnC
     ngOnChanges(changes: SimpleChanges) {
         const { id } = changes;
         if (id && id.currentValue !== id.previousValue) {
-            this.retrieveTaskFilterAndBuildForm();
+            if (this.taskFilter) {
+                this.taskFilterProperties = this.createAndFilterProperties();
+                this.taskFilterActions = this.createAndFilterActions();
+                this.buildForm(this.taskFilterProperties);
+            } else {
+                this.retrieveTaskFilterAndBuildForm();
+            }
         }
     }
 
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.spec.ts
index cc451c7401..1bf11492ef 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.spec.ts
@@ -189,6 +189,7 @@ describe('EditServiceTaskFilterCloudComponent', () => {
 
         describe('Save & Delete buttons', () => {
             it('should disable save and delete button for default task filters', async () => {
+                component.taskFilter = undefined;
                 getTaskFilterSpy.and.returnValue(
                     of({
                         name: 'ADF_CLOUD_SERVICE_TASK_FILTERS.ALL_SERVICE_TASKS',
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.spec.ts
index 642c48fca1..b063cd5c96 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.spec.ts
@@ -299,6 +299,7 @@ describe('EditTaskFilterCloudComponent', () => {
 
         describe('Save & Delete buttons', () => {
             it('should disable save and delete button for default task filters', async () => {
+                component.taskFilter = undefined;
                 getTaskFilterSpy.and.returnValue(of(mockDefaultTaskFilter));
 
                 component.ngOnChanges({ id: mockTaskFilterIdChange });