fix(grid): fixed advancedFilteringExpressionsTree rehydration #15500

projects/igniteui-angular/src/lib/data-operations/expressions-tree-util.ts

@@ -150,7 +150,7 @@ function recreateExpression(expression: IFilteringExpression, fields: FieldType[
     }
 
     if (!expression.condition && expression.conditionName) {
-        throw Error('Wrong `conditionName`, `condition` or `field` provided!');
+        throw Error('Wrong `conditionName`, `condition` or `field` provided! It is possible that there is a type mismatch between the condition type and field type.');
     }
 
     if (!expression.conditionName) {

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

@@ -908,7 +908,7 @@ export interface IFilteringOperation {
     hidden?: boolean;
     /* blazorCSSuppress */
     /* blazorAlternateType: FilteringOperationLogicHandler */
-    logic: (value: any, searchVal?: any, ignoreCase?: boolean) => boolean;
+    logic?: null | ((value: any, searchVal?: any, ignoreCase?: boolean) => boolean);
 }
 
 /**

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

@@ -14,9 +14,9 @@ export enum FilteringLogic {
  */
 export declare interface IFilteringExpression {
     fieldName: string;
-    condition?: IFilteringOperation;
-    conditionName?: string;
-    searchVal?: any;
-    searchTree?: IExpressionTree;
+    condition?: IFilteringOperation | null;
+    conditionName?: string | null;
+    searchVal?: any | null;
+    searchTree?: IExpressionTree | null;
     ignoreCase?: boolean;
 }

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

@@ -11,9 +11,9 @@ export enum FilteringExpressionsTreeType {
 export declare interface IExpressionTree {
     filteringOperands: (IExpressionTree | IFilteringExpression)[];
     operator: FilteringLogic;
-    fieldName?: string;
-    entity?: string;
-    returnFields?: string[];
+    fieldName?: string | null;
+    entity?: string | null;
+    returnFields?: (string | null)[];
 }
 
 /* marshalByValue */

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -1856,8 +1856,8 @@ export abstract class IgxGridBaseDirective implements GridType,
             }
 
             value.type = FilteringExpressionsTreeType.Regular;
-            if (value && this.columns) {
-                this._filteringExpressionsTree = recreateTreeFromFields(value, this.columns) as IFilteringExpressionsTree;
+            if (value && this._columns && this._columns.length > 0) {
+                this._filteringExpressionsTree = recreateTreeFromFields(value, this._columns) as IFilteringExpressionsTree;
             } else {
                 this._filteringExpressionsTree = value;
             }
@@ -1906,7 +1906,11 @@ export abstract class IgxGridBaseDirective implements GridType,
 
         if (value && isTree(value)) {
             value.type = FilteringExpressionsTreeType.Advanced;
-            this._advancedFilteringExpressionsTree = recreateTreeFromFields(value, this.columns) as IFilteringExpressionsTree;
+            if (this._columns && this._columns.length > 0) {
+                this._advancedFilteringExpressionsTree = recreateTreeFromFields(value, this._columns) as IFilteringExpressionsTree;
+            } else {
+                this._advancedFilteringExpressionsTree = value;
+            }
             this.filteringPipeTrigger++;
         } else {
             this._advancedFilteringExpressionsTree = null;
@@ -6607,6 +6611,9 @@ export abstract class IgxGridBaseDirective implements GridType,
         if (this._columns && this._filteringExpressionsTree) {
             this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
         }
+        if (this._columns && this._advancedFilteringExpressionsTree) {
+            this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
+        }
         this.resetCaches();
     }
 
@@ -6668,9 +6675,12 @@ export abstract class IgxGridBaseDirective implements GridType,
             this.autogenerateColumns();
         } else {
             this._columns = this.getColumnList();
-            if (this._columns && this._filteringExpressionsTree) {
-                this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
-            }
+        }
+        if (this._columns && this._filteringExpressionsTree) {
+            this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
+        }
+        if (this._columns && this._advancedFilteringExpressionsTree) {
+            this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
         }
 
         this.initColumns(this._columns, (col: IgxColumnComponent) => this.columnInit.emit(col));

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

@@ -15,7 +15,8 @@ import {
     IgxGridAdvancedFilteringComponent,
     IgxGridExternalAdvancedFilteringComponent,
     IgxGridAdvancedFilteringBindingComponent,
-    IgxGridAdvancedFilteringDynamicColumnsComponent
+    IgxGridAdvancedFilteringDynamicColumnsComponent,
+    IgxGridAdvancedFilteringSerializedTreeComponent
 } from '../../test-utils/grid-samples.spec';
 import { FormattedValuesFilteringStrategy } from '../../data-operations/filtering-strategy';
 import { IgxHierGridExternalAdvancedFilteringComponent } from '../../test-utils/hierarchical-grid-components.spec';
@@ -1389,6 +1390,52 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
             // Verify no filtered data
             expect(grid.filteredData).toBe(null);
         }));
