Merge branch 'pbozhinov/row-pinning-tree-grid' of https://github.com/IgniteUI/igniteui-angular into pbozhinov/row-pinning-tree-grid

Author: 3phase

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

@@ -10,7 +10,8 @@ import {
     IgxGridPaginatorOptionsPipe,
     IgxHasVisibleColumnsPipe,
     IgxDatePipeComponent,
-    IgxDecimalPipeComponent
+    IgxDecimalPipeComponent,
+    IgxGridRowPinningPipe
 } from './pipes';
 
 @NgModule({
@@ -24,7 +25,8 @@ import {
         IgxGridCellStylesPipe,
         IgxGridCellStyleClassesPipe,
         IgxGridPaginatorOptionsPipe,
-        IgxHasVisibleColumnsPipe
+        IgxHasVisibleColumnsPipe,
+        IgxGridRowPinningPipe
     ],
     exports: [
         IgxDatePipeComponent,
@@ -36,7 +38,8 @@ import {
         IgxGridCellStylesPipe,
         IgxGridCellStyleClassesPipe,
         IgxGridPaginatorOptionsPipe,
-        IgxHasVisibleColumnsPipe
+        IgxHasVisibleColumnsPipe,
+        IgxGridRowPinningPipe
     ],
     imports: [
         CommonModule

projects/igniteui-angular/src/lib/grids/common/pipes.ts

@@ -212,3 +212,34 @@ export class IgxDecimalPipeComponent extends DecimalPipe implements PipeTransfor
         }
     }
 }
+
+/**
+ * @hidden
+ */
+@Pipe({
+    name: 'gridRowPinning',
+    pure: true
+})
+export class IgxGridRowPinningPipe implements PipeTransform {
+
+    constructor(private gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>) {}
+
+    public transform(collection: any[] , id: string, isPinned = false, pipeTrigger: number) {
+        const grid = this.gridAPI.grid;
+
+        if (!grid.hasPinnedRecords) {
+            return isPinned ? [] : collection;
+        }
+
+        if (grid.hasPinnedRecords && isPinned) {
+            const result = collection.filter(rec => grid.isRecordPinned(rec));
+            result.sort((rec1, rec2) => grid.pinRecordIndex(rec1) - grid.pinRecordIndex(rec2));
+            return result;
+        }
+
+        grid.unpinnedRecords = collection;
+        return collection.map((rec) => {
+            return grid.isRecordPinned(rec) ? { recordRef: rec, ghostRecord: true} : rec;
+        });
+    }
+}

projects/igniteui-angular/src/lib/grids/grid-common.module.ts

@@ -29,7 +29,6 @@ import { IgxGridColumnModule } from './columns/column.module';
 import { IgxGridHeadersModule } from './headers/headers.module';
 import { IgxGridFilteringModule } from './filtering/base/filtering.module';
 import { IgxRowDirective } from './row.directive';
-import { IgxGridRowPinningPipe } from './grid/grid.pipes';
 /**
  * @hidden
  */
@@ -44,8 +43,7 @@ import { IgxGridRowPinningPipe } from './grid/grid.pipes';
         IgxRowEditTabStopDirective,
         IgxGridBodyDirective,
         IgxGridFooterComponent,
-        IgxAdvancedFilteringDialogComponent,
-        IgxGridRowPinningPipe
+        IgxAdvancedFilteringDialogComponent
     ],
     entryComponents: [
         IgxAdvancedFilteringDialogComponent
@@ -73,8 +71,7 @@ import { IgxGridRowPinningPipe } from './grid/grid.pipes';
         IgxGridSummaryModule,
         IgxGridToolbarModule,
         IgxAdvancedFilteringDialogComponent,
-        IgxGridSharedModules,
-        IgxGridRowPinningPipe
+        IgxGridSharedModules
     ],
     imports: [
         IgxGridColumnModule,

projects/igniteui-angular/src/lib/grids/grid/grid.module.ts

@@ -13,8 +13,7 @@ import {
     IgxGridPagingPipe,
     IgxGridGroupingPipe,
     IgxGridSortingPipe,
-    IgxGridFilteringPipe,
-    IgxGridRowPinningPipe
+    IgxGridFilteringPipe
 } from './grid.pipes';
 import { IgxGridGroupByRowComponent } from './groupby-row.component';
 import { IgxGridRowComponent } from './grid-row.component';

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

@@ -152,33 +152,3 @@ export class IgxGridFilteringPipe implements PipeTransform {
     }
 }
 
-/**
- * @hidden
- */
-@Pipe({
-    name: 'gridRowPinning',
-    pure: true
-})
-export class IgxGridRowPinningPipe implements PipeTransform {
-
-    constructor(private gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>) {}
-
-    public transform(collection: any[] , id: string, isPinned = false, pipeTrigger: number) {
-        const grid = this.gridAPI.grid;
-
-        if (!grid.hasPinnedRecords) {
-            return isPinned ? [] : collection;
-        }
-
-        if (grid.hasPinnedRecords && isPinned) {
-            const result = collection.filter(rec => grid.isRecordPinned(rec));
-            result.sort((rec1, rec2) => grid.pinRecordIndex(rec1) - grid.pinRecordIndex(rec2));
-            return result;
-        }
-
-        grid.unpinnedRecords = collection;
-        return collection.map((rec) => {
-            return grid.isRecordPinned(rec) ? { recordRef: rec, ghostRecord: true} : rec;
-        });
-    }
-}

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

@@ -20,15 +20,15 @@ export class IgxTreeGridCellComponent extends IgxGridExpandableCellComponent {
     private treeGridAPI: IgxTreeGridAPIService;
 
     constructor(
-                selectionService: IgxGridSelectionService,
-                crudService: IgxGridCRUDService,
-                gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>,
-                cdr: ChangeDetectorRef,
-                element: ElementRef,
-                protected zone: NgZone,
-                touchManager: HammerGesturesManager,
-                @Inject(DOCUMENT) public document,
-                protected platformUtil: PlatformUtil) {
+        selectionService: IgxGridSelectionService,
+        crudService: IgxGridCRUDService,
+        gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>,
+        cdr: ChangeDetectorRef,
+        element: ElementRef,
+        protected zone: NgZone,
+        touchManager: HammerGesturesManager,
+        @Inject(DOCUMENT) public document,
+        protected platformUtil: PlatformUtil) {
         super(selectionService, crudService, gridAPI, cdr, element, zone, touchManager, document, platformUtil);
         this.treeGridAPI = <IgxTreeGridAPIService>gridAPI;
     }