Merge branch '19.1.x' into mpopov/query-builder/fix-fake-ghost-colors-19-1-x

Author: desig9stein

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

@@ -7,7 +7,6 @@ export enum FilteringLogic {
     Or
 }
 
-/* tsPlainInterface */
 /* marshalByValue */
 /**
  * Represents filtering expressions.

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

@@ -16,6 +16,7 @@ export declare interface IExpressionTree {
     returnFields?: string[] | null;
 }
 
+/* alternateBaseType: ExpressionTree */
 /* marshalByValue */
 export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpressionTree {
     filteringOperands: (IFilteringExpressionsTree | IFilteringExpression)[];

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

@@ -49,6 +49,29 @@ describe('Unit testing FilteringStrategy', () => {
         const res = fs.matchRecord(rec, expressionTree);
         expect(res).toBeTruthy();
     });
+
+    it ('tests `findMatchByExpression` for working with filtering operands with missing condition', () => {
+        const rec = data[0];
+        const expressionTree = JSON.parse('{"filteringOperands":[{"fieldName":"Missing","condition":{"name":"notEmpty","isUnary":true,"iconName":"filter_not_empty"},"conditionName":"notEmpty","ignoreCase":true,"searchVal":null,"searchTree":null}],"operator":0,"returnFields":[],"type":1}');
+        const res = fs.matchRecord(rec, expressionTree);
+        expect(res).toBeFalsy();
+    });
+
+    it ('no error when condition is missing in the filtering expressions tree', () => {
+        const rec = data[0];
+        const expressionTree = new FilteringExpressionsTree(FilteringLogic.Or);
+        expressionTree.filteringOperands = [
+            {
+                conditionName: 'contains',
+                fieldName: 'string',
+                ignoreCase: false,
+                searchVal: 'ROW'
+            }
+        ];
+        const res = fs.matchRecord(rec, expressionTree);
+        expect(res).toBeFalsy();
+    });
+
     it ('tests `findMatch`', () => {
         const rec = data[0];
         const res = fs.findMatchByExpression(rec, {

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

@@ -39,9 +39,10 @@ export interface IgxFilterItem {
 export abstract class BaseFilteringStrategy implements IFilteringStrategy  {
     // protected
     public findMatchByExpression(rec: any, expr: IFilteringExpression, isDate?: boolean, isTime?: boolean, grid?: GridType): boolean {
-        const cond = expr.condition;
         const val = this.getFieldValue(rec, expr.fieldName, isDate, isTime, grid);
-        return cond.logic(val, expr.searchVal, expr.ignoreCase);
+        if (expr.condition?.logic) {
+            return expr.condition.logic(val, expr.searchVal, expr.ignoreCase);
+        }
     }
 
     // protected

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

@@ -6608,10 +6608,10 @@ export abstract class IgxGridBaseDirective implements GridType,
             .filter((c) => c.pinned);
         this._unpinnedColumns = newColumns.filter((c) => !c.pinned);
         this._columns = newColumns;
-        if (this._columns && this._filteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._filteringExpressionsTree) {
             this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
         }
-        if (this._columns && this._advancedFilteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
             this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
         }
         this.resetCaches();
@@ -6676,10 +6676,10 @@ export abstract class IgxGridBaseDirective implements GridType,
         } else {
             this._columns = this.getColumnList();
         }
-        if (this._columns && this._filteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._filteringExpressionsTree) {
             this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
         }
-        if (this._columns && this._advancedFilteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
             this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
         }