Merge branch '11.1.x' into dTsvetkov/fiix-8819-11.1.x

Author: zdrawku

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

@@ -669,7 +669,9 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
                     filterListItem.isFiltered = true;
                 }
                 filterListItem.value = element;
-                filterListItem.label = element;
+                filterListItem.label = element ?
+                    this.grid.resourceStrings.igx_grid_filter_true :
+                    this.grid.resourceStrings.igx_grid_filter_false;
                 filterListItem.indeterminate = false;
                 this.listData.push(filterListItem);
             } else {

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

@@ -3740,7 +3740,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
             expect(listItems.length).toBe(3, 'incorrect rendered list items count');
             expect(listItems[0].innerText).toBe('Select all search results');
-            expect(listItems[2].innerText).toBe('false');
+            expect(listItems[2].innerText).toBe('False');
         }));
 
         it('should scroll items in search list correctly', (async () => {
@@ -4071,7 +4071,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             tick(100);
             fix.detectChanges();
             verifyExcelStyleFilterAvailableOptions(fix,
-                ['Select All', '(Blanks)', 'false', 'true'],
+                ['Select All', '(Blanks)', 'False', 'True'],
                 [true, true, true, true]);
 
             toggleExcelStyleFilteringItems(fix, true, 3);
@@ -4082,7 +4082,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             tick(100);
             fix.detectChanges();
             verifyExcelStyleFilterAvailableOptions(fix,
-                ['Select All', '(Blanks)', 'false', 'true'],
+                ['Select All', '(Blanks)', 'False', 'True'],
                 [null, true, true, false]);
 
             GridFunctions.clickExcelFilterIcon(fix, 'Downloads');
@@ -4108,7 +4108,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             tick(100);
             fix.detectChanges();
             verifyExcelStyleFilterAvailableOptions(fix,
-                ['Select All', '(Blanks)', 'false', 'true'],
+                ['Select All', '(Blanks)', 'False', 'True'],
                 [null, true, true, false]);
 
             GridFunctions.clickExcelFilterIcon(fix, 'ProductName');
@@ -5204,6 +5204,47 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             const cellValues = GridFunctions.getColumnCells(fix, 'ProductName').map(c => c.nativeElement.innerText).sort();
             expect(cellValues).toEqual(['Web', 'Web']);
         });
+
+        it('Should display the default True and False resource strings in the search list for boolean column.', fakeAsync(() => {
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Released');
+            flush();
+            fix.detectChanges();
+
+            const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
+            const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
+
+            expect(listItems.length).toBe(4, 'incorrect rendered list items count');
+            expect(listItems[2].innerText).toBe('False', 'incorrect list item label');
+            expect(listItems[3].innerText).toBe('True', 'incorrect list item label');
+
+            const checkboxes = GridFunctions.getExcelStyleFilteringCheckboxes(fix);
+            checkboxes[3].click();
+            tick();
+            fix.detectChanges();
+
+            GridFunctions.clickApplyExcelStyleFiltering(fix);
+            flush();
+            fix.detectChanges();
+
+            expect(grid.filteredData.length).toEqual(5);
+        }));
+
+        it('Should display the custom resource strings when specified in the search list for boolean column.', fakeAsync(() => {
+            grid.resourceStrings.igx_grid_filter_false = 'No';
+            grid.resourceStrings.igx_grid_filter_true = 'Yes';
+            fix.detectChanges();
+
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Released');
+            flush();
+            fix.detectChanges();
+
+            const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
+            const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
+
+            expect(listItems.length).toBe(4, 'incorrect rendered list items count');
+            expect(listItems[2].innerText).toBe('No', 'incorrect list item label');
+            expect(listItems[3].innerText).toBe('Yes', 'incorrect list item label');
+        }));
     });
 
     describe('Templates: ', () => {