Merge branch '8.2.x' into mkirova/fix-4970-8.2.x

Author: ChronosSF

projects/igniteui-angular/src/lib/core/grid-selection.ts

@@ -1,5 +1,6 @@
 import { Injectable, EventEmitter, NgZone } from '@angular/core';
-import { IGridEditEventArgs } from '../grids/grid-base.component';
+import { IGridEditEventArgs, IgxGridBaseComponent } from '../grids/grid-base.component';
+import { FilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
 
 export interface GridSelectionRange {
     rowStart: number;
@@ -688,7 +689,9 @@ export class IgxGridSelectionService {
     }
 
     private isFilteringApplied(): boolean {
-        return this.grid.filteringExpressionsTree.filteringOperands.length > 0;
+        const grid = this.grid as IgxGridBaseComponent;
+        return !FilteringExpressionsTree.empty(grid.filteringExpressionsTree) ||
+        !FilteringExpressionsTree.empty(grid.advancedFilteringExpressionsTree);
     }
 
     private isRowDeleted(rowID): boolean {

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

@@ -2072,7 +2072,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
      * @hidden
      */
     public get parentRowOutletDirective() {
-        return null;
+        return this.outletDirective;
     }
 
     /**

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

@@ -1251,14 +1251,15 @@ describe('IgxGrid - Filtering actions #grid', () => {
         fix.detectChanges();
 
         const firstMonth = calendar.querySelector('.igx-calendar__month');
+        const firstMonthText = (firstMonth as HTMLElement).innerText;
         firstMonth.dispatchEvent(new Event('click'));
         tick();
         fix.detectChanges();
 
         calendar = outlet.getElementsByClassName('igx-calendar')[0];
         const month = calendar.querySelector('.igx-calendar-picker__date');
 
-        expect(month.innerHTML.trim()).toEqual('Jan');
+        expect(month.innerHTML.trim()).toEqual(firstMonthText);
     }));
 
     it('Should correctly select year from year view datepicker/calendar component', fakeAsync(() => {

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

@@ -19,6 +19,8 @@ import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-fun
 import { SampleTestData } from '../../test-utils/sample-test-data.spec';
 import { GridSelectionMode } from '../common/enums';
 import { IgxRowSelectorsModule } from '../igx-row-selectors.module';
+import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
+import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
 
 const DEBOUNCETIME = 30;
 
@@ -1671,6 +1673,38 @@ describe('IgxGrid - Row Selection #grid', () => {
             expect(grid.getRowByIndex(1).selected).toBeTruthy();
             expect(grid.onRowSelectionChange.emit).toHaveBeenCalledTimes(6);
         }));
+
+        it('Should select only filtered records', fakeAsync(() => {
+            grid.height = '1100px';
+            const tree = new FilteringExpressionsTree(FilteringLogic.And);
+            tree.filteringOperands.push({
+                fieldName: 'UnitsInStock',
+                searchVal: 0,
+                condition: IgxNumberFilteringOperand.instance().condition('greaterThan'),
+            });
+            tree.filteringOperands.push({
+                fieldName: 'ProductName',
+                searchVal: 'a',
+                condition: IgxStringFilteringOperand.instance().condition('contains'),
+                ignoreCase: true
+            });
+            grid.advancedFilteringExpressionsTree = tree;
+            GridSelectionFunctions.headerCheckboxClick(grid);
+            fix.detectChanges();
+            tick();
+
+            expect(grid.rowList.length).toBe(9);
+            expect(grid.selectedRows().length).toBe(9);
+            GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, true, false);
+
+            grid.advancedFilteringExpressionsTree = null;
+            fix.detectChanges();
+            tick();
+
+            expect(grid.rowList.length).toBe(19);
+            expect(grid.selectedRows().length).toBe(9);
+            GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, false, true);
+        }));
     });
 
     describe('Integration with CRUD and transactions', () => {

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

@@ -2565,6 +2565,7 @@ describe('IgxGrid - GroupBy #grid', () => {
     it('should apply custom comparer function when grouping by dragging a column into the group area', async () => {
         const fix = TestBed.createComponent(GroupableGridComponent);
         const grid = fix.componentInstance.instance;
+        const year =  new Date().getFullYear().toString();
         fix.detectChanges();
         await wait();
 
@@ -2604,7 +2605,7 @@ describe('IgxGrid - GroupBy #grid', () => {
         expect(grid.groupsRecords.length).toEqual(2);
         expect(grid.groupsRecords[1].records.length).toEqual(6);
         for (let i = 0; i < grid.groupsRecords[1].records.length; i++) {
-            expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual('2019');
+            expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual(year);
         }
     });
 

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

@@ -446,13 +446,6 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseCompone
         return this.rootGrid._outletDirective;
     }
 
-    /**
-     * @hidden
-     */
-    public get parentRowOutletDirective() {
-        return this === this.rootGrid ? null : this.rootGrid.rowEditingOutletDirective;
-    }
-
     /**
      * @hidden
      */