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

package/src/agGrid/AdaptableAgGrid.js

@@ -1,4 +1,3 @@
-import throttle from '../Utilities/utils/throttle';
 import debounce from '../Utilities/utils/debounce';
 import { createGrid, LocalEventService, } from 'ag-grid-enterprise';
 import { AdaptableLogger } from './AdaptableLogger';
@@ -21,6 +20,7 @@ import { ThemeService } from '../Utilities/Services/ThemeService';
 import { ValidationService } from '../Utilities/Services/ValidationService';
 import { ModuleService } from '../Utilities/Services/ModuleService';
 import { CalculatedColumnExpressionService } from '../Utilities/Services/CalculatedColumnExpressionService';
+import { expandCellDataChangedInfosWithCalculatedColumns } from '../Utilities/Services/CalculatedColumnSyntheticChange';
 import { QueryLanguageService } from '../Utilities/Services/QueryLanguageService';
 import { AlertService } from '../Utilities/Services/AlertService';
 import { TeamSharingService } from '../Utilities/Services/TeamSharingService';
@@ -78,12 +78,8 @@ import { AgGridOptionsService } from './AgGridOptionsService';
 import { parseDateValue } from '../Utilities/Helpers/DateHelper';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import getScrollbarSize from '../Utilities/getScrollbarSize';
