Skip to content

Commit b490bdd

Browse files
authored
Merge branch 'master' into skrastev/fix-10868-pivot
2 parents 16dfebb + 140d2b8 commit b490bdd

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { FilteringLogic, IFilteringExpression } from './filtering-expression.interface';
22
import { FilteringExpressionsTree, IFilteringExpressionsTree } from './filtering-expressions-tree';
33
import { resolveNestedPath, parseDate } from '../core/utils';
4-
import { GridType } from '../grids/common/grid.interface';
4+
import { GridType, PivotGridType } from '../grids/common/grid.interface';
5+
import { PivotUtil } from '../grids/pivot-grid/pivot-util';
56

67
const DateType = 'date';
78
const DateTimeType = 'dateTime';

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { first, takeUntil } from 'rxjs/operators';
33
import { IFilteringOperation } from '../../data-operations/filtering-condition';
44
import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
55
import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
6+
import { DimensionValuesFilteringStrategy } from '../../data-operations/pivot-strategy';
67
import { ColumnType } from '../common/grid.interface';
78
import { IgxFilteringService } from '../filtering/grid-filtering.service';
89
import { IgxPivotGridComponent } from './pivot-grid.component';
@@ -46,6 +47,7 @@ export class IgxPivotFilteringService extends IgxFilteringService {
4647
this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
4748
dim.filter = filteringTree;
4849
grid.filteringPipeTrigger++;
50+
grid.filterStrategy = grid.filterStrategy ?? new DimensionValuesFilteringStrategy();
4951
if (allDimensions.indexOf(dim) !== -1) {
5052
// update columns
5153
(grid as any).setupColumns();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
132132
this._pivotConfiguration = value;
133133
this.notifyChanges(true);
134134
}
135-
135+
136136
public get pivotConfiguration() {
137137
return this._pivotConfiguration;
138138
}
@@ -1154,6 +1154,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
11541154
*/
11551155
protected autogenerateColumns() {
11561156
let columns = [];
1157+
this.filterStrategy = this.filterStrategy ?? new DimensionValuesFilteringStrategy();
11571158
const data = this.gridAPI.filterDataByExpressions(this.filteringExpressionsTree);
11581159
this.dimensionDataColumns = this.generateDimensionColumns();
11591160
let fieldsMap;

0 commit comments

Comments
 (0)