Merge branch 'PMiteva/fix-9717-12.1.x' of https://github.com/IgniteUI/igniteui-angular into PMiteva/fix-9717-12.1.x

Author: PlamenaMiteva

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

@@ -196,7 +196,8 @@ export class UpdateChanges {
         this.valueTransforms.set(functionName, callback);
     }
 
-    public getDefaultLanguageService(entryPath: string): tss.LanguageService | undefined {
+    /** Path must be absolute. If calling externally, use this.getAbsolutePath */
+    protected getDefaultLanguageService(entryPath: string): tss.LanguageService | undefined {
         const project = this.getDefaultProjectForFile(entryPath);
         return project.getLanguageService();
     }

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

@@ -247,7 +247,7 @@ const getTypeDefinitions = (langServ: tss.LanguageService, entryPath: string, po
  * Get type information about a TypeScript identifier
  *
  * @param langServ TypeScript/Angular LanguageService
- * @param entryPath path to file
+ * @param entryPath path to file (absolute)
  * @param position Index of identifier
  */
 export const getTypeDefinitionAtPosition =

projects/igniteui-angular/migrations/update-11_1_0/changes/members.json

@@ -363,6 +363,20 @@
             "definedIn": [
                 "IgxTooltipTargetDirective"
             ]
+        },
+        {
+            "member": "remote",
+            "replaceWith": "Remote",
+            "definedIn": [
+                "GridPagingMode"
+            ]
+        },
+        {
+            "member": "local",
+            "replaceWith": "Local",
+            "definedIn": [
+                "GridPagingMode"
+            ]
         }
     ]
 }

projects/igniteui-angular/migrations/update-11_1_0/index.spec.ts

@@ -749,4 +749,49 @@ export class CsvExportComponent {
             )
         ).toEqual(expectedContent);
     });
+
+    it('should update GridPagingMode enum from lowerCase to TitleCase', async () => {
+        pending('set up tests for migrations through lang service');
+        appTree.create(
+            '/testSrc/appPrefix/component/paging-test.component.ts',
+`import { Component } from '@angular/core';
+import { GridPagingMode } from "igniteui-angular";
+
+@Component({
+    selector: "app-paging-test",
+    styleUrls: ["./paging-test.component.scss"],
+    templateUrl: "./paging-test.component.html"
+})
+export class PagingComponent {
+    public pagingLocal: GridPagingMode = GridPagingMode.Local;
+    public pagingRemote: GridPagingMode = GridPagingMode.Remote;
+    constructor(){}
+}
+`);
+
+        const tree = await runner
+            .runSchematicAsync('migration-19', {}, appTree)
+            .toPromise();
+
+        const expectedContent =
+`import { Component } from '@angular/core';
+import { GridPagingMode } from "igniteui-angular";
+
+@Component({
+    selector: "app-paging-test",
+    styleUrls: ["./paging-test.component.scss"],
+    templateUrl: "./paging-test.component.html"
+})
+export class PagingComponent {
+    public pagingLocal: GridPagingMode = GridPagingMode.local;
+    public pagingRemote: GridPagingMode = GridPagingMode.remote;
+    constructor(){}
+}
+`;
+        expect(
+            tree.readContent(
+                '/testSrc/appPrefix/component/paging-test.component.ts'
+            )
+        ).toEqual(expectedContent);
+    });
 });

projects/igniteui-angular/migrations/update-11_1_0/index.ts

@@ -1,5 +1,4 @@
 import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import { findMatches, replaceMatch } from '../common/tsUtils';
 import { UpdateChanges } from '../common/UpdateChanges';
 
 const version = '11.1.0';
@@ -8,28 +7,5 @@ export default (): Rule => (host: Tree, context: SchematicContext) => {
     context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
 
     const update = new UpdateChanges(__dirname, host, context);
-    const tsFiles = update.tsFiles;
-    const targetEnum = 'GridPagingMode';
-    const changes = [
-        { member: 'remote', replaceWith: 'Remote', definedIn: [targetEnum] },
-        { member: 'local', replaceWith: 'Local', definedIn: [targetEnum] }
-    ];
     update.applyChanges();
-    for (const entryPath of tsFiles) {
-        const ls = update.getDefaultLanguageService(entryPath);
-        let content = host.read(entryPath).toString();
-        for (const change of changes) {
-            const matches = findMatches(content, change.member);
-            for (const position of matches) {
-                const definition = ls.getDefinitionAndBoundSpan(entryPath, position - 1)?.definitions[0];
-                if (definition
-                    && definition.kind === 'enum'
-                    && definition.name === targetEnum
-                    && definition.fileName.includes('igniteui-angular')) {
-                    content = replaceMatch(content, change.member, change.replaceWith, position);
-                    host.overwrite(entryPath, content);
-                }
-            }
-        }
-    }
 };

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

@@ -7003,6 +7003,9 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
 
         this.hideOverlays();
         this.actionStrip?.hide();
+        if (this.actionStrip) {
+            this.actionStrip.context = null;
+        }
         const args: IGridScrollEventArgs = {
             direction: 'vertical',
             event,

src/app/tree-grid-add-row/tree-grid-add-row.sample.html

@@ -1,16 +1,14 @@
 <div>
     <igx-tree-grid [pinning]="pinningConfig" #grid [allowFiltering]="true" [data]="data" primaryKey="employeeID" foreignKey="PID"
-    [width]="'900px'" [height]="'800px'" [rowEditable]="true"
-    (mouseleave)="onMouseLeave(actionstrip)"
-    (mouseover)="onMouseOver($event, grid, actionstrip)">
+    [width]="'900px'" [height]="'800px'" [rowEditable]="true">
     <igx-column *ngFor="let c of columns" [field]="c.field" [dataType]="c.dataType" [header]="c.label"
         [pinned]="c.pinned" [movable]="c.movable" [groupable]="false" [resizable]="c.resizable" [width]="c.width"
         [sortable]="true" [filterable]="true" [editable]="true" [hidden]="c.hidden"
         [minWidth]="c.minWidth" [maxWidth]="c.maxWidth">
     </igx-column>
     <igx-action-strip #actionstrip>
         <igx-grid-pinning-actions></igx-grid-pinning-actions>
-        <igx-grid-editing-actions [addRow]="true" [addChild]='true'></igx-grid-editing-actions>
+        <igx-grid-editing-actions [addRow]="true" [addChild]="actionstrip.context?.treeRow.level < 1"></igx-grid-editing-actions>
     </igx-action-strip>
 </igx-tree-grid>
 </div>