-import { ONLY_AGG_FN_NAME } from '../AdaptableState/Common/AggregationColumns';
-import { computeParameterizedAggregation, getParameterizedAggregationDefinitions, } from '../Aggregation/ParameterizedAggregationRegistry';
-import { getParameterizedAggForColumn } from '../Aggregation/parameterizedAggregationHelpers';
-import { getParameterizedAggregationHeaderParenthesisValue } from '../Aggregation/parameterizedAggregationHeader';
+import { ONLY_AGG_FN_NAME, WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../AdaptableState/Common/AggregationColumns';
 import { RowFormService } from '../Utilities/Services/RowFormService';
-import { FilterOnDataChangeOptions } from '../AdaptableState/Common/Enums';
 import { ADAPTABLE_PUBLISH_TIMESTAMP } from '../EnvVars';
 import { AdaptableUpgradeHelper } from '../migration/AdaptableUpgradeHelper';
 import { ensureLoadingScreenPortalElement } from '../components/Modal';
@@ -91,10 +87,11 @@ import { AdaptableLoadingScreen } from '../View/Components/Popups/AdaptableLoadi
 import { createElement } from 'react';
 import { createAgStatusPanelComponent } from '../Utilities/createAgStatusPanelComponent';
 import { only } from '../Utilities/only';
+import { weightedAverage } from '../Utilities/weightedAverage';
 import { ROW_SUMMARY_ROW_ID } from '../AdaptableState/Common/RowSummary';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
-import { checkForDuplicateColumns, getLayoutRowGroupValuesExceptionGroupKeys, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
+import { checkForDuplicateColumns, resetLayoutHelperErrorOnceMessages, getLayoutRowGroupValuesExceptionGroupKeys, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
 import { LayoutManager } from '../layout-manager/src';
 import { rowGroupDisplayTypeToGridOption } from '../layout-manager/src/rowGroupDisplayType';
 import { isPivotLayoutModel } from '../layout-manager/src/isPivotLayoutModel';
@@ -204,7 +201,6 @@ export class AdaptableAgGrid {
     LicenseService;
     ChartingService;
     rowListeners;
-    throttleFilterOnDataChange;
     debouncedSetSelectedRows;
     debouncedSetSelectedCells;
     agGridListenerKeydown;
@@ -356,6 +352,7 @@ export class AdaptableAgGrid {
             this._rawAdaptableOptions.adaptableId = `adaptable_id_${Date.now()}`;
         }
         this.logger = this.logger ?? new AdaptableLogger(this._rawAdaptableOptions.adaptableId);
+        resetLayoutHelperErrorOnceMessages();
         const adaptableId = this._rawAdaptableOptions.adaptableId;
         const initMarker = getMarker(adaptableId).track.Init.label.Init.start();
         const perfInitAdaptableAgGrid = this.logger.beginPerf(`Adaptable._initAdaptableAgGrid()`);
@@ -901,16 +898,7 @@ export class AdaptableAgGrid {
             // #customize_header
             const defaultColDef = { ...original_defaultColDef };
             defaultColDef.headerValueGetter = 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 = 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;
             });
@@ -1124,16 +1112,17 @@ export class AdaptableAgGrid {
             aggregationFunctions[ONLY_AGG_FN_NAME] = (params) => {
                 return only(params);
             };
-            getParameterizedAggregationDefinitions().forEach((definition) => {
-                aggregationFunctions[definition.agGridAggFuncName] = (params) => {
-                    const columnId = params.column.getColId();
-                    const parameterizedAggFunc = getParameterizedAggForColumn(columnId, this.api.layoutApi.getCurrentLayout());
-                    if (!parameterizedAggFunc || parameterizedAggFunc.type !== definition.type) {
-                        return undefined;
-                    }
-                    return computeParameterizedAggregation(params, params.colDef.colId, parameterizedAggFunc);
-                };
-            });
+            aggregationFunctions[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 weightedAverage(params, params.colDef.colId, adaptableAggFunc.weightedColumnId);
+                }
+                return undefined;
+            };
             return aggregationFunctions;
         });
         /**
@@ -1699,12 +1688,6 @@ export class AdaptableAgGrid {
             }), true);
             gridContainerElement.addEventListener('mouseleave', (this.agGridListenerMouseLeave = (event) => this._emit('MouseLeave', event)));
         }
-        this.throttleFilterOnDataChange = throttle(
-        // 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
@@ -3813,7 +3796,6 @@ export 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, [
@@ -4049,6 +4031,25 @@ export class AdaptableAgGrid {
             ],
         });
     }
+    getActiveAdaptableAggFuncForCol(columnId) {
+        if (!columnId) {
+            return null;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        const aggregationFunctionsColumnsMap = (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;
@@ -4133,6 +4134,7 @@ export 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 = expandCellDataChangedInfosWithCalculatedColumns(this.api, cellDataChangedInfos);
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
             // if a Cell Data Change is undone, log to the Console
             if (cellDataChangedInfo.trigger === 'undo') {
@@ -4290,14 +4292,7 @@ export class AdaptableAgGrid {
         }
     }
     filterOnDataChange() {
-        if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            FilterOnDataChangeOptions.Always) {
-            this.agGridAdapter.getAgGridApi()?.onFilterChanged();
-        }
-        else if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            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

@@ -8,8 +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 { getParameterizedAggregationDefinitionByAgGridName } from '../Aggregation/ParameterizedAggregationRegistry';
-import { isParameterizedAggFuncName } from '../Aggregation/ParameterizedAggregationRegistry';
+import { ONLY_AGG_FN_NAME, WEIGHTED_AVERAGE_AGG_FN_NAME, } 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;
@@ -226,9 +225,8 @@ export class AgGridAdapter {
             if (fctName === 'only') {
                 return 'Only';
             }
-            const parameterizedDefinition = getParameterizedAggregationDefinitionByAgGridName(fctName);
-            if (parameterizedDefinition) {
-                return parameterizedDefinition.agGridAggFuncName;
+            if (fctName === 'weightedAvg') {
+                return 'Weighted Average';
             }
             return original_getDefaultFuncLabel.call(this, fctName);
         };
@@ -542,16 +540,23 @@ export 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) {
@@ -684,12 +689,6 @@ export 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);
@@ -697,9 +696,20 @@ export 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 !== WEIGHTED_AVERAGE_AGG_FN_NAME && name !== ONLY_AGG_FN_NAME);
+            // 'weightedAvg' is displayed right after 'avg'
+            const avgIndex = result.indexOf('avg');
+            if (avgIndex >= 0) {
+                result.splice(avgIndex + 1, 0, WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            else {
+                result.push(WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            result.push(...customAggFuncNames);
+            // 'only' is always the last element
+            result.push(ONLY_AGG_FN_NAME);
         }
-        result = result.filter((func) => !isParameterizedAggFuncName(func));
         return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -1,6 +1,7 @@
 import kebabCase from '../Utilities/utils/kebabCase';
 import { resolveDisplayFormat } from '../AdaptableState/Common/AdaptableFormatPresets';
 import merge from '../Utilities/utils/merge';
+import { resolveSparklineOptionsForRender } from '../Utilities/Helpers/SparklineOptionsHelper';
 import { convertAdaptableStyleToCSS, getVariableColor, hasCellBoxStyle, hasCellFontStyle, normalizeStyleForAgGrid, } from '../Utilities/Helpers/StyleHelper';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
@@ -26,7 +27,7 @@ import { AgGridFilterAdapterFactory } from './AgGridFilterAdapter';
 import { AgGridFloatingFilterAdapterFactory } from './AgGridFloatingFilterAdapter';
 import { errorOnce } from './AdaptableLogger';
 import { isUnsupportedColumnDataTypeForIconStyle } from '../Utilities/Helpers/iconStyledColumnColumnSupport';
-import { isParameterizedAggFuncName } from '../Aggregation/ParameterizedAggregationRegistry';
+import { isWeightedAverageAggFuncName, } from '../AdaptableState/Common/AggregationColumns';
 /**
  * CSS property keys produced by `convertAdaptableStyleToCSS` from a
  * `CellFontStyle` slice. Used to strip Format-Column-derived font CSS
@@ -552,7 +553,7 @@ export class AgGridColumnAdapter {
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparklineStyle) {
                     const sanitizedSparklineOptions = AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
-                    const sparklineOptions = merge({}, userDefined?.sparklineOptions, sanitizedSparklineOptions);
+                    const sparklineOptions = resolveSparklineOptionsForRender(merge({}, userDefined?.sparklineOptions, sanitizedSparklineOptions));
                     return {
                         ...userDefined,
                         sparklineOptions,
@@ -571,8 +572,7 @@ export 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 &&
-                !isUnsupportedColumnDataTypeForIconStyle(abColumn.dataType)) {
+            if (styledColumn.IconStyle && !isUnsupportedColumnDataTypeForIconStyle(abColumn.dataType)) {
                 const iconTokens = styledColumn.IconStyle.ToolTipText ?? [];
                 if (iconTokens.length === 0) {
                     return undefined;
@@ -650,9 +650,7 @@ export 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);
@@ -661,8 +659,7 @@ export class AgGridColumnAdapter {
                     else {
                         const scaleSpan = max - min;
                         const clamped = Helper.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)}%)`;
                 }
@@ -728,8 +725,7 @@ export class AgGridColumnAdapter {
             if (!abColumn.availableAggregationFunctions) {
                 return undefined;
             }
-            return abColumn.availableAggregationFunctions.filter((func) => !isParameterizedAggFuncName(func));
-            // .filter((func) => func !== ONLY_AGG_FN_NAME);
+            return abColumn.availableAggregationFunctions.filter((func) => !isWeightedAverageAggFuncName(func));
         });
     }
     setupColumnType(columnSetupInfo) {
@@ -951,10 +947,7 @@ export 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();
@@ -1466,8 +1459,7 @@ export 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 &&
-            !isUnsupportedColumnDataTypeForIconStyle(abColumn.dataType);
+        const iconStyleFontApplies = styledColumn.IconStyle && !isUnsupportedColumnDataTypeForIconStyle(abColumn.dataType);
         const fontSlot = styledColumn.GradientStyle?.Font ??
             styledColumn.PercentBarStyle?.Font ??
             styledColumn.BulletChartStyle?.Font ??
@@ -1479,8 +1471,7 @@ export class AgGridColumnAdapter {
         if (fontSlot) {
             style = { ...style, ...convertAdaptableStyleToCSS(fontSlot) };
         }
-        const iconStyleCellApplies = styledColumn.IconStyle &&
-            !isUnsupportedColumnDataTypeForIconStyle(abColumn.dataType);
+        const iconStyleCellApplies = styledColumn.IconStyle && !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

@@ -2,8 +2,8 @@ import { isAdaptableElementIcon } from '../components/Icon';
 import { iconToString } from '../components/icons';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { MENU_SEPARATOR } from '../Utilities/Constants/GeneralConstants';
-import { buildConsolidatedAggregationColumnMenuItem, findParameterizedAggMenuInsertIndex, isValueAggregationMenuItem, } from '../Aggregation/parameterizedAggregationColumnMenu';
-import { removeColumnAggregationFromLayout, upsertColumnAggregationInLayout, } from '../Aggregation/parameterizedAggregationHelpers';
+import { buildValueAggregationMenuItem } from './buildValueAggregationMenuItem';
+import { createAgGridIcon } from './createAgGridIcon';
 export class AgGridMenuAdapter {
     _adaptableInstance;
     constructor(_adaptableInstance) {
@@ -55,42 +55,25 @@ export 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
+            ? {
+                ...buildValueAggregationMenuItem(this.adaptableApi, menuContext),
+                icon: 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 = buildConsolidatedAggregationColumnMenuItem(this.adaptableApi, column, (columnId, parameterizedAgg) => {
-            this.adaptableApi.layoutApi.setColumnParameterizedAggregation(columnId, parameterizedAgg);
-        }, (columnId, aggFunc) => {
-            this.adaptableApi.layoutApi.updateCurrentLayout((layout) => {
-                if (aggFunc == null) {
-                    removeColumnAggregationFromLayout(layout, columnId);
-                }
-                else {
-                    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) => isValueAggregationMenuItem(item));
-        const menuItemsWithoutValueAgg = menuItems.filter((item) => !isValueAggregationMenuItem(item));
-        const result = [...menuItemsWithoutValueAgg];
-        const insertIndex = originalValueAggMenuIndex !== -1
-            ? Math.min(originalValueAggMenuIndex, result.length)
-            : findParameterizedAggMenuInsertIndex(menuItemsWithoutValueAgg);
-        result.splice(insertIndex, 0, consolidatedAggregationMenuItem);
-        return result;
-    }
     buildContextMenu(params, originalGetContextMenuItems) {
         if (!params.column) {
             return [];
@@ -269,7 +252,7 @@ export 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)),
         };
@@ -282,7 +265,7 @@ export 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
@@ -310,7 +293,7 @@ export 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
@@ -735,7 +718,7 @@ export class AgGridMenuAdapter {
         }
         else {
             return 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,111 @@
+import { getAggFuncName, getDisplayAggFuncNames, isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../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.
+ */
+export 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 = getAggFuncName(currentAggFunc);
+        activeAggFuncName = aggFuncName === true ? column.aggregationFunction : aggFuncName;
+    }
+    const activeWeightColumnId = 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 = 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 === 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 === 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;