Merge pull request #7571 from IgniteUI/dmdimitrov/issue7480-9.0.x

fix(filtering): clearing all column filters if no field is provided - 9.0.x

Author: rkaraivanov

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

@@ -179,7 +179,7 @@ export class IgxFilteringService implements OnDestroy {
     }
 
     /**
-     * Clear the filter of a given column.
+     * Clears the filter of a given column if name is provided. Otherwise clears the filters of all columns.
      */
     public clearFilter(field: string): void {
         if (field) {
@@ -199,6 +199,11 @@ export class IgxFilteringService implements OnDestroy {
         if (field) {
             const expressions = this.getExpressions(field);
             expressions.length = 0;
+        } else {
+            this.grid.columns.forEach(c => {
+                const expressions = this.getExpressions(c.field);
+                expressions.length = 0;
+            });
         }
 
         this.isFiltering = false;

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

@@ -2047,6 +2047,40 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             expect(chipDiv.classList.contains('igx-chip__item--selected')).toBe(false, 'chip is not committed');
             expect(input.value).toBe('', 'input value is present and not committed');
         }));
+
+        it('should not retain expression values in cell filter after calling grid clearFilter() method.', fakeAsync(() => {
+            // Click on 'ProductName' filter chip
+            GridFunctions.clickFilterCellChipUI(fix, 'ProductName');
+            fix.detectChanges();
+
+            // Enter expression
+            GridFunctions.typeValueInFilterRowInput('NetAdvantage', fix);
+            tick(DEBOUNCETIME);
+            GridFunctions.closeFilterRow(fix);
+            fix.detectChanges();
+
+            // Verify filtered data
+            expect(grid.filteredData.length).toEqual(1);
+
+            // Clear filters of all columns
+            grid.clearFilter();
+            fix.detectChanges();
+
+            // Verify filtered data
+            expect(grid.filteredData).toBeNull();
+
+            // Click on 'ProductName' filter chip
+            GridFunctions.clickFilterCellChipUI(fix, 'ProductName');
+            fix.detectChanges();
+
+            // Verify there are no chips since we cleared all filters
+            const filteringRow = fix.debugElement.query(By.directive(IgxGridFilteringRowComponent));
+            const conditionChips = filteringRow.queryAll(By.directive(IgxChipComponent));
+            expect(conditionChips.length).toBe(0);
+
+            // Verify filtered data
+            expect(grid.filteredData).toBeNull();
+        }));
     });
 
     describe('Integration scenarios', () => {
@@ -2352,8 +2386,6 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             expect(colOperands[0].nativeElement.innerText).toEqual('AND');
             expect(colIndicator.length).toEqual(0);
         }));
-
-
     });
 
     describe(null, () => {