Merge branch 'master' into mkirova/fix-pinned-area-changes

Author: ChronosSF

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

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

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

@@ -97,13 +97,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

@@ -2138,24 +2138,24 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
         }));
 
         it('Should close filter row when hide the current column', fakeAsync(() => {
-            pending('This issue is failing because of bug #');
             GridFunctions.clickFilterCellChip(fix, 'ProductName');
 
             // 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);
             tick(100);
 
             grid.getColumnByName('ProductName').hidden = true;
-            fix.detectChanges();
             tick(100);
+            fix.detectChanges();
 
             // Check that the filterRow is closed
-            expect(fix.debugElement.query(By.css(FILTER_UI_ROW))).toBeNull();
-            expect(grid.rowList.length).toBe(8);
+            filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
+            expect(filterUIRow).toBeNull();
+            expect(grid.rowList.length).toBe(3, 'filter is not applied');
         }));
 
         it('Should keep existing column filter after hiding another column.', fakeAsync(() => {

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

@@ -1458,7 +1458,7 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
 
         });
 
-        it('should add pinned badge in the pinned row instance in the body', () => {
+        it('should add pinned chip in the pinned row instance in the body', () => {
             const rowToPin = treeGrid.getRowByIndex(0);
             const primaryKey = treeGrid.primaryKey;
 
@@ -1636,5 +1636,20 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
                 {ID: 475, Name: 'Michael Langdon'},
             ]);
         });
+
+        it('should remove the pinned chip for filtered out parent', () => {
+            treeGrid.pinRow(147);
+            fix.detectChanges();
+
+            treeGrid.filter('ID', 957, IgxStringFilteringOperand.instance().condition('contains'), false);
+            fix.detectChanges();
+
+            const firstColumnField = treeGrid.columns[0].field;
+            const pinnedChipExpectedPosition = treeGrid.getCellByColumn(1, firstColumnField);
+            const pinnedRow = pinnedChipExpectedPosition.row;
+
+            expect(pinnedChipExpectedPosition.nativeElement.getElementsByClassName('igx-grid__td--pinned-chip').length).toBe(0);
+            expect(pinnedRow.disabled).toBe(false);
+        });
     });
 });

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts

@@ -612,7 +612,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
             $implicit: this.isGhostRecord(rowData) ? rowData.recordRef : rowData,
             index: this.getRowIndex(rowIndex, pinned),
             templateID: this.isSummaryRow(rowData) ? 'summaryRow' : 'dataRow',
-            disabled: this.isGhostRecord(rowData)
+            disabled: this.isGhostRecord(rowData) ? rowData.recordRef.isFilteredOutParent === undefined : false
         };
     }
 

projects/igniteui-angular/src/lib/paginator/paginator.component.ts

@@ -7,7 +7,7 @@ import { IgxSelectModule } from '../select/index';
 import { IgxIconModule } from '../icon/index';
 import { IgxButtonModule } from '../directives/button/button.directive';
 import { IgxRippleModule } from '../directives/ripple/ripple.directive';
-import { IgxInputGroupModule } from '../input-group';
+import { IgxInputGroupModule } from '../input-group/index';
 import { IPaginatorResourceStrings } from '../core/i18n/paginator-resources';
 import { DeprecateProperty } from '../core/deprecateDecorators';