Merge branch 'master' into ddimitrov/advancedFiltering

Author: DiyanDimitrov

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

@@ -1687,8 +1687,8 @@ export class IgxColumnComponent implements AfterContentInit {
     */
     public get pinnable() {
         const gridUnpinnedWidth = (this.grid as any).getUnpinnedWidth(true);
-        const columnWidth = parseInt(this.width, 10);
-        return !((gridUnpinnedWidth - columnWidth) < this.grid.unpinnedAreaMinWidth);
+        const elementWidth = this.parent ? parseInt(this.topLevelParent.width, 10) : parseInt(this.width, 10);
+        return !((gridUnpinnedWidth - elementWidth) < this.grid.unpinnedAreaMinWidth);
     }
 
     /**

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

@@ -29,6 +29,8 @@ 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

@@ -1,5 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { FilterListItem } from './grid.excel-style-filtering.component';
+import { FilterListItem, IgxGridExcelStyleFilteringComponent } from './grid.excel-style-filtering.component';
+import { cloneArray } from '../../../core/utils';
 
 /**
  * @hidden
@@ -8,12 +9,16 @@ import { FilterListItem } from './grid.excel-style-filtering.component';
     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;
         }
 
@@ -22,6 +27,14 @@ export class IgxExcelStyleSearchFilterPipe implements PipeTransform {
             (it.value !== null && it.value !== undefined) &&
             it.value.toString().toLowerCase().indexOf(searchText) > -1);
 
-        return result.length > 1 ? result : [];
+        // 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;
     }
 }

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

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

@@ -3504,7 +3504,8 @@ describe('IgxGrid - Filtering actions - Excel style filtering', () => {
             declarations: [
                 IgxGridFilteringComponent,
                 IgxTestExcelFilteringDatePickerComponent,
-                IgxGridFilteringESFTemplatesComponent
+                IgxGridFilteringESFTemplatesComponent,
+                IgxGridFilteringMCHComponent
             ],
             imports: [
                 NoopAnimationsModule,
@@ -4258,6 +4259,42 @@ describe('IgxGrid - Filtering actions - Excel style filtering', () => {
             tick(100);
         }));
 
+        it('Should filter, clear and enable/disable the apply button correctly.', fakeAsync(() => {
+            GridFunctions.clickExcelFilterIcon(fix, 'ProductName');
+            tick(100);
+            fix.detectChanges();
+
+            // Type string in search box.
+            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'));
+            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);
+
+            // Clear filtering.
+            const icons = Array.from(searchComponent.querySelectorAll('igx-icon'));
+            const clearIcon: any = icons.find((ic: any) => ic.innerText === 'clear');
+            clearIcon.click();
+            tick(100);
+            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);
+        }));
+
         it('display density is properly applied on the excel style filtering component', fakeAsync(() => {
             const gridNativeElement = fix.debugElement.query(By.css('igx-grid')).nativeElement;
             const column = grid.columns.find((c) => c.field === 'ProductName');
@@ -5578,6 +5615,37 @@ describe('IgxGrid - Filtering actions - Excel style filtering', () => {
             // expect(datePicker.componentInstance.templateDropDownTarget).toBeTruthy();
         }));
     });
+
+    describe(null, () => {
+        let fix, grid;
+        beforeEach(fakeAsync(() => {
+            fix = TestBed.createComponent(IgxGridFilteringMCHComponent);
+            grid = fix.componentInstance.grid;
+            grid.filterMode = FilterMode.excelStyleFilter;
+            fix.detectChanges();
+        }));
+
+        it('Should not pin column when its parent group cannot be pinned.', fakeAsync(() => {
+            // Test prerequisites
+            grid.width = '1000px';
+            fix.detectChanges();
+            tick(100);
+
+            // Pin the 'AnotherField' column.
+            GridFunctions.clickExcelFilterIcon(fix, 'AnotherField');
+            fix.detectChanges();
+            GridFunctions.clickPinIconInExcelStyleFiltering(fix, false);
+            tick(200);
+            fix.detectChanges();
+
+            // Verify that the 'ProductName' pin button is disabled, because its parent column cannot be pinned.
+            GridFunctions.clickExcelFilterIcon(fix, 'ProductName');
+            fix.detectChanges();
+            const pinButton = GridFunctions.getExcelFilteringPinContainer(fix);
+            expect(pinButton.classList.contains('igx-excel-filter__actions-pin--disabled')).toBe(true,
+                'pinButton should be disabled');
+        }));
+    });
 });
 
 const expectedResults = [];