Skip to content

Commit d21fdb6

Browse files
authored
Fixed AFD to show column headers (when available) instead of the actual field names. (#15822)
* fix(AFD): Brought back column headers to the generated entity.
1 parent 0d9ab22 commit d21fdb6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
208208
fields: this.filterableFields.map(f => ({
209209
field: f.field,
210210
dataType: f.dataType,
211-
// label: f.label,
212-
// header: f.header,
211+
label: f.label,
212+
header: f.header,
213213
editorOptions: f.editorOptions,
214214
filters: f.filters,
215215
pipeArgs: f.pipeArgs,

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,9 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
640640
fix.detectChanges();
641641
const dropdownItems = QueryBuilderFunctions.getQueryBuilderSelectDropdownItems(queryBuilderElement);
642642
expect(dropdownItems.length).toBe(4);
643-
expect((dropdownItems[0] as HTMLElement).innerText).toBe('ID');
643+
expect((dropdownItems[0] as HTMLElement).innerText).toBe('HeaderID');
644644
expect((dropdownItems[1] as HTMLElement).innerText).toBe('ProductName');
645-
expect((dropdownItems[2] as HTMLElement).innerText).toBe('AnotherField');
645+
expect((dropdownItems[2] as HTMLElement).innerText).toBe('Another Field');
646646
expect((dropdownItems[3] as HTMLElement).innerText).toBe('ReleaseTime');
647647
}));
648648

@@ -1331,7 +1331,7 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
13311331
QueryBuilderFunctions.clickQueryBuilderColumnSelect(fix);
13321332
fix.detectChanges();
13331333
const dropdownValues = QueryBuilderFunctions.getQueryBuilderSelectDropdownItems(queryBuilderElement).map((x: any) => x.innerText);
1334-
const expectedValues = ['ID', 'ProductName', 'Downloads', 'Released', 'ReleaseDate', 'AnotherField', 'DateTimeCreated'];
1334+
const expectedValues = ['ID', 'ProductName', 'Downloads', 'Released', 'ReleaseDate', 'Another Field', 'DateTimeCreated'];
13351335
expect(expectedValues).toEqual(dropdownValues);
13361336
}));
13371337
});

0 commit comments

Comments
 (0)