Skip column generation for columns that are filtered out.

Author: MKirova

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.component.ts

@@ -392,11 +392,12 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
                     });
                 }
             }
-
-            this.esf.grid.filteringService.filterInternal(this.esf.column.field, filterTree);
+            const grid = this.esf.grid;
+            const col = this.esf.column;
+            grid.filteringService.filterInternal(col.field, filterTree);
             this.esf.expressionsList = new Array<ExpressionUI>();
-            this.esf.grid.filteringService.generateExpressionsList(this.esf.column.filteringExpressionsTree,
-                this.esf.grid.filteringLogic, this.esf.expressionsList);
+            grid.filteringService.generateExpressionsList(col.filteringExpressionsTree,
+                grid.filteringLogic, this.esf.expressionsList);
         } else {
             this.esf.grid.filteringService.clearFilter(this.esf.column.field);
         }

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

@@ -25,6 +25,10 @@ export class IgxPivotFilteringService extends IgxFilteringService {
         this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
         dim.filters = filteringTree;
         grid.filteringPipeTrigger++;
+        if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
+            // update columns
+            (grid as any).setupColumns();
+        }
     }
 
 }

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

@@ -41,9 +41,10 @@ import { IgxColumnResizingService } from '../resizing/resizing.service';
 import { IgxFlatTransactionFactory, IgxOverlayService, State, Transaction, TransactionService } from '../../services/public_api';
 import { DOCUMENT } from '@angular/common';
 import { DisplayDensityToken, IDisplayDensityOptions } from '../../core/displayDensity';
-import { PlatformUtil } from '../../core/utils';
+import { cloneArray, PlatformUtil } from '../../core/utils';
 import { IgxGridTransaction } from '../hierarchical-grid/public_api';
 import { IgxPivotFilteringService } from './pivot-filtering.service';
+import { DataUtil } from '../../data-operations/data-util';
 
 let NEXT_ID = 0;
 const MINIMUM_COLUMN_WIDTH = 200;
@@ -424,7 +425,19 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         const factoryColumnGroup = this.resolver.resolveComponentFactory(IgxColumnGroupComponent);
         let columns = [];
         fields.forEach((value, key) => {
-            if (value.children == null || value.children.length === 0 || value.children.size === 0) {
+            let shouldGenerate = true;
+            if (value.dimension && value.dimension.filters) {
+                const state = {
+                    expressionsTree: value.dimension.filters.filteringOperands[0],
+                    strategy: this.filterStrategy,
+                    advancedFilteringExpressionsTree: this.advancedFilteringExpressionsTree
+                };
+                const filtered = DataUtil.filter(cloneArray(value.records), state);
+                if (filtered.length === 0) {
+                    shouldGenerate = false;
+                }
+            }
+            if (shouldGenerate && (value.children == null || value.children.length === 0 || value.children.size === 0)) {
                 const ref = this.hasMultipleValues ?
                 factoryColumnGroup.create(this.viewRef.injector) :
                 factoryColumn.create(this.viewRef.injector);
@@ -439,7 +452,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
                     columns = columns.concat(measureChildren);
                 }
 
-            } else {
+            } else if(shouldGenerate) {
                 const ref = factoryColumnGroup.create(this.viewRef.injector);
                 ref.instance.parent = parent;
                 ref.instance.field = key;

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

@@ -150,7 +150,7 @@ export class PivotUtil {
             const value = this.extractValueFromDimension(col, recData);
             path.push(value);
             const newValue = path.join('-');
-            lvlCollection.push({ value: newValue });
+            lvlCollection.push({ value: newValue, dimension: col });
             lvlCollection[0].expandable = col.expandable;
             if (!lvlCollection[0].children) {
                 lvlCollection[0].children = [];