fix(igxTreeGrid): Undoes changes in existing pipes #6640

Author: 3phase

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

@@ -79,7 +79,6 @@
             <ng-container *ngFor="let rowData of data
                 | visibleColumns:hasVisibleColumns
                 | treeGridRowPinning:id:pipeTrigger
-                | treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:true:pipeTrigger
                 | treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger
                 | treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger; let rowIndex = index">
                 <ng-container *ngTemplateOutlet="record_template; context: getContext(rowData, rowIndex, true)">
@@ -93,7 +92,7 @@
         <ng-template igxGridFor let-rowData [igxGridForOf]="data
         | treeGridTransaction:id:pipeTrigger
         | visibleColumns:hasVisibleColumns
-        | treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:false:pipeTrigger
+        | treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:pipeTrigger
         | treeGridShadowRows:id:pipeTrigger
         | treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger
         | treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger

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

@@ -25,23 +25,21 @@ export class IgxTreeGridHierarchizingPipe implements PipeTransform {
     }
 
     public transform(collection: any[], primaryKey: string, foreignKey: string, childDataKey: string,
-        id: string, pinned: boolean = false, pipeTrigger: number): ITreeGridRecord[] {
+        id: string, pipeTrigger: number): ITreeGridRecord[] {
         const grid = this.gridAPI.grid;
         let hierarchicalRecords: ITreeGridRecord[] = [];
         const treeGridRecordsMap = new Map<any, ITreeGridRecord>();
         const flatData: any[] = [];
 
-        if (pinned) {
-            hierarchicalRecords = this.normalizePinnedRecords(collection, primaryKey);
-        } else if (primaryKey && foreignKey) {
+        if (primaryKey && foreignKey) {
             hierarchicalRecords = this.hierarchizeFlatData(id, collection, primaryKey, foreignKey, treeGridRecordsMap, flatData);
         } else if (childDataKey) {
             hierarchicalRecords = this.hierarchizeRecursive(id, collection, primaryKey, childDataKey, undefined,
                 flatData, 0, treeGridRecordsMap);
         }
 
         grid.flatData = flatData;
-        grid.records = (pinned) ? grid.records : treeGridRecordsMap;
+        grid.records = treeGridRecordsMap;
         grid.rootRecords = hierarchicalRecords;
         return hierarchicalRecords;
     }
@@ -123,19 +121,6 @@ export class IgxTreeGridHierarchizingPipe implements PipeTransform {
 
         return result;
     }
-
-    private normalizePinnedRecords(collection: any[], primaryKey: string) {
-        const result: ITreeGridRecord[] = [];
-        collection.forEach(row => {
-            const record: ITreeGridRecord = {
-                rowID: this.getRowID(primaryKey, row),
-                data: row,
-                children: []
-            };
-            result.push(record);
-        });
-        return result;
-    }
 }
 
 /**
@@ -342,13 +327,32 @@ export class IgxTreeGridRowPinningPipe implements PipeTransform {
             return [];
         }
 
-        const result = grid.flatData.filter((value, index) => grid.isRecordPinned(value));
+        let result = grid.flatData.filter((value, index) => grid.isRecordPinned(value));
 
         // pinned records should be ordered as they were pinned.
         result.sort((rec1, rec2) => grid.pinRecordIndex(rec1) - grid.pinRecordIndex(rec2));
 
+        result = this.normalizePinnedRecords(result, this.gridAPI.grid.primaryKey);
+
         return result;
     }
+
+    private normalizePinnedRecords(collection: any[], primaryKey: string) {
+        const result: ITreeGridRecord[] = [];
+        collection.forEach(row => {
+            const record: ITreeGridRecord = {
+                rowID: this.getRowID(primaryKey, row),
+                data: row,
+                children: []
+            };
+            result.push(record);
+        });
+        return result;
+    }
+
+    private getRowID(primaryKey: any, rowData: any) {
+        return primaryKey ? rowData[primaryKey] : rowData;
+    }
 }
 
 @Pipe({