@adaptabletools/adaptable 21.0.11 → 21.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.0.11",
+  "version": "21.0.12",
   "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/AgGridAdapter.js

@@ -8,6 +8,7 @@ import { agGridDataTypeDefinitions, ALL_ADAPTABLE_DATA_TYPES } from './agGridDat
 import { isPivotGrandTotal } from '../Api/Implementation/ColumnApiImpl';
 import { isPivotColumnTotal } from '../layout-manager/src/isPivotColumnTotal';
 import { isPivotAggTotalColumn } from '../layout-manager/src/isPivotAggTotalColumn';
+import { isWeightedAverageAggFuncName } from '../AdaptableState/Common/AggregationColumns';
 // AG GRID obfuscates its internals, this is (currently) the best way to get hold of its internal services
 const DANGER_AG_GRID_BEANS_MAP = {};
 const getColumnApiModule = () => ColumnApiModule;
@@ -608,9 +609,10 @@ export class AgGridAdapter {
         return false;
     }
     getColumnAggregationFunctions(colDef) {
-        const result = colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']; // those are the default fns aggrid supports out-of-the-box
+        let result = [].concat(colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']); // those are the default fns aggrid supports out-of-the-box
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
         result.push(...Object.keys(gridOptionsAggFuncs));
+        result = result.filter((func) => !isWeightedAverageAggFuncName(func));
         return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -17,6 +17,7 @@ import { AdaptableFilterHandler } from './AdaptableFilterHandler';
 import { AgGridFilterAdapterFactory } from './AgGridFilterAdapter';
 import { AgGridFloatingFilterAdapterFactory } from './AgGridFloatingFilterAdapter';
 import { errorOnce } from './AdaptableLogger';
+import { isWeightedAverageAggFuncName } from '../AdaptableState/Common/AggregationColumns';
 export function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableReactNumberEditor : AdaptableNumberEditor;
@@ -516,7 +517,10 @@ export class AgGridColumnAdapter {
     }
     setupColumnAllowedAggFuncs({ col, abColumn }) {
         this.setColDefProperty(col, 'allowedAggFuncs', () => {
-            return abColumn.availableAggregationFunctions;
+            if (!abColumn.availableAggregationFunctions) {
+                return undefined;
+            }
+            return abColumn.availableAggregationFunctions.filter((func) => !isWeightedAverageAggFuncName(func));
         });
     }
     setupColumnType(columnSetupInfo) {

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1761929176914 || Date.now(),
-    VERSION: "21.0.11" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1762861055223 || Date.now(),
+    VERSION: "21.0.12" || '--current-version--',
 };