chore(*): Making sure filteredData collection contains both pinned and unpinned filter results.

Author: MKirova

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

@@ -2391,6 +2391,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
      */
     protected destroy$ = new Subject<any>();
 
+    protected _filteredPinnedData;
+    protected _filteredUnpinnedData;
+
     /**
      * @hidden
      */
@@ -2826,6 +2829,17 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         }
     }
 
+    public setFilterData(data, pinned: boolean) {
+        if (this.pinnedRecords.length > 0 && pinned) {
+            this._filteredPinnedData = data;
+            this.filteredData = [... this._filteredPinnedData, ... this._filteredUnpinnedData];
+        } else if (this.pinnedRecords.length > 0 && !pinned) {
+            this._filteredUnpinnedData = data;
+        } else {
+            this.filteredData = data;
+        }
+    }
+
     /**
      * @hidden
      * @internal

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

@@ -114,7 +114,7 @@
         <ng-container *ngIf='pinnedRecords
         | gridTransaction:id:pipeTrigger
         | visibleColumns:hasVisibleColumns
-        | gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger
+        | gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
         | gridSort:sortingExpressions:sortStrategy:id:pipeTrigger
         | gridDetails:hasDetails:expansionStates:pipeTrigger as pinnedData'>
             <div #pinContainer *ngIf='pinnedData.length > 0' 

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

@@ -135,7 +135,7 @@ export class IgxGridFilteringPipe implements PipeTransform {
 
     public transform(collection: any[], expressionsTree: IFilteringExpressionsTree,
         filterStrategy: IFilteringStrategy,
-        advancedExpressionsTree: IFilteringExpressionsTree, id: string, pipeTrigger: number, filteringPipeTrigger: number) {
+        advancedExpressionsTree: IFilteringExpressionsTree, id: string, pipeTrigger: number, filteringPipeTrigger: number, pinned?) {
         const grid = this.gridAPI.grid;
         const state = {
             expressionsTree: expressionsTree,
@@ -148,7 +148,7 @@ export class IgxGridFilteringPipe implements PipeTransform {
         }
 
         const result = DataUtil.filter(cloneArray(collection), state);
-        grid.filteredData = result;
+        grid.setFilterData(result, pinned);
         return result;
     }
 }

projects/igniteui-angular/src/lib/grids/grid/row-pinning.spec.ts

@@ -256,6 +256,29 @@ describe('Row Pinning #grid', () => {
             expectedHeight = parseInt(grid.height, 10) - grid.pinnedRowHeight - 18 -  grid.theadRow.nativeElement.offsetHeight;
             expect(grid.calcHeight - expectedHeight).toBeLessThanOrEqual(1);
         });
+
+        it('should return correct filterData collection.', () => {
+            grid.getRowByIndex(1).pin();
+            fix.detectChanges();
+            grid.getRowByIndex(5).pin();
+            fix.detectChanges();
+
+            grid.filter('ID', 'B', IgxStringFilteringOperand.instance().condition('contains'), false);
+            fix.detectChanges();
+
+            let gridFilterData = grid.filteredData;
+            expect(gridFilterData.length).toBe(7);
+            expect(gridFilterData[0].ID).toBe('BLAUS');
+            expect(gridFilterData[1].ID).toBe('BERGS');
+
+            fix.componentInstance.pinningConfig = { columns: ColumnPinningPosition.Start, rows: RowPinningPosition.Bottom };
+            fix.detectChanges();
+
+            gridFilterData = grid.filteredData;
+            expect(gridFilterData.length).toBe(7);
+            expect(gridFilterData[0].ID).toBe('BLAUS');
+            expect(gridFilterData[1].ID).toBe('BERGS');
+        });
     });
 });