Reoslve conflicts.

Author: MKirova

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

@@ -8,14 +8,32 @@ import { PivotUtil } from './pivot-util';
 
 @Injectable()
 export class IgxPivotFilteringService extends IgxFilteringService {
+    public clearFilter(field: string): void {
+        this.clear_filter(field);
+    }
+
+    public clear_filter(fieldName: string) {
+        super.clear_filter(fieldName);
+        const grid = this.grid;
+        const config = (grid as IgxPivotGridComponent).pivotConfiguration;
+        const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
+        const enabledDimensions = allDimensions.filter(x => x && x.enabled);
+        const dim = enabledDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
+        dim.filters = undefined;
+        grid.filteringPipeTrigger++;
+        if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
+            // update columns
+            (grid as any).setupColumns();
+        }
+    }
     protected filter_internal(fieldName: string, term, conditionOrExpressionsTree: IFilteringOperation | IFilteringExpressionsTree,
         ignoreCase: boolean) {
         super.filter_internal(fieldName, term, conditionOrExpressionsTree, ignoreCase);
         const grid = this.grid;
         const config = (grid as IgxPivotGridComponent).pivotConfiguration;
         const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
         const enabledDimensions = allDimensions.filter(x => x && x.enabled);
-        const dim = enabledDimensions.find(x => x.fieldName === fieldName || x.member === fieldName);
+        const dim = enabledDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
         const filteringTree = dim.filters || new FilteringExpressionsTree(FilteringLogic.And);
         const fieldFilterIndex = filteringTree.findIndex(fieldName);
         if (fieldFilterIndex > -1) {
@@ -30,23 +48,4 @@ export class IgxPivotFilteringService extends IgxFilteringService {
             (grid as any).setupColumns();
         }
     }
-    public clearFilter(field: string): void {
-        this.clear_filter(field);
-    }
-
-    public clear_filter(fieldName: string) {
-        super.clear_filter(fieldName);
-        const grid = this.grid;
-        const config = (grid as IgxPivotGridComponent).pivotConfiguration;
-        const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
-        const enabledDimensions = allDimensions.filter(x => x && x.enabled);
-        const dim = enabledDimensions.find(x => x.fieldName === fieldName || x.member === fieldName);
-        dim.filters = undefined;
-        grid.filteringPipeTrigger++;
-        if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
-            // update columns
-            (grid as any).setupColumns();
-        }
-    }
-
 }

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.ts

@@ -90,11 +90,11 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
         let dim = dimension;
         let col;
         while(dim) {
-            col = this.grid.originalDataColumns.find(x => x.field === dim.fieldName || x.field === dim.member);
+            col = this.grid.originalDataColumns.find(x => x.field === dim.memberName || x.field === dim.member);
             if (col) {
                 break;
             } else {
-                dim = dimension.childLevels[0];
+                dim = dimension.childLevel;
             }
         }
         this.grid.filteringService.toggleFilterDropdown(event.target, col);