Merge pull request #6916 from IgniteUI/dkamburov/fix-6816-9.0.x

fix(hgrid): Block child expansion based on hasChildrenKey prop

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-api.service.ts

@@ -112,6 +112,10 @@ export class IgxHierarchicalGridAPIService extends GridBaseAPIService<IgxGridBas
 
     public allow_expansion_state_change(rowID, expanded): boolean {
         const rec = this.get_rec_by_id(rowID);
+        const grid = (this.grid as any);
+        if (grid.hasChildrenKey && !rec[grid.hasChildrenKey]) {
+            return false;
+        }
         return !!rec && this.grid.expansionStates.get(rowID) !== expanded;
     }
 

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts

@@ -416,6 +416,43 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
 
         expect(childGrid.calcWidth - 370 ).toBeLessThan(3);
     });
+
+    it('should not expand children when hasChildrenKey is false for the row', () => {
+        hierarchicalGrid.hasChildrenKey = 'hasChild';
+        fixture.componentInstance.data = [
+            {ID: 1, ProductName: 'Product: A1', hasChild: false, childData: fixture.componentInstance.generateDataUneven(1, 1)},
+            {ID: 2, ProductName: 'Product: A2', hasChild: true, childData: fixture.componentInstance.generateDataUneven(1, 1)}
+        ];
+        fixture.detectChanges();
+        const row1 = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
+        const rowElems = fixture.debugElement.queryAll(By.directive(IgxHierarchicalRowComponent));
+        expect(rowElems[0].query(By.css('igx-icon')).nativeElement.innerText).toEqual('');
+        const row2 = hierarchicalGrid.getRowByIndex(1) as IgxHierarchicalRowComponent;
+        expect(rowElems[1].query(By.css('igx-icon')).nativeElement.innerText).toEqual('chevron_right');
+        hierarchicalGrid.expandRow(row1.rowData);
+        hierarchicalGrid.expandRow(row2.rowData);
+        expect(row1.expanded).toBe(false);
+        expect(row2.expanded).toBe(true);
+    });
+
+    it('should not expand children when hasChildrenKey is false for the row and there is primaryKey', () => {
+        hierarchicalGrid.hasChildrenKey = 'hasChild';
+        hierarchicalGrid.primaryKey = 'ID';
+        fixture.componentInstance.data = [
+            {ID: 1, ProductName: 'Product: A1', hasChild: false, childData: fixture.componentInstance.generateDataUneven(1, 1)},
+            {ID: 2, ProductName: 'Product: A2', hasChild: true, childData: fixture.componentInstance.generateDataUneven(1, 1)}
+        ];
+        fixture.detectChanges();
+        const row1 = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
+        const rowElems = fixture.debugElement.queryAll(By.directive(IgxHierarchicalRowComponent));
+        expect(rowElems[0].query(By.css('igx-icon')).nativeElement.innerText).toEqual('');
+        const row2 = hierarchicalGrid.getRowByIndex(1) as IgxHierarchicalRowComponent;
+        expect(rowElems[1].query(By.css('igx-icon')).nativeElement.innerText).toEqual('chevron_right');
+        hierarchicalGrid.expandRow(1);
+        hierarchicalGrid.expandRow(2);
+        expect(row1.expanded).toBe(false);
+        expect(row2.expanded).toBe(true);
+    });
 });
 
 describe('IgxHierarchicalGrid Row Islands #hGrid', () => {