Skip to content

Commit fcc9941

Browse files
authored
Merge pull request #15217 from IgniteUI/gedinakova/fix-clear-filter-15193-18.2
Clear selected condition when clearing the filters #15193
2 parents ac985f5 + 7a0cf02 commit fcc9941

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
137137

138138
public onClearButtonClick() {
139139
this.filteringService.clearFilter(this.column.field);
140+
this.selectedOperator = null;
140141
this.createInitialExpressionUIElement();
141142
this.cdr.detectChanges();
142143
}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6273,6 +6273,41 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
62736273
['Select All', '1:00:00 AM', '12:00:00 PM', '11:00:00 PM'],
62746274
[true, true, true, true]);
62756275
}));
6276+
6277+
it('should clear all filters in the custom dialog when clicking "Clear Filter" button', fakeAsync(() => {
6278+
GridFunctions.clickExcelFilterIcon(fix, 'ReleaseDate');
6279+
tick(100);
6280+
fix.detectChanges();
6281+
6282+
GridFunctions.clickExcelFilterCascadeButton(fix);
6283+
tick();
6284+
fix.detectChanges();
6285+
6286+
GridFunctions.clickOperatorFromCascadeMenu(fix, 5);
6287+
tick();
6288+
fix.detectChanges();
6289+
6290+
const expressions = GridFunctions.getExcelCustomFilteringDateExpressions(fix);
6291+
const lastExpression = expressions[expressions.length - 1];
6292+
(lastExpression.querySelector('igx-select').querySelector('igx-input-group') as HTMLElement).click();
6293+
tick();
6294+
fix.detectChanges();
6295+
const dropdownList = fix.debugElement.query(By.css('div.igx-drop-down__list.igx-toggle'));
6296+
6297+
const todayItem = dropdownList.children[0].children.find(item => item.nativeElement?.innerText === 'Today');
6298+
todayItem.nativeElement.click();
6299+
tick();
6300+
fix.detectChanges();
6301+
6302+
GridFunctions.clickClearFilterExcelStyleCustomFiltering(fix);
6303+
tick();
6304+
fix.detectChanges();
6305+
6306+
GridFunctions.getExcelCustomFilteringDateExpressions(fix).forEach(expr => {
6307+
const input = expr.children[0].querySelector('input');
6308+
expect(input.value).toBe('');
6309+
});
6310+
}));
62766311
});
62776312

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

0 commit comments

Comments
 (0)