@adaptabletools/adaptable-cjs 23.0.0-canary.3 → 23.0.0-canary.5

package/src/agGrid/AdaptableAgGrid.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableAgGrid = void 0;
 const tslib_1 = require("tslib");
-const throttle_1 = tslib_1.__importDefault(require("../Utilities/utils/throttle"));
 const debounce_1 = tslib_1.__importDefault(require("../Utilities/utils/debounce"));
 const ag_grid_enterprise_1 = require("ag-grid-enterprise");
 const AdaptableLogger_1 = require("./AdaptableLogger");
@@ -25,6 +24,7 @@ const ThemeService_1 = require("../Utilities/Services/ThemeService");
 const ValidationService_1 = require("../Utilities/Services/ValidationService");
 const ModuleService_1 = require("../Utilities/Services/ModuleService");
 const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
+const CalculatedColumnSyntheticChange_1 = require("../Utilities/Services/CalculatedColumnSyntheticChange");
 const QueryLanguageService_1 = require("../Utilities/Services/QueryLanguageService");
 const AlertService_1 = require("../Utilities/Services/AlertService");
 const TeamSharingService_1 = require("../Utilities/Services/TeamSharingService");
@@ -83,11 +83,7 @@ const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
 const AgGridColumnAdapter_1 = require("./AgGridColumnAdapter");
 const getScrollbarSize_1 = tslib_1.__importDefault(require("../Utilities/getScrollbarSize"));
 const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
-const parameterizedAggregationHelpers_1 = require("../Aggregation/parameterizedAggregationHelpers");
-const parameterizedAggregationHeader_1 = require("../Aggregation/parameterizedAggregationHeader");
 const RowFormService_1 = require("../Utilities/Services/RowFormService");
-const Enums_1 = require("../AdaptableState/Common/Enums");
 const EnvVars_1 = require("../EnvVars");
 const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
 const Modal_1 = require("../components/Modal");
@@ -95,6 +91,7 @@ const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoa
 const react_1 = require("react");
 const createAgStatusPanelComponent_1 = require("../Utilities/createAgStatusPanelComponent");
 const only_1 = require("../Utilities/only");
+const weightedAverage_1 = require("../Utilities/weightedAverage");
 const RowSummary_1 = require("../AdaptableState/Common/RowSummary");
 const FlashingCellService_1 = require("../Utilities/Services/FlashingCellService");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
