Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mkirova/pivot-keys-config

Author: 3phase

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -5909,51 +5909,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         }
     }
 
-    protected _createColumn(col) {
-        let ref;
-        if (col instanceof IgxColumnGroupComponent) {
-            ref = this._createColGroupComponent(col);
-        } else {
-            ref = this._createColComponent(col);
-        }
-        return ref;
-    }
-
-    protected _createColGroupComponent(col: IgxColumnGroupComponent) {
-        const factoryGroup = this.resolver.resolveComponentFactory(IgxColumnGroupComponent);
-        const ref = this.viewRef.createComponent(factoryGroup, null, this.viewRef.injector);
-        ref.changeDetectorRef.detectChanges();
-        factoryGroup.inputs.forEach((input) => {
-            const propName = input.propName;
-            ref.instance[propName] = col[propName];
-        });
-        if (col.children.length > 0) {
-            const newChildren = [];
-            col.children.forEach(child => {
-                const newCol = this._createColumn(child).instance;
-                newCol.parent = ref.instance;
-                newChildren.push(newCol);
-            });
-            ref.instance.children.reset(newChildren);
-            ref.instance.children.notifyOnChanges();
-        }
-        return ref;
-    }
-
-    protected _createColComponent(col) {
-        const factoryColumn = this.resolver.resolveComponentFactory(IgxColumnComponent);
-        const ref = this.viewRef.createComponent(factoryColumn, null, this.viewRef.injector);
-        factoryColumn.inputs.forEach((input) => {
-            const propName = input.propName;
-            if (!(col[propName] instanceof IgxSummaryOperand)) {
-                ref.instance[propName] = col[propName];
-            } else {
-                ref.instance[propName] = col[propName].constructor;
-            }
-        });
-        return ref;
-    }
-
     protected switchTransactionService(val: boolean) {
         if (val) {
             this._transactions = this.transactionFactory.create(TRANSACTION_TYPE.Base);

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

@@ -1,7 +1,7 @@
 import { fakeAsync, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { IgxPivotGridModule } from 'igniteui-angular';
+import { IgxPivotDateDimension, IgxPivotGridModule } from 'igniteui-angular';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
 import { IgxPivotGridTestBaseComponent, IgxPivotGridTestComplexHierarchyComponent, IgxTotalSaleAggregate } from '../../test-utils/pivot-grid-samples.spec';
@@ -106,6 +106,75 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
         expect(pivotGrid.columns.length).not.toBe(9);
     });
 
+    it('should collapse column with 1 value dimension', () => {
+        const pivotGrid = fixture.componentInstance.pivotGrid;
+        pivotGrid.pivotConfiguration.values.pop();
+        pivotGrid.pivotConfiguration.columns = [{
+            memberName: 'AllCountries',
+            memberFunction: () => 'All Countries',
+            enabled: true,
+            childLevel: {
+                memberName: 'Country',
+                enabled: true
+            }
+        }];
+        pivotGrid.pivotConfiguration.rows[0] = new IgxPivotDateDimension(
+            {
+                memberName: 'Date',
+                enabled: true
+            }, {
+            total: false
+        }
+        );
+        pivotGrid.notifyDimensionChange(true);
+        expect(pivotGrid.columns.length).toBe(5);
+        expect(pivotGrid.columnGroupStates.size).toBe(0);
+        const headerRow = fixture.nativeElement.querySelector('igx-pivot-header-row');
+        const header = headerRow.querySelector('igx-grid-header-group');
+        const expander = header.querySelectorAll('igx-icon')[0];
+        expander.click();
+        fixture.detectChanges();
+        expect(pivotGrid.columnGroupStates.size).toBe(1);
+        const value = pivotGrid.columnGroupStates.entries().next().value;
+        expect(value[0]).toEqual('All Countries');
+        expect(value[1]).toBeTrue();
+    });
+
+    it('should collapse column with 2 value dimension', () => {
+        const pivotGrid = fixture.componentInstance.pivotGrid;
+        pivotGrid.pivotConfiguration.columns = [{
+            memberName: 'AllCountries',
+            memberFunction: () => 'All Countries',
+            enabled: true,
+            childLevel: {
+                memberName: 'Country',
+                enabled: true
+            }
+        },
+        {
+            memberName: 'SellerName',
+            enabled: true
+        }];
+        pivotGrid.notifyDimensionChange(true);
+        fixture.detectChanges();
+        expect(pivotGrid.columnGroupStates.size).toBe(0);
+        const headerRow = fixture.nativeElement.querySelector('igx-pivot-header-row');
+        const header = headerRow.querySelector('igx-grid-header-group');
+        const expander = header.querySelectorAll('igx-icon')[0];
+        expander.click();
+        fixture.detectChanges();
+        expect(pivotGrid.columnGroupStates.size).toBe(1);
+        let value = pivotGrid.columnGroupStates.entries().next().value;
+        expect(value[0]).toEqual('All Countries');
+        expect(value[1]).toBeTrue();
+
+        expander.click();
+        fixture.detectChanges();
+        value = pivotGrid.columnGroupStates.entries().next().value;
+        expect(value[0]).toEqual('All Countries');
+        expect(value[1]).toBeFalse();
+    });
+
     describe('IgxPivotGrid Features #pivotGrid', () => {
         it('should show excel style filtering via dimension chip.', () => {
             const excelMenu = GridFunctions.getExcelStyleFilteringComponent(fixture, 'igx-pivot-grid');

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

@@ -317,7 +317,10 @@ export class PivotUtil {
                 for (const nested of nestedData) {
                     if (nested[pivotKeys.records] && nested[pivotKeys.records].length === 1) {
                         // only 1 child record, apply same props to parent.
-                        PivotUtil.processSiblingProperties(nested[pivotKeys.records][0], [nested], pivotKeys);
+                        const keys = Object.assign({}, pivotKeys) as any;
+                        const memberName = h[pivotKeys.children].entries().next().value[1].dimension.memberName;
+                        keys[memberName] = nested[memberName];
+                        PivotUtil.processSiblingProperties(nested[pivotKeys.records][0], [nested], keys);
                     }
                 }
                 obj[pivotKeys.records] = this.getDirectLeafs(nestedData, pivotKeys);

src/app/pivot-grid-hierarchy/pivot-grid-hierarchy.sample.html

@@ -4,6 +4,6 @@
         [data]="dimensions" [displayKey]="'memberName'" [(ngModel)]="selected"
         placeholder="Dimension(s)" searchPlaceholder="Search...">
     </igx-combo>
-    <igx-pivot-grid #grid1 [data]="origData" [pivotConfiguration]="pivotConfigHierarchy" (dimensionsChange)='dimensionChange($event)'>
+    <igx-pivot-grid #grid1 [data]="origData" [pivotConfiguration]="pivotConfigHierarchy" (dimensionsChange)='dimensionChange($event)' [defaultExpandState]='true'>
     </igx-pivot-grid>
 </div>