Skip to content

Commit 21b73a3

Browse files
MKirovaMKirova
authored andcommitted
Update based on new interface for PivotDimensions.
1 parent 9155191 commit 21b73a3

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</div>
1010
<!-- Filter area -->
1111
<igx-chips-area #filterArea droppable='true' style="width:fit-content; height: 100%;">
12-
<igx-chip *ngFor="let filter of grid.filterDimensions" [id]="filter.fieldName" [draggable]="true"
12+
<igx-chip *ngFor="let filter of grid.filterDimensions" [id]="filter.memberName" [draggable]="true"
1313
[removable]="true" (remove)="filterRemoved($event)"
1414
(dragOver)="onDimDragOver($event, 2)"
1515
(dragLeave)="onDimDragLeave($event)"
1616
(dragDrop)="onDimDrop($event, filterArea, 2)"
1717
>
1818
<igx-icon igxPrefix>filter_list</igx-icon>
19-
{{filter.fieldName}}
19+
{{filter.memberName}}
2020
</igx-chip>
2121
</igx-chips-area>
2222
</div>
@@ -29,14 +29,14 @@
2929
</div>
3030
<!-- Columns area -->
3131
<igx-chips-area #colArea droppable='true' style="width:fit-content; height: 100%;">
32-
<igx-chip *ngFor="let col of grid.columnDimensions" [draggable]="'true'" [id]="col.fieldName"
32+
<igx-chip *ngFor="let col of grid.columnDimensions" [draggable]="'true'" [id]="col.memberName"
3333
[removable]="true" (remove)="columnRemoved($event)"
3434
(dragOver)="onDimDragOver($event, 1)"
3535
(dragLeave)="onDimDragLeave($event)"
3636
(dragDrop)="onDimDrop($event, colArea, 1)">
3737
<igx-icon igxPrefix>view_column</igx-icon>
3838
<igx-icon igxPrefix>filter_list</igx-icon>
39-
{{col.fieldName}}
39+
{{col.memberName}}
4040
</igx-chip>
4141
</igx-chips-area>
4242
</div>
@@ -79,14 +79,14 @@
7979
</div>
8080
<!-- Row area -->
8181
<igx-chips-area #rowArea droppable='true' style="width:fit-content; height: 100%;">
82-
<igx-chip *ngFor="let row of grid.rowDimensions" [draggable]="'true'" [id]="row.fieldName"
82+
<igx-chip *ngFor="let row of grid.rowDimensions" [draggable]="'true'" [id]="row.memberName"
8383
[removable]="true" (remove)="rowRemoved($event)"
8484
(dragLeave)="onDimDragLeave($event)"
8585
(dragDrop)="onDimDrop($event, rowArea, 0)"
8686
(dragOver)="onDimDragOver($event, 0)">
8787
<igx-icon igxPrefix>table_rows</igx-icon>
8888
<igx-icon igxPrefix>filter_list</igx-icon>
89-
{{ row.fieldName}}
89+
{{ row.memberName}}
9090
</igx-chip>
9191
</igx-chips-area>
9292
</div>

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
5151
}
5252

5353
public rowRemoved(event: IBaseChipEventArgs) {
54-
const row = this.grid.pivotConfiguration.rows.find(x => x.fieldName === event.owner.id);
54+
const row = this.grid.pivotConfiguration.rows.find(x => x.memberName === event.owner.id);
5555
row.enabled = false;
5656
this.grid.pipeTrigger++;
5757
}
5858

5959
public columnRemoved(event: IBaseChipEventArgs) {
60-
const col = this.grid.pivotConfiguration.columns.find(x => x.fieldName === event.owner.id);
60+
const col = this.grid.pivotConfiguration.columns.find(x => x.memberName === event.owner.id);
6161
col.enabled = false;
6262
this.grid.setupColumns();
6363
this.grid.pipeTrigger++;
@@ -71,7 +71,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
7171
}
7272

7373
public filterRemoved(event: IBaseChipEventArgs) {
74-
const filter = this.grid.pivotConfiguration.filters.find(x => x.fieldName === event.owner.id);
74+
const filter = this.grid.pivotConfiguration.filters.find(x => x.memberName === event.owner.id);
7575
filter.enabled = false;
7676
}
7777

