Additional fix for collections in deeper sibling hierarchy. Process subgroups based on level.

Author: MKirova

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

@@ -1,4 +1,5 @@
 
+import { cloneArray } from '../core/utils';
 import { GridType } from '../grids/common/grid.interface';
 import { IgxPivotGridComponent } from '../grids/pivot-grid/pivot-grid.component';
 import { IPivotDimension, IPivotKeys, IPivotValue, PivotDimensionType } from '../grids/pivot-grid/pivot-grid.interface';
@@ -43,7 +44,9 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
             let data;
             const prevRowDims = [];
             let prevDim;
-            for (const row of rows) {
+            const currRows = cloneArray(rows, true);
+            PivotUtil.assignLevels(currRows);
+            for (const row of currRows) {
                 if (!data) {
                     // build hierarchies - groups and subgroups
                     hierarchies = PivotUtil.getFieldsHierarchy(collection, [row], PivotDimensionType.Row, pivotKeys);

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

@@ -2,6 +2,18 @@ import { cloneValue } from '../../core/utils';
 import { IPivotConfiguration, IPivotDimension, IPivotKeys, IPivotValue, PivotDimensionType } from './pivot-grid.interface';
 
 export class PivotUtil {
+    public static assignLevels(dims) {
+        for (const dim of dims) {
+            let currDim = dim;
+            let lvl = 0;
+            while (currDim.childLevel) {
+                currDim.level = lvl;
+                currDim = currDim.childLevel;
+                lvl++;
+            }
+
+        }
+    }
     public static getFieldsHierarchy(data: any[], dimensions: IPivotDimension[],
         dimensionType: PivotDimensionType, pivotKeys: IPivotKeys): Map<string, any> {
         const hierarchy = new Map<string, any>();
@@ -218,7 +230,7 @@ export class PivotUtil {
         }
     }
 
-    public static processSubGroups(row, prevRowDims, siblingData, pivotKeys) {
+    public static processSubGroups(row, prevRowDims, siblingData, pivotKeys, lvl = 0) {
         const prevRowDimsIter = prevRowDims.slice(0);
         // process combined groups
         while (prevRowDimsIter.length > 0) {
@@ -254,11 +266,12 @@ export class PivotUtil {
                     }
                     PivotUtil.processSiblingProperties(child, siblingData2, keys);
                 }
-                if (prevRowDim.childLevel) {
+                const prevRowDimsFromLvl = prevRowDims.filter(x => x.level === lvl);
+                if (prevRowDimsFromLvl.some(x => x.childLevel)) {
                     // Get child dimensions now as well since we go a level deeper into the hierarchy.
                     // Keep above level dims as well since lower level dims correspond to upper sibling dims as well.
-                    const childDimensions = prevRowDims.filter(dim => !!dim.childLevel).map(dim => dim.childLevel);
-                    this.processSubGroups(row, [...prevRowDims, ...childDimensions], childCollection, pivotKeys);
+                    const childDimensions = prevRowDimsFromLvl.filter(dim => !!dim.childLevel).map(dim => dim.childLevel);
+                    this.processSubGroups(row, [...prevRowDimsFromLvl, ...childDimensions], childCollection, pivotKeys, lvl + 1);
                 }
             }
         }

src/app/pivot-grid/pivot-grid.sample.ts

@@ -44,14 +44,11 @@ export class PivotGridSampleComponent {
                 enabled: true
             },
             {
-                memberFunction: () => 'All',
-                memberName: 'AllProducts',
-                enabled: true,
-                childLevel: {
+
                     memberFunction: (data) => data.ProductCategory,
                     memberName: 'ProductCategory',
                     enabled: true
-                }
+
             },
             {
                     memberFunction: () => 'AllSel',