Fix merge conflicts.

Author: MKirova

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

@@ -2,11 +2,11 @@ import { IgxNumberSummaryOperand } from '../summaries/grid-summary';
 import { IPivotConfiguration } from './pivot-grid.interface';
 import { IgxPivotColumnPipe, IgxPivotRowPipe } from './pivot-grid.pipes';
 
-describe('Pivot pipes', () => {
+fdescribe('Pivot pipes', () => {
     // This pipe is a pure, stateless function so no need for BeforeEach
     const rowPipe = new IgxPivotRowPipe();
     const columnPipe = new IgxPivotColumnPipe();
-
+    const expansionStates = new Map<any, boolean>();
     const data = [
         { ProductCategory: 'Clothing', UnitPrice: 12.81, SellerName: 'Stanley', Country: 'Bulgaria', Date: '01/01/2021', UnitsSold: 282 },
         { ProductCategory: 'Clothing', UnitPrice: 49.57, SellerName: 'Elisa', Country: 'USA', Date: '01/05/2019', UnitsSold: 296 },
@@ -49,7 +49,7 @@ describe('Pivot pipes', () => {
     };
 
     it('transforms flat data to pivot data', () => {
-        const rowPipeResult = rowPipe.transform(data, pivotConfigHierarchy.rows, pivotConfigHierarchy.values);
+        const rowPipeResult = rowPipe.transform(data, pivotConfigHierarchy.rows, expansionStates, pivotConfigHierarchy.values);
         const columnPipeResult = columnPipe.transform(rowPipeResult, pivotConfigHierarchy.columns, pivotConfigHierarchy.values);
         expect(columnPipeResult).toEqual([
             {
@@ -72,7 +72,7 @@ describe('Pivot pipes', () => {
             member: 'ProductCategory',
             enabled: true,
             childLevels: []
-        }], pivotConfigHierarchy.values);
+        }], expansionStates, pivotConfigHierarchy.values);
         expect(rowPipeResult).toEqual([
             {
                 ProductCategory: 'Clothing', level: 0, records: [
@@ -116,7 +116,7 @@ describe('Pivot pipes', () => {
             member: 'Date',
             enabled: true,
             childLevels: []
-        }], pivotConfigHierarchy.values);
+        }], expansionStates, pivotConfigHierarchy.values);
 
         expect(rowPipeResult).toEqual([
             {

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

@@ -74,7 +74,8 @@ export class PivotUtil {
                 flatData.push(obj);
                 const isExpanded = expansionStates.get(key);
                 if (h[pivotKeys.children] && h[pivotKeys.children].size > 0) {
-                    obj[pivotKeys.records] = this.flattenHierarchy(h[pivotKeys.children], rec, dim.childLevels, pivotKeys, level + 1);
+                    obj[pivotKeys.records] = this.flattenHierarchy(h[pivotKeys.children], rec,
+                         dim.childLevels, pivotKeys, level + 1, expansionStates);
                     if (isExpanded) {
                         for (const record of obj[pivotKeys.records]) {
                             flatData.push(record);