Merge branch 'mkirova/fix-pinned-area-changes' of https://github.com/IgniteUI/igniteui-angular.git

Author: MKirova

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

@@ -34,6 +34,9 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
     public get_summary_data() {
         const grid = this.grid;
         let data = grid.filteredData;
+        if (data && grid.hasPinnedRecords) {
+           data = grid._filteredUnpinnedData;
+        }
         if (!data) {
             if (grid.transactions.enabled) {
                 data = DataUtil.mergeTransactions(

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

@@ -238,6 +238,7 @@ export class IgxGridRowPinningPipe implements PipeTransform {
         }
 
         grid.unpinnedRecords = collection;
+
         return collection.map((rec) => {
             return grid.isRecordPinned(rec) ? { recordRef: rec, ghostRecord: true} : rec;
         });

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

@@ -2460,7 +2460,11 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
     protected _filteredSortedPinnedData;
     protected _filteredSortedUnpinnedData;
     protected _filteredPinnedData;
-    protected _filteredUnpinnedData;
+
+    /**
+     * @hidden
+     */
+    public _filteredUnpinnedData;
 
     /**
      * @hidden
@@ -2879,10 +2883,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             this.summaryService.summaryHeight = 0;
             this.notifyChanges(true);
         });
-
-        this.onRowPinning.subscribe(() => {
-            this.summaryService.clearSummaryCache();
-        });
     }
 
     /**
@@ -2937,7 +2937,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         if (this.hasPinnedRecords && pinned) {
             this._filteredPinnedData = data || [];
             const filteredUnpinned =  this._filteredUnpinnedData || [];
-            this.filteredData = [... this._filteredPinnedData, ... filteredUnpinned];
+            const filteredData =  [... this._filteredPinnedData, ... filteredUnpinned];
+            this.filteredData =  filteredData.length > 0 ? filteredData : this._filteredUnpinnedData;
         } else if (this.hasPinnedRecords && !pinned) {
             this._filteredUnpinnedData = data;
         } else {

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

@@ -359,6 +359,23 @@ describe('Row Pinning #grid', () => {
             expect(pinRowContainer[0].children[0].context.rowID).toBe(fix.componentInstance.data[4]);
         });
 
+        it('should calculate global summaries correctly when filtering is applied.', () => {
+            grid.getColumnByName('ID').hasSummary = true;
+            fix.detectChanges();
+            grid.filter('ID', 'BERGS', IgxStringFilteringOperand.instance().condition('contains'), false);
+            fix.detectChanges();
+
+            let summaryRow = GridSummaryFunctions.getRootSummaryRow(fix);
+            GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['1']);
+
+            // pin row
+            grid.getRowByIndex(0).pin();
+            fix.detectChanges();
+
+            summaryRow = GridSummaryFunctions.getRootSummaryRow(fix);
+            GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['1']);
+        });
+
         it('should remove pinned container and recalculate sizes when all pinned records are filtered out.', () => {
             grid.getRowByIndex(1).pin();
             fix.detectChanges();