Merge branch 'master' into mkirova/more-pivot-apis

Author: simeonoff

projects/igniteui-angular/src/lib/data-operations/filtering-strategy.ts

@@ -1,7 +1,8 @@
 import { FilteringLogic, IFilteringExpression } from './filtering-expression.interface';
 import { FilteringExpressionsTree, IFilteringExpressionsTree } from './filtering-expressions-tree';
 import { resolveNestedPath, parseDate } from '../core/utils';
-import { GridType } from '../grids/common/grid.interface';
+import { GridType, PivotGridType } from '../grids/common/grid.interface';
+import { PivotUtil } from '../grids/pivot-grid/pivot-util';
 
 const DateType = 'date';
 const DateTimeType = 'dateTime';

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-filtering.service.ts

@@ -3,6 +3,7 @@ import { first, takeUntil } from 'rxjs/operators';
 import { IFilteringOperation } from '../../data-operations/filtering-condition';
 import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
 import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
+import { DimensionValuesFilteringStrategy } from '../../data-operations/pivot-strategy';
 import { ColumnType } from '../common/grid.interface';
 import { IgxFilteringService } from '../filtering/grid-filtering.service';
 import { IgxPivotGridComponent } from './pivot-grid.component';
@@ -46,6 +47,7 @@ export class IgxPivotFilteringService extends IgxFilteringService {
         this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
         dim.filter = filteringTree;
         grid.filteringPipeTrigger++;
+        grid.filterStrategy = grid.filterStrategy ?? new DimensionValuesFilteringStrategy();
         if (allDimensions.indexOf(dim) !== -1) {
             // update columns
             (grid as any).setupColumns();

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

@@ -1366,6 +1366,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     protected autogenerateColumns() {
         let columns = [];
+        this.filterStrategy = this.filterStrategy ?? new DimensionValuesFilteringStrategy();
         const data = this.gridAPI.filterDataByExpressions(this.filteringExpressionsTree);
         this.dimensionDataColumns = this.generateDimensionColumns();
         let fieldsMap;