Skip to content

Commit fec280f

Browse files
committed
fix(query-builder): prevent changing fields collection
1 parent f27eca0 commit fec280f

File tree

2 files changed

+20
-35
lines changed

2 files changed

+20
-35
lines changed

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,8 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
176176
if (!this._fields && this.isAdvancedFiltering()) {
177177
this._fields = this.entities[0].fields;
178178
}
179-
180-
if (this._fields) {
181-
this._fields.forEach(field => {
182-
this.setFilters(field);
183-
this.setFormat(field);
184-
});
185-
}
179+
180+
this._fields = this._fields.map(f => ({...f, filters: this.getFilters(f), pipeArgs: this.getPipeArgs(f) }));
186181
}
187182

188183
/**
@@ -1182,7 +1177,7 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
11821177
if (!this.selectedField) {
11831178
this.fieldSelect.input.nativeElement.focus();
11841179
} else if (this.selectedField.filters.condition(this.selectedCondition)?.isUnary) {
1185-
this.conditionSelect.input.nativeElement.focus();
1180+
this.conditionSelect?.input.nativeElement.focus();
11861181
} else {
11871182
const input = this.searchValueInput?.nativeElement || this.picker?.getEditElement();
11881183
input?.focus();
@@ -1485,16 +1480,19 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
14851480
return ctx;
14861481
}
14871482

1488-
private setFormat(field: FieldType) {
1489-
if (!field.pipeArgs) {
1490-
field.pipeArgs = { digitsInfo: DEFAULT_PIPE_DIGITS_INFO };
1483+
private getPipeArgs(field: FieldType) {
1484+
let pipeArgs = {...field.pipeArgs};
1485+
if (!pipeArgs) {
1486+
pipeArgs = { digitsInfo: DEFAULT_PIPE_DIGITS_INFO };
14911487
}
14921488

1493-
if (!field.pipeArgs.format) {
1494-
field.pipeArgs.format = field.dataType === DataType.Time ?
1489+
if (!pipeArgs.format) {
1490+
pipeArgs.format = field.dataType === DataType.Time ?
14951491
DEFAULT_PIPE_TIME_FORMAT : field.dataType === DataType.DateTime ?
14961492
DEFAULT_PIPE_DATE_TIME_FORMAT : DEFAULT_PIPE_DATE_FORMAT;
14971493
}
1494+
1495+
return pipeArgs;
14981496
}
14991497

15001498
private selectDefaultCondition() {
@@ -1503,30 +1501,24 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
15031501
}
15041502
}
15051503

1506-
private setFilters(field: FieldType) {
1504+
private getFilters(field: FieldType) {
15071505
if (!field.filters) {
15081506
switch (field.dataType) {
15091507
case DataType.Boolean:
1510-
field.filters = IgxBooleanFilteringOperand.instance();
1511-
break;
1508+
return IgxBooleanFilteringOperand.instance();
15121509
case DataType.Number:
15131510
case DataType.Currency:
15141511
case DataType.Percent:
1515-
field.filters = IgxNumberFilteringOperand.instance();
1516-
break;
1512+
return IgxNumberFilteringOperand.instance();
15171513
case DataType.Date:
1518-
field.filters = IgxDateFilteringOperand.instance();
1519-
break;
1514+
return IgxDateFilteringOperand.instance();
15201515
case DataType.Time:
1521-
field.filters = IgxTimeFilteringOperand.instance();
1522-
break;
1516+
return IgxTimeFilteringOperand.instance();
15231517
case DataType.DateTime:
1524-
field.filters = IgxDateTimeFilteringOperand.instance();
1525-
break;
1518+
return IgxDateTimeFilteringOperand.instance();
15261519
case DataType.String:
15271520
default:
1528-
field.filters = IgxStringFilteringOperand.instance();
1529-
break;
1521+
return IgxStringFilteringOperand.instance();
15301522
}
15311523
}
15321524
}

projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3317,8 +3317,7 @@ export class IgxQueryBuilderSampleTestComponent implements OnInit {
33173317
<p class="selectedField">{{selectedField.field}}</p>
33183318
<p class="selectedCondition">{{selectedCondition}}</p>
33193319
} @else if (selectedField?.field === 'OrderId' && selectedCondition === 'equals') {
3320-
<igx-combo [data]="comboData" [(ngModel)]="searchValue.value"
3321-
(selectionChanging)="handleChange($event, selectedField, searchValue)" [displayKey]="'field'">
3320+
<igx-combo [data]="comboData" [(ngModel)]="searchValue.value" [displayKey]="'field'">
33223321
</igx-combo>
33233322
} @else {
33243323
<ng-container #defaultTemplate *ngTemplateOutlet="defaultSearchValueTemplate"></ng-container>
@@ -3347,6 +3346,7 @@ export class IgxQueryBuilderCustomTemplateSampleTestComponent implements OnInit
33473346

33483347
public ngOnInit(): void {
33493348
this.entities = SampleEntities.map(a => ({ ...a }));
3349+
this.entities[1].fields[0].formatter = (value: any, rowData: any) => rowData === 'equals' ? (Array.from(value)[0] as any).id : value;
33503350

33513351
const tree = new FilteringExpressionsTree(FilteringLogic.And, null, 'Orders', ['*']);
33523352
tree.filteringOperands.push({
@@ -3364,11 +3364,4 @@ export class IgxQueryBuilderCustomTemplateSampleTestComponent implements OnInit
33643364
{ id: 1, field: 'B' }
33653365
];
33663366
}
3367-
3368-
public handleChange(ev, selectedField, searchVal) {
3369-
if (selectedField.field === 'OrderId') {
3370-
searchVal.value = ev.newValue[0];
3371-
selectedField.formatter = (value: any, rowData: any) => rowData === 'equals' ? (Array.from(value)[0] as any).id : value;
3372-
}
3373-
}
33743367
}

0 commit comments

Comments
 (0)