Skip to content

Commit 1595cb4

Browse files
committed
chore(*): Move max dimension level to a function property.
1 parent 8957bfb commit 1595cb4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class IgxPivotRowExpansionPipe implements PipeTransform {
6666
for (const row of enabledRows) {
6767
const lvl = PivotUtil.getDimensionDepth(row);
6868
totalLlv += lvl;
69-
PivotUtil.flattenHierarchy(data, config, row, expansionStates, defaultExpand, pivotKeys, totalLlv, prevDims, 0);
69+
PivotUtil.flattenHierarchy(data, config, row, expansionStates, defaultExpand, pivotKeys, totalLlv, prevDims, 0, lvl);
7070
prevDims.push(row);
7171
}
7272
const finalData = config.columnStrategy ? data : data.filter(x => x[pivotKeys.records]);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ export class PivotUtil {
8282
pivotKeys: IPivotKeys,
8383
lvl: number,
8484
prevDims: IPivotDimension[],
85-
currDimLvl: number) {
85+
currDimLvl: number,
86+
maxDimLvl: number) {
8687
const data = records;
87-
const dimMaxLvl = PivotUtil.getDimensionDepth(dim);
8888
for (let i = 0; i < data.length; i++) {
8989
const rec = data[i];
9090
const field = dim.memberName;
@@ -98,12 +98,12 @@ export class PivotUtil {
9898
expansionStates.get(expansionRowKey);
9999
if (rec[field + '_' + pivotKeys.records] &&
100100
rec[field + '_' + pivotKeys.records].length > 0 &&
101-
((isExpanded && lvl > 0) || (dimMaxLvl == currDimLvl))) {
101+
((isExpanded && lvl > 0) || (maxDimLvl == currDimLvl))) {
102102
let dimData = rec[field + '_' + pivotKeys.records];
103103
if (dim.childLevel) {
104104
if (PivotUtil.getDimensionDepth(dim) > 1) {
105105
dimData = this.flattenHierarchy(dimData, config, dim.childLevel,
106-
expansionStates, defaultExpandState, pivotKeys, lvl - 1, prevDims, currDimLvl + 1);
106+
expansionStates, defaultExpandState, pivotKeys, lvl - 1, prevDims, currDimLvl + 1, maxDimLvl);
107107
} else {
108108
dimData.forEach(d => {
109109
d[dim.childLevel.memberName + '_' + pivotKeys.level] = currDimLvl + 1;

0 commit comments

Comments
 (0)