Apply and manage dimension filters.

Author: MKirova

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

@@ -555,7 +555,7 @@ export class IgxFilteringService implements OnDestroy {
         return true;
     }
 
-    private filter_internal(fieldName: string, term, conditionOrExpressionsTree: IFilteringOperation | IFilteringExpressionsTree,
+    protected filter_internal(fieldName: string, term, conditionOrExpressionsTree: IFilteringOperation | IFilteringExpressionsTree,
         ignoreCase: boolean) {
         const grid = this.grid;
         const filteringTree = grid.filteringExpressionsTree;
@@ -578,7 +578,7 @@ export class IgxFilteringService implements OnDestroy {
      * If createNewTree is true, filteringState will not be modified (because it directly affects the grid.filteringExpressionsTree),
      * but a new object is created and returned.
      */
-    private prepare_filtering_expression(
+    protected prepare_filtering_expression(
         filteringState: IFilteringExpressionsTree,
         fieldName: string,
         searchVal,

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

@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+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 { IgxFilteringService } from '../filtering/grid-filtering.service';
+import { IgxPivotGridComponent } from './pivot-grid.component';
+import { PivotUtil } from './pivot-util';
+
+@Injectable()
+export class IgxPivotFilteringService extends IgxFilteringService {
+    protected filter_internal(fieldName: string, term, conditionOrExpressionsTree: IFilteringOperation | IFilteringExpressionsTree,
+        ignoreCase: boolean) {
+        super.filter_internal(fieldName, term, conditionOrExpressionsTree, ignoreCase);
+        const grid = this.grid;
+        const config = (grid as IgxPivotGridComponent).pivotConfiguration;
+        const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
+        const enabledDimensions = allDimensions.filter(x => x && x.enabled);
+        const dim = enabledDimensions.find(x => x.fieldName === fieldName || x.member === fieldName);
+        const filteringTree = dim.filters || new FilteringExpressionsTree(FilteringLogic.And);
+        const fieldFilterIndex = filteringTree.findIndex(fieldName);
+        if (fieldFilterIndex > -1) {
+            filteringTree.filteringOperands.splice(fieldFilterIndex, 1);
+        }
+
+        this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
+        dim.filters = filteringTree;
+        grid.filteringPipeTrigger++;
+    }
+
+}

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

@@ -30,7 +30,7 @@
             [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true" id="left"
             class="igx-grid__scroll-on-drag-pinned" [style.left.px]="pinnedWidth"></span>
         <ng-template igxGridFor let-rowData [igxGridForOf]="data
-        | gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
+        | pivotGridFilter:pivotConfiguration:filterStrategy:advancedFilteringExpressionsTree:filteringPipeTrigger:pipeTrigger
         | pivotGridRow:pivotConfiguration:expansionStates:pipeTrigger
         | pivotGridRowExpansion:pivotConfiguration:expansionStates:pipeTrigger
         | pivotGridColumn:pivotConfiguration:expansionStates:pipeTrigger"

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

@@ -43,6 +43,7 @@ import { DOCUMENT } from '@angular/common';
 import { DisplayDensityToken, IDisplayDensityOptions } from '../../core/displayDensity';
 import { PlatformUtil } from '../../core/utils';
 import { IgxGridTransaction } from '../hierarchical-grid/public_api';
+import { IgxPivotFilteringService } from './pivot-filtering.service';
 
 let NEXT_ID = 0;
 const MINIMUM_COLUMN_WIDTH = 200;
@@ -57,7 +58,7 @@ const MINIMUM_COLUMN_WIDTH = 200;
         IgxGridSelectionService,
         GridBaseAPIService,
         { provide: IgxGridBaseDirective, useExisting: forwardRef(() => IgxPivotGridComponent) },
-        IgxFilteringService,
+        { provide: IgxFilteringService, useClass: IgxPivotFilteringService },
         IgxPivotGridNavigationService,
         IgxForOfSyncService,
         IgxForOfScrollSyncService

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

@@ -91,16 +91,28 @@ export class IgxPivotColumnPipe implements PipeTransform {
 /**
  * @hidden
  */
-@Pipe({
+ @Pipe({
     name: 'pivotGridFilter',
     pure: true
 })
 export class IgxPivotGridFilterPipe implements PipeTransform {
 
     public transform(collection: any[],
-        expressionsTree: FilteringExpressionsTree,
+        config: IPivotConfiguration,
         filterStrategy: IFilteringStrategy,
-        advancedExpressionsTree: IFilteringExpressionsTree): any[] {
+        advancedExpressionsTree: IFilteringExpressionsTree,
+        _filterPipeTrigger: boolean,
+        _pipeTrigger: boolean): any[] {
+        const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
+        const enabledDimensions = allDimensions.filter(x => x && x.enabled);
+
+        const expressionsTree = new FilteringExpressionsTree(FilteringLogic.And);
+        // add expression trees from all filters
+        PivotUtil.flatten(enabledDimensions).forEach(x => {
+            if (x.filters) {
+                expressionsTree.filteringOperands.push(x.filters);
+            }
+        });
         const state = {
             expressionsTree,
             strategy: filterStrategy,