Merge branch 'master' into mvenkov/sync-column-editable-with-roweditable

Author: Lipata

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

@@ -296,6 +296,43 @@ describe('IgxTreeGrid - CRUD ', () => {
                 verifyTreeGridRecordsCount(fix, 3, 8);
                 verifyProcessedTreeGridRecordsCount(fix, 3, 8);
             });
+
+            it('should support adding child rows to a parent with ID=0 through treeGrid API', () => {
+                verifyRowsCount(fix, 8, 8);
+                verifyTreeGridRecordsCount(fix, 3, 8);
+                verifyProcessedTreeGridRecordsCount(fix, 3, 8);
+
+                // Add child row with ID=0 on root level
+                spyOn(treeGrid.onRowAdded, 'emit');
+                let newRow = {
+                    ID: 0,
+                    Name: 'New Employee 1',
+                    JobTitle: 'Senior Web Developer',
+                    Age: 33
+                };
+                treeGrid.addRow(newRow);
+                fix.detectChanges();
+
+                expect(treeGrid.onRowAdded.emit).toHaveBeenCalledWith({ data: newRow });
+                verifyRowsCount(fix, 9, 9);
+                verifyTreeGridRecordsCount(fix, 4, 9);
+                verifyProcessedTreeGridRecordsCount(fix, 4, 9);
+
+                // Add child row to the parent with ID=0
+                newRow = {
+                    ID: 333,
+                    Name: 'New Employee 2',
+                    JobTitle: 'Senior Web Developer',
+                    Age: 33
+                };
+                treeGrid.addRow(newRow, 0);
+                fix.detectChanges();
+
+                expect(treeGrid.onRowAdded.emit).toHaveBeenCalledWith({ data: newRow });
+                verifyRowsCount(fix, 10, 10);
+                verifyTreeGridRecordsCount(fix, 4, 10);
+                verifyProcessedTreeGridRecordsCount(fix, 4, 10);
+            });
         });
     });
 

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

@@ -855,7 +855,7 @@ describe('IgxTreeGrid - Integration ', () => {
             const grandChildRow = { ID: 13, ParentID: 12, Name: 'Asparuh Pulev', JobTitle: 'wrestler', Age: 14 };
             const trans = treeGrid.transactions;
 
-            treeGrid.addRow(rootRow, 0);
+            treeGrid.addRow(rootRow);
             fix.detectChanges();
 
             treeGrid.addRow(childRow, 11);
@@ -930,7 +930,7 @@ describe('IgxTreeGrid - Integration ', () => {
                 JobTitle: 'Copywriter',
                 Age: 22
             };
-            treeGrid.addRow(newRow, 0);
+            treeGrid.addRow(newRow);
             fix.detectChanges();
 
             const addedRow = treeGrid.rowList.filter(r => r.rowID === addedRowId)[0] as IgxTreeGridRowComponent;
@@ -1356,7 +1356,7 @@ describe('IgxTreeGrid - Integration ', () => {
             const grandChildRow = { ID: 13, ParentID: 12, Name: 'Asparuh Pulev', JobTitle: 'wrestler', Age: 14 };
             const trans = treeGrid.transactions;
 
-            treeGrid.addRow(rootRow, 0);
+            treeGrid.addRow(rootRow);
             fix.detectChanges();
 
             treeGrid.addRow(childRow, 11);

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts

@@ -599,7 +599,7 @@ export class IgxTreeGridComponent extends IgxGridBaseComponent implements IGridD
      * @memberof IgxTreeGridComponent
      */
     public addRow(data: any, parentRowID?: any) {
-        if (parentRowID) {
+        if (parentRowID !== undefined && parentRowID !== null) {
             super.endEdit(true);
 
             const state = this.transactions.getState(parentRowID);