Merge branch '18.2.x' into didimmova/fix-15093-18.2.x

Author: SisIvanova

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-conditional-filter.component.ts

@@ -41,7 +41,7 @@ export class IgxExcelStyleConditionalFilterComponent implements OnDestroy {
     public subMenu: IgxDropDownComponent;
 
     protected get filterNumber() {
-        return this.esf.expressionsList.length;
+        return this.esf.expressionsList.filter(e => e.expression.condition).length;
     }
 
     private shouldOpenSubMenu = true;
@@ -146,6 +146,8 @@ export class IgxExcelStyleConditionalFilterComponent implements OnDestroy {
         if (this.esf.expressionsList && this.esf.expressionsList.length &&
             this.esf.expressionsList[0].expression.condition.name !== 'in') {
             this.customDialog.expressionsList = this.esf.expressionsList;
+        } else {
+            this.customDialog.expressionsList = this.customDialog.expressionsList.filter(e => e.expression.fieldName === this.esf.column.field && e.expression.condition);
         }
 
         this.customDialog.selectedOperator = eventArgs.newSelection.value;

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts

@@ -46,6 +46,7 @@ import { NgClass, NgIf, NgFor } from '@angular/common';
 export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
     @Input()
     public expressionsList = new Array<ExpressionUI>();
+
     @Input()
     public column: ColumnType;