fix(adv-filtering): column header moved to ExpressionOperandItem #5993

(cherry picked from commit 374a909)

Author: igdmdimitrov

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

@@ -10,7 +10,6 @@ export enum FilteringLogic {
  */
 export declare interface IFilteringExpression {
     fieldName: string;
-    headerName?: string;
     condition: IFilteringOperation;
     searchVal?: any;
     ignoreCase?: boolean;

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html

@@ -99,7 +99,7 @@ <h6 class="igx-filter-empty__title">
                           (onRemove)="onChipRemove(expressionItem)"
                           (onSelectionDone)="onChipSelectionEnd()"
                     >
-                    <span igxPrefix class="igx-filter-tree__expression-column">{{ expressionItem.expression.headerName || expressionItem.expression.fieldName }}</span>
+                    <span igxPrefix class="igx-filter-tree__expression-column">{{ expressionItem.columnHeader || expressionItem.expression.fieldName }}</span>
                     <igx-icon
                         igxPrefix
                         fontSet="filtering-icons"

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

@@ -56,6 +56,7 @@ class ExpressionOperandItem extends ExpressionItem {
     inEditMode: boolean;
     inAddMode: boolean;
     hovered: boolean;
+    columnHeader: string;
 }
 
 /**
@@ -468,9 +469,9 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     public commitOperandEdit() {
         if (this.editedExpression) {
             this.editedExpression.expression.fieldName = this.selectedColumn.field;
-            this.editedExpression.expression.headerName = this.selectedColumn.header;
             this.editedExpression.expression.condition = this.selectedColumn.filters.condition(this.selectedCondition);
             this.editedExpression.expression.searchVal = DataUtil.parseValue(this.selectedColumn.dataType, this.searchValue);
+            this.editedExpression.columnHeader = this.selectedColumn.header;
 
             this.editedExpression.inEditMode = false;
             this.editedExpression = null;
@@ -564,12 +565,13 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
                     const filteringExpr = expr as IFilteringExpression;
                     const exprCopy: IFilteringExpression = {
                         fieldName: filteringExpr.fieldName,
-                        headerName: filteringExpr.headerName,
                         condition: filteringExpr.condition,
                         searchVal: filteringExpr.searchVal,
                         ignoreCase: filteringExpr.ignoreCase
                     };
                     const operandItem = new ExpressionOperandItem(exprCopy, groupItem);
+                    const column = this.grid.getColumnByName(filteringExpr.fieldName);
+                    operandItem.columnHeader = column.header;
                     groupItem.children.push(operandItem);
                 }
             }