Skip to content

Commit 456613c

Browse files
MKirovaMKirova
MKirova
authored and
MKirova
committed
Merge from base.
2 parents e5e7165 + 7a0cbb9 commit 456613c

File tree

5 files changed

+419
-275
lines changed

5 files changed

+419
-275
lines changed

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

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { PivotUtil } from '../grids/pivot-grid/pivot-util';
55
import { FilteringStrategy } from './filtering-strategy';
66
import { GridColumnDataType } from './data-util';
77
import { DefaultSortingStrategy, SortingDirection } from './sorting-strategy';
8-
import { parseDate } from '../core/utils';
8+
import { cloneArray, parseDate } from '../core/utils';
99

1010
export class NoopPivotDimensionsStrategy implements IPivotDimensionStrategy {
1111
private static _instance: NoopPivotDimensionsStrategy = null;
@@ -28,50 +28,52 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
2828
}
2929

3030
public process(
31-
collection: any,
32-
rows: IPivotDimension[],
33-
values?: IPivotValue[],
34-
pivotKeys: IPivotKeys =
35-
{ aggregations: 'aggregations', records: 'records', children: 'children', level: 'level' }
36-
): any[] {
37-
let hierarchies;
38-
let data;
39-
const prevRowDims = [];
40-
let prevDim;
41-
for (const row of rows) {
42-
if (!data) {
43-
// build hierarchies - groups and subgroups
44-
hierarchies = PivotUtil.getFieldsHierarchy(collection, [row], PivotDimensionType.Row, pivotKeys);
45-
// generate flat data from the hierarchies
46-
data = PivotUtil.processHierarchy(hierarchies, collection[0] ?? [], pivotKeys, 0, true);
47-
prevRowDims.push(row);
48-
prevDim = row;
49-
} else {
50-
const newData = [...data];
51-
for (let i = 0; i < newData.length; i++) {
52-
const currData = newData[i][prevDim.memberName + '_' + pivotKeys.records];
53-
const hierarchyFields = PivotUtil
54-
.getFieldsHierarchy(currData, [row], PivotDimensionType.Row, pivotKeys);
55-
const siblingData = PivotUtil
56-
.processHierarchy(hierarchyFields, newData[i] ?? [], pivotKeys, 0);
57-
PivotUtil.processSiblingProperties(newData[i], siblingData, pivotKeys);
58-
59-
PivotUtil.processSubGroups(row, prevRowDims.slice(0), siblingData, pivotKeys);
60-
if (siblingData.length > 1) {
61-
newData[i][row.memberName + '_' + pivotKeys.records] = siblingData;
62-
} else {
63-
newData.splice(i , 1, ...siblingData);
64-
}
31+
collection: any,
32+
rows: IPivotDimension[],
33+
values?: IPivotValue[],
34+
pivotKeys: IPivotKeys =
35+
{ aggregations: 'aggregations', records: 'records', children: 'children', level: 'level'}
36+
): any[] {
37+
let hierarchies;
38+
let data;
39+
const prevRowDims = [];
40+
let prevDim;
41+
const currRows = cloneArray(rows, true);
42+
PivotUtil.assignLevels(currRows);
43+
for (const row of currRows) {
44+
if (!data) {
45+
// build hierarchies - groups and subgroups
46+
hierarchies = PivotUtil.getFieldsHierarchy(collection, [row], PivotDimensionType.Row, pivotKeys);
47+
// generate flat data from the hierarchies
48+
data = PivotUtil.processHierarchy(hierarchies, collection[0] ?? [], pivotKeys, 0, true);
49+
prevRowDims.push(row);
50+
prevDim = row;
51+
} else {
52+
const newData = [...data];
53+
for (let i = 0; i < newData.length; i++) {
54+
const currData = newData[i][prevDim.memberName + '_' + pivotKeys.records];
55+
const hierarchyFields = PivotUtil
56+
.getFieldsHierarchy(currData, [row], PivotDimensionType.Row, pivotKeys);
57+
const siblingData = PivotUtil
58+
.processHierarchy(hierarchyFields, newData[i] ?? [], pivotKeys, 0);
59+
PivotUtil.processSiblingProperties(newData[i], siblingData, pivotKeys);
60+
61+
PivotUtil.processSubGroups(row, prevRowDims.slice(0), siblingData, pivotKeys);
62+
if (PivotUtil.getDimensionDepth(prevDim) > PivotUtil.getDimensionDepth(row) && siblingData.length > 1) {
63+
newData[i][row.memberName + '_' + pivotKeys.records] = siblingData;
64+
} else {
65+
newData.splice(i, 1, ...siblingData);
6566
i += siblingData.length - 1;
6667
}
67-
data = newData;
68-
prevDim = row;
69-
prevRowDims.push(row);
7068
}
69+
data = newData;
70+
prevDim = row;
71+
prevRowDims.push(row);
7172
}
72-
return data;
7373
}
74+
return data;
7475
}
76+
}
7577

7678
export class PivotColumnDimensionsStrategy implements IPivotDimensionStrategy {
7779
private static _instance: PivotRowDimensionsStrategy = null;
@@ -174,7 +176,7 @@ export class DimensionValuesFilteringStrategy extends FilteringStrategy {
174176
}
175177

176178
protected getFieldValue(rec: any, fieldName: string, isDate: boolean = false, isTime: boolean = false,
177-
grid?: PivotGridType): any {
179+
grid?: PivotGridType): any {
178180
const config = grid.pivotConfiguration;
179181
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
180182
const enabledDimensions = allDimensions.filter(x => x && x.enabled);
@@ -190,13 +192,13 @@ export class DefaultPivotSortingStrategy extends DefaultSortingStrategy {
190192
return this._instance || (this._instance = new this());
191193
}
192194
public sort(data: any[],
193-
fieldName: string,
194-
dir: SortingDirection,
195-
ignoreCase: boolean,
196-
valueResolver: (obj: any, key: string, isDate?: boolean) => any,
197-
isDate?: boolean,
198-
isTime?: boolean,
199-
grid?: PivotGridType) {
195+
fieldName: string,
196+
dir: SortingDirection,
197+
ignoreCase: boolean,
198+
valueResolver: (obj: any, key: string, isDate?: boolean) => any,
199+
isDate?: boolean,
200+
isTime?: boolean,
201+
grid?: PivotGridType) {
200202
const key = fieldName;
201203
const config = grid.pivotConfiguration;
202204
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);

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

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,48 @@ export interface IPivotDimensionStrategy {
1414
export type PivotAggregation = (members: any[], data: any[]) => any;
1515

1616
export interface IPivotAggregator {
17-
// Aggregation unique key.
17+
/** Aggregation unique key. */
1818
key: string;
19-
// Aggregation label to show in the UI.
19+
/** Aggregation label to show in the UI. */
2020
label: string;
21-
// Aggregator function can be a custom implementation of PivotAggregation or
22-
// use predefined ones from IgxPivotAggregate and its variants.
21+
/**
22+
* Aggregator function can be a custom implementation of `PivotAggregation`, or
23+
* use predefined ones from `IgxPivotAggregate` and its variants.
24+
*/
2325
aggregator: (members: any[], data?: any[]) => any;
2426
}
2527

28+
/**
29+
* Configuration of the pivot grid.
30+
*/
2631
export interface IPivotConfiguration {
32+
/** A strategy to transform the rows. */
2733
rowStrategy?: IPivotDimensionStrategy | null;
34+
/** A strategy to transform the columns. */
2835
columnStrategy?: IPivotDimensionStrategy | null;
36+
/** A list of the rows. */
2937
rows: IPivotDimension[] | null;
38+
/** A list of the columns. */
3039
columns: IPivotDimension[] | null;
40+
/** A list of the values. */
3141
values: IPivotValue[] | null;
32-
// dimensions to be displayed in the filter area.
42+
/** Dimensions to be displayed in the filter area. */
3343
filters?: IPivotDimension[] | null;
3444
pivotKeys?: IPivotKeys;
3545
}
3646

3747
export interface IPivotDimension {
38-
// allow defining a hierarchy when multiple sub groups need to be extracted from single member.
48+
/** Allows defining a hierarchy when multiple sub groups need to be extracted from single member. */
3949
childLevel?: IPivotDimension;
40-
// field name which to use to extract value
50+
/** Field name to use in order to extract value. */
4151
memberName: string;
42-
// function that extract the value
52+
/** Function that extracts the value */
4353
memberFunction?: (data: any) => any;
44-
// Enables/Disables a particular dimension from pivot structure.
54+
/** Enables/Disables a particular dimension from pivot structure. */
4555
enabled: boolean;
46-
// A predefined or defined via the `igxPivotSelector` filter expression tree for the current dimension to be applied in the filter pipe.
56+
/**
57+
* A predefined or defined via the `igxPivotSelector` filter expression tree for the current dimension to be applied in the filter pipe.
58+
* */
4759
filter?: FilteringExpressionsTree | null;
4860
sortDirection?: SortingDirection;
4961
dataType?: GridColumnDataType;

0 commit comments

Comments
 (0)