Merge branch '8.2.x' into vmihalkov/fix-6593-8.2.x

Author: ChronosSF

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

@@ -54,8 +54,6 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit {
     @Input()
     public data: FilterListItem[];
 
-    public filteredData: FilterListItem[];
-
     @Input()
     public column: IgxColumnComponent;
 

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.pipe.ts

@@ -9,16 +9,12 @@ import { cloneArray } from '../../../core/utils';
     name: 'excelStyleSearchFilter'
 })
 export class IgxExcelStyleSearchFilterPipe implements PipeTransform {
-
-    constructor(private esf: IgxGridExcelStyleFilteringComponent) { }
-
     transform(items: FilterListItem[], searchText: string): any[] {
         if (!items || !items.length) {
             return [];
         }
 
         if (!searchText) {
-            this.esf.excelStyleSearch.filteredData = null;
             return items;
         }
 
@@ -27,14 +23,7 @@ export class IgxExcelStyleSearchFilterPipe implements PipeTransform {
             (it.value !== null && it.value !== undefined) &&
             it.value.toString().toLowerCase().indexOf(searchText) > -1);
 
-        // If 'result' contains the 'Select All' item and at least one more, we use it as a 'finalResult',
-        // otherwise we use an empty array as a 'finalResult' of the filtering.
-        const finalResult = result.length > 1 ? result : [];
-
-        // Update the filteredData of the search component.
-        this.esf.excelStyleSearch.filteredData = cloneArray(finalResult);
-        this.esf.cdr.detectChanges();
-
-        return finalResult;
+        // If 'result' contains the 'Select All' item and at least one more - we use it, otherwise we use an empty array.
+        return result.length > 1 ? result : [];
     }
 }

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

@@ -131,7 +131,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy, OnInit, A
     public customDialog: IgxExcelStyleCustomDialogComponent;
 
     @ViewChild('excelStyleSearch', { read: IgxExcelStyleSearchComponent, static: true })
-    public excelStyleSearch: IgxExcelStyleSearchComponent;
+    protected excelStyleSearch: IgxExcelStyleSearchComponent;
 
     @ViewChild('excelStyleSorting', { read: IgxExcelStyleSortingComponent, static: false })
     protected excelStyleSorting: IgxExcelStyleSortingComponent;
@@ -171,7 +171,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy, OnInit, A
         }
     }
 
-    constructor(public cdr: ChangeDetectorRef) {}
+    constructor(private cdr: ChangeDetectorRef) {}
 
     ngOnInit() {
         this.isColumnPinnable = this.column.pinnable;
@@ -608,8 +608,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy, OnInit, A
     }
 
     get applyButtonDisabled() {
-        return  (this.excelStyleSearch.filteredData && this.excelStyleSearch.filteredData.length === 0) ||
-                (this.listData[0] && !this.listData[0].isSelected && !this.listData[0].indeterminate);
+        return this.listData[0] && !this.listData[0].isSelected && !this.listData[0].indeterminate;
     }
 
     public applyFilter() {

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

@@ -4403,40 +4403,27 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             tick(100);
         }));
 
-        it('Should filter, clear and enable/disable the apply button correctly.', fakeAsync(() => {
+        it('Should enable/disable the apply button correctly.', fakeAsync(() => {
             GridFunctions.clickExcelFilterIcon(fix, 'ProductName');
             tick(100);
             fix.detectChanges();
 
-            // Type string in search box.
+            // Verify there are filtered-in results and that apply button is enabled.
             const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
-            const inputNativeElement = searchComponent.querySelector('.igx-input-group__input');
-            sendInputNativeElement(inputNativeElement, 'hello there', fix);
-            tick(100);
-            fix.detectChanges();
-
-            // Verify there are no filtered-in results and that apply button is disabled.
-            let listItems = searchComponent.querySelectorAll('igx-list-item');
-            let excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
-            let raisedButtons = Array.from(excelMenu.querySelectorAll('.igx-button--raised'));
+            const listItems = searchComponent.querySelectorAll('igx-list-item');
+            const excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+            const raisedButtons = Array.from(excelMenu.querySelectorAll('.igx-button--raised'));
             let applyButton: any = raisedButtons.find((rb: any) => rb.innerText === 'apply');
-            expect(listItems.length).toBe(0, 'ESF search result should be empty');
-            expect(applyButton.classList.contains('igx-button--disabled')).toBe(true);
+            expect(listItems.length).toBe(6, 'ESF search result should NOT be empty');
+            expect(applyButton.classList.contains('igx-button--disabled')).toBe(false);
 
-            // Clear filtering.
-            const icons = Array.from(searchComponent.querySelectorAll('igx-icon'));
-            const clearIcon: any = icons.find((ic: any) => ic.innerText === 'clear');
-            clearIcon.click();
-            tick(100);
+            // Verify the apply button is disabled when all items are unchecked (when unchecking 'Select All').
+            const checkbox = excelMenu.querySelectorAll('.igx-checkbox__input');
+            checkbox[0].click(); // Select All
+            tick();
             fix.detectChanges();
-
-            // Verify there are filtered-in results and that apply button is enabled.
-            listItems = searchComponent.querySelectorAll('igx-list-item');
-            excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
-            raisedButtons = Array.from(excelMenu.querySelectorAll('.igx-button--raised'));
             applyButton = raisedButtons.find((rb: any) => rb.innerText === 'apply');
-            expect(listItems.length).toBe(6, 'ESF search result should NOT be empty');
-            expect(applyButton.classList.contains('igx-button--disabled')).toBe(false);
+            expect(applyButton.classList.contains('igx-button--disabled')).toBe(true);
         }));
 
         it('display density is properly applied on the excel style filtering component', fakeAsync(() => {