Skip to content

Commit ff5eaa7

Browse files
committed
fix(pivot): Do not split ESF values by pivot separators
1 parent 840d611 commit ff5eaa7

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -321,17 +321,17 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
321321
private p_id = `igx-pivot-grid-${NEXT_ID++}`;
322322

323323

324-
/**
325-
* Gets/Sets the default expand state for all rows.
326-
*/
327-
@Input()
328-
public get defaultExpandState() {
329-
return this._defaultExpandState;
330-
}
324+
/**
325+
* Gets/Sets the default expand state for all rows.
326+
*/
327+
@Input()
328+
public get defaultExpandState() {
329+
return this._defaultExpandState;
330+
}
331331

332-
public set defaultExpandState(val: boolean) {
333-
this._defaultExpandState = val;
334-
}
332+
public set defaultExpandState(val: boolean) {
333+
this._defaultExpandState = val;
334+
}
335335

336336
/**
337337
* @hidden @internal
@@ -604,7 +604,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
604604
this.pivotKeys
605605
);
606606
const flatData = Array.from(allValuesHierarchy.values());
607-
columnValues = flatData.map(record => this.extractValue(record['value']));
607+
// Note: Once ESF supports tree view, we should revert this back.
608+
columnValues = flatData.map(record => record['value']);
608609
done(columnValues);
609610
return;
610611
}
@@ -987,18 +988,18 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
987988
groupColumn.hidden = state;
988989
this.columnGroupStates.set(groupColumn.field, state);
989990
const childrenTotal = this.hasMultipleValues ?
990-
groupColumn.children.filter(x => x.columnGroup && x.children.filter(y => !y.columnGroup).length === this.values.length) :
991-
groupColumn.children.filter(x => !x.columnGroup);
992-
const childrenSubgroups = this.hasMultipleValues ?
993-
groupColumn.children.filter(x => x.columnGroup && x.children.filter(y => !y.columnGroup).length === 0) :
994-
groupColumn.children.filter(x => x.columnGroup);
995-
childrenTotal.forEach(group => {
991+
groupColumn.children.filter(x => x.columnGroup && x.children.filter(y => !y.columnGroup).length === this.values.length) :
992+
groupColumn.children.filter(x => !x.columnGroup);
993+
const childrenSubgroups = this.hasMultipleValues ?
994+
groupColumn.children.filter(x => x.columnGroup && x.children.filter(y => !y.columnGroup).length === 0) :
995+
groupColumn.children.filter(x => x.columnGroup);
996+
childrenTotal.forEach(group => {
996997
if (state) {
997998
group.headerTemplate = this.headerTemplate;
998999
} else {
9991000
group.headerTemplate = undefined;
10001001
}
1001-
});
1002+
});
10021003
if (!groupColumn.hidden && childrenSubgroups.length > 0) {
10031004
childrenSubgroups.forEach(group => {
10041005
this.resolveToggle(group, state);
@@ -1216,7 +1217,4 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
12161217
});
12171218
return cols;
12181219
}
1219-
private extractValue(value) {
1220-
return value.split(this.pivotKeys.columnDimensionSeparator)[value.split(this.pivotKeys.columnDimensionSeparator).length - 1];
1221-
}
12221220
}

0 commit comments

Comments
 (0)