Merge branch 'master' into pmoleri/memory-leak-fixing

Author: kdinev

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/grids/grid-base.directive.ts

@@ -6618,10 +6618,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();
@@ -6686,10 +6686,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;
         }