Merge branch '15.0.x' into mkirova/fix-12251

dkamburov · web-flow · commit 268e95c41ed0 · 2022-11-25T14:21:40.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes for each version of this project will be documented in this file.
 
+
+## 15.0.1
+
+- `igxPivotGrid`
+    - Adding `aggregatorName` for pivot value configuration as an alternative to setting `aggregator` function. If both are set `aggregatorName` takes precedent. If none are set an error is thrown.
+
 ## 15.0.0
 
 ### New Features
diff --git a/projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsBG_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Входните данни трябва да са дълги поне {0} знака.',
     igx_grid_max_length_validation_error: 'Входните данни не трябва да са дълги повече от {0} знака.',
     igx_grid_email_validation_error: 'Трябва да бъде въведен валиден имейл адрес.',
-    igx_grid_pattern_validation_error: 'Въведените данни не спазват зададения образец.'
+    igx_grid_pattern_validation_error: 'Въведените данни не спазват зададения образец.',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsCS_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Záznam by měl mít alespoň {0} znaků',
     igx_grid_max_length_validation_error: 'Záznam by neměl mít více než {0} znaků',
     igx_grid_email_validation_error: 'Je třeba zadat platnou e-mailovou adresu',
-    igx_grid_pattern_validation_error: 'Položka neodpovídá požadovanému vzoru'
+    igx_grid_pattern_validation_error: 'Položka neodpovídá požadovanému vzoru',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Indtastningen skal være mindst {0} tegn',
     igx_grid_max_length_validation_error: 'Indtastningen må højst være {0} tegn',
     igx_grid_email_validation_error: 'Der skal indtastes en gyldig e-mailadresse',
-    igx_grid_pattern_validation_error: 'Indtastning stemmer ikke overens med det krævede mønster'
+    igx_grid_pattern_validation_error: 'Indtastning stemmer ikke overens med det krævede mønster',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsDE_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Bitte geben Sie mindestens {0} Zeichen ein',
     igx_grid_max_length_validation_error: 'Bitte geben Sie nicht mehr als {0} Zeichen ein',
     igx_grid_email_validation_error: 'Eine gültige E-Mail-Adresse sollte eingegeben werden',
-    igx_grid_pattern_validation_error: 'Eintrag entspricht nicht dem erforderlichen Muster'
+    igx_grid_pattern_validation_error: 'Eintrag entspricht nicht dem erforderlichen Muster',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsES_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Escriba {0} caracteres como mínimo',
     igx_grid_max_length_validation_error: 'No escriba más de {0} caracteres',
     igx_grid_email_validation_error: 'Debe introducirse una dirección de correo electrónico válida.',
-    igx_grid_pattern_validation_error: 'La entrada no coincide con el patrón necesario.'
+    igx_grid_pattern_validation_error: 'La entrada no coincide con el patrón necesario.',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/FR/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/FR/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsFR_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Veuillez entrer au moins {0} caractères',
     igx_grid_max_length_validation_error: 'Veuillez sélectionner au maximum {0} caractères',
     igx_grid_email_validation_error: 'Une adresse e-mail valide doit être saisie',
-    igx_grid_pattern_validation_error: 'La valeur entrée ne correspond pas au schéma requis'
+    igx_grid_pattern_validation_error: 'La valeur entrée ne correspond pas au schéma requis',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/HU/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/HU/grid-resources.ts
@@ -165,7 +165,8 @@ const GridResourceStringsHU_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'A bejegyzésnek legalább {0} karakter hosszúságúnak kell lennie',
     igx_grid_max_length_validation_error: 'A bejegyzés legfeljebb {0} karakter hosszúságú lehet',
     igx_grid_email_validation_error: 'Érvényes e-mail címet kell megadni',
