fix(filtering): passing expressionTree to isFilteringExpressionsTreeEmpty #6289

Author: igdmdimitrov

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

@@ -505,13 +505,12 @@ export class IgxFilteringService implements OnDestroy {
         }
     }
 
-    public isFilteringExpressionsTreeEmpty(): boolean {
-        const expressionTree = this.grid.filteringExpressionsTree;
+    public isFilteringExpressionsTreeEmpty(expressionTree: IFilteringExpressionsTree): boolean {
         if (FilteringExpressionsTree.empty(expressionTree)) {
             return true;
         }
 
-        let expr: any;
+        let expr: any; 
 
         for (let i = 0; i < expressionTree.filteringOperands.length; i++) {
             expr = expressionTree.filteringOperands[i];

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

@@ -393,7 +393,8 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
             this._filteringExpressionsTree = filteringExpressionTreeClone;
             this.filteringExpressionsTreeChange.emit(this._filteringExpressionsTree);
 
-            if (this.filteringService.isFilteringExpressionsTreeEmpty() && !this.advancedFilteringExpressionsTree) {
+            if (this.filteringService.isFilteringExpressionsTreeEmpty(this._filteringExpressionsTree) &&
+                !this.advancedFilteringExpressionsTree) {
                 this.filteredData = null;
             }
 
@@ -454,13 +455,14 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
             this._advancedFilteringExpressionsTree = null;
         }
 
-        if (this.filteringService.isFilteringExpressionsTreeEmpty() && !this.advancedFilteringExpressionsTree) {
+        if (this.filteringService.isFilteringExpressionsTreeEmpty(this._advancedFilteringExpressionsTree) &&
+            !this.advancedFilteringExpressionsTree) {
             this.filteredData = null;
         }
 
         this.selectionService.clearHeaderCBState();
         this.summaryService.clearSummaryCache();
-        this.markForCheck();
+        this.notifyChanges();
 
         // Wait for the change detection to update filtered data through the pipes and then emit the event.
         requestAnimationFrame(() => this.onFilteringDone.emit(this._advancedFilteringExpressionsTree));