Merge branch 'master' into mpopov/ESF-horizontal-scrolbar-MASTER

Author: simeonoff

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

@@ -1717,6 +1717,18 @@ describe('IgxGrid - Row Selection #grid', () => {
             expect(grid.getRowByIndex(3).selected).toBeTrue();
             expect(grid.getRowByIndex(0).selected).toBeFalse();
         });
+
+        it('Row Pinning: should update checkbox status correctly when there is pinned row and groupBy', () => {
+            grid.pinRow(2);
+            fix.detectChanges();
+
+            grid.groupBy({ fieldName: 'InStock', dir: SortingDirection.Desc, ignoreCase: false });
+
+            GridSelectionFunctions.headerCheckboxClick(grid);
+            fix.detectChanges();
+            GridSelectionFunctions.verifyHeaderRowCheckboxState(fix, true, false);
+            expect(grid.selectedRows.length).toBe(grid.data.length);
+        });
     });
 
     describe('Integration with CRUD and transactions', () => {

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

@@ -729,8 +729,12 @@ export class IgxGridSelectionService {
 
     /** Returns all data in the grid, with applied filtering and sorting and without deleted rows. */
     public get allData(): Array<any> {
-        const allData = this.isFilteringApplied() || this.grid.sortingExpressions.length ?
-            this.grid.filteredSortedData : this.grid.gridAPI.get_all_data(true);
+        let  allData;
+        if (this.isFilteringApplied() || this.grid.sortingExpressions.length) {
+            allData = this.grid.pinnedRecordsCount ? this.grid._filteredSortedUnpinnedData : this.grid.filteredSortedData;
+        } else {
+            allData = this.grid.gridAPI.get_all_data(true);
+        }
         return allData.filter(rData => !this.isRowDeleted(this.grid.gridAPI.get_row_id(rData)));
     }
 

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

@@ -622,6 +622,17 @@ describe('IgxTreeGrid - Selection #tGrid', () => {
             TreeGridFunctions.verifyHeaderCheckboxSelection(fix, true);
         });
 
+        it('should have correct header checkbox when add a row and then selectAll rows', () => {
+            treeGrid.addRow({ ID: 13, Name: 'Michael Cooper', Age: 33, OnPTO: false }, 317);
+            fix.detectChanges();
+
+            TreeGridFunctions.clickHeaderRowSelectionCheckbox(fix);
+            fix.detectChanges();
+
+            expect(treeGrid.selectedRows.length).toBeGreaterThan(treeGrid.flatData.length);
+            TreeGridFunctions.verifyHeaderCheckboxSelection(fix, true);
+        });
+
         it('should have correct header checkbox when add a row and undo transaction', fakeAsync(() => {
             treeGrid.addRow({ ID: 13, Name: 'Michael Cooper', Age: 33, OnPTO: false }, 317);
             tick();

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

@@ -39,7 +39,8 @@ export class IgxTreeGridHierarchizingPipe implements PipeTransform {
                 flatData, 0, treeGridRecordsMap);
         }
 
-        grid.flatData = flatData;
+        grid.flatData = grid.transactions.enabled ?
+        flatData.filter(rec => !grid.transactions.getState(this.getRowID(primaryKey, rec))) : flatData;
         grid.records = treeGridRecordsMap;
         grid.rootRecords = hierarchicalRecords;
         return hierarchicalRecords;

src/app/grid-row-pinning/grid-row-pinning.sample.html

@@ -20,7 +20,7 @@
             </div>
             <igx-grid [rowEditable]="true" [igxGridState]="options" [allowFiltering]='true' [primaryKey]='"ID"' [pinning]="pinningConfig" [paging]="true"
                 [columnHiding]='true' [showToolbar]='true' [columnPinning]='true' #grid1 [data]="data" [width]="'800px'"
-                [height]="'600px'" [rowSelection]="true">
+                [height]="'600px'" [rowSelection]="'multiple'">
 
                 <ng-template igxGridDetail let-dataItem>
                     <div>