-    igx_grid_pattern_validation_error: 'A bejegyzés nem felel meg a szükséges sémának'
+    igx_grid_pattern_validation_error: 'A bejegyzés nem felel meg a szükséges sémának',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/IT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/IT/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsIT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: 'La voce non deve contenere più di {0} caratteri',
     igx_grid_email_validation_error: 'È necessario inserire un indirizzo e-mail valido',
     igx_grid_pattern_validation_error: 'La voce non corrisponde al modello richiesto',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/JA/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/JA/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsJA_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: '入力の長さは {0} 文字以下である必要があります',
     igx_grid_email_validation_error: '有効なメール アドレスを入力してください',
     igx_grid_pattern_validation_error: '入力が所定のパターンに一致しません',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/KO/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/KO/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsKO_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Entry should be at least {0} character(s) long',
     igx_grid_max_length_validation_error: 'Entry should be no more than {0} character(s) long',
     igx_grid_email_validation_error: 'A valid email address should be entered',
-    igx_grid_pattern_validation_error: 'Entry does not match the required pattern'
+    igx_grid_pattern_validation_error: 'Entry does not match the required pattern',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 
diff --git a/projects/igniteui-angular-i18n/src/i18n/NB/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NB/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsNB_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: 'Oppføringen må ikke være mer enn {0} tegn(er) lang',
     igx_grid_email_validation_error: 'Du må angi en gyldig e-postadresse',
     igx_grid_pattern_validation_error: 'Oppføringen samsvarer ikke med det nødvendige mønsteret',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/NL/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NL/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsNL_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: 'Invoer mag niet meer dan {0} teken(s) lang zijn',
     igx_grid_email_validation_error: 'Er moet een geldig e-mailadres worden ingevoerd',
     igx_grid_pattern_validation_error: 'Invoer komt niet overeen met het vereiste patroon',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PL/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PL/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsPL_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: 'Długość wpisu nie może przekraczać {0} znaków',
     igx_grid_email_validation_error: 'Należy podać prawidłowy adres e-mail',
     igx_grid_pattern_validation_error: 'Wpis nie pasuje do wymaganego wzorca',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PT/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsPT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'A entrada deve ter pelo menos {0} caracteres',
     igx_grid_max_length_validation_error: 'A entrada não deve ter mais de {0} caracteres',
     igx_grid_email_validation_error: 'Deve ser introduzido um endereço de e-mail válido',
-    igx_grid_pattern_validation_error: 'A entrada não corresponde ao padrão necessário'
+    igx_grid_pattern_validation_error: 'A entrada não corresponde ao padrão necessário',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/RO/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/RO/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsRO_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: 'Intrarea nu trebuie să aibă mai mult de {0} caractere',
     igx_grid_email_validation_error: 'Ar trebui introdusă o adresă de e-mail validă',
     igx_grid_pattern_validation_error: 'Intrarea nu se potrivește cu modelul cerut',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/SV/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/SV/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsSV_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Inmatningen ska innehålla minst {0} tecken',
     igx_grid_max_length_validation_error: 'Inmatningen får inte vara längre än {0} tecken',
     igx_grid_email_validation_error: 'En giltig e-postadress borde anges',
-    igx_grid_pattern_validation_error: 'Inmatningen matchar inte det önskade mönstret'
+    igx_grid_pattern_validation_error: 'Inmatningen matchar inte det önskade mönstret',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/TR/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/TR/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsTR_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: 'Giriş en az {0} karakter uzunluğunda olmalıdır',
     igx_grid_max_length_validation_error: 'Giriş, {0} karakterden uzun olmamalıdır',
     igx_grid_email_validation_error: 'Geçerli bir e-posta adresi girilmelidir',
-    igx_grid_pattern_validation_error: 'Giriş, gerekli modelle eşleşmiyor'
+    igx_grid_pattern_validation_error: 'Giriş, gerekli modelle eşleşmiyor',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/grid-resources.ts
@@ -165,6 +165,7 @@ const GridResourceStringsZHHANS_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_max_length_validation_error: '输入项的字符不得超过 {0} 个字符',
     igx_grid_email_validation_error: '必须输入有效的电子邮件地址',
     igx_grid_pattern_validation_error: '输入项与要求的模式不匹配',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/grid-resources.ts
