Merge branch 'master' into rkaraivanov/grid-clipboard-master

Author: zdrawku

projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts

@@ -23,21 +23,47 @@ export class IgxFilteringOperand {
             logic: (target: any) => {
                 return target !== null;
             }
+        }, {
+            name: 'in',
+            isUnary: false,
+            iconName: 'is_in',
+            hidden: true,
+            logic: (target: any, searchVal: Set<any>) => {
+                return this.findValueInSet(target, searchVal);
+            }
         }];
     }
 
     public static instance(): IgxFilteringOperand {
         return this._instance || (this._instance = new this());
     }
 
+    /**
+     * @hidden
+     */
+    protected findValueInSet(target: any, searchVal: Set<any>) {
+        return searchVal.has(target);
+    }
+
+    /**
+     * Returns an array of names of the conditions which are visible in the UI
+     */
     public conditionList(): string[] {
-        return this.operations.map((element) => element.name);
+        return this.operations.filter(f => !f.hidden).map((element) => element.name);
     }
 
+    /**
+     * Returns an instance of the condition with the specified name.
+     * @param name The name of the condition.
+     */
     public condition(name: string): IFilteringOperation {
         return this.operations.find((element) => element.name === name);
     }
 
+    /**
+     * Adds a new condition to the filtering operations.
+     * @param operation The filtering operation.
+     */
     public append(operation: IFilteringOperation) {
         this.operations.push(operation);
     }
@@ -362,6 +388,10 @@ export class IgxDateFilteringOperand extends IgxFilteringOperand {
             throw new Error('Could not perform filtering on \'date\' column because the datasource object type is not \'Date\'.');
         }
     }
+
+    protected findValueInSet(target: any, searchVal: Set<any>) {
+        return searchVal.has(new Date(target.getFullYear(), target.getMonth(), target.getDate()).toISOString());
+    }
 }
 
 /**
@@ -532,6 +562,7 @@ export interface IFilteringOperation {
     name: string;
     isUnary: boolean;
     iconName: string;
+    hidden?: boolean;
     logic: (value: any, searchVal?: any, ignoreCase?: boolean) => boolean;
 }
 
@@ -549,27 +580,3 @@ export interface IDateParts {
     seconds: number;
     milliseconds: number;
 }
-
-/**
- * @hidden
- */
-export class InFilteringOperation implements IFilteringOperation {
-    name = 'in';
-    isUnary = false;
-    iconName = 'is_in';
-    logic = (target: any, searchVal: Set<any>) => {
-        return searchVal.has(target);
-    }
-}
-
-/**
- * @hidden
- */
-export class InDateFilteringOperation extends InFilteringOperation {
-    logic = (target: any, searchVal: Set<any>) => {
-        if (target instanceof Date) {
-            return searchVal.has(new Date(target.getFullYear(), target.getMonth(), target.getDate()).toISOString());
-        }
-        return searchVal.has(target);
-    }
-}

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

@@ -25,9 +25,7 @@ import {
     IgxStringFilteringOperand,
     IgxNumberFilteringOperand,
     IgxBooleanFilteringOperand,
-    IgxDateFilteringOperand,
-    InFilteringOperation,
-    InDateFilteringOperation
+    IgxDateFilteringOperand
 } from '../../../data-operations/filtering-condition';
 import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../../../data-operations/filtering-expressions-tree';
 import { FilteringLogic, IFilteringExpression } from '../../../data-operations/filtering-expression.interface';
@@ -579,22 +577,14 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy, AfterView
                     selectedItems.splice(blanksItemIndex, 1);
                 }
 
-                if (this.column.dataType === DataType.Date) {
-                    filterTree.filteringOperands.push({
-                        condition: new InDateFilteringOperation(),
-                        fieldName: this.column.field,
-                        ignoreCase: this.column.filteringIgnoreCase,
-                        searchVal: new Set(selectedItems.map(d =>
-                            new Date(d.value.getFullYear(), d.value.getMonth(), d.value.getDate()).toISOString()))
-                    });
-                } else {
-                    filterTree.filteringOperands.push({
-                        condition: new InFilteringOperation(),
-                        fieldName: this.column.field,
-                        ignoreCase: this.column.filteringIgnoreCase,
-                        searchVal: new Set(selectedItems.map(e => e.value))
-                    });
-                }
+                filterTree.filteringOperands.push({
+                    condition: this.createCondition('in'),
+                    fieldName: this.column.field,
+                    ignoreCase: this.column.filteringIgnoreCase,
+                    searchVal: new Set(this.column.dataType === DataType.Date ?
+                        selectedItems.map(d => new Date(d.value.getFullYear(), d.value.getMonth(), d.value.getDate()).toISOString()) :
+                        selectedItems.map(e => e.value))
+                });
 
                 if (blanksItem) {
                     filterTree.filteringOperands.push({

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

@@ -5447,19 +5447,19 @@ function checkUIForType(type: string, elem: DebugElement) {
     const isReadOnly = type === 'bool' ? true : false;
     switch (type) {
         case 'string':
-            expectedConditions = IgxStringFilteringOperand.instance().operations;
+            expectedConditions = IgxStringFilteringOperand.instance().operations.filter(f => !f.hidden);
             expectedInputType = 'text';
             break;
         case 'number':
-            expectedConditions = IgxNumberFilteringOperand.instance().operations;
+            expectedConditions = IgxNumberFilteringOperand.instance().operations.filter(f => !f.hidden);
             expectedInputType = 'number';
             break;
         case 'date':
-            expectedConditions = IgxDateFilteringOperand.instance().operations;
+            expectedConditions = IgxDateFilteringOperand.instance().operations.filter(f => !f.hidden);
             expectedInputType = 'datePicker';
             break;
         case 'bool':
-            expectedConditions = IgxBooleanFilteringOperand.instance().operations;
+            expectedConditions = IgxBooleanFilteringOperand.instance().operations.filter(f => !f.hidden);
             expectedInputType = 'text';
             break;
     }