@@ -157,15 +157,15 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
157157
const chip = chipsArray.find(x => x.id === dragId);
158158
const isNewChip = chip === undefined;
159159
//const chipIndex = chipsArray.indexOf(event.owner) !== -1 ? chipsArray.indexOf(event.owner) : chipsArray.length;
160-
const chipIndex = currentDim.findIndex(x => x.fieldName === event.owner.id) !== -1 ?
161-
currentDim.findIndex(x => x.fieldName === event.owner.id) : currentDim.length;
160+
const chipIndex = currentDim.findIndex(x => x.memberName === event.owner.id) !== -1 ?
161+
currentDim.findIndex(x => x.memberName === event.owner.id) : currentDim.length;
162162
const targetIndex = this._dropPos === DropPosition.AfterDropTarget ? chipIndex + 1 : chipIndex;
163163
if (isNewChip) {
164164
const allDims = this.grid.pivotConfiguration.rows
165165
.concat(this.grid.pivotConfiguration.columns)
166166
.concat(this.grid.pivotConfiguration.filters);
167167
// chip moved from external collection
168-
const dims = allDims.filter(x => x && x.fieldName === dragId);
168+
const dims = allDims.filter(x => x && x.memberName === dragId);
169169
if (dims.length === 0) {
170170
// you have dragged something that is not a dimension
171171
return;
@@ -174,7 +174,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
174174
element.enabled = false;
175175
});
176176

177-
const currentDimChild = currentDim.find(x => x && x.fieldName === dragId);
177+
const currentDimChild = currentDim.find(x => x && x.memberName === dragId);
178178
if (currentDimChild) {
179179
currentDimChild.enabled = true;
180180
const dragChipIndex = currentDim.indexOf(currentDimChild);
@@ -185,16 +185,16 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
185185
newDim.enabled = true;
186186
currentDim.splice(chipIndex, 0, newDim);
187187
}
188-
const isDraggedFromColumn = !!this.grid.pivotConfiguration.columns?.find(x => x && x.fieldName === dragId);
188+
const isDraggedFromColumn = !!this.grid.pivotConfiguration.columns?.find(x => x && x.memberName === dragId);
189189
if (isDraggedFromColumn) {
190190
// columns have changed.
191191
this.grid.setupColumns();
192192
}
193193
} else {
194194
// chip from same collection, reordered.
195-
const newDim = currentDim.find(x => x.fieldName === dragId);
195+
const newDim = currentDim.find(x => x.memberName === dragId);
196196
//const dragChipIndex = chipsArray.indexOf(event.dragChip || event.dragData.chip);
197-
const dragChipIndex = currentDim.findIndex(x => x.fieldName === dragId);
197+
const dragChipIndex = currentDim.findIndex(x => x.memberName === dragId);
198198
currentDim.splice(dragChipIndex, 1);
199199
currentDim.splice(dragChipIndex > chipIndex ? targetIndex : targetIndex - 1, 0, newDim);
200200
}

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,33 @@ export class PivotGridHierarchySampleComponent {
1414

1515
public pivotConfigHierarchy: IPivotConfiguration = {
1616
columns: [{
17-
member: () => 'All',
17+
memberName: 'All',
18+
memberFunction: () => 'All',
1819
enabled: true,
1920
childLevel:
2021
{
2122

22-
member: (data) => data.Product.Name,
23+
memberName: 'Product',
24+
memberFunction: (data) => data.Product.Name,
2325
enabled: true,
2426
childLevel:
2527
{
26-
member: (data) => data.Seller.City,
28+
memberName: 'City',
29+
memberFunction: (data) => data.Seller.City,
2730
enabled: true,
2831
}
2932

3033
}
3134
},
3235
],
3336
rows: [{
34-
member: () => 'All',
37+
memberName: 'AllSeller',
38+
memberFunction: () => 'All',
3539
enabled: true,
3640
childLevel:
3741
{
38-
member: (data) => data.Seller.Name,
42+
memberName: 'Seller',
43+
memberFunction: (data) => data.Seller.Name,
3944
enabled: true,
4045
}
4146
}],

0 commit comments

Comments
 (0)