refactor(pivot-grid): remove repetitive code

Author: IMinchev64

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

@@ -523,7 +523,7 @@ export class IgxPivotDataSelectorComponent {
             this.value.aggregate = event.newSelection.value;
             const isSingleValue = this.grid.values.length === 1;
 
-            PivotUtil.handleCountAggregator(this.grid.columns, this.value, isSingleValue);
+            PivotUtil.updateColumnTypeByAggregator(this.grid.columns, this.value, isSingleValue);
 
             this.grid.pipeTrigger++;
             this.grid.cdr.markForCheck();

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

@@ -2274,23 +2274,6 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         });
         return hierarchy;
     }
-    private updateColumnDataTypeByAggregator(column: any) {
-        this.values.forEach((aggregatorValue) => {
-            if ((aggregatorValue.dataType === GridColumnDataType.Currency || aggregatorValue.dataType === GridColumnDataType.Percent) && aggregatorValue.aggregate?.key?.toLowerCase() === 'count') {
-                if (column.field?.includes(aggregatorValue.member) || this.values.length === 1) {
-                    column.dataType = GridColumnDataType.Number;
-                }
-            } else if (aggregatorValue.dataType === GridColumnDataType.Currency && aggregatorValue.aggregate?.key?.toLowerCase() !== 'count') {
-                if (column.field?.includes(aggregatorValue.member) || this.values.length === 1) {
-                    column.dataType = GridColumnDataType.Currency;
-                }
-            } else if (aggregatorValue.dataType === GridColumnDataType.Percent && aggregatorValue.aggregate?.key?.toLowerCase() !== 'count') {
-                if (column.field?.includes(aggregatorValue.member) || this.values.length === 1) {
-                    column.dataType = GridColumnDataType.Percent;
-                }
-            }
-        })
-    }
     protected generateColumnHierarchy(fields: Map<string, any>, data, parent = null): IgxColumnComponent[] {
         let columns = [];
         if (fields.size === 0) {
@@ -2321,15 +2304,18 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
             if (shouldGenerate && (value.children == null || value.children.length === 0 || value.children.size === 0)) {
                 const col = this.createColumnForDimension(value, data, parent, this.hasMultipleValues);
 
-                this.updateColumnDataTypeByAggregator(col);
+                if (!this.hasMultipleValues && this.values.length > 0) {
+                    PivotUtil.updateColumnTypeByAggregator([col], this.values[0], true);
+                }
 
                 columns.push(col);
                 if (this.hasMultipleValues) {
                     const measureChildren = this.getMeasureChildren(data, col, false, value.dimension.width);
 
-                    measureChildren.forEach((child) => {
-                        this.updateColumnDataTypeByAggregator(child);
-                    })
+                    measureChildren.forEach((child, index) => {
+                        const pivotValue = this.values[index];
+                        PivotUtil.updateColumnTypeByAggregator([child], pivotValue, this.values.length === 1);
+                    });
 
                     col.children.reset(measureChildren);
                     columns = columns.concat(measureChildren);

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

@@ -414,7 +414,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem
             this.value.aggregate = event.newSelection.value;
             const isSingleValue = this.grid.values.length === 1;
 
-            PivotUtil.handleCountAggregator(this.grid.columns, this.value, isSingleValue);
+            PivotUtil.updateColumnTypeByAggregator(this.grid.columns, this.value, isSingleValue);
 
             this.grid.pipeTrigger++;
         }

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

@@ -88,13 +88,13 @@ export class PivotUtil {
     }
 
     public static flattenGroupsHorizontally(data: IPivotGridRecord[],
-                                            dimension: IPivotDimension,
-                                            expansionStates,
-                                            defaultExpand: boolean,
-                                            visibleDimensions: IPivotDimension[],
-                                            summariesPosition: PivotSummaryPosition,
-                                            parent?: IPivotDimension,
-                                            parentRec?: IPivotGridRecord) {
+        dimension: IPivotDimension,
+        expansionStates,
+        defaultExpand: boolean,
+        visibleDimensions: IPivotDimension[],
+        summariesPosition: PivotSummaryPosition,
+        parent?: IPivotDimension,
+        parentRec?: IPivotGridRecord) {
         for (let i = 0; i < data.length; i++) {
             const rec = data[i];
             const field = dimension.memberName;
@@ -316,7 +316,7 @@ export class PivotUtil {
                 const aggregationKey = groupName ? groupName + pivotKeys.columnDimensionSeparator + key : key;
                 rec.aggregationValues.set(aggregationKey, aggregationData[key]);
             });
-        } else  if (aggregationKeys.length === 1) {
+        } else if (aggregationKeys.length === 1) {
             const aggregationKey = aggregationKeys[0];
             rec.aggregationValues.set(groupName || aggregationKey, aggregationData[aggregationKey]);
         }
@@ -508,28 +508,24 @@ export class PivotUtil {
         }
     }
 
-    public static handleCountAggregator(columns: ColumnType[], value: IPivotValue, isSingleValue: boolean): void {
+    public static updateColumnTypeByAggregator(columns: any[], value: IPivotValue, isSingleValue: boolean): void {
+        const targetColumnType = PivotUtil.getColumnDataTypeForValue(value);
+        columns.forEach(column => {
+            if (column.field?.includes(value.member) || isSingleValue) {
+                column.dataType = targetColumnType;
+            }
+        })
+    }
+
+    private static getColumnDataTypeForValue(value: IPivotValue): GridColumnDataType {
         const isCountAggregator = value.aggregate.aggregator?.name?.toLowerCase() === 'count' || value.aggregate.aggregatorName?.toLowerCase() === 'count';
 
         if ((value.dataType === GridColumnDataType.Currency || value.dataType === GridColumnDataType.Percent) && isCountAggregator) {
-            columns.forEach(column => {
-                console.log(column.field?.includes(value.member))
-                if (column.field?.includes(value.member) || isSingleValue) {
-                    column.dataType = GridColumnDataType.Number;
-                }                
-            });
+            return GridColumnDataType.Number;
         } else if (value.dataType === GridColumnDataType.Currency && !isCountAggregator) {
-            columns.forEach(column => {
-                if (column.field?.includes(value.member) || isSingleValue) {
-                    column.dataType = GridColumnDataType.Currency;
-                }  
-            });
+            return GridColumnDataType.Currency;
         } else if (value.dataType === GridColumnDataType.Percent && !isCountAggregator) {
-            columns.forEach(column => {
-                if (column.field?.includes(value.member) || isSingleValue) {
-                    column.dataType = GridColumnDataType.Percent;
-                }  
-            });
+            return GridColumnDataType.Percent;
         }
     }
 }