fix(platform): fix unit tests fater refactorings

SAP · Jun 13, 2023 · 0ae7728 · 0ae7728
1 parent 90d9759
commit 0ae7728
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/libs/platform/src/lib/table-helpers/models/selection-change-event.model.ts b/libs/platform/src/lib/table-helpers/models/selection-change-event.model.ts
@@ -10,7 +10,7 @@ export class TableSelectionChangeEvent<T> {
     /** Indexes location of additions or removals */
     index: number[];
     /** Whether `Check/Uncheck` all checkbox was pressed. */
-    all: boolean;
+    all?: boolean;
 }
 
 export class TableRowSelectionChangeEvent<T> extends TableSelectionChangeEvent<T> {

diff --git a/libs/platform/src/lib/table/components/table-header-row/table-header-row.component.html b/libs/platform/src/lib/table/components/table-header-row/table-header-row.component.html
@@ -11,6 +11,7 @@
 <th
     *ngIf="isShownSelectionColumn"
     fd-table-cell
+    [focusable]="true"
     [class.fd-table__cell--fixed]="fixed"
     class="fd-table__cell--checkbox"
     [style]="

diff --git a/libs/platform/src/lib/table/components/table-popping-row/table-popping-row.component.ts b/libs/platform/src/lib/table/components/table-popping-row/table-popping-row.component.ts
@@ -28,7 +28,7 @@ import {
     providers: [
         {
             provide: FDK_FOCUSABLE_LIST_DIRECTIVE,
-            useExisting: TableRowDirective
+            useExisting: TablePoppingRowComponent
         },
         DestroyedService
     ]

diff --git a/libs/platform/src/lib/table/components/table-row/table-row.component.html b/libs/platform/src/lib/table/components/table-row/table-row.component.html
@@ -37,6 +37,7 @@
             [class.fd-table__cell--fixed]="fixed"
             role="cell"
             fd-table-cell
+            [focusable]="true"
             [style]="
                 _contentDensityObserver
                     | async

diff --git a/libs/platform/src/lib/table/table.component.spec.ts b/libs/platform/src/lib/table/table.component.spec.ts
@@ -383,7 +383,8 @@ describe('TableComponent internal', () => {
                         added: [tableComponent._tableRowsVisible[0].value],
                         removed: [],
                         selection: [tableComponent._tableRowsVisible[0].value],
-                        index: [0]
+                        index: [0],
+                        all: false
                     };
 
                     expect(emitSpy).toHaveBeenCalledWith(event1);
@@ -396,7 +397,8 @@ describe('TableComponent internal', () => {
                         added: [tableComponent._tableRowsVisible[1].value],
                         removed: event1.added,
                         selection: [tableComponent._tableRowsVisible[1].value],
-                        index: [1, 0]
+                        index: [1, 0],
+                        all: false
                     };
 
                     expect(emitSpy).toHaveBeenCalledWith(event2);
@@ -468,7 +470,8 @@ describe('TableComponent internal', () => {
                         selection: [tableComponent._tableRowsVisible[0].value],
                         added: [tableComponent._tableRowsVisible[0].value],
                         removed: [],
-                        index: [0]
+                        index: [0],
+                        all: false
                     };
 
                     expect(emitSpy).toHaveBeenCalledWith(event1);
@@ -484,7 +487,8 @@ describe('TableComponent internal', () => {
                         ],
                         added: [tableComponent._tableRowsVisible[1].value],
                         removed: [],
-                        index: [1]
+                        index: [1],
+                        all: false
                     };
 
                     expect(emitSpy).toHaveBeenCalledWith(event2);
@@ -497,7 +501,8 @@ describe('TableComponent internal', () => {
                         selection: [tableComponent._tableRowsVisible[1].value],
                         added: [],
                         removed: [tableComponent._tableRowsVisible[0].value],
-                        index: [0]
+                        index: [0],
+                        all: false
                     };
 
                     expect(emitSpy).toHaveBeenCalledWith(event3);
@@ -1030,11 +1035,16 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
         let tableBodyRows: DebugElement[] = [];
         let tableRowTogglerCellsArray: DebugElement[] = [];
 
+        let firstRowToggler: DebugElement;
+        let secondRowToggler: DebugElement;
+
         const calculateTableElementsMetaData = (): void => {
             tableBodyRows = fixture.debugElement.queryAll(By.css('.fdp-table__body tbody .fd-table__row'));
             tableRowTogglerCellsArray = fixture.debugElement.queryAll(
                 By.css('.fdp-table__body tbody .fd-table__row .fd-table__cell--expand')
             );
+            firstRowToggler = tableRowTogglerCellsArray[0];
+            secondRowToggler = tableRowTogglerCellsArray[1];
         };
 
         beforeEach(waitForAsync(() => {
@@ -1067,14 +1077,8 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
         });
 
         describe('Collapsing/Expanding', () => {
-            let firstRowToggler: DebugElement;
-            let secondRowToggler: DebugElement;
-
             beforeEach(() => {
                 calculateTableElementsMetaData();
-
-                firstRowToggler = tableRowTogglerCellsArray[0];
-                secondRowToggler = tableRowTogglerCellsArray[1];
             });
 
             it('should emit event when parent item collapsed/expanded', () => {
@@ -1090,6 +1094,8 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
 
                 expect(emitSpy).toHaveBeenCalledWith(event1);
 
+                calculateTableElementsMetaData();
+
                 secondRowToggler.nativeElement.dispatchEvent(new MouseEvent('click'));
 
                 const secondRowIndex = 1 + treeItemsChildrenPerParentCount;
@@ -1103,11 +1109,15 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
                 expect(emitSpy.calls.argsFor(1)).toEqual([event2]);
             });
 
-            it('should react to toggling/collapsing with changing rows count', () => {
+            it('should react to toggling/collapsing with changing rows count', async () => {
                 firstRowToggler.nativeElement.dispatchEvent(new MouseEvent('click'));
 
+                // debugger;
+
                 fixture.detectChanges();
 
+                await fixture.whenStable();
+
                 calculateTableElementsMetaData();
 
                 expect(tableBodyRows.length).toEqual(treeItemParentsCount + treeItemsChildrenPerParentCount);
@@ -1116,6 +1126,8 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
 
                 fixture.detectChanges();
 
+                await fixture.whenStable();
+
                 calculateTableElementsMetaData();
 
                 expect(tableBodyRows.length).toEqual(treeItemParentsCount + treeItemsChildrenPerParentCount * 2);
@@ -1124,6 +1136,8 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
 
                 fixture.detectChanges();
 
+                await fixture.whenStable();
+
                 calculateTableElementsMetaData();
 
                 expect(tableBodyRows.length).toEqual(treeItemParentsCount + treeItemsChildrenPerParentCount);
@@ -1132,15 +1146,15 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
 
                 fixture.detectChanges();
 
+                await fixture.whenStable();
+
                 calculateTableElementsMetaData();
 
                 expect(tableBodyRows.length).toEqual(treeItemParentsCount);
             });
         });
 
         describe('Drag & Drop', () => {
-            let firstRowToggler: DebugElement;
-
             beforeEach(() => {
                 calculateTableElementsMetaData();
 
@@ -1424,9 +1438,6 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
                     hostComponent.table.selectionMode = SelectionMode.MULTIPLE;
                     hostComponent.table.ngAfterViewInit();
 
-                    console.log('XXX', hostComponent.table._tableRows[0].checked);
-                    console.log('XXX', hostComponent.table._tableRows[0].children[0].checked);
-
                     const emitChangeSpy = spyOn(hostComponent.table.rowSelectionChange, 'emit').and.stub();
                     hostComponent.table._toggleMultiSelectRow(hostComponent.table._tableRows[0].children[0]);
 
@@ -1442,9 +1453,6 @@ class TreeTableDataProviderMock extends TableDataProvider<SourceTreeItem> {
                     hostComponent.table.selectionMode = SelectionMode.MULTIPLE;
                     hostComponent.table.ngAfterViewInit();
 
-                    console.log('XXX', hostComponent.table._tableRows[0].checked);
-                    console.log('XXX', hostComponent.table._tableRows[0].children[0].checked);
-
                     const emitChangeSpy = spyOn(hostComponent.table.rowSelectionChange, 'emit').and.stub();
                     hostComponent.table._toggleMultiSelectRow(hostComponent.table._tableRows[0].children[0]);
                     expect(emitChangeSpy).toHaveBeenCalled();

diff --git a/libs/platform/src/lib/table/table.component.ts b/libs/platform/src/lib/table/table.component.ts
@@ -297,8 +297,8 @@ export class TableComponent<T = any>
     @Input()
     trackBy: TrackByFunction<T>;
     /**
-     * An optional function, that identifies uniqueness of a particular row.
-     * Table component uses it to be able to preserve selection when data list is changed.
+     * An optional function that identifies uniqueness of a particular row.
+     * Table component uses it to be able to preserve selection when a data list is changed.
      */
     @Input()
     rowComparator: RowComparator<T>;