Merge branch '8.2.x' into set-width-hideallcolumns-82x

Author: nrobakova

projects/igniteui-angular/src/lib/core/grid-selection.ts

@@ -1,5 +1,6 @@
 import { Injectable, EventEmitter, NgZone } from '@angular/core';
-import { IGridEditEventArgs } from '../grids/grid-base.component';
+import { IGridEditEventArgs, IgxGridBaseComponent } from '../grids/grid-base.component';
+import { FilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
 
 export interface GridSelectionRange {
     rowStart: number;
@@ -688,7 +689,9 @@ export class IgxGridSelectionService {
     }
 
     private isFilteringApplied(): boolean {
-        return this.grid.filteringExpressionsTree.filteringOperands.length > 0;
+        const grid = this.grid as IgxGridBaseComponent;
+        return !FilteringExpressionsTree.empty(grid.filteringExpressionsTree) ||
+        !FilteringExpressionsTree.empty(grid.advancedFilteringExpressionsTree);
     }
 
     private isRowDeleted(rowID): boolean {

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

@@ -167,23 +167,34 @@ export class IgxGridNavigationService {
     }
 
     public movePreviousEditable(rowIndex: number, currentColumnVisibleIndex: number) {
-        const prevEditableColumnIndex = this.findNextEditable(MoveDirection.LEFT, currentColumnVisibleIndex - 1);
-        if (prevEditableColumnIndex === -1 && this.grid.rowEditTabs.length) {
-            //  TODO: make gridAPI visible for internal use and remove cast to any
-            (this.grid as any).gridAPI.submit_value();
-            this.grid.rowEditTabs.last.element.nativeElement.focus();
-            return;
+        let prevEditableColumnIndex = this.findNextEditable(MoveDirection.LEFT, currentColumnVisibleIndex - 1);
+        if (prevEditableColumnIndex === -1) {
+            if (this.grid.rowEditTabs.length) {
+                //  TODO: make gridAPI visible for internal use and remove cast to any
+                (this.grid as any).gridAPI.submit_value();
+                this.grid.rowEditTabs.last.element.nativeElement.focus();
+                return;
+            } else {
+                // In case when row edit template is empty select last editable cell
+                prevEditableColumnIndex = this.grid.lastEditableColumnIndex;
+            }
+
         }
         this.focusEditableTarget(rowIndex, prevEditableColumnIndex);
     }
 
     public moveNextEditable(rowIndex: number, currentColumnVisibleIndex: number) {
-        const nextEditableColumnIndex = this.findNextEditable(MoveDirection.RIGHT, currentColumnVisibleIndex + 1);
-        if (nextEditableColumnIndex === -1 && this.grid.rowEditTabs.length) {
-            //  TODO: make gridAPI visible for internal use and remove cast to any
-            (this.grid as any).gridAPI.submit_value();
-            this.grid.rowEditTabs.first.element.nativeElement.focus();
-            return;
+        let nextEditableColumnIndex = this.findNextEditable(MoveDirection.RIGHT, currentColumnVisibleIndex + 1);
+        if (nextEditableColumnIndex === -1) {
+            if ( this.grid.rowEditTabs.length) {
+                 //  TODO: make gridAPI visible for internal use and remove cast to any
+                (this.grid as any).gridAPI.submit_value();
+                this.grid.rowEditTabs.first.element.nativeElement.focus();
+                return;
+            } else {
+                // In case when row edit template is empty select first editable cell
+                nextEditableColumnIndex = this.grid.firstEditableColumnIndex;
+            }
         }
         this.focusEditableTarget(rowIndex, nextEditableColumnIndex);
     }

projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts

@@ -23,7 +23,8 @@ import {
     IgxGridWithEditingAndFeaturesComponent,
     IgxGridRowEditingWithoutEditableColumnsComponent,
     IgxGridCustomOverlayComponent,
-    IgxGridRowEditingWithFeaturesComponent
+    IgxGridRowEditingWithFeaturesComponent,
+    IgxGridEmptyRowEditTemplateComponent
 } from '../../test-utils/grid-samples.spec';
 import { IgxGridTestComponent } from './grid.component.spec';
 
@@ -45,7 +46,8 @@ describe('IgxGrid - Row Editing #grid', () => {
                 IgxGridRowEditingWithoutEditableColumnsComponent,
                 IgxGridTestComponent,
                 IgxGridCustomOverlayComponent,
-                IgxGridRowEditingWithFeaturesComponent
+                IgxGridRowEditingWithFeaturesComponent,
+                IgxGridEmptyRowEditTemplateComponent
             ],
             imports: [
                 NoopAnimationsModule, IgxGridModule]
@@ -1912,7 +1914,7 @@ describe('IgxGrid - Row Editing #grid', () => {
 
             expect(parseInt(GridFunctions.getRowEditingBannerText(fix), 10)).toEqual(0);
             fix.componentInstance.cellInEditMode.editValue = 'Spiro';
-            fix.componentInstance.moveNext(true);
+            UIInteractions.triggerKeyDownWithBlur('tab', cell.nativeElement, true);
             tick(16);
             fix.detectChanges();
 
@@ -1923,6 +1925,41 @@ describe('IgxGrid - Row Editing #grid', () => {
             expect(grid.endEdit).toHaveBeenCalled();
             expect(grid.endEdit).toHaveBeenCalledTimes(1);
         }));
+
+        it('Empty template', fakeAsync(() => {
+            const fix = TestBed.createComponent(IgxGridEmptyRowEditTemplateComponent);
+            fix.detectChanges();
+            tick(16);
+
+            const grid = fix.componentInstance.grid;
+            let cell = grid.getCellByColumn(0, 'ProductName');
+            UIInteractions.triggerKeyDownEvtUponElem('f2', cell.nativeElement, true);
+
+            fix.detectChanges();
+            tick(16);
+
+            cell.editValue = 'Spiro';
+            UIInteractions.triggerKeyDownEvtUponElem('tab', cell.nativeElement, true);
+
+            fix.detectChanges();
+            tick(16);
+            fix.detectChanges();
+            tick(16);
+
+            expect(cell.editMode).toBe(false);
+            cell = grid.getCellByColumn(0, 'ReorderLevel');
+            expect(cell.editMode).toBe(true);
+
+            UIInteractions.triggerKeyDownEvtUponElem('tab', cell.nativeElement, true, false, true);
+            fix.detectChanges();
+            tick(16);
+            fix.detectChanges();
+            tick(16);
+
+            expect(cell.editMode).toBe(false);
+            cell = grid.getCellByColumn(0, 'ProductName');
+            expect(cell.editMode).toBe(true);
+        }));
     });
 
     describe('Transaction', () => {

projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts

@@ -19,6 +19,8 @@ import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-fun
 import { SampleTestData } from '../../test-utils/sample-test-data.spec';
 import { GridSelectionMode } from '../common/enums';
 import { IgxRowSelectorsModule } from '../igx-row-selectors.module';
+import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
+import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
 
 const DEBOUNCETIME = 30;
 
@@ -1671,6 +1673,38 @@ describe('IgxGrid - Row Selection #grid', () => {
             expect(grid.getRowByIndex(1).selected).toBeTruthy();
             expect(grid.onRowSelectionChange.emit).toHaveBeenCalledTimes(6);
         }));
+
+        it('Should select only filtered records', fakeAsync(() => {
+            grid.height = '1100px';
+            const tree = new FilteringExpressionsTree(FilteringLogic.And);
+            tree.filteringOperands.push({
+                fieldName: 'UnitsInStock',
+                searchVal: 0,
+                condition: IgxNumberFilteringOperand.instance().condition('greaterThan'),
+            });
+            tree.filteringOperands.push({
+                fieldName: 'ProductName',
+                searchVal: 'a',
+                condition: IgxStringFilteringOperand.instance().condition('contains'),
+                ignoreCase: true
+            });
+            grid.advancedFilteringExpressionsTree = tree;
+            GridSelectionFunctions.headerCheckboxClick(grid);
+            fix.detectChanges();
+            tick();
+
+            expect(grid.rowList.length).toBe(9);
+            expect(grid.selectedRows().length).toBe(9);
+            GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, true, false);
+
+            grid.advancedFilteringExpressionsTree = null;
+            fix.detectChanges();
+            tick();
+
+            expect(grid.rowList.length).toBe(19);
+            expect(grid.selectedRows().length).toBe(9);
+            GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, false, true);
+        }));
     });
 
     describe('Integration with CRUD and transactions', () => {

projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts

@@ -1419,6 +1419,22 @@ export class IgxGridCustomOverlayComponent extends BasicGridComponent {
     }
 }
 
+@Component({
+    template: `
+    <igx-grid #grid [data]="data" [primaryKey]="'ProductID'" width="700px" height="400px" [rowEditable]="true">
+        <igx-column field="ProductID" header="Product ID"></igx-column>
+        <igx-column field="ReorderLevel" header="Reorder Lever" [dataType]="'number'" [editable]="true" width="100px"></igx-column>
+        <igx-column field="ProductName" header="Product Name" [dataType]="'string'" width="150px"></igx-column>
+        <igx-column field="OrderDate" header="Order Date" [dataType]="'date'" width="150px" [editable]="false"></igx-column>
+        <ng-template igxRowEdit >
+        </ng-template>
+    </igx-grid>
+    `
+})
+export class IgxGridEmptyRowEditTemplateComponent extends BasicGridComponent {
+    public data = SampleTestData.foodProductData();
+}
+
 @Component({
     template: `
     <igx-grid #grid [data]="data" [primaryKey]="'ProductID'" width="900px" height="900px" [rowEditable]="true"