Address review comments - extract default pivot keys in global var and replace hardcoded values.

Author: MKirova

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

@@ -1,6 +1,6 @@
 
 import { GridType, PivotGridType } from '../grids/common/grid.interface';
-import { IPivotDimension, IPivotDimensionStrategy, IPivotKeys, IPivotValue, PivotDimensionType } from '../grids/pivot-grid/pivot-grid.interface';
+import { DEFAULT_PIVOT_KEYS, IPivotDimension, IPivotDimensionStrategy, IPivotKeys, IPivotValue, PivotDimensionType } from '../grids/pivot-grid/pivot-grid.interface';
 import { PivotUtil } from '../grids/pivot-grid/pivot-util';
 import { FilteringStrategy } from './filtering-strategy';
 import { GridColumnDataType } from './data-util';
@@ -31,11 +31,7 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
         collection: any,
         rows: IPivotDimension[],
         values?: IPivotValue[],
-        pivotKeys: IPivotKeys =
-            {
-                aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-                rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-            }
+        pivotKeys: IPivotKeys = DEFAULT_PIVOT_KEYS
     ): any[] {
         let hierarchies;
         let data;
@@ -90,10 +86,7 @@ export class PivotColumnDimensionsStrategy implements IPivotDimensionStrategy {
         collection: any[],
         columns: IPivotDimension[],
         values: IPivotValue[],
-        pivotKeys: IPivotKeys = {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        }
+        pivotKeys: IPivotKeys = DEFAULT_PIVOT_KEYS
     ): any[] {
         const res = this.processHierarchy(collection, columns, values, pivotKeys);
         return res;

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

@@ -33,7 +33,7 @@ import { IgxForOfSyncService, IgxForOfScrollSyncService } from '../../directives
 import { GridServiceType, GridType, IGX_GRID_BASE, IGX_GRID_SERVICE_BASE, RowType } from '../common/grid.interface';
 import { IgxGridCRUDService } from '../common/crud.service';
 import { IgxGridSummaryService } from '../summaries/grid-summary.service';
-import { IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IValuesChange, PivotDimensionType } from './pivot-grid.interface';
+import { DEFAULT_PIVOT_KEYS, IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IValuesChange, PivotDimensionType } from './pivot-grid.interface';
 import { IgxPivotHeaderRowComponent } from './pivot-header-row.component';
 import { IgxColumnGroupComponent } from '../columns/column-group.component';
 import { IgxColumnComponent } from '../columns/column.component';
@@ -294,10 +294,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     public columnGroupStates = new Map<string, boolean>();
     public dimensionDataColumns;
     public get pivotKeys() {
-        return this.pivotConfiguration.pivotKeys || {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        };
+        return this.pivotConfiguration.pivotKeys || DEFAULT_PIVOT_KEYS;
     }
     public isPivot = true;
 
@@ -1019,7 +1016,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
             const rowFields = PivotUtil.flatten(this.pivotConfiguration.rows).map(x => x.memberName);
             const keyFields = Object.values(this.pivotKeys);
             const filteredFields = fields.filter(x => rowFields.indexOf(x) === -1 && keyFields.indexOf(x) === -1 &&
-                x.indexOf(this.pivotKeys.rowDimensionSeparator + 'level') === -1 && x.indexOf(this.pivotKeys.rowDimensionSeparator + 'records') === -1);
+                x.indexOf(this.pivotKeys.rowDimensionSeparator + this.pivotKeys.level) === -1 &&
+                x.indexOf(this.pivotKeys.rowDimensionSeparator + this.pivotKeys.records) === -1);
             fieldsMap = this.generateFromData(filteredFields);
         } else {
             fieldsMap = PivotUtil.getFieldsHierarchy(

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

@@ -3,6 +3,11 @@ import { FilteringExpressionsTree } from '../../data-operations/filtering-expres
 import { SortingDirection } from '../../data-operations/sorting-strategy';
 import { ColumnType } from '../common/grid.interface';
 
+export const DEFAULT_PIVOT_KEYS = {
+    aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
+    rowDimensionSeparator: '_', columnDimensionSeparator: '-'
+};
+
 export interface IDimensionsChange {
     dimensions: IPivotDimension[],
     dimensionCollectionType: PivotDimensionType

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

@@ -3,7 +3,7 @@ import { cloneArray } from '../../core/utils';
 import { DataUtil } from '../../data-operations/data-util';
 import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
 import { IFilteringStrategy } from '../../data-operations/filtering-strategy';
-import { IPivotConfiguration, IPivotKeys } from './pivot-grid.interface';
+import { DEFAULT_PIVOT_KEYS, IPivotConfiguration, IPivotKeys } from './pivot-grid.interface';
 import {
     DefaultPivotSortingStrategy, DimensionValuesFilteringStrategy, PivotColumnDimensionsStrategy,
     PivotRowDimensionsStrategy
@@ -15,6 +15,7 @@ import { GridType } from '../common/grid.interface';
 import { GridBaseAPIService } from '../api.service';
 import { IgxGridBaseDirective } from '../grid-base.directive';
 import { IGridSortingStrategy } from '../common/strategy';
+
 /**
  * @hidden
  */
@@ -33,10 +34,7 @@ export class IgxPivotRowPipe implements PipeTransform {
         _pipeTrigger?: number,
         __?
     ): any[] {
-        const pivotKeys = config.pivotKeys || {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        };
+        const pivotKeys = config.pivotKeys || DEFAULT_PIVOT_KEYS;
         const enabledRows = config.rows.filter(x => x.enabled);
         const rowStrategy = config.rowStrategy || PivotRowDimensionsStrategy.instance();
         const data = cloneArray(collection, true);
@@ -63,10 +61,7 @@ export class IgxPivotRowExpansionPipe implements PipeTransform {
         _pipeTrigger?: number,
         __?,
     ): any[] {
-        const pivotKeys = config.pivotKeys || {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        };
+        const pivotKeys = config.pivotKeys || DEFAULT_PIVOT_KEYS;
         const enabledRows = config.rows.filter(x => x.enabled);
         const data = collection ? cloneArray(collection, true) : [];
         let totalLlv = 0;
@@ -113,10 +108,7 @@ export class IgxPivotColumnPipe implements PipeTransform {
         _pipeTrigger?: number,
         __?
     ): any[] {
-        const pivotKeys = config.pivotKeys || {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        };
+        const pivotKeys = config.pivotKeys || DEFAULT_PIVOT_KEYS;
         const enabledColumns = config.columns.filter(x => x.enabled);
         const enabledValues = config.values.filter(x => x.enabled);
 
@@ -182,10 +174,7 @@ export class IgxPivotGridColumnSortingPipe implements PipeTransform {
         expressions: ISortingExpression[],
         sorting: IGridSortingStrategy,
         pipeTrigger: number,
-        pivotKeys: IPivotKeys = {
-            aggregations: 'aggregations', records: 'records', children: 'children', level: 'level',
-            rowDimensionSeparator: '_', columnDimensionSeparator: '-'
-        }
+        pivotKeys: IPivotKeys = DEFAULT_PIVOT_KEYS
     ): any[] {
         let result: any[];