fixing failing test

Author: zamoore

packages/components/src/components/hds/advanced-table/models/row.ts

@@ -27,12 +27,6 @@ export default class HdsAdvancedTableRow {
     return this.isOpen && this.hasChildren;
   }
 
-  get allDescendantsAreOpen(): boolean {
-    return this.children.every(
-      (child) => child.isOpen && child.allDescendantsAreOpen
-    );
-  }
-
   constructor(args: HdsAdvancedTableRowArgs) {
     // set row data
     Object.assign(this, args);

packages/components/src/components/hds/advanced-table/models/table.ts

@@ -34,6 +34,18 @@ export default class HdsAdvancedTableTableModel {
     });
   }
 
+  get totalRowCount(): number {
+    function getChildrenCount(rows: HdsAdvancedTableRow[]): number {
+      return rows.reduce((acc, row) => {
+        return acc + 1 + getChildrenCount(row.children);
+      }, 0);
+    }
+
+    return this.rows.reduce((acc, row) => {
+      return acc + 1 + getChildrenCount(row.children);
+    }, 0);
+  }
+
   get flattenedVisibleRows(): HdsAdvancedTableRow[] {
     return getVisibleRows(this.rows);
   }
@@ -46,12 +58,12 @@ export default class HdsAdvancedTableTableModel {
     return this.rows.some((row) => row.hasChildren);
   }
 
-  get allDescendantsAreOpen(): boolean {
-    return this.rows.every((row) => row.isOpen && row.allDescendantsAreOpen);
+  get allRowsAreOpen(): boolean {
+    return this.flattenedVisibleRows.length === this.totalRowCount;
   }
 
   get expandState(): HdsAdvancedTableExpandState {
-    if (this.allDescendantsAreOpen) {
+    if (this.allRowsAreOpen) {
       return true;
     } else if (this.rows.some((row) => row.isOpen)) {
       return 'mixed';
@@ -72,7 +84,7 @@ export default class HdsAdvancedTableTableModel {
 
   @action
   toggleAll() {
-    if (this.allDescendantsAreOpen) {
+    if (this.allRowsAreOpen) {
       this.collapseAll();
     } else {
       this.openAll();

showcase/tests/integration/components/hds/advanced-table/index-test.js

@@ -1060,6 +1060,7 @@ module('Integration | Component | hds/advanced-table/index', function (hooks) {
 
     for (let i = 0; i < rowToggles.length; i++) {
       await click(rowToggles[i]);
+
       if (i < rowToggles.length - 1) {
         assert.dom(expandAllButton).hasAria('expanded', 'mixed');
       }