fix: add falsy handling for async columnTemplate loading (#472)

onecx · Sep 17, 2024 · c7c4adc · c7c4adc
1 parent 6d23ada
commit c7c4adc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.html b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="(displayedPageSize$ | async) as displayedPageSize">
   <p-dataView
-    *ngIf="(columnTemplates$ | async) ?? [] as columnTemplates"
+    *ngIf="(columnTemplates$ | async) ?? {} as columnTemplates"
     [value]="(displayedItems$ | async) ?? []"
     [paginator]="paginator"
     [first]="page * displayedPageSize"

diff --git a/libs/angular-accelerator/src/lib/components/data-table/data-table.component.html b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.html
@@ -105,7 +105,7 @@
 
 <ng-container *ngIf="(displayedPageSize$ | async) as displayedPageSize">
   <p-table
-    *ngIf="(columnTemplates$ | async) as columnTemplates"
+    *ngIf="(columnTemplates$ | async) ?? {} as columnTemplates"
     [value]="(displayedRows$ | async) ?? []"
     responsiveLayout="scroll"
     [paginator]="paginator"

diff --git a/libs/angular-accelerator/src/lib/components/data-table/data-table.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.spec.ts
@@ -478,8 +478,7 @@ describe('DataTableComponent', () => {
       expect(component.editTableRowObserved).toBe(true)
       expect(component.deleteTableRowObserved).toBe(true)
 
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       const tableActions = await dataTable.getActionButtons()
       expect(tableActions.length).toBe(3)
@@ -502,8 +501,7 @@ describe('DataTableComponent', () => {
       setUpActionButtonMockData()
       component.viewActionEnabledField = 'ready'
 
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       let tableActions = await dataTable.getActionButtons()
       expect(tableActions.length).toBe(3)
@@ -524,8 +522,7 @@ describe('DataTableComponent', () => {
 
       component.rows = [...tempRows]
 
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       tableActions = await dataTable.getActionButtons()
 
@@ -546,8 +543,7 @@ describe('DataTableComponent', () => {
       expect(component.viewTableRowObserved).toBe(true)
       expect(component.editTableRowObserved).toBe(true)
       expect(component.deleteTableRowObserved).toBe(true)
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       const tableActions = await dataTable.getActionButtons()
       expect(tableActions.length).toBe(3)
@@ -569,8 +565,7 @@ describe('DataTableComponent', () => {
       setUpActionButtonMockData()
       component.viewActionVisibleField = 'ready'
 
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       let tableActions = await dataTable.getActionButtons()
       expect(tableActions.length).toBe(2)
@@ -586,8 +581,7 @@ describe('DataTableComponent', () => {
 
       component.rows = [...tempRows]
 
-      fixture.detectChanges()
-      await fixture.whenStable()
+
 
       tableActions = await dataTable.getActionButtons()
       expect(tableActions.length).toBe(3)