Merge branch 'master' into sstoychev/groupingstrategy-master

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/state.directive.spec.ts

@@ -178,6 +178,27 @@ describe('IgxGridState - input properties #grid', () => {
         expect(gridState).toBe(filteringState);
     });
 
+    it('setState should correctly restore grid filtering state from  with null date values', () => {
+        const fix = TestBed.createComponent(IgxGridStateComponent);
+        fix.detectChanges();
+        const grid  = fix.componentInstance.grid;
+        grid.getCellByColumn(0, 'OrderDate').value = null;
+        fix.detectChanges();
+        const state = fix.componentInstance.state;
+
+        const filteringState = '{"filtering":{"filteringOperands":[{"filteringOperands":[{"condition":{"name":"empty","isUnary":true,"iconName":"is-empty"},"fieldName":"OrderDate","ignoreCase":true,"searchVal":null}],"operator":1,"fieldName":"OrderDate"}],"operator":0,"type":0}}';
+        const initialState = '{"filtering":{"filteringOperands":[],"operator":0}}';
+
+        let gridState = state.getState(true, 'filtering');
+        expect(gridState).toBe(initialState);
+
+        state.setState(filteringState);
+        gridState = state.getState(false, 'filtering') as IGridState;
+        HelperFunctions.verifyFilteringExpressions(grid.filteringExpressionsTree, gridState);
+        gridState = state.getState(true, 'filtering');
+        expect(gridState).toBe(filteringState);
+    });
+
     it('setState should correctly restore grid filtering state from object', () => {
         const fix = TestBed.createComponent(IgxGridStateComponent);
         fix.detectChanges();

projects/igniteui-angular/src/lib/grids/state.directive.ts

@@ -549,7 +549,7 @@ export class IgxGridStateDirective {
                 if (Array.isArray(expr.searchVal)) {
                     expr.searchVal = new Set(expr.searchVal);
                 } else {
-                    expr.searchVal = (dataType === 'date') ? new Date(Date.parse(expr.searchVal)) : expr.searchVal;
+                    expr.searchVal = expr.searchVal && (dataType === 'date') ? new Date(Date.parse(expr.searchVal)) : expr.searchVal;
                 }
                 expr.condition = this.generateFilteringCondition(dataType, expr.condition.name);
                 expressionsTree.filteringOperands.push(expr);

src/app/grid-cell-api/grid-cell-api.sample.ts

@@ -4,8 +4,6 @@ import {
     IgxTreeGridComponent,
     IgxHierarchicalGridComponent,
     CellType,
-    IgxGridTransaction,
-    IgxTransactionService
 } from 'igniteui-angular';
 import { HIERARCHICAL_SAMPLE_DATA } from '../shared/sample-data';
 

src/app/grid-row-api/grid-row-api.sample.ts

@@ -6,7 +6,6 @@ import {
     IgxHierarchicalGridComponent,
     IPinningConfig,
     RowPinningPosition,
-    IRowDragStartEventArgs,
     GridSummaryCalculationMode,
     GridSummaryPosition
 } from 'igniteui-angular';
@@ -179,7 +178,6 @@ export class GridRowAPISampleComponent implements OnInit {
     public togglePinning(grid: IgxGridComponent | IgxTreeGridComponent | IgxHierarchicalGridComponent,
         byIndex: boolean, index: number, key: any) {
         const row: RowType = byIndex ? grid.getRowByIndex(index) : grid.getRowByKey(key);
-        const index2: number = row.index;
         if (row.pinned) {
             row.unpin();
         } else {
@@ -308,16 +306,15 @@ export class GridRowAPISampleComponent implements OnInit {
         }
     }
 
-    public onEnter(args) {
+    public onEnter() {
         this.dragIcon = 'add';
     }
-    public onRowDragStart(args: IRowDragStartEventArgs) {
-        const row = args.dragData;
+    public onRowDragStart() {
         const count = this.grid.selectedRows.length || 1;
         this.countIcon = `filter_${count > 9 ? '9_plus' : `${count}`}`;
     }
-    public onLeave(args) {
-        this.onRowDragStart(args);
+    public onLeave() {
+        this.onRowDragStart();
         this.dragIcon = 'arrow_right_alt';
     }
 }

src/app/tree-grid-groupby/tree-grid-groupby.sample.ts

@@ -59,7 +59,7 @@ export class TreeGridGroupBySampleComponent implements OnInit {
         this.density = this.displayDensities[event.index].label;
     }
 
-    public cellEditDone(event: any) {
+    public cellEditDone() {
         this.groupingExpressions = [...this.groupingExpressions]; // will trigger grouping pipe
     }
 }

src/app/tree/tree.sample.ts

@@ -188,18 +188,14 @@ export class TreeSampleComponent implements AfterViewInit, OnDestroy {
 
     public ngAfterViewInit() {
         this.tree.nodes.toArray().forEach(node => {
-            node.selectedChange.subscribe((ev) => {
-                // console.log(ev);
-            });
+            node.selectedChange.subscribe(() => {});
         });
     }
 
     public ngOnDestroy() {
     }
 
-    public toggleSelectionMode(args) {
-        // this.tree.selection = this.selectionModes[args.index].selectMode;
-    }
+    public toggleSelectionMode() { }
 
     public changeDensity(args) {
         this.density = this.displayDensities[args.index].selectMode;