feat(h-grid): fixed adv filtering for date and time columns on nested levels

Author: igdmdimitrov

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

@@ -1,12 +1,13 @@
 import { FilteringLogic, IFilteringExpression } from './filtering-expression.interface';
 import { FilteringExpressionsTree, IFilteringExpressionsTree } from './filtering-expressions-tree';
 import { resolveNestedPath, parseDate, formatDate, formatCurrency } from '../core/utils';
-import { ColumnType, GridType } from '../grids/common/grid.interface';
+import { ColumnType, EntityType, GridType } from '../grids/common/grid.interface';
 import { GridColumnDataType } from './data-util';
 import { SortingDirection } from './sorting-strategy';
 import { formatNumber, formatPercent, getLocaleCurrencyCode } from '@angular/common';
 import { IFilteringState } from './filtering-state.interface';
 import { isTree } from './expressions-tree-util';
+import { IgxHierarchicalGridComponent } from '../grids/hierarchical-grid/hierarchical-grid.component';
 
 const DateType = 'date';
 const DateTimeType = 'dateTime';
@@ -94,23 +95,42 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy  {
                 return true;
             } else {
                 const expression = expressions;
-                let isDate = false;
-                let isTime = false;
+                let dataType = null;
                 if (!entity) {
                     const column = grid && grid.getColumnByName(expression.fieldName);
-                    isDate = column ? column.dataType === DateType || column.dataType === DateTimeType : false;
-                    isTime = column ? column.dataType === TimeType : false;
-                } else {
-                    // TODO: check for date and time
+                    dataType = column.dataType;
+                } else if (grid.type === 'hierarchical') {
+                    const schema = (grid as IgxHierarchicalGridComponent).schema;
+                    const entityMatch = this.findEntityByName(schema, 'entity');
+                    dataType = entityMatch?.fields.find(f => f.field === expression.fieldName)?.dataType;
                 }
 
+                const isDate = dataType ? dataType === DateType || dataType === DateTimeType : false;
+                const isTime = dataType ? dataType === TimeType : false;
+
                 return this.findMatchByExpression(rec, expression, isDate, isTime, grid);
             }
         }
 
         return true;
     }
 
+    private findEntityByName(schema: EntityType[], name: string): EntityType | null {
+        for (const entity of schema) {
+            if (entity.name === name) {
+                return entity;
+            }
+
+            if (entity.childEntities && entity.childEntities.length > 0) {
+                const found = this.findEntityByName(entity.childEntities, name);
+                if (found) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
     public getFilterItems(column: ColumnType, tree: IFilteringExpressionsTree): Promise<IgxFilterItem[]> {
 
         let data = column.grid.gridAPI.filterDataByExpressions(tree);

src/app/hierarchical-grid-advanced-filtering/hierarchical-grid-advanced-filtering.sample.ts

@@ -4,8 +4,8 @@ import {
     IGX_HIERARCHICAL_GRID_DIRECTIVES,
     FilteringExpressionsTree,
     FilteringLogic,
-    IgxNumberFilteringOperand,
-    IgxStringFilteringOperand
+    IgxStringFilteringOperand,
+    IgxDateFilteringOperand
 } from 'igniteui-angular';
 import { SINGERS } from './data';
 
@@ -29,10 +29,10 @@ export class HierarchicalGridAdvancedFilteringSampleComponent implements AfterVi
     public ngAfterViewInit() {
         const albumsTree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Albums', ['Artist']);
         albumsTree.filteringOperands.push({
-            fieldName: 'USBillboard200',
-            condition: IgxNumberFilteringOperand.instance().condition('lessThanOrEqualTo'),
-            conditionName: IgxNumberFilteringOperand.instance().condition('lessThanOrEqualTo').name,
-            searchVal: 5
+            fieldName: 'LaunchDate',
+            condition: IgxDateFilteringOperand.instance().condition('after'),
+            conditionName: IgxDateFilteringOperand.instance().condition('after').name,
+            searchVal: new Date(2018, 1, 1)
         });
         // const toursTree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Tours', ['TouredBy']);
         // toursTree.filteringOperands.push({