From 2a2e3b2fb8521a12d3c81879649fb02c70b6b6bf Mon Sep 17 00:00:00 2001 From: 3phase Date: Tue, 22 Feb 2022 13:29:26 +0200 Subject: [PATCH 1/6] fix(data-selector): Makes filter nullable when setting grid #11050 --- .../src/lib/grids/pivot-grid/pivot-data-selector.component.ts | 2 +- src/app/pivot-grid/pivot-grid.sample.ts | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts index 23de1b24338..fff99a732de 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts @@ -170,7 +170,7 @@ export class IgxPivotDataSelectorComponent { this.dims = [ ...this._grid.pivotConfiguration.columns, ...this._grid.pivotConfiguration.rows, - ...this._grid.pivotConfiguration.filters, + ...this._grid.pivotConfiguration.filters || [], ]; this.values = this._grid.pivotConfiguration.values; } diff --git a/src/app/pivot-grid/pivot-grid.sample.ts b/src/app/pivot-grid/pivot-grid.sample.ts index 74fca84ea04..93cd355811f 100644 --- a/src/app/pivot-grid/pivot-grid.sample.ts +++ b/src/app/pivot-grid/pivot-grid.sample.ts @@ -164,9 +164,6 @@ export class PivotGridSampleComponent { downFont1: (rowData: any, columnKey: any): boolean => rowData[columnKey] <= 50 }, } - ], - filters: [ - ] }; From e3a76aa2e743bfa9df7bce1a3be28d2469830760 Mon Sep 17 00:00:00 2001 From: 3phase Date: Wed, 23 Feb 2022 12:13:59 +0200 Subject: [PATCH 2/6] fix(pivot): Returns empty arrays in case there're no dimensions #11050 --- .../grids/pivot-grid/pivot-data-selector.component.ts | 2 +- .../src/lib/grids/pivot-grid/pivot-grid.component.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts index b0dae02fd45..345154fa3d2 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts @@ -275,7 +275,7 @@ export class IgxPivotDataSelectorComponent { this.dims = [ ...this._grid.pivotConfiguration.columns, ...this._grid.pivotConfiguration.rows, - ...this._grid.pivotConfiguration.filters || [], + ...this._grid.pivotConfiguration.filters, ]; this.values = this._grid.pivotConfiguration.values; } diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts index 6a06843a3ed..f54571e41f4 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts @@ -135,7 +135,12 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni } public get pivotConfiguration() { - return this._pivotConfiguration || { rows: null, columns: null, values: null, filters: null }; + return { + rows: this._pivotConfiguration?.rows || [], + columns: this._pivotConfiguration?.columns || [], + values: this._pivotConfiguration?.values || [], + filters: this._pivotConfiguration?.filters || [] + }; } @Input() @@ -424,7 +429,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni protected _defaultExpandState = false; private _data; private _filteredData; - private _pivotConfiguration: IPivotConfiguration = { rows: null, columns: null, values: null, filters: null }; + private _pivotConfiguration: IPivotConfiguration = { rows: [], columns: [], values: [], filters: [] }; private p_id = `igx-pivot-grid-${NEXT_ID++}`; private _superCompactMode = false; From 0eb1c0540d1c2db6b51565e4d088a636138d4790 Mon Sep 17 00:00:00 2001 From: 3phase Date: Wed, 23 Feb 2022 12:26:14 +0200 Subject: [PATCH 3/6] fix(pivot): Removes 'fix' and just sets dims to alldimensions #11050 --- .../lib/grids/pivot-grid/pivot-data-selector.component.ts | 6 +----- .../src/lib/grids/pivot-grid/pivot-grid.component.ts | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts index 9a4d6ecf10f..c5024c1306a 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts @@ -272,11 +272,7 @@ export class IgxPivotDataSelectorComponent { @Input() public set grid(value: PivotGridType) { this._grid = value; - this.dims = [ - ...this._grid.pivotConfiguration.columns, - ...this._grid.pivotConfiguration.rows, - ...this._grid.pivotConfiguration.filters, - ]; + this.dims = this._grid.allDimensions; this.values = this._grid.pivotConfiguration.values; } diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts index 5087b43fa76..de0a0979e11 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts @@ -149,12 +149,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni } public get pivotConfiguration() { - return { - rows: this._pivotConfiguration?.rows || [], - columns: this._pivotConfiguration?.columns || [], - values: this._pivotConfiguration?.values || [], - filters: this._pivotConfiguration?.filters || [] - }; + return this._pivotConfiguration || { rows: null, columns: null, values: null, filters: null }; } @Input() From c7a4c112c3e12ed8ec377be979e532f2e00fd1c0 Mon Sep 17 00:00:00 2001 From: 3phase Date: Wed, 23 Feb 2022 12:27:45 +0200 Subject: [PATCH 4/6] chore(pivot): Reverts _pivotConfiguration --- .../src/lib/grids/pivot-grid/pivot-grid.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts index de0a0979e11..d9908bef59b 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts @@ -438,7 +438,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni protected _defaultExpandState = false; private _data; private _filteredData; - private _pivotConfiguration: IPivotConfiguration = { rows: [], columns: [], values: [], filters: [] }; + private _pivotConfiguration: IPivotConfiguration = { rows: null, columns: null, values: null, filters: null }; private p_id = `igx-pivot-grid-${NEXT_ID++}`; private _superCompactMode = false; From cad0a07de6f3b7e75fc7af75e7d678f3aa226f07 Mon Sep 17 00:00:00 2001 From: 3phase Date: Wed, 23 Feb 2022 13:04:46 +0200 Subject: [PATCH 5/6] chore(*): Resets pivotItems collection in the order they appear in allDimensions --- .../src/lib/grids/pivot-grid/pivot-data-selector.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts index 4b96b57cb41..9f4439193e6 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts @@ -39,8 +39,8 @@ describe("Pivot data selector", () => { grid = fixture.componentInstance.pivotGrid; selector = fixture.componentInstance.dataSelector; pivotItems = [ - ...grid.pivotConfiguration.columns, ...grid.pivotConfiguration.rows, + ...grid.pivotConfiguration.columns, ...grid.pivotConfiguration.filters, ...grid.pivotConfiguration.values, ]; @@ -146,7 +146,7 @@ describe("Pivot data selector", () => { expect(expansionPanels[3].componentInstance.collapsed).toBeTrue(); }); - it("should render a list of all row, column, filter, and value dimensions", () => { + fit("should render a list of all row, column, filter, and value dimensions", () => { const valueList = Array.from( fixture.debugElement .query(By.directive(IgxPivotDataSelectorComponent)) From 99cba692f810c778e04a4274dc52cc1c4ff2bd09 Mon Sep 17 00:00:00 2001 From: 3phase Date: Wed, 23 Feb 2022 13:05:48 +0200 Subject: [PATCH 6/6] chore(*): Removes f in test --- .../src/lib/grids/pivot-grid/pivot-data-selector.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts index 9f4439193e6..352b6105254 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts @@ -146,7 +146,7 @@ describe("Pivot data selector", () => { expect(expansionPanels[3].componentInstance.collapsed).toBeTrue(); }); - fit("should render a list of all row, column, filter, and value dimensions", () => { + it("should render a list of all row, column, filter, and value dimensions", () => { const valueList = Array.from( fixture.debugElement .query(By.directive(IgxPivotDataSelectorComponent))