Skip to content

Commit ede4fa6

Browse files
authored
fix(query-builder): prevent fields collection change - 19.1.x (#15602)
* fix(query-builder): add test for mutated fields collection * fix(query-builder): prevent changing fields collection * fix(query-builder): disable mouse drag test * fix(query-builder): fix Advanced filtering failing tests * fix(query-builder): enable xit QB test
1 parent 82885ef commit ede4fa6

File tree

2 files changed

+31
-36
lines changed

2 files changed

+31
-36
lines changed

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

+19-27
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,12 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
172172
@Input()
173173
public set fields(fields: FieldType[]) {
174174
this._fields = fields;
175-
175+
176+
this._fields = this._fields?.map(f => ({...f, filters: this.getFilters(f), pipeArgs: this.getPipeArgs(f) }));
177+
176178
if (!this._fields && this.isAdvancedFiltering()) {
177179
this._fields = this.entities[0].fields;
178180
}
179-
180-
if (this._fields) {
181-
this._fields.forEach(field => {
182-
this.setFilters(field);
183-
this.setFormat(field);
184-
});
185-
}
186181
}
187182

188183
/**
@@ -1180,7 +1175,7 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
11801175
if (!this.selectedField) {
11811176
this.fieldSelect.input.nativeElement.focus();
11821177
} else if (this.selectedField.filters.condition(this.selectedCondition)?.isUnary) {
1183-
this.conditionSelect.input.nativeElement.focus();
1178+
this.conditionSelect?.input.nativeElement.focus();
11841179
} else {
11851180
const input = this.searchValueInput?.nativeElement || this.picker?.getEditElement();
11861181
input?.focus();
@@ -1483,16 +1478,19 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
14831478
return ctx;
14841479
}
14851480

1486-
private setFormat(field: FieldType) {
1487-
if (!field.pipeArgs) {
1488-
field.pipeArgs = { digitsInfo: DEFAULT_PIPE_DIGITS_INFO };
1481+
private getPipeArgs(field: FieldType) {
1482+
let pipeArgs = {...field.pipeArgs};
1483+
if (!pipeArgs) {
1484+
pipeArgs = { digitsInfo: DEFAULT_PIPE_DIGITS_INFO };
14891485
}
14901486

1491-
if (!field.pipeArgs.format) {
1492-
field.pipeArgs.format = field.dataType === DataType.Time ?
1487+
if (!pipeArgs.format) {
1488+
pipeArgs.format = field.dataType === DataType.Time ?
14931489
DEFAULT_PIPE_TIME_FORMAT : field.dataType === DataType.DateTime ?
14941490
DEFAULT_PIPE_DATE_TIME_FORMAT : DEFAULT_PIPE_DATE_FORMAT;
14951491
}
1492+
1493+
return pipeArgs;
14961494
}
14971495

14981496
private selectDefaultCondition() {
@@ -1501,30 +1499,24 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
15011499
}
15021500
}
15031501

1504-
private setFilters(field: FieldType) {
1502+
private getFilters(field: FieldType) {
15051503
if (!field.filters) {
15061504
switch (field.dataType) {
15071505
case DataType.Boolean:
1508-
field.filters = IgxBooleanFilteringOperand.instance();
1509-
break;
1506+
return IgxBooleanFilteringOperand.instance();
15101507
case DataType.Number:
15111508
case DataType.Currency:
15121509
case DataType.Percent:
1513-
field.filters = IgxNumberFilteringOperand.instance();
1514-
break;
1510+
return IgxNumberFilteringOperand.instance();
15151511
case DataType.Date:
1516-
field.filters = IgxDateFilteringOperand.instance();
1517-
break;
1512+
return IgxDateFilteringOperand.instance();
15181513
case DataType.Time:
1519-
field.filters = IgxTimeFilteringOperand.instance();
1520-
break;
1514+
return IgxTimeFilteringOperand.instance();
15211515
case DataType.DateTime:
1522-
field.filters = IgxDateTimeFilteringOperand.instance();
1523-
break;
1516+
return IgxDateTimeFilteringOperand.instance();
15241517
case DataType.String:
15251518
default:
1526-
field.filters = IgxStringFilteringOperand.instance();
1527-
break;
1519+
return IgxStringFilteringOperand.instance();
15281520
}
15291521
}
15301522
}

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

+12-9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ describe('IgxQueryBuilder', () => {
119119
expect(mainEntityContainer.children[1].children[1].tagName).toBe('IGX-COMBO');
120120
expect(nestedEntityContainer.children[1].children[1].tagName).toBe('IGX-SELECT');
121121
}));
122+
123+
it('Should return proper fields collection without additional props.', fakeAsync(() => {
124+
queryBuilder.expressionTree = QueryBuilderFunctions.generateExpressionTree();
125+
fix.detectChanges();
126+
127+
queryBuilder.entities[0].fields.forEach(field => {
128+
expect(field.filters).toBeUndefined();
129+
expect(field.pipeArgs).toBeUndefined();
130+
});
131+
}));
122132
});
123133

124134
describe('Interactions', () => {
@@ -3195,8 +3205,7 @@ export class IgxQueryBuilderSampleTestComponent implements OnInit {
31953205
<p class="selectedField">{{selectedField.field}}</p>
31963206
<p class="selectedCondition">{{selectedCondition}}</p>
31973207
} @else if (selectedField?.field === 'OrderId' && selectedCondition === 'equals') {
3198-
<igx-combo [data]="comboData" [(ngModel)]="searchValue.value"
3199-
(selectionChanging)="handleChange($event, selectedField, searchValue)" [displayKey]="'field'">
3208+
<igx-combo [data]="comboData" [(ngModel)]="searchValue.value" [displayKey]="'field'">
32003209
</igx-combo>
32013210
} @else {
32023211
<ng-container #defaultTemplate *ngTemplateOutlet="defaultSearchValueTemplate"></ng-container>
@@ -3225,6 +3234,7 @@ export class IgxQueryBuilderCustomTemplateSampleTestComponent implements OnInit
32253234

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

32293239
const tree = new FilteringExpressionsTree(FilteringLogic.And, null, 'Orders', ['*']);
32303240
tree.filteringOperands.push({
@@ -3242,11 +3252,4 @@ export class IgxQueryBuilderCustomTemplateSampleTestComponent implements OnInit
32423252
{ id: 1, field: 'B' }
32433253
];
32443254
}
3245-
3246-
public handleChange(ev, selectedField, searchVal) {
3247-
if (selectedField.field === 'OrderId') {
3248-
searchVal.value = ev.newValue[0];
3249-
selectedField.formatter = (value: any, rowData: any) => rowData === 'equals' ? (Array.from(value)[0] as any).id : value;
3250-
}
3251-
}
32523255
}

0 commit comments

Comments
 (0)