@@ -164,7 +164,8 @@ const GridResourceStringsZHHANT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_min_length_validation_error: '輸入內容必須至少 {0} 個字元',
     igx_grid_max_length_validation_error: '輸入內容不得超過 {0} 個字元',
     igx_grid_email_validation_error: '必須輸入有效的電子郵件地址',
-    igx_grid_pattern_validation_error: '輸入的內容不符合要求的格式'
+    igx_grid_pattern_validation_error: '輸入的內容不符合要求的格式',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
 
 /**
diff --git a/projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts b/projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts
@@ -162,6 +162,7 @@ export interface IGridResourceStrings {
     igx_grid_max_length_validation_error?: string;
     igx_grid_email_validation_error?: string;
     igx_grid_pattern_validation_error?: string;
+    igx_grid_pivot_no_aggregator?: string;
 }
 
 export const GridResourceStringsEN: IGridResourceStrings = {
@@ -327,5 +328,6 @@ export const GridResourceStringsEN: IGridResourceStrings = {
     igx_grid_min_length_validation_error: 'Entry should be at least {0} character(s) long',
     igx_grid_max_length_validation_error: 'Entry should be no more than {0} character(s) long',
     igx_grid_email_validation_error: 'A valid email address should be entered',
-    igx_grid_pattern_validation_error: 'Entry does not match the required pattern'
+    igx_grid_pattern_validation_error: 'Entry does not match the required pattern',
+    igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
 };
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-aggregate.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-aggregate.ts
@@ -28,7 +28,7 @@ export class IgxPivotAggregate {
      *
      * @memberof IgxPivotAggregate
      */
-    public static aggregators() {
+    public static aggregators(): Array<IPivotAggregator> {
         return [{
             key: 'COUNT',
             label: this.resourceStrings.igx_grid_pivot_aggregate_count,
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface.ts
@@ -57,11 +57,16 @@ export interface IPivotAggregator {
     key: string;
     /** Aggregation label to show in the UI. */
     label: string;
+    /**
+     * Aggregation name that will be used from a list of predefined aggregations.
+     * If not set will use the specified aggregator function.
+     */
+    aggregatorName?: PivotAggregationType;
     /**
      * Aggregator function can be a custom implementation of `PivotAggregation`, or 
      * use predefined ones from `IgxPivotAggregate` and its variants.
      */
-    aggregator: (members: any[], data?: any[]) => any;
+    aggregator?: (members: any[], data?: any[]) => any;
 }
 
 /**
@@ -176,6 +181,8 @@ export enum PivotDimensionType {
     Filter
 }
 
+export type PivotAggregationType = 'SUM' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'LATEST' | 'EARLIEST' ;
+
 /** Interface describing the pivot dimension data.
 * Contains additional information needed to render dimension headers.
 */
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts
@@ -2591,5 +2591,48 @@ describe('IgxPivotGrid #pivotGrid', () => {
             expect(pivotGrid.rowList.length).toBe(1);
             expect(pivotGrid.rowList.toArray()[0].data.dimensionValues.get('ProductCategory')).toBe('Bikes');
         });
+
+        it('should allow setting aggregatorName instead of aggregator.', () => {
+            pivotGrid.pivotConfiguration.values = [
+                {
+                    member: 'UnitsSold',
+                    aggregate: {
+                        aggregatorName: 'SUM',
+                        key: 'SUM',
+                        label: 'Sum',
+                    },
+                    enabled: true
+                }
+            ];
+            pivotGrid.notifyDimensionChange(true);
+            fixture.detectChanges();
+            let pivotRecord = (pivotGrid.rowList.first as IgxPivotRowComponent).data;
+            expect(pivotRecord.aggregationValues.get('US')).toBe(296);
+            expect(pivotRecord.aggregationValues.get('Bulgaria')).toBe(774);
+            expect(pivotRecord.aggregationValues.get('UK')).toBe(293);
+            expect(pivotRecord.aggregationValues.get('Japan')).toBe(240);
+        });
+
+        it('should use aggregatorName if both aggregatorName and aggregator are set at the same time.', () => {
+            pivotGrid.pivotConfiguration.values = [
+                {
+                    member: 'UnitsSold',
+                    aggregate: {
+                        aggregatorName: 'SUM',
+                        aggregator: IgxPivotNumericAggregate.average,
+                        key: 'SUM',
+                        label: 'Sum',
+                    },
+                    enabled: true
+                }
+            ];
+            pivotGrid.notifyDimensionChange(true);
+            fixture.detectChanges();
+            let pivotRecord = (pivotGrid.rowList.first as IgxPivotRowComponent).data;
+            expect(pivotRecord.aggregationValues.get('US')).toBe(296);
+            expect(pivotRecord.aggregationValues.get('Bulgaria')).toBe(774);
+            expect(pivotRecord.aggregationValues.get('UK')).toBe(293);
+            expect(pivotRecord.aggregationValues.get('Japan')).toBe(240);
+        });
     });
 });
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts
@@ -1,3 +1,4 @@
+import { CurrentResourceStrings } from '../../core/i18n/resources';
 import { cloneValue } from '../../core/utils';
 import { DataUtil, GridColumnDataType } from '../../data-operations/data-util';
 import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
