Skip to content

Commit b977d20

Browse files
committed
chore(pivot): Adress comments
1 parent b23f189 commit b977d20

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -140,23 +140,3 @@ export class FormattedValuesFilteringStrategy extends FilteringStrategy {
140140
return value;
141141
}
142142
}
143-
144-
export class PivotFilteringStrategy extends FilteringStrategy {
145-
146-
constructor() {
147-
super();
148-
}
149-
150-
protected getFieldValue(rec: any, fieldName: string, isDate: boolean = false, isTime: boolean = false, grid?: GridType): any {
151-
let value = resolveNestedPath(rec, fieldName);
152-
if (value && !(value instanceof Object)) {
153-
value = value && (isDate || isTime) ? parseDate(value) : value;
154-
return value;
155-
}
156-
const config = (grid as PivotGridType).pivotConfiguration;
157-
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined);
158-
const flattenedDims = PivotUtil.flatten(allDimensions, 0);
159-
const dimension = flattenedDims.find(x => x.memberName === fieldName);
160-
return dimension.memberFunction ? dimension.memberFunction(rec) : value;
161-
}
162-
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
22
import { IFilteringOperation } from '../../data-operations/filtering-condition';
33
import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
44
import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
5-
import { PivotFilteringStrategy } from '../../data-operations/filtering-strategy';
5+
import { DimensionValuesFilteringStrategy } from '../../data-operations/pivot-strategy';
66
import { IgxFilteringService } from '../filtering/grid-filtering.service';
77
import { IgxPivotGridComponent } from './pivot-grid.component';
88
import { PivotUtil } from './pivot-util';
@@ -43,7 +43,7 @@ export class IgxPivotFilteringService extends IgxFilteringService {
4343
this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
4444
dim.filter = filteringTree;
4545
grid.filteringPipeTrigger++;
46-
grid.filterStrategy = new PivotFilteringStrategy();
46+
grid.filterStrategy = grid.filterStrategy ?? new DimensionValuesFilteringStrategy();
4747
if (allDimensions.indexOf(dim) !== -1) {
4848
// update columns
4949
(grid as any).setupColumns();

0 commit comments

Comments
 (0)