From f34bbf59bec2143aab34f64412e89e44c1e36a27 Mon Sep 17 00:00:00 2001
From: Ehsan Rezaei <ehsan.rezaei@hyland.com>
Date: Wed, 23 Apr 2025 16:58:28 +0200
Subject: [PATCH] AAE-33589 Get task variables when preferences are updated
 (#10813)

---
 .../task-list/task-list-cloud.component.spec.ts           | 8 +++++++-
 .../components/task-list/task-list-cloud.component.ts     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.spec.ts
index cc527c30af..a021d1278c 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.spec.ts
@@ -230,6 +230,9 @@ describe('TaskListCloudComponent', () => {
                 done();
             });
 
+            component.ngAfterContentInit();
+            spyOn(component, 'createDatatableSchema');
+            component.appName = 'fake-app-name';
             component.reload();
         });
 
@@ -375,6 +378,9 @@ describe('TaskListCloudComponent', () => {
                 done();
             });
 
+            component.ngAfterContentInit();
+            spyOn(component, 'createDatatableSchema');
+            component.appName = 'fake-app-name';
             component.reload();
         });
 
@@ -390,7 +396,7 @@ describe('TaskListCloudComponent', () => {
 
             fixture.detectChanges();
 
-            expect(fetchTaskListSpy).toHaveBeenCalledTimes(1);
+            expect(fetchTaskListSpy).toHaveBeenCalledTimes(2);
         });
         describe('component changes', () => {
             beforeEach(() => {
diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.ts
index ed18458967..da04a08eef 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.ts
@@ -280,10 +280,10 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent<ProcessLi
     ) {
         super(appConfigService, taskCloudService, userPreferences, PRESET_KEY, cloudPreferenceService);
 
-        combineLatest([this.isColumnSchemaCreated$, this.fetchProcessesTrigger$])
+        combineLatest([this.isLoadingPreferences$, this.isColumnSchemaCreated$, this.fetchProcessesTrigger$])
             .pipe(
                 tap(() => this.isReloadingSubject$.next(true)),
-                filter((isColumnSchemaCreated) => !!isColumnSchemaCreated),
+                filter(([isLoadingPreferences, isColumnSchemaCreated]) => !isLoadingPreferences && !!isColumnSchemaCreated),
                 switchMap(() => {
                     if (this.searchApiMethod === 'POST') {
                         const requestNode = this.createTaskListRequestNode();