@@ -233,12 +234,30 @@ export class PivotUtil {
     public static aggregate(records, values: IPivotValue[]) {
         const result = {};
         for (const pivotValue of values) {
-            result[pivotValue.member] = pivotValue.aggregate.aggregator(records.map(r => r[pivotValue.member]), records);
+            const aggregator = PivotUtil.getAggregatorForType(pivotValue.aggregate, pivotValue.dataType);
+            if (!aggregator) {
+                throw CurrentResourceStrings.GridResStrings.igx_grid_pivot_no_aggregator.replace("{0}", pivotValue.member);
+            }
+            result[pivotValue.member] = aggregator(records.map(r => r[pivotValue.member]), records);
         }
 
         return result;
     }
 
+    public static getAggregatorForType(aggregate: IPivotAggregator, dataType: GridColumnDataType) {
+        let aggregator = aggregate.aggregator;
+        if (aggregate.aggregatorName) {
+            let aggregators = IgxPivotNumericAggregate.aggregators();
+            if (!dataType || dataType === 'date' || dataType === 'dateTime') {
+                aggregators = aggregators.concat(IgxPivotDateAggregate.aggregators())
+            } else if (dataType === 'time') {
+                aggregators = aggregators.concat(IgxPivotTimeAggregate.aggregators());
+            }
+            aggregator = aggregators.find(x => x.key === aggregate.aggregatorName)?.aggregator;
+        }
+        return aggregator;
+    }
+
     public static processHierarchy(hierarchies, pivotKeys, level = 0, rootData = false): IPivotGridRecord[] {
         const flatData: IPivotGridRecord[] = [];
         hierarchies.forEach((h, key) => {
diff --git a/src/app/pivot-grid/pivot-grid.sample.ts b/src/app/pivot-grid/pivot-grid.sample.ts
@@ -125,7 +125,7 @@ export class PivotGridSampleComponent {
                 member: 'UnitsSold',
                 aggregate: {
                     key: 'SUM',
-                    aggregator: IgxPivotNumericAggregate.sum,
+                    aggregatorName: 'SUM',
                     label: 'Sum'
                 },
                 enabled: true,
@@ -372,7 +372,7 @@ export class PivotGridSampleComponent {
                     member: 'UnitsSold',
                     aggregate: {
                         key: 'SUM',
-                        aggregator: IgxPivotNumericAggregate.sum,
+                        aggregatorName: 'SUM',
                         label: 'Sum'
                     },
                     enabled: true,
