[ACA-3368] Add presetColumn change detection for task list

Alfresco · May 28, 2020 · 479059f · 479059f
1 parent 901574b
commit 479059f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.ts b/lib/process-services/src/lib/process-list/components/process-list.component.ts
@@ -182,7 +182,8 @@ export class ProcessInstanceListComponent extends DataTableSchema implements OnC
             this.reload();
         }
 
-        if (changes['presetColumn']) {
+        const presetColumnChanges = changes['presetColumn'];
+        if (presetColumnChanges && !presetColumnChanges.firstChange) {
             this.columns = this.mergeJsonAndHtmlSchema();
         }
     }

diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts
@@ -533,6 +533,14 @@ describe('TaskListComponent', () => {
                 responseText: JSON.stringify(fakeGlobalTask)
             });
         });
+
+        it('should update columns when presetColumn schema changes', () => {
+            component.ngAfterContentInit();
+            component.columns = [];
+            const presetColumnChange = new SimpleChange(null, 'fakeCustomSchema', false);
+            component.ngOnChanges({ 'presetColumn': presetColumnChange });
+            expect(component.columns).toEqual(component.mergeJsonAndHtmlSchema());
+        });
     });
 
     it('should show the updated list when pagination changes', async(() => {

diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.ts b/lib/process-services/src/lib/task-list/components/task-list.component.ts
@@ -235,6 +235,11 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
             }
             this.reload();
         }
+
+        const presetColumnChanges = changes['presetColumn'];
+        if (presetColumnChanges && !presetColumnChanges.firstChange) {
+            this.columns = this.mergeJsonAndHtmlSchema();
+        }
     }
 
     private isSortChanged(changes: SimpleChanges): boolean {