Merge pull request #7151 from IgniteUI/ibarakov/fix-6520-8.2.x

fix(filter-ui): hide filtering row on column hide #6520

Author: kdinev

projects/igniteui-angular/src/lib/grids/column.component.ts

@@ -252,6 +252,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
                 this.grid.endEdit(false);
                 this.grid.summaryService.resetSummaryHeight();
                 this.grid.filteringService.refreshExpressions();
+                this.grid.filteringService.hideFilteringRowOnColumnVisibilityChange(this);
                 this.grid.notifyChanges();
                 // this.grid.refreshSearch(true);
             }

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

@@ -114,13 +114,17 @@ export class IgxFilteringService implements OnDestroy {
                     filterCell.updateFilterCellArea();
                 });
             });
+        }
+    }
 
-            this.grid.onColumnVisibilityChanged.pipe(takeUntil(this.destroy$)).subscribe((eventArgs: IColumnVisibilityChangedEventArgs) => {
-                if (this.grid.filteringRow && this.grid.filteringRow.column === eventArgs.column ) {
-                    this.grid.filteringRow.close();
+    /**
+     * Close filtering row if a column is hidden.
+     */
+    public hideFilteringRowOnColumnVisibilityChange(col: IgxColumnComponent) {
+        const filteringRow = this.grid.filteringRow;
 
-                }
-            });
+        if (filteringRow && filteringRow.column && filteringRow.column === col) {
+            filteringRow.close();
         }
     }
 

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

@@ -3330,43 +3330,25 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             expect(grid.rowList.length).toBe(3);
         });
 
-        it('Should close filter row when hide the current column', (async () => {
-            grid.height = '700px';
-            grid.showToolbar = true;
-            grid.columnHiding = true;
-            fix.detectChanges();
-            await wait(16);
-
-            const prodNameCol = grid.columns.find((col) => col.field === 'ProductName');
-            GridFunctions.verifyColumnIsHidden(prodNameCol, false, 6);
-
+        it('Should close filter row when hide the current column', fakeAsync(() => {
             GridFunctions.clickFilterCellChip(fix, 'ProductName');
-            fix.detectChanges();
 
             // Check that the filterRow is opened
-            const filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
+            let filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
             expect(filterUIRow).not.toBeNull();
 
             // Add first chip.
             GridFunctions.typeValueInFilterRowInput('a', fix);
-            await wait(16);
-
-            const hideButton = GridFunctions.getColumnHidingButton(fix);
-            hideButton.focus();
-            fix.detectChanges();
-            await wait(16);
-            hideButton.click();
-            fix.detectChanges();
-            await wait(100);
+            tick(100);
 
-            const dropDown = fix.debugElement.query(By.css('igx-column-hiding'));
-            HelperUtils.getCheckboxInput('ProductName', dropDown, fix).click();
+            grid.getColumnByName('ProductName').hidden = true;
+            tick(100);
             fix.detectChanges();
-            await wait(100);
 
             // Check that the filterRow is closed
-            expect(fix.debugElement.query(By.css(FILTER_UI_ROW))).toBeNull();
-            GridFunctions.verifyColumnIsHidden(prodNameCol, true, 5);
+            filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
+            expect(filterUIRow).toBeNull();
+            expect(grid.rowList.length).toBe(3, 'filter is not applied');
         }));
 
         it('Unary conditions should be committable', fakeAsync(() => {