@@ -208,7 +205,6 @@ class AdaptableAgGrid {
     LicenseService;
     ChartingService;
     rowListeners;
-    throttleFilterOnDataChange;
     debouncedSetSelectedRows;
     debouncedSetSelectedCells;
     agGridListenerKeydown;
@@ -360,6 +356,7 @@ class AdaptableAgGrid {
             this._rawAdaptableOptions.adaptableId = `adaptable_id_${Date.now()}`;
         }
         this.logger = this.logger ?? new AdaptableLogger_1.AdaptableLogger(this._rawAdaptableOptions.adaptableId);
+        (0, LayoutHelpers_1.resetLayoutHelperErrorOnceMessages)();
         const adaptableId = this._rawAdaptableOptions.adaptableId;
         const initMarker = (0, devTools_1.getMarker)(adaptableId).track.Init.label.Init.start();
         const perfInitAdaptableAgGrid = this.logger.beginPerf(`Adaptable._initAdaptableAgGrid()`);
@@ -905,16 +902,7 @@ class AdaptableAgGrid {
             // #customize_header
             const defaultColDef = { ...original_defaultColDef };
             defaultColDef.headerValueGetter = (0, adaptableOverrideCheck_1.tagProvidedByAdaptable)((params) => {
-                let columnHeaderName = this.api.columnApi.internalApi.getColumnHeaderName(params);
-                const currentLayout = this.api.layoutApi.getCurrentLayout();
-                if (params.column &&
-                    !currentLayout.SuppressAggFuncInHeader &&
-                    params.location === 'header') {
-                    const parameterizedParenthesisValue = (0, parameterizedAggregationHeader_1.getParameterizedAggregationHeaderParenthesisValue)(this.api, params.column.getColId(), currentLayout);
-                    if (parameterizedParenthesisValue) {
-                        columnHeaderName = parameterizedParenthesisValue;
-                    }
-                }
+                const columnHeaderName = this.api.columnApi.internalApi.getColumnHeaderName(params);
                 const formattedHeaderName = this.api.formatColumnApi.internalApi.formatColumnHeaderName(columnHeaderName, params);
                 return formattedHeaderName;
             });
@@ -1128,16 +1116,17 @@ class AdaptableAgGrid {
             aggregationFunctions[AggregationColumns_1.ONLY_AGG_FN_NAME] = (params) => {
                 return (0, only_1.only)(params);
             };
-            (0, ParameterizedAggregationRegistry_1.getParameterizedAggregationDefinitions)().forEach((definition) => {
-                aggregationFunctions[definition.agGridAggFuncName] = (params) => {
-                    const columnId = params.column.getColId();
-                    const parameterizedAggFunc = (0, parameterizedAggregationHelpers_1.getParameterizedAggForColumn)(columnId, this.api.layoutApi.getCurrentLayout());
-                    if (!parameterizedAggFunc || parameterizedAggFunc.type !== definition.type) {
-                        return undefined;
-                    }
-                    return (0, ParameterizedAggregationRegistry_1.computeParameterizedAggregation)(params, params.colDef.colId, parameterizedAggFunc);
-                };
-            });
+            aggregationFunctions[AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
+                const columnId = params.column.getColId();
+                const adaptableAggFunc = this.getActiveAdaptableAggFuncForCol(columnId);
+                if (!adaptableAggFunc) {
+                    return undefined;
+                }
+                if (adaptableAggFunc.type === 'weightedAverage') {
+                    return (0, weightedAverage_1.weightedAverage)(params, params.colDef.colId, adaptableAggFunc.weightedColumnId);
+                }
+                return undefined;
+            };
             return aggregationFunctions;
         });
         /**
@@ -1703,12 +1692,6 @@ class AdaptableAgGrid {
             }), true);
             gridContainerElement.addEventListener('mouseleave', (this.agGridListenerMouseLeave = (event) => this._emit('MouseLeave', event)));
         }
-        this.throttleFilterOnDataChange = (0, throttle_1.default)(
-        // the extra function is to make sure we have a reference to ag-grid-api
-        () => this.agGridAdapter.getAgGridApi()?.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnDataChange.throttleDelay, {
-            trailing: true,
-            leading: false,
-        });
         /**
          * Use Case: User has started inline editing but its disabled in Row Form Options
          * Action: Stop editing
@@ -3817,7 +3800,6 @@ class AdaptableAgGrid {
             this.listenerCellSelectionChanged = null;
             this.listenerGlobalSetRowSelection = null;
             this.listenerSortChanged = null;
-            this.throttleFilterOnDataChange = null;
             const liveGridOptions = this.agGridAdapter.DANGER_getLiveGridOptions();
             if (liveGridOptions) {
                 this.agGridOptionsService.revertGridOptionsPropertiesToUserValue(liveGridOptions, [
@@ -4053,6 +4035,25 @@ class AdaptableAgGrid {
             ],
         });
     }
+    getActiveAdaptableAggFuncForCol(columnId) {
+        if (!columnId) {
+            return null;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        const aggregationFunctionsColumnsMap = ((0, LayoutHelpers_1.isPivotLayout)(currentLayout)
+            ? currentLayout.PivotAggregationColumns
+            : currentLayout.TableAggregationColumns).reduce((acc, col) => {
+            acc[col.ColumnId] = col.AggFunc;
+            return acc;
+        }, {});
+        const adaptableAggFunc = aggregationFunctionsColumnsMap[columnId];
+        if (typeof adaptableAggFunc === 'object' &&
+            'type' in adaptableAggFunc &&
+            adaptableAggFunc.type === 'weightedAverage') {
+            return adaptableAggFunc;
+        }
+        return null;
+    }
     onRowDataChanged({ rowNode, oldData, newData, }) {
         if (oldData == null || oldData == undefined) {
             return;
@@ -4137,6 +4138,7 @@ class AdaptableAgGrid {
      * There are a few things we need to do AFTER we edit a cell and it makes sense to put them in one place
      */
     performPostEditChecks(rowNode, cellDataChangedInfos) {
+        cellDataChangedInfos = (0, CalculatedColumnSyntheticChange_1.expandCellDataChangedInfosWithCalculatedColumns)(this.api, cellDataChangedInfos);
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
             // if a Cell Data Change is undone, log to the Console
             if (cellDataChangedInfo.trigger === 'undo') {
@@ -4294,14 +4296,7 @@ class AdaptableAgGrid {
         }
     }
     filterOnDataChange() {
-        if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Always) {
-            this.agGridAdapter.getAgGridApi()?.onFilterChanged();
-        }
-        else if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Throttle) {
-            this.throttleFilterOnDataChange();
-        }
+        this.agGridAdapter.getAgGridApi()?.onFilterChanged();
     }
     refreshLayout() {
         const columnDefs = this.agGridAdapter.getColumnDefinitionsInclSpecialColumns();

package/src/agGrid/AgGridAdapter.d.ts

@@ -50,6 +50,7 @@ export declare class AgGridAdapter {
     deriveSelectedRowInfoFromAgGrid(): SelectedRowInfo;
     isPinnedRowNode(rowNode: IRowNode): boolean;
     createAdaptableColumnFromAgGridColumn(agGridColumn: Column, colsToGroups: Record<string, AdaptableColumnGroup>): AdaptableColumn;
+    private getUserAllowedAggFuncs;
     private deriveAdaptableColumnDataType;
     private isColumnReadonly;
     private isColumnFieldonly;
@@ -57,7 +58,6 @@ export declare class AgGridAdapter {
     private isColumnRowGroupable;
     private isColumnPivotable;
     private isColumnAggregetable;
-    private getUserAllowedAggFuncs;
     private getColumnAggregationFunctions;
     private isTreeColumn;
     private isColumnMoveable;

package/src/agGrid/AgGridAdapter.js

@@ -12,8 +12,7 @@ const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const ColumnApiImpl_1 = require("../Api/Implementation/ColumnApiImpl");
 const isPivotColumnTotal_1 = require("../layout-manager/src/isPivotColumnTotal");
 const isPivotAggTotalColumn_1 = require("../layout-manager/src/isPivotAggTotalColumn");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
-const ParameterizedAggregationRegistry_2 = require("../Aggregation/ParameterizedAggregationRegistry");
+const AggregationColumns_1 = require("../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 = () => ag_grid_enterprise_1.ColumnApiModule;
@@ -230,9 +229,8 @@ class AgGridAdapter {
             if (fctName === 'only') {
                 return 'Only';
             }
-            const parameterizedDefinition = (0, ParameterizedAggregationRegistry_1.getParameterizedAggregationDefinitionByAgGridName)(fctName);
-            if (parameterizedDefinition) {
-                return parameterizedDefinition.agGridAggFuncName;
+            if (fctName === 'weightedAvg') {
+                return 'Weighted Average';
             }
             return original_getDefaultFuncLabel.call(this, fctName);
         };
@@ -546,16 +544,23 @@ class AgGridAdapter {
         abColumn.exportable = this.isColumnExportable(abColumn);
         if (abColumn.aggregatable) {
             abColumn.availableAggregationFunctions = this.getColumnAggregationFunctions(colDef);
-            const userAllowedAggFuncs = this.getUserAllowedAggFuncs(ColumnId);
-            if (userAllowedAggFuncs) {
-                abColumn.userAllowedAggFuncs = userAllowedAggFuncs;
-            }
+            Object.defineProperty(abColumn, 'userAllowedAggFuncs', {
+                get: () => this.getUserAllowedAggFuncs(ColumnId),
+                enumerable: true,
+                configurable: true,
+            });
             if (typeof colDef.aggFunc === 'string') {
                 abColumn.aggregationFunction = colDef.aggFunc;
             }
         }
         return abColumn;
     }
+    getUserAllowedAggFuncs(columnId) {
+        const userColumnAllowed = this._adaptableInstance?.agGridColumnAdapter?.getUserColDefProperty(columnId, 'allowedAggFuncs');
+        const userDefaultColDef = this.getUserGridOptionsProperty('defaultColDef');
+        const userAllowed = userColumnAllowed ?? userDefaultColDef?.allowedAggFuncs;
+        return Array.isArray(userAllowed) ? [...userAllowed] : undefined;
+    }
     deriveAdaptableColumnDataType(agColumn, logWarning = true) {
         // Some columns can have no ID or Title. we return string as a consequence but it needs testing
         if (!agColumn) {
@@ -688,12 +693,6 @@ class AgGridAdapter {
         }
         return false;
     }
-    getUserAllowedAggFuncs(columnId) {
-        const userColumnAllowed = this._adaptableInstance?.agGridColumnAdapter?.getUserColDefProperty(columnId, 'allowedAggFuncs');
-        const userDefaultColDef = this.getUserGridOptionsProperty('defaultColDef');
-        const userAllowed = userColumnAllowed ?? userDefaultColDef?.allowedAggFuncs;
-        return Array.isArray(userAllowed) ? [...userAllowed] : undefined;
-    }
     getColumnAggregationFunctions(colDef) {
         const defaultAggFuncs = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
         const hasAllowedAggFuncs = Array.isArray(colDef.allowedAggFuncs);
@@ -701,9 +700,20 @@ class AgGridAdapter {
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
         const gridOptionsAggFuncNames = Object.keys(gridOptionsAggFuncs);
         if (!hasAllowedAggFuncs) {
-            result.push(...gridOptionsAggFuncNames);
+            // we assume gridOptionsAggFuncNames includes 'weightedAvg' and 'only'
+            const customAggFuncNames = gridOptionsAggFuncNames.filter((name) => name !== AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME && name !== AggregationColumns_1.ONLY_AGG_FN_NAME);
+            // 'weightedAvg' is displayed right after 'avg'
+            const avgIndex = result.indexOf('avg');
+            if (avgIndex >= 0) {
+                result.splice(avgIndex + 1, 0, AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            else {
+                result.push(AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            result.push(...customAggFuncNames);
+            // 'only' is always the last element
+            result.push(AggregationColumns_1.ONLY_AGG_FN_NAME);
         }
-        result = result.filter((func) => !(0, ParameterizedAggregationRegistry_2.isParameterizedAggFuncName)(func));
         return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 const kebabCase_1 = tslib_1.__importDefault(require("../Utilities/utils/kebabCase"));
 const AdaptableFormatPresets_1 = require("../AdaptableState/Common/AdaptableFormatPresets");
 const merge_1 = tslib_1.__importDefault(require("../Utilities/utils/merge"));
+const SparklineOptionsHelper_1 = require("../Utilities/Helpers/SparklineOptionsHelper");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
@@ -31,7 +32,7 @@ const AgGridFilterAdapter_1 = require("./AgGridFilterAdapter");
 const AgGridFloatingFilterAdapter_1 = require("./AgGridFloatingFilterAdapter");
 const AdaptableLogger_1 = require("./AdaptableLogger");
 const iconStyledColumnColumnSupport_1 = require("../Utilities/Helpers/iconStyledColumnColumnSupport");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
+const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
 /**
  * CSS property keys produced by `convertAdaptableStyleToCSS` from a
  * `CellFontStyle` slice. Used to strip Format-Column-derived font CSS
@@ -557,7 +558,7 @@ class AgGridColumnAdapter {
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparklineStyle) {
                     const sanitizedSparklineOptions = AdaptableHelper_1.AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
-                    const sparklineOptions = (0, merge_1.default)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions);
+                    const sparklineOptions = (0, SparklineOptionsHelper_1.resolveSparklineOptionsForRender)((0, merge_1.default)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions));
                     return {
                         ...userDefined,
                         sparklineOptions,
@@ -576,8 +577,7 @@ class AgGridColumnAdapter {
             // Icon Style has its own tooltip vocabulary (`'CellValue'` /
             // `'IconDescription'`) so we handle it before falling through to the
             // numeric tooltip branch.
-            if (styledColumn.IconStyle &&
-                !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
+            if (styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
                 const iconTokens = styledColumn.IconStyle.ToolTipText ?? [];
                 if (iconTokens.length === 0) {
                     return undefined;
@@ -655,9 +655,7 @@ class AgGridColumnAdapter {
                 if (textOptions.includes('CellValue')) {
                     returnValue = String(params.value ?? '');
                 }
-                if (textOptions.includes('PercentageValue') &&
-                    min != undefined &&
-                    max != undefined) {
+                if (textOptions.includes('PercentageValue') && min != undefined && max != undefined) {
                     let percentageValue;
                     if (styledColumn.PercentBarStyle?.ColumnComparison) {
                         const absMax = Math.abs(max);
@@ -666,8 +664,7 @@ class AgGridColumnAdapter {
                     else {
                         const scaleSpan = max - min;
                         const clamped = Helper_1.default.clamp(Number(params.value), min, max);
-                        percentageValue =
-                            scaleSpan === 0 ? 0 : ((clamped - min) / scaleSpan) * 100;
+                        percentageValue = scaleSpan === 0 ? 0 : ((clamped - min) / scaleSpan) * 100;
                     }
                     returnValue += ` (${percentageValue.toFixed(0)}%)`;
                 }
@@ -733,8 +730,7 @@ class AgGridColumnAdapter {
             if (!abColumn.availableAggregationFunctions) {
                 return undefined;
             }
-            return abColumn.availableAggregationFunctions.filter((func) => !(0, ParameterizedAggregationRegistry_1.isParameterizedAggFuncName)(func));
-            // .filter((func) => func !== ONLY_AGG_FN_NAME);
+            return abColumn.availableAggregationFunctions.filter((func) => !(0, AggregationColumns_1.isWeightedAverageAggFuncName)(func));
         });
     }
     setupColumnType(columnSetupInfo) {
@@ -956,10 +952,7 @@ class AgGridColumnAdapter {
                 // 1. evaluate EditOptions.isCellEditable if provided
                 if (this.adaptableApi.gridApi.internalApi.hasCellEditableAccordingToEditOptions()) {
                     const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, params.column.getColId());
-                    const editOptionsEditability = this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
-                    if (editOptionsEditability) {
-                        return editOptionsEditability;
-                    }
+                    return this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
                 }
                 // 2. otherwise, fallback to colDef.editable
                 return getOriginalColDefEditable();
@@ -1471,8 +1464,7 @@ class AgGridColumnAdapter {
         // basis when a Gradient cell has a tinted background, even if the user
         // also set `Font.ForeColor` as a baseline.
         const autoContrastColor = gradientStyle?.AutoContrastText && style.color ? style.color : undefined;
-        const iconStyleFontApplies = styledColumn.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleFontApplies = styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const fontSlot = styledColumn.GradientStyle?.Font ??
             styledColumn.PercentBarStyle?.Font ??
             styledColumn.BulletChartStyle?.Font ??
@@ -1484,8 +1476,7 @@ class AgGridColumnAdapter {
         if (fontSlot) {
             style = { ...style, ...(0, StyleHelper_1.convertAdaptableStyleToCSS)(fontSlot) };
         }
-        const iconStyleCellApplies = styledColumn.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleCellApplies = styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const cellSlot = styledColumn.RatingStyle?.Cell ??
             styledColumn.SparklineStyle?.Cell ??
             styledColumn.BadgeStyle?.Cell ??

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -9,7 +9,6 @@ export declare class AgGridMenuAdapter {
     private get adaptableApi();
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (DefaultMenuItem | MenuItemDef)[];
-    private injectParameterizedAggregationColumnMenuItems;
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (DefaultMenuItem | MenuItemDef)[];
     private mapAgGridItemTypeToAgGridMenuItem;
     private removeConsecutiveSeparators;

package/src/agGrid/AgGridMenuAdapter.js

@@ -6,8 +6,8 @@ const Icon_1 = require("../components/Icon");
 const icons_1 = require("../components/icons");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
-const parameterizedAggregationColumnMenu_1 = require("../Aggregation/parameterizedAggregationColumnMenu");
-const parameterizedAggregationHelpers_1 = require("../Aggregation/parameterizedAggregationHelpers");
+const buildValueAggregationMenuItem_1 = require("./buildValueAggregationMenuItem");
+const createAgGridIcon_1 = require("./createAgGridIcon");
 class AgGridMenuAdapter {
     _adaptableInstance;
     constructor(_adaptableInstance) {
@@ -59,42 +59,25 @@ class AgGridMenuAdapter {
                 .filter(Boolean);
         }
         // 2. if not, return the default context menu
-        let defaultContextMenu = [
-            ...agGridMenuItems,
+        // AG Grid does not allow customizing the built-in `valueAggSubMenu`, so we
+        // replace it with an Adaptable-built equivalent that also offers a Weighted
+        // Average aggregation (with a submenu to pick the weight column).
+        // Weighted Average is never used in Pivot Layouts, so we leave the AG Grid
+        // default item untouched there.
+        const isPivotLayout = this.adaptableApi.layoutApi.isCurrentLayoutPivot();
+        const mappedAgGridMenuItems = agGridMenuItems.map((itemName) => itemName === 'valueAggSubMenu' && !isPivotLayout
+            ? {
+                ...(0, buildValueAggregationMenuItem_1.buildValueAggregationMenuItem)(this.adaptableApi, menuContext),
+                icon: (0, createAgGridIcon_1.createAgGridIcon)('aggregation'),
+            }
+            : itemName);
+        const defaultContextMenu = [
+            ...mappedAgGridMenuItems,
             'separator',
             ...defaultColumnMenuStructure.map((adaptableItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(adaptableItem)),
         ];
-        defaultContextMenu = this.injectParameterizedAggregationColumnMenuItems(defaultContextMenu, adaptableColumn);
         return this.removeConsecutiveSeparators(defaultContextMenu);
     }
-    injectParameterizedAggregationColumnMenuItems(menuItems, column) {
-        const consolidatedAggregationMenuItem = (0, parameterizedAggregationColumnMenu_1.buildConsolidatedAggregationColumnMenuItem)(this.adaptableApi, column, (columnId, parameterizedAgg) => {
-            this.adaptableApi.layoutApi.setColumnParameterizedAggregation(columnId, parameterizedAgg);
-        }, (columnId, aggFunc) => {
-            this.adaptableApi.layoutApi.updateCurrentLayout((layout) => {
-                if (aggFunc == null) {
-                    (0, parameterizedAggregationHelpers_1.removeColumnAggregationFromLayout)(layout, columnId);
-                }
-                else {
-                    (0, parameterizedAggregationHelpers_1.upsertColumnAggregationInLayout)(layout, columnId, aggFunc);
-                }
-                return layout;
-            });
-            this.adaptableApi.agGridApi.setColumnAggFunc(columnId, aggFunc);
-        });
-        if (!consolidatedAggregationMenuItem) {
-            return menuItems;
-        }
-        consolidatedAggregationMenuItem.icon = this.mapAdaptableIconToAgGridIcon({ name: 'equation' });
-        const originalValueAggMenuIndex = menuItems.findIndex((item) => (0, parameterizedAggregationColumnMenu_1.isValueAggregationMenuItem)(item));
-        const menuItemsWithoutValueAgg = menuItems.filter((item) => !(0, parameterizedAggregationColumnMenu_1.isValueAggregationMenuItem)(item));
-        const result = [...menuItemsWithoutValueAgg];
-        const insertIndex = originalValueAggMenuIndex !== -1
-            ? Math.min(originalValueAggMenuIndex, result.length)
-            : (0, parameterizedAggregationColumnMenu_1.findParameterizedAggMenuInsertIndex)(menuItemsWithoutValueAgg);
-        result.splice(insertIndex, 0, consolidatedAggregationMenuItem);
-        return result;
-    }
     buildContextMenu(params, originalGetContextMenuItems) {
         if (!params.column) {
             return [];
@@ -273,7 +256,7 @@ class AgGridMenuAdapter {
                     ? () => this.adaptableApi.internalApi.dispatchReduxAction(fullMenuItem.reduxAction)
                     : undefined,
             icon: this.mapAdaptableIconToAgGridIcon(fullMenuItem.icon, {
-                fill: 'var(--ab-color-text-on-primary)',
+                fill: 'var(--ab-color-primary-foreground)',
             }),
             subMenu: fullMenuItem.subItems?.map((subMenuItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(subMenuItem)),
         };
@@ -286,7 +269,7 @@ class AgGridMenuAdapter {
             return {
                 name: customMenuItem.label,
                 icon: this.mapAdaptableIconToAgGridIcon(customMenuItem.icon, {
-                    fill: 'var(--ab-color-text-on-primary)',
+                    fill: 'var(--ab-color-primary-foreground)',
                 }),
                 disabled: customMenuItem.disabled,
                 subMenu: !customMenuItem.disabled
@@ -314,7 +297,7 @@ class AgGridMenuAdapter {
             name: userMenuItem.label,
             action: () => (userMenuItem.onClick ? userMenuItem.onClick(menuContext) : null),
             icon: this.mapAdaptableIconToAgGridIcon(userMenuItem.icon, {
-                fill: 'var(--ab-color-text-on-primary)',
+                fill: 'var(--ab-color-primary-foreground)',
             }),
             disabled: userMenuItem.disabled,
             subMenu: userMenuItem.subMenuItems
@@ -739,7 +722,7 @@ class AgGridMenuAdapter {
         }
         else {
             return (0, icons_1.iconToString)(icon, {
-                fill: 'var(--ab-color-text-on-primary)',
+                fill: 'var(--ab-color-primary-foreground)',
             });
         }
     }

package/src/agGrid/buildValueAggregationMenuItem.d.ts

@@ -0,0 +1,19 @@
+import { MenuItemDef } from 'ag-grid-enterprise';
+import { AdaptableApi } from '../types';
+import { ColumnMenuContext } from '../AdaptableState/Common/Menu';
+/**
+ * Builds the replacement for AG Grid's built-in `valueAggSubMenu` column menu item.
+ *
+ * AG Grid does not allow customizing the built-in submenu, so we rebuild an
+ * equivalent one: the column's existing aggregation functions plus a
+ * `Weighted Average` item whose submenu lists the numeric columns that can be
+ * used as the weight parameter.
+ *
+ * Both standard and weighted selections persist through the current Layout
+ * (`updateCurrentLayout`), so the existing `weightedAvg` aggFunc can read the
+ * chosen `weightedColumnId` back from the Layout.
+ *
+ * Weighted Average is never used in Pivot Layouts, so this only deals with the
+ * Table Layout aggregations and the caller skips it entirely in Pivot mode.
+ */
+export declare function buildValueAggregationMenuItem(adaptableApi: AdaptableApi, menuContext: ColumnMenuContext): MenuItemDef;

package/src/agGrid/buildValueAggregationMenuItem.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildValueAggregationMenuItem = buildValueAggregationMenuItem;
+const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
+const toFuncLabel = (funcName) => {
+    if (funcName === 'avg') {
+        return 'Average';
+    }
+    if (funcName === 'weightedAvg') {
+        return 'Weighted Average';
+    }
+    return funcName ? funcName.charAt(0).toUpperCase() + funcName.slice(1) : funcName;
+};
+/**
+ * Builds the replacement for AG Grid's built-in `valueAggSubMenu` column menu item.
+ *
+ * AG Grid does not allow customizing the built-in submenu, so we rebuild an
+ * equivalent one: the column's existing aggregation functions plus a
+ * `Weighted Average` item whose submenu lists the numeric columns that can be
+ * used as the weight parameter.
+ *
+ * Both standard and weighted selections persist through the current Layout
+ * (`updateCurrentLayout`), so the existing `weightedAvg` aggFunc can read the
+ * chosen `weightedColumnId` back from the Layout.
+ *
+ * Weighted Average is never used in Pivot Layouts, so this only deals with the
+ * Table Layout aggregations and the caller skips it entirely in Pivot mode.
+ */
+function buildValueAggregationMenuItem(adaptableApi, menuContext) {
+    const column = menuContext.adaptableColumn;
+    const columnId = column.columnId;
+    const currentLayout = adaptableApi.layoutApi.getCurrentLayout();
+    const aggregationColumns = currentLayout.TableAggregationColumns || [];
+    const currentAggFunc = aggregationColumns.find((agg) => agg.ColumnId === columnId)?.AggFunc;
+    let activeAggFuncName;
+    if (currentAggFunc != null) {
+        const aggFuncName = (0, AggregationColumns_1.getAggFuncName)(currentAggFunc);
+        activeAggFuncName = aggFuncName === true ? column.aggregationFunction : aggFuncName;
+    }
+    const activeWeightColumnId = (0, AggregationColumns_1.isWeightedAverageAggregation)(currentAggFunc)
+        ? currentAggFunc.weightedColumnId
+        : undefined;
+    const applyAggregation = (aggFuncValue) => {
+        const upsert = (cols) => {
+            const list = cols ? [...cols] : [];
+            const index = list.findIndex((col) => col.ColumnId === columnId);
+            if (index >= 0) {
+                list[index] = { ...list[index], AggFunc: aggFuncValue };
+            }
+            else {
+                list.push({ ColumnId: columnId, AggFunc: aggFuncValue });
+            }
+            return list;
+        };
+        adaptableApi.layoutApi.updateCurrentLayout((layout) => {
+            const tableLayout = layout;
+            return {
+                ...tableLayout,
+                TableAggregationColumns: upsert(tableLayout.TableAggregationColumns),
+            };
+        });
+    };
+    const removeAggregation = () => {
+        adaptableApi.layoutApi.updateCurrentLayout((layout) => {
+            const tableLayout = layout;
+            return {
+                ...tableLayout,
+                TableAggregationColumns: (tableLayout.TableAggregationColumns || []).filter((col) => col.ColumnId !== columnId),
+            };
+        });
+    };
+    // 'None' clears any aggregation for the column and is checked when none is set
+    const subMenu = [
+        {
+            name: 'None',
+            checked: activeAggFuncName == null,
+            action: () => removeAggregation(),
+        },
+    ];
+    // getDisplayAggFuncNames already positions weightedAvg right after 'avg'
+    // (and only includes it when the column is eligible)
+    const aggFuncItems = (0, AggregationColumns_1.getDisplayAggFuncNames)(column).map((funcName) => {
+        // Weighted Average needs a weight column parameter, so instead of a plain
+        // action it gets a submenu listing the numeric columns usable as the weight.
+        if (funcName === AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME) {
+            const weightColumnItems = adaptableApi.columnApi
+                .getNumericColumns()
+                .filter((numericColumn) => numericColumn.columnId !== columnId)
+                .map((numericColumn) => ({
+                name: numericColumn.friendlyName ?? numericColumn.columnId,
+                checked: activeWeightColumnId === numericColumn.columnId,
+                action: () => applyAggregation({
+                    type: 'weightedAverage',
+                    weightedColumnId: numericColumn.columnId,
+                }),
+            }));
+            return {
+                name: 'Weighted Average',
+                checked: activeAggFuncName === AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME,
+                subMenu: weightColumnItems,
+            };
+        }
+        return {
+            name: toFuncLabel(funcName),
+            checked: activeAggFuncName === funcName,
+            action: () => applyAggregation(funcName),
+        };
+    });
+    subMenu.push(...aggFuncItems);
+    return {
+        name: 'Value Aggregation',
+        subMenu,
+    };
+}

package/src/agGrid/cellRenderers/IconRenderer.d.ts

@@ -18,6 +18,12 @@ import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
  * is configured for case-insensitive matching.
  */
 export declare const resolveEffectiveIconStyleMappings: (iconStyle: IconStyle | undefined) => IconStyleMapping[];
+/**
+ * Mapping list for wizard / settings summaries: custom mappings first so
+ * user-authored entries are always visible, then any remaining preset
+ * entries (after override filtering).
+ */
+export declare const resolveIconStyleMappingsForSummaryPreview: (iconStyle: IconStyle | undefined) => IconStyleMapping[];
 export declare const getIconRendererForColumn: (styledColumn: StyledColumn, abColumn: AdaptableColumn, api: AdaptableApi) => any;
 /** Helper exposed for the tooltip getter in `AgGridColumnAdapter`. */
 export declare const findIconStyleMappingForValue: (iconStyle: IconStyle | undefined, cellValue: any) => IconStyleMapping | undefined;