Skip to content

Commit a47c28c

Browse files
committed
refactor(sample): query-builder formatter example simplified
1 parent 3b017a4 commit a47c28c

2 files changed

Lines changed: 5 additions & 38 deletions

File tree

src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
let-defaultSearchValueTemplate = "defaultSearchValueTemplate">
1212
@if (selectedField?.field === 'Region' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){
1313
<igx-select [placeholder]="'Select region'" [(ngModel)]="searchValue.value">
14-
<igx-select-item *ngFor="let reg of regionOptions" [value]="reg.value">{{ reg.text }}</igx-select-item>
14+
<igx-select-item *ngFor="let reg of regionOptions" [value]="reg">{{ reg.text }}</igx-select-item>
1515
</igx-select>
1616
}
1717
@else if (selectedField?.field === 'OrderStatus' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){
@@ -21,12 +21,7 @@
2121
</igx-radio>
2222
</igx-radio-group>
2323
}
24-
@else if (selectedField?.field === 'ShipCountry' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){
25-
<igx-select [placeholder]="'Select Country'" [(ngModel)]="searchValue.value">
26-
<igx-select-item *ngFor="let c of countries" [value]="c.data">{{ c.text }}</igx-select-item>
27-
</igx-select>
28-
}
29-
@else {
24+
@else {
3025
<ng-container *ngTemplateOutlet="defaultSearchValueTemplate"></ng-container>
3126
}
3227
</ng-template>

src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,6 @@ export class QueryBuilderTemplateSampleComponent implements OnInit {
2626
{ text: 'Southern Africa', value: 'SAF' },
2727
{ text: 'Northern Australia', value: 'NAU' }];
2828

29-
public countries = [
30-
{ text: "United States", data: { iso: "US", code: "+1" } },
31-
{ text: "Canada", data: { iso: "CA", code: "+1" } },
32-
{ text: "Mexico", data: { iso: "MX", code: "+52" } },
33-
{ text: "Brazil", data: { iso: "BR", code: "+55" } },
34-
{ text: "Argentina", data: { iso: "AR", code: "+54" } },
35-
{ text: "Colombia", data: { iso: "CO", code: "+57" } },
36-
{ text: "Germany", data: { iso: "DE", code: "+49" } },
37-
{ text: "United Kingdom", data: { iso: "GB", code: "+44" } },
38-
{ text: "France", data: { iso: "FR", code: "+33" } },
39-
{ text: "Nigeria", data: { iso: "NG", code: "+234" } },
40-
{ text: "Egypt", data: { iso: "EG", code: "+20" } },
41-
{ text: "South Africa", data: { iso: "ZA", code: "+27" } },
42-
{ text: "China", data: { iso: "CN", code: "+86" } },
43-
{ text: "India", data: { iso: "IN", code: "+91" } },
44-
{ text: "Japan", data: { iso: "JP", code: "+81" } },
45-
{ text: "Australia", data: { iso: "AU", code: "+61" } },
46-
{ text: "New Zealand", data: { iso: "NZ", code: "+64" } },
47-
{ text: "Papua New Guinea", data: { iso: "PG", code: "+675" } }
48-
];
49-
5029
public statusOptions = [
5130
{ text: 'New', value: 1 },
5231
{ text: 'Shipped', value: 2 },
@@ -65,8 +44,8 @@ export class QueryBuilderTemplateSampleComponent implements OnInit {
6544
{ field: "ShipName", dataType: "string" },
6645
{ field: "ShipCity", dataType: "string" },
6746
{ field: "ShipPostalCode", dataType: "string" },
68-
{ field: "ShipCountry", dataType: "string", formatter: (value: any, rowData: any) => rowData === 'equals' || rowData === 'doesNotEqual' ? `${value.iso} (${value.code})` : value },
69-
{ field: "Region", dataType: "string" },
47+
{ field: "ShipCountry", dataType: "string" },
48+
{ field: "Region", dataType: "string", formatter: (value: any, rowData: any) => rowData === 'equals' || rowData === 'doesNotEqual' ? `${value.value}` : value },
7049
{ field: "OrderStatus", dataType: "number" }
7150
];
7251

@@ -82,23 +61,16 @@ export class QueryBuilderTemplateSampleComponent implements OnInit {
8261
fieldName: 'Region',
8362
condition: IgxStringFilteringOperand.instance().condition('equals'),
8463
conditionName: 'equals',
85-
searchVal: 'CNA'
64+
searchVal: this.regionOptions[0]
8665
});
8766
tree.filteringOperands.push({
8867
fieldName: 'OrderStatus',
8968
condition: IgxNumberFilteringOperand.instance().condition('equals'),
9069
conditionName: 'equals',
9170
searchVal: 1
9271
});
93-
tree.filteringOperands.push({
94-
fieldName: 'ShipCountry',
95-
condition: IgxStringFilteringOperand.instance().condition('equals'),
96-
conditionName: 'equals',
97-
searchVal: this.countries[3].data
98-
});
9972

10073
this.expressionTree = tree;
101-
this.shipViaFormatterData = [{ id: 0, field: 'sea' }, { id: 1, field: 'air' }, { id: 2, field: 'land' }]
10274
}
10375

10476
public printExpressionTree(tree: IExpressionTree) {

0 commit comments

Comments
 (0)