+
+    });
+
+    describe('Expression tree rehydration - ', () => {
+        it('should correctly filter with a deserialized expression tree.', fakeAsync(() => {
+            const errorSpy = spyOn(console, 'error');
+            let fix = TestBed.createComponent(IgxGridAdvancedFilteringSerializedTreeComponent);
+            fix.detectChanges();
+            let grid = fix.componentInstance.grid;
+
+            expect(errorSpy).not.toHaveBeenCalled();
+
+            // Verify filtered data
+            expect(grid.filteredData.length).toEqual(3);
+            expect(grid.rowList.length).toBe(3);
+        }));
+
+        it('should correctly filter with a declared IFilteringExpressionsTree object.', fakeAsync(() => {
+            const errorSpy = spyOn(console, 'error');
+            let fix = TestBed.createComponent(IgxGridAdvancedFilteringSerializedTreeComponent);
+            fix.detectChanges();
+            fix.componentInstance.grid.advancedFilteringExpressionsTree = fix.componentInstance.filterTreeObject;
+            fix.detectChanges();
+            let grid = fix.componentInstance.grid;
+
+            expect(errorSpy).not.toHaveBeenCalled();
+
+            // Verify filtered data
+            expect(grid.filteredData.length).toEqual(2);
+            expect(grid.rowList.length).toBe(2);
+        }));
+
+        it('should correctly filter when binding to a declared IFilteringExpressionsTree object.', fakeAsync(() => {
+            const errorSpy = spyOn(console, 'error');
+            let fix = TestBed.createComponent(IgxGridAdvancedFilteringSerializedTreeComponent);
+            fix.detectChanges();
+            fix.componentInstance.filterTree = fix.componentInstance.filterTreeObject;
+            fix.detectChanges();
+            let grid = fix.componentInstance.grid;
+
+            expect(errorSpy).not.toHaveBeenCalled();
+
+            // Verify filtered data
+            expect(grid.filteredData.length).toEqual(2);
+            expect(grid.rowList.length).toBe(2);
+        }));
     });
 });
 

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

@@ -2077,6 +2077,61 @@ export class IgxGridAdvancedFilteringBindingComponent extends BasicGridComponent
     }
 }
 
+@Component({
+    template: `
+    <igx-grid [data]="data" height="500px" [allowAdvancedFiltering]="true" [(advancedFilteringExpressionsTree)]="filterTree">
+        <igx-column width="100px" [field]="'ID'" [header]="'ID'" [hasSummary]="true" [filterable]="false" [resizable]="resizable">
+        </igx-column>
+        <igx-column width="100px" [field]="'ProductName'" [filterable]="filterable" [resizable]="resizable" dataType="string"></igx-column>
+        <igx-column width="100px" [field]="'Downloads'" [filterable]="filterable" [resizable]="resizable" dataType="number"></igx-column>
+        <igx-column width="100px" [field]="'Released'" [filterable]="filterable" [resizable]="resizable" dataType="boolean"></igx-column>
+    </igx-grid>`,
+    imports: [IgxGridComponent, IgxColumnComponent]
+})
+export class IgxGridAdvancedFilteringSerializedTreeComponent extends BasicGridComponent implements OnInit {
+    public resizable = false;
+    public filterable = true;
+    public filterTree: IFilteringExpressionsTree;
+    public filterTreeObject: IFilteringExpressionsTree;
+
+    public override data = SampleTestData.excelFilteringData();
+
+    public ngOnInit(): void {
+        this.filterTree = JSON.parse(`{ 
+            "filteringOperands":  [
+                {
+                    "conditionName": "greaterThan",
+                    "fieldName": "Downloads",
+                    "searchVal": 200
+                }
+            ],
+            "operator": 0
+        }`);
+
+        this.filterTreeObject =	{
+            "filteringOperands": [
+              {
+                "fieldName": "ProductName",
+                "condition": {
+                  "name": "contains",
+                  "isUnary": false,
+                  "iconName": "filter_contains"
+                },
+                "conditionName": "contains",
+                "ignoreCase": true,
+                "searchVal": "Ig",
+                "searchTree": null
+              }
+            ],
+            "operator": 1,
+            "returnFields": [
+              "ID",
+              "ProductName"
+            ]
+        };
+    }
+}
+
 @Component({
     template: `
         <igx-grid [data]="data" width="300px" height="250px">