Skip to content

Commit 5809299

Browse files
authored
Merge pull request #9127 from IgniteUI/gedinakova/fix-8971-10.2
fix(ESF): Made search component's boolean values localizable.
2 parents b99a9ad + 49ef930 commit 5809299

File tree

2 files changed

+48
-5
lines changed

2 files changed

+48
-5
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,9 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
615615
filterListItem.isFiltered = true;
616616
}
617617
filterListItem.value = element;
618-
filterListItem.label = element;
618+
filterListItem.label = element ?
619+
this.grid.resourceStrings.igx_grid_filter_true :
620+
this.grid.resourceStrings.igx_grid_filter_false;
619621
filterListItem.indeterminate = false;
620622
this.listData.push(filterListItem);
621623
} else {

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

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3672,7 +3672,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
36723672
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
36733673
expect(listItems.length).toBe(3, 'incorrect rendered list items count');
36743674
expect(listItems[0].innerText).toBe('Select all search results');
3675-
expect(listItems[2].innerText).toBe('false');
3675+
expect(listItems[2].innerText).toBe('False');
36763676
}));
36773677

36783678
it('should scroll items in search list correctly', (async () => {
@@ -4005,7 +4005,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
40054005
tick(100);
40064006
fix.detectChanges();
40074007
verifyExcelStyleFilterAvailableOptions(fix,
4008-
['Select All', '(Blanks)', 'false', 'true'],
4008+
['Select All', '(Blanks)', 'False', 'True'],
40094009
[true, true, true, true]);
40104010

40114011
toggleExcelStyleFilteringItems(fix, true, 3);
@@ -4016,7 +4016,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
40164016
tick(100);
40174017
fix.detectChanges();
40184018
verifyExcelStyleFilterAvailableOptions(fix,
4019-
['Select All', '(Blanks)', 'false', 'true'],
4019+
['Select All', '(Blanks)', 'False', 'True'],
40204020
[null, true, true, false]);
40214021

40224022
GridFunctions.clickExcelFilterIcon(fix, 'Downloads');
@@ -4042,7 +4042,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
40424042
tick(100);
40434043
fix.detectChanges();
40444044
verifyExcelStyleFilterAvailableOptions(fix,
4045-
['Select All', '(Blanks)', 'false', 'true'],
4045+
['Select All', '(Blanks)', 'False', 'True'],
40464046
[null, true, true, false]);
40474047

40484048
GridFunctions.clickExcelFilterIcon(fix, 'ProductName');
@@ -5094,6 +5094,47 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
50945094
expect(inputNativeElement.type).toBe('number', 'input type of number column is not number');
50955095

50965096
}));
5097+
5098+
it('Should display the default True and False resource strings in the search list for boolean column.', fakeAsync(() => {
5099+
GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Released');
5100+
flush();
5101+
fix.detectChanges();
5102+
5103+
const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
5104+
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
5105+
5106+
expect(listItems.length).toBe(4, 'incorrect rendered list items count');
5107+
expect(listItems[2].innerText).toBe('False', 'incorrect list item label');
5108+
expect(listItems[3].innerText).toBe('True', 'incorrect list item label');
5109+
5110+
const checkboxes = GridFunctions.getExcelStyleFilteringCheckboxes(fix);
5111+
checkboxes[3].click();
5112+
tick();
5113+
fix.detectChanges();
5114+
5115+
GridFunctions.clickApplyExcelStyleFiltering(fix);
5116+
flush();
5117+
fix.detectChanges();
5118+
5119+
expect(grid.filteredData.length).toEqual(5);
5120+
}));
5121+
5122+
it('Should display the custom resource strings when specified in the search list for boolean column.', fakeAsync(() => {
5123+
grid.resourceStrings.igx_grid_filter_false = 'No';
5124+
grid.resourceStrings.igx_grid_filter_true = 'Yes';
5125+
fix.detectChanges();
5126+
5127+
GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Released');
5128+
flush();
5129+
fix.detectChanges();
5130+
5131+
const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
5132+
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
5133+
5134+
expect(listItems.length).toBe(4, 'incorrect rendered list items count');
5135+
expect(listItems[2].innerText).toBe('No', 'incorrect list item label');
5136+
expect(listItems[3].innerText).toBe('Yes', 'incorrect list item label');
5137+
}));
50975138
});
50985139

50995140
describe('Templates: ', () => {

0 commit comments

Comments
 (0)