Merge branch 'dkamburov/pivot-pipes' of https://github.com/IgniteUI/igniteui-angular.git

Author: MKirova

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

@@ -48,15 +48,15 @@ describe('Pivot pipes', () => {
         filters: null
     };
 
-    it('transforms flat data to pivot data', () => {
+    fit('transforms flat data to pivot data', () => {
         const rowPipeResult = rowPipe.transform(data, pivotConfigHierarchy.rows, pivotConfigHierarchy.values);
         const columnPipeResult = columnPipe.transform(rowPipeResult, pivotConfigHierarchy.columns, pivotConfigHierarchy.values);
         expect(columnPipeResult).toEqual([
             { field1: 'All', All: 2127, Bulgaria: 774, USA: 829, Uruguay: 524, level: 0, records: [
-                { field1: 'Clothing', Bulgaria: 774, USA: 296, Uruguay: 456, level: 1  },
-                { field1: 'Bikes', Uruguay: 68, level: 1  },
-                { field1: 'Accessories', USA: 293, level: 1  },
-                { field1: 'Components', USA: 240, level: 1  }
+                { field1: 'Clothing', All: 1526, Bulgaria: 774, USA: 296, Uruguay: 456, level: 1  },
+                { field1: 'Bikes', All: 68, Uruguay: 68, level: 1  },
+                { field1: 'Accessories', All: 293, USA: 293, level: 1  },
+                { field1: 'Components', All: 240, USA: 240, level: 1  }
             ] },
             { field1: 'Clothing', All: 1526, Bulgaria: 774, USA: 296, Uruguay: 456, level: 1  },
             { field1: 'Bikes', All: 68, Uruguay: 68, level: 1  },

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

@@ -65,7 +65,12 @@ export class IgxPivotColumnPipe implements PipeTransform {
                     delete hierarchy[pivotKeys.records]; /* remove the helper records of the actual records so that
                 expand indicators can be rendered properly */
                 }
-                result.push({...hierarchy, ...flatCols});
+                for (const property in flatCols) {
+                    if (flatCols.hasOwnProperty(property)) {
+                        hierarchy[property] = flatCols[property];
+                    }
+                }
+                result.push(hierarchy);
             }
         });
 

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

@@ -62,7 +62,7 @@ export class PivotUtil {
     }
 
     public static flattenHierarchy(hierarchies, rec, dims, pivotKeys, level = 0) {
-        let flatData = [];
+        const flatData = [];
         for (const dim of dims) {
             hierarchies.forEach((h, key) => {
                 const field = (dim && dim.fieldName) ?? this.generateFieldValue(rec);
@@ -74,7 +74,9 @@ export class PivotUtil {
                 flatData.push(obj);
                 if (h[pivotKeys.children]) {
                     obj[pivotKeys.records] = this.flattenHierarchy(h[pivotKeys.children], rec, dim.childLevels, pivotKeys, level + 1);
-                    flatData = [...flatData, ...obj[pivotKeys.records]];
+                    for (const record of obj[pivotKeys.records]) {
+                        flatData.push(record);
+                    }
                 }
             });
         }
@@ -83,15 +85,18 @@ export class PivotUtil {
     }
 
     public static flattenColumnHierarchy(hierarchies, values, pivotKeys) {
-        let flatData = [];
+        const flatData = [];
         hierarchies.forEach((h, key) => {
             const obj = {};
             for (const value of values) {
                 obj[key] = h[pivotKeys.aggregations][value.member];
                 obj[pivotKeys.records] = h[pivotKeys.records];
                 flatData.push(obj);
                 if (h[pivotKeys.children]) {
-                    flatData = [...flatData, ...this.flattenColumnHierarchy(h[pivotKeys.children], values, pivotKeys)];
+                    const records = this.flattenColumnHierarchy(h[pivotKeys.children], values, pivotKeys);
+                    for (const record of records) {
+                        flatData.push(record);
+                    }
                 }
             }
         });