@adaptabletools/adaptable-cjs 22.0.9 → 22.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "22.0.9",
+  "version": "22.0.10",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/agGrid/AdaptableAgGrid.js

@@ -507,6 +507,7 @@ class AdaptableAgGrid {
         this.agGridAdapter.setAgGridApi(agGridApi);
         this.agGridAdapter.monkeyPatchingGridOptionsUpdates();
         this.agGridAdapter.monkeyPatchingAggColumnFilters();
+        this.agGridAdapter.monkeyPatchingAggFuncLabels();
         this.lifecycleState = 'agGridReady';
         this.api.entitlementApi.internalApi.setModulesAgGridDepsInfos();
         this.ModuleService.logMissingAgGridDepsInfos();

package/src/agGrid/AgGridAdapter.d.ts

@@ -11,6 +11,7 @@ export declare class AgGridAdapter {
     private DANGER_updateGridOptionsMonkeyPatcher;
     private DANGER_doFiltersPassMonkeyPatcher;
     private DANGER_isAggFilterPresentMonkeyPatcher;
+    private DANGER_getDefaultFuncLabelMonkeyPatcher;
     private activePivotColumnFilters_MEMO;
     initialGridOptions: GridOptions;
     private _agGridId;
@@ -28,6 +29,7 @@ export declare class AgGridAdapter {
     getAgGridApi(skipLogging?: boolean): GridApi | undefined;
     monkeyPatchingGridOptionsUpdates(): void;
     monkeyPatchingAggColumnFilters(): void;
+    monkeyPatchingAggFuncLabels(): void;
     private DANGER_getPrivateAgGridBeans;
     DANGER_getLiveGridOptions(): GridOptions<any>;
     getAgGridRootElement(): HTMLElement;

package/src/agGrid/AgGridAdapter.js

@@ -25,6 +25,8 @@ class AgGridAdapter {
     // see #aggColumnFilters_monkey_patch
     DANGER_doFiltersPassMonkeyPatcher;
     DANGER_isAggFilterPresentMonkeyPatcher;
+    // see #aggFuncLabels_monkey_patch
+    DANGER_getDefaultFuncLabelMonkeyPatcher;
     activePivotColumnFilters_MEMO = new WeakMap();
     initialGridOptions;
     _agGridId;
@@ -55,6 +57,7 @@ class AgGridAdapter {
         this.DANGER_updateGridOptionsMonkeyPatcher = null;
         this.DANGER_doFiltersPassMonkeyPatcher = null;
         this.DANGER_isAggFilterPresentMonkeyPatcher = null;
+        this.DANGER_getDefaultFuncLabelMonkeyPatcher = null;
         this.activePivotColumnFilters_MEMO = null;
         this._adaptableInstance = null;
     }
@@ -212,6 +215,27 @@ class AgGridAdapter {
         };
         agGridColumnFilterService.isAggFilterPresent = this.DANGER_isAggFilterPresentMonkeyPatcher;
     }
+    // #aggFuncLabels_monkey_patch
+    monkeyPatchingAggFuncLabels() {
+        const agGridAggFuncService = this.DANGER_getPrivateAgGridBeans()?.aggFuncSvc;
+        if (!agGridAggFuncService) {
+            return;
+        }
+        const original_getDefaultFuncLabel = agGridAggFuncService.getDefaultFuncLabel;
+        if (typeof original_getDefaultFuncLabel !== 'function') {
+            return;
+        }
+        this.DANGER_getDefaultFuncLabelMonkeyPatcher = function (fctName) {
+            if (fctName === 'only') {
+                return 'Only';
+            }
+            if (fctName === 'weightedAvg') {
+                return 'Weighted Average';
+            }
+            return original_getDefaultFuncLabel.call(this, fctName);
+        };
+        agGridAggFuncService.getDefaultFuncLabel = this.DANGER_getDefaultFuncLabelMonkeyPatcher;
+    }
     DANGER_getPrivateAgGridBeans() {
         const beans = DANGER_AG_GRID_BEANS_MAP[this._agGridId];
         if (!beans) {
@@ -659,9 +683,14 @@ class AgGridAdapter {
         return false;
     }
     getColumnAggregationFunctions(colDef) {
-        let result = [].concat(colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']); // those are the default fns aggrid supports out-of-the-box
+        const defaultAggFuncs = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
+        const hasAllowedAggFuncs = Array.isArray(colDef.allowedAggFuncs);
+        let result = hasAllowedAggFuncs ? [...colDef.allowedAggFuncs] : [...defaultAggFuncs];
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
-        result.push(...Object.keys(gridOptionsAggFuncs));
+        const gridOptionsAggFuncNames = Object.keys(gridOptionsAggFuncs);
+        if (!hasAllowedAggFuncs) {
+            result.push(...gridOptionsAggFuncNames);
+        }
         result = result.filter((func) => !(0, AggregationColumns_1.isWeightedAverageAggFuncName)(func));
         return [...new Set(result)];
     }

package/src/agGrid/AgGridColumnAdapter.js

@@ -576,6 +576,7 @@ class AgGridColumnAdapter {
                 return undefined;
             }
             return abColumn.availableAggregationFunctions.filter((func) => !(0, AggregationColumns_1.isWeightedAverageAggFuncName)(func));
+            // .filter((func) => func !== ONLY_AGG_FN_NAME);
         });
     }
     setupColumnType(columnSetupInfo) {

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1775641581659 || Date.now(),
-    VERSION: "22.0.9" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1775746156657 || Date.now(),
+    VERSION: "22.0.10" || '--current-version--',
 };