Merge branch 'master' into mdragnev/fix-8373

Author: Lipata

projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts

@@ -390,7 +390,7 @@ describe('UpdateChanges', () => {
         });
         spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
 
-        const fileContent =
+        let fileContent =
 `import { Size, Type as someThg } from "igniteui-angular";
 import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular';
 import { Type } from "@angular/core";
@@ -411,7 +411,7 @@ export class Test {
         expect(update.getClassChanges()).toEqual(classJson);
 
         update.applyChanges();
-        expect(appTree.readContent('test.component.ts')).toEqual(
+        let expectedFileContent =
 `import { IgxSize, IgxType as someThg } from "igniteui-angular";
 import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular';
 import { Type } from "@angular/core";
@@ -423,8 +423,15 @@ export class Test {
     cal: Calendar;
 
     constructor (public router: Router, private _iconService: IgxService1) {}
-}`
-        );
+}`;
+        expect(appTree.readContent('test.component.ts')).toEqual(expectedFileContent);
+
+        // with ig feed package:
+        fileContent = fileContent.replace(/igniteui-angular/g, '@infragistics/igniteui-angular');
+        expectedFileContent = expectedFileContent.replace(/igniteui-angular/g, '@infragistics/igniteui-angular');
+        appTree.overwrite('test.component.ts', fileContent);
+        update.applyChanges();
+        expect(appTree.readContent('test.component.ts')).toEqual(expectedFileContent);
     });
 
     it('should move property value between element tags', done => {

projects/igniteui-angular/migrations/common/tsUtils.ts

@@ -69,7 +69,7 @@ export function getImportModulePositions(sourceText: string, startsWith: string)
 /** Filters out statements to named imports (e.g. `import {x, y}`) from PACKAGE_IMPORT */
 const namedImportFilter = (statement: ts.Statement) => {
     if (statement.kind === ts.SyntaxKind.ImportDeclaration &&
-        ((statement as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral).text === IG_PACKAGE_NAME) {
+        ((statement as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral).text.endsWith(IG_PACKAGE_NAME)) {
 
         const clause = (statement as ts.ImportDeclaration).importClause;
         return clause && clause.namedBindings && clause.namedBindings.kind === ts.SyntaxKind.NamedImports;

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -3149,7 +3149,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
      */
     public generateRowID(): string | number {
         const primaryColumn = this.columnList.find(col => col.field === this.primaryKey);
-        const idType = primaryColumn ? primaryColumn.dataType : this.data.length ? typeof (this.data[0][this.primaryKey]) : 'string';
+        const idType = this.data.length ? typeof (this.data[0][this.primaryKey]) : primaryColumn ? primaryColumn.dataType : 'string';
         return idType === 'string' ? uuidv4() : FAKE_ROW_ID--;
     }
 
@@ -6659,7 +6659,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
                 if (args.cancel) {
                     return args.cancel;
                 }
-                this.gridAPI.addRowToData(row.data, this.addRowParent.asChild ? this.addRowParent.rowID : undefined);
+                const parentId = this._getParentRecordId();
+                this.gridAPI.addRowToData(row.data, parentId);
                 const doneArgs = row.createDoneEditEventArgs(cachedRowData);
                 this.rowEditDone.emit(doneArgs);
                 this.crudService.endRowEdit();
@@ -6685,6 +6686,14 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         return this.cancelAddMode;
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    protected _getParentRecordId() {
+        return this.addRowParent.asChild ? this.addRowParent.rowID : undefined;
+    }
+
     /**
      * @hidden
      * @internal

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

@@ -1,4 +1,4 @@
-import { async, TestBed, fakeAsync } from '@angular/core/testing';
+import { async, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxColumnComponent, IgxGridComponent, IgxGridModule, IGridEditEventArgs, IGridEditDoneEventArgs } from './public_api';
@@ -756,20 +756,23 @@ describe('IgxGrid - Cell Editing #grid', () => {
             expect(grid.cellEdit.emit).toHaveBeenCalledWith(cellArgs);
         });
 
-        it(`Should be able to cancel 'cellEdit' event`, () => {
-            spyOn(grid.cellEdit, 'emit').and.callThrough();
+        it(`Should be able to cancel 'cellEdit' event`, fakeAsync(() => {
+            const emitSpy = spyOn(grid.cellEdit, 'emit').and.callThrough();
             grid.cellEdit.subscribe((e: IGridEditEventArgs) => {
                 e.cancel = true;
             });
-            let cell = grid.getCellByColumn(0, 'fullName');
+            const cell = grid.getCellByColumn(0, 'fullName');
             let cellArgs: IGridEditEventArgs;
             const initialRowData = {...cell.rowData};
 
             UIInteractions.simulateDoubleClickAndSelectEvent(cell);
             fixture.detectChanges();
+            tick(16); // trigger igxFocus rAF
+            const editInput = fixture.debugElement.query(By.css('igx-grid-cell input')).nativeElement;
 
             expect(cell.editMode).toBe(true);
-            let cellValue = cell.value;
+            expect(document.activeElement).toBe(editInput);
+            const cellValue = cell.value;
             const newValue = 'new value';
             cell.editValue = newValue;
 
@@ -790,29 +793,39 @@ describe('IgxGrid - Cell Editing #grid', () => {
             expect(grid.cellEdit.emit).toHaveBeenCalledTimes(1);
             expect(grid.cellEdit.emit).toHaveBeenCalledWith(cellArgs);
 
+            emitSpy.calls.reset();
             UIInteractions.triggerEventHandlerKeyDown('tab', gridContent);
             fixture.detectChanges();
 
             expect(cell.editMode).toBe(true);
             expect(cell.value).toBe(cellValue);
-            expect(grid.cellEdit.emit).toHaveBeenCalledTimes(2);
+            expect(document.activeElement).toBe(editInput);
+            expect(grid.cellEdit.emit).toHaveBeenCalledTimes(1);
             expect(grid.cellEdit.emit).toHaveBeenCalledWith(cellArgs);
 
-            cell = grid.getCellByColumn(0, 'age');
-            cellValue = cell.value;
-            expect(cell.editMode).toBe(false);
+            const nextCell = grid.getCellByColumn(0, 'age');
+            expect(nextCell.editMode).toBe(false);
 
             // activate the new cell
-            cell.activate(null);
+            emitSpy.calls.reset();
+            nextCell.activate(null);
             fixture.detectChanges();
-            expect(grid.cellEdit.emit).toHaveBeenCalledTimes(3);
+            expect(grid.cellEdit.emit).toHaveBeenCalledTimes(1);
             expect(grid.cellEdit.emit).toHaveBeenCalledWith(cellArgs);
 
-            expect(cell.editMode).toBe(false);
+            expect(nextCell.editMode).toBe(false);
+            expect(cell.editMode).toBe(true);
+            expect(document.activeElement).toBe(editInput);
+
+            emitSpy.calls.reset();
+            UIInteractions.triggerEventHandlerKeyDown('enter', gridContent);
+            fixture.detectChanges();
 
-            cell = grid.getCellByColumn(0, 'fullName');
             expect(cell.editMode).toBe(true);
-        });
+            expect(document.activeElement).toBe(editInput);
+            expect(grid.cellEdit.emit).toHaveBeenCalledTimes(1);
+            expect(grid.cellEdit.emit).toHaveBeenCalledWith(cellArgs);
+        }));
 
         it(`Should be able to update other cell in 'cellEdit' event`, () => {
             grid.primaryKey = 'personNumber';
@@ -1031,7 +1044,7 @@ describe('IgxGrid - Cell Editing #grid', () => {
             expect(grid.crudService.cellInEditMode).toEqual(true);
         });
 
-        it('When cellEdit is canceled the new value of the cell should never be commited nor the editing should be closed', () => {
+        it('When cellEdit is canceled the new value of the cell should never be committed nor the editing should be closed', () => {
             const cell = grid.getCellByColumn(0, 'fullName');
             grid.cellEdit.pipe(takeUntil($destroyer)).subscribe((evt) => {
                 evt.cancel = true;

projects/igniteui-angular/src/lib/grids/selection/selection.service.ts

@@ -210,12 +210,12 @@ export class IgxGridCRUDService {
         }
 
         if (this.cellInEditMode) {
+            // TODO: case solely for f2/enter nav that uses enterEditMode as toggle. Refactor.
             const canceled = this.grid.endEdit(true);
-            if (this.grid.rowEditable && canceled) {
-                this._rowEditingBlocked = canceled;
-            }
 
-            this.grid.tbody.nativeElement.focus();
+            if (!canceled || !this.cell) {
+                this.grid.tbody.nativeElement.focus();
+            }
         } else {
 
             if (cell?.row.addRow) {
@@ -355,7 +355,7 @@ export class IgxGridCRUDService {
     }
 
 
-    /** Cleares cell and row editing state and closes row editing template if it is open */
+    /** Clears cell and row editing state and closes row editing template if it is open */
     public endEditMode() {
         this.endCellEdit();
         if (this.grid.rowEditable) {

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-add-row-ui.spec.ts

@@ -92,5 +92,23 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
             const addRow = treeGrid.getRowByIndex(2);
             expect(addRow.addRow).toBeTrue();
         });
+
+        it('should allow adding sibling to child row via the API.', () => {
+            const row = treeGrid.rowList.toArray()[2] as IgxTreeGridRowComponent;
+            // adds row as sibling
+            row.beginAddRow();
+            fix.detectChanges();
+            endTransition();
+
+            treeGrid.endEdit(true);
+            fix.detectChanges();
+
+            // check row is added as sibling
+            expect(treeGrid.rowList.length).toBe(9);
+            const addedRow = treeGrid.rowList.toArray()[4] as IgxTreeGridRowComponent;
+            expect(addedRow.rowData.Name).toBe(undefined);
+            // should have same parent record.
+            expect(addedRow.treeRow.parent).toBe(row.treeRow.parent);
+        });
     });
 });

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

@@ -519,6 +519,19 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         this.notifyChanges();
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    protected _getParentRecordId() {
+        if (this.addRowParent.asChild) {
+            return super._getParentRecordId();
+        } else {
+            const spawnedForRecord =  this._gridAPI.get_rec_by_id(this.addRowParent.rowID);
+            return spawnedForRecord.parent?.rowID;
+        }
+    }
+
     /** @hidden */
     public deleteRowById(rowId: any) {
         //  if this is flat self-referencing data, and CascadeOnDelete is set to true