Skip to content

Commit 734086e

Browse files
authored
Merge branch 'master' into simeonoff/fix-8718
2 parents 6a16284 + a409674 commit 734086e

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ export class IgxStringFilteringOperand extends IgxFilteringOperand {
548548
* @memberof IgxStringFilteringOperand
549549
*/
550550
public static applyIgnoreCase(a: string, ignoreCase: boolean): string {
551-
a = a || '';
551+
a = a ?? '';
552552
// bulletproof
553553
return ignoreCase ? ('' + a).toLowerCase() : a;
554554
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,16 @@ describe('IgxGrid - Filtering actions #grid', () => {
649649
expect(grid.rowList.length).toEqual(1);
650650
}));
651651

652+
it('should exclude null and undefined values when filter by \'false\'', fakeAsync(() => {
653+
expect(grid.rowList.length).toEqual(8);
654+
655+
grid.filter('Released', false, IgxStringFilteringOperand.instance().condition('equals'), true);
656+
fix.detectChanges();
657+
expect(grid.rowList.length).toEqual(2);
658+
expect(grid.getCellByColumn(0, 'Released').value).toBe(false);
659+
expect(grid.getCellByColumn(1, 'Released').value).toBe(false);
660+
}));
661+
652662
it('should correctly apply multiple filtering through API', fakeAsync(() => {
653663
const gridExpressionsTree = new FilteringExpressionsTree(FilteringLogic.And);
654664
gridExpressionsTree.filteringOperands = [

0 commit comments

Comments
 (0)