@adaptabletools/adaptable-cjs 23.0.0-canary.4 → 23.0.0-canary.6

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledColumnWizardStyleSection = exports.renderFormatColumnStyleWizardSummary = exports.renderStyledColumnStyleSummary = exports.StyledColumnWizardRangesSection = exports.renderStyledColumnRangesSummary = void 0;
+exports.StyledColumnWizardStyleSection = exports.renderFormatColumnStyleWizardSummary = exports.renderStyledColumnStyleSummary = exports.getStyledColumnPercentBarStyleViewValues = exports.StyledColumnWizardRangesSection = exports.renderStyledColumnRangesSummary = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const CheckBox_1 = require("../../../../components/CheckBox");
@@ -16,6 +16,7 @@ const Radio_1 = tslib_1.__importStar(require("../../../../components/Radio"));
 const Toggle_1 = require("../../../../components/Toggle");
 const StyledColumnSliceStyleEditors_1 = require("../StyledColumnSliceStyleEditors");
 const Card_1 = require("../../../../components/Card");
+const StyledColumnPercentBarPreview_1 = require("./Components/StyledColumnPercentBarPreview");
 // Re-export the Ranges section + summary for legacy import paths.
 var StyledColumnWizardRangesSection_1 = require("./StyledColumnWizardRangesSection");
 Object.defineProperty(exports, "renderStyledColumnRangesSummary", { enumerable: true, get: function () { return StyledColumnWizardRangesSection_1.renderStyledColumnRangesSummary; } });
@@ -24,47 +25,70 @@ Object.defineProperty(exports, "StyledColumnWizardRangesSection", { enumerable:
 // Summary helpers
 // ---------------------------------------------------------------------------
 const formatOriginLabel = (origin) => {
-    if (origin == undefined)
+    if (origin == undefined) {
         return 'Auto';
-    if (typeof origin === 'number')
+    }
+    if (typeof origin === 'number') {
         return `Custom (${origin})`;
+    }
     return origin;
 };
-const formatAlignmentLabel = (alignment) => {
-    if (alignment == undefined)
-        return 'Inherit';
-    return alignment;
+const formatPercentBarCellTextSummary = (cellText) => cellText
+    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
+    .join(' + ') ?? '';
+const formatPercentBarToolTipSummary = (toolTipText) => toolTipText
+    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
+    .join(' + ') ?? '';
+const buildStyledColumnPercentBarStyleSummaryStrings = (pb, options) => {
+    const items = [`Origin: ${formatOriginLabel(pb.Origin)}`];
+    if (pb.CellText?.length) {
+        items.push(`Cell Text: ${formatPercentBarCellTextSummary(pb.CellText)}`);
+        items.push(`Cell Text Position: ${pb.CellTextPosition ?? 'Below'}`);
+        if (pb.CellTextAlignment != null) {
+            items.push(`Cell Text Alignment: ${pb.CellTextAlignment}`);
+        }
+    }
+    else if (options.includeEmptyCellText) {
+        items.push('Cell Text: None');
+    }
+    if (pb.ToolTipText?.length) {
+        items.push(`Tooltip: ${formatPercentBarToolTipSummary(pb.ToolTipText)}`);
+    }
+    else if (options.includeEmptyTooltip) {
+        items.push('Tooltip: No Tooltip');
+    }
+    if (pb.BackColor) {
+        items.push(`Back Colour: ${pb.BackColor}`);
+    }
+    (0, StyledColumnSliceStyleEditors_1.getCellFontStyleSummaryItems)(pb.Font).forEach(({ label, value }) => {
+        items.push(`${label}: ${value}`);
+    });
+    return items;
 };
-const formatCellText = (cellText) => {
-    if (!cellText || cellText.length === 0)
-        return '—';
-    return cellText.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value')).join(' + ');
+const getStyledColumnPercentBarStyleViewValues = (data) => {
+    const pb = data.PercentBarStyle;
+    if (!pb) {
+        return [];
+    }
+    return buildStyledColumnPercentBarStyleSummaryStrings(pb, {
+        includeEmptyCellText: false,
+        includeEmptyTooltip: false,
+    });
 };
+exports.getStyledColumnPercentBarStyleViewValues = getStyledColumnPercentBarStyleViewValues;
 /**
  * Compact summary of the *non-range* style properties of a Percent Bar.
- * (Gradient uses `renderStyledColumnGradientStyleSummary`.)
- *
- * Used by:
- *   - the wizard's "Style" step `renderSummary`
- *   - the Styled Column module's `toView` (read-only summary popup)
  */
 const renderStyledColumnStyleSummary = (data, _api) => {
     const pb = data.PercentBarStyle;
     if (!pb) {
         return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Styling Defined" });
     }
-    const parts = [
-        (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-2", children: ["Origin: ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: formatOriginLabel(pb.Origin) })] }, "origin"),
-    ];
-    if (pb.CellText && pb.CellText.length > 0) {
-        parts.push((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-2", children: ["Text: ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: formatCellText(pb.CellText) }), " (", pb.CellTextPosition ?? 'Below', ")"] }, "text"));
-        parts.push((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-2", children: ["Align: ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: formatAlignmentLabel(pb.CellTextAlignment) })] }, "align"));
-    }
-    const fontTags = (0, StyledColumnSliceStyleEditors_1.renderFontStyleSummaryTags)(pb.Font);
-    if (fontTags) {
-        parts.push((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-2", children: ["Font: ", fontTags] }, "font"));
-    }
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:flex-wrap", children: parts }));
+    const items = buildStyledColumnPercentBarStyleSummaryStrings(pb, {
+        includeEmptyCellText: true,
+        includeEmptyTooltip: true,
+    });
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: item }, item))) }));
 };
 exports.renderStyledColumnStyleSummary = renderStyledColumnStyleSummary;
 // Legacy wrapper kept for any external consumers; safe no-op here.
@@ -178,6 +202,6 @@ const StyledColumnWizardStyleSection = (props) => {
                                             delete cleaned.Font;
                                             props.onChange({ ...data, PercentBarStyle: cleaned });
                                         }
-                                    } }) })] })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Cell Style" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Configure Tooltip and Background Colour" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { children: (0, jsx_runtime_1.jsxs)(FormLayout_1.default, { sizes: [...STYLE_FORM_SIZES], children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.FormRow, { label: "Tooltip Display:", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, checked: pb.ToolTipText?.includes('CellValue'), onChange: (checked) => onToolTipTextChanged('CellValue', checked), children: "Cell Value" }), ' ', (0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, className: "twa:ml-3", checked: pb.ToolTipText?.includes('PercentageValue'), onChange: (checked) => onToolTipTextChanged('PercentageValue', checked), children: "Percent Value" })] }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: `Back ${api.internalApi.getCorrectEnglishVariant('Colour')}:`, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, checked: !!pb.BackColor, onChange: onUseBackColorChanged, className: "twa:mr-2" }), pb.BackColor != undefined && ((0, jsx_runtime_1.jsx)(ColorPicker_1.ColorPicker, { disabled: disabled, api: api, value: pb.BackColor, onChange: onBackColorChange }))] }) })] }) })] })] }));
+                                    } }) })] })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Cell Style" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Configure Tooltip and Background Colour" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { children: (0, jsx_runtime_1.jsxs)(FormLayout_1.default, { sizes: [...STYLE_FORM_SIZES], children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.FormRow, { label: "Tooltip Display:", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, checked: pb.ToolTipText?.includes('CellValue'), onChange: (checked) => onToolTipTextChanged('CellValue', checked), children: "Cell Value" }), ' ', (0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, className: "twa:ml-3", checked: pb.ToolTipText?.includes('PercentageValue'), onChange: (checked) => onToolTipTextChanged('PercentageValue', checked), children: "Percent Value" })] }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: `Back ${api.internalApi.getCorrectEnglishVariant('Colour')}:`, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, checked: !!pb.BackColor, onChange: onUseBackColorChanged, className: "twa:mr-2" }), pb.BackColor != undefined && ((0, jsx_runtime_1.jsx)(ColorPicker_1.ColorPicker, { disabled: disabled, api: api, value: pb.BackColor, onChange: onBackColorChange }))] }) })] }) })] }), (0, jsx_runtime_1.jsx)(StyledColumnPercentBarPreview_1.StyledColumnPercentBarPreviewCard, { data: data })] }));
 };
 exports.StyledColumnWizardStyleSection = StyledColumnWizardStyleSection;

package/src/View/SystemStatus/Utilities/getStatusItemStyle.js

@@ -7,7 +7,7 @@ const getStatusItemStyle = (systemStatusMessageInfo) => {
     const background = UIHelper_1.default.getColorByMessageType(systemStatusMessageInfo?.statusType ?? 'Success');
     const color = systemStatusMessageInfo
         ? UIHelper_1.default.getButtonTextColourForMessageType(systemStatusMessageInfo.statusType)
-        : 'var(--ab-color-text-on-primary)';
+        : 'var(--ab-color-primary-foreground)';
     return {
         background,
         color,

package/src/View/Theme/ThemePopup.d.ts

@@ -1,19 +1,7 @@
 import * as React from 'react';
-import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableTheme } from '../../AdaptableState/ThemeState';
-interface ThemePopupProps extends ModuleViewPopupProps<ThemePopupComponent> {
-    CurrentTheme: string;
-    UserThemes: AdaptableTheme[];
-    SelectTheme: (newTheme: string) => ThemeRedux.ThemeSelectAction;
-    hideShowInWindow?: boolean;
-}
-declare class ThemePopupComponent extends React.Component<ThemePopupProps, {}> {
+declare class ThemePopupComponent extends React.Component<ModuleViewPopupProps<ThemePopupComponent>, {}> {
     render(): React.JSX.Element;
-    onChangeTheme(value: string): void;
-    handleCreateNewTheme: (variant: "dark" | "light") => void;
 }
-export declare let ThemePopup: import("react-redux").ConnectedComponent<typeof ThemePopupComponent, {
-    [x: string]: any;
-}>;
+export declare let ThemePopup: typeof ThemePopupComponent;
 export {};

package/src/View/Theme/ThemePopup.js

@@ -4,48 +4,13 @@ exports.ThemePopup = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ThemeSelector_1 = require("./ThemeSelector");
 const Flex_1 = require("../../components/Flex");
 class ThemePopupComponent extends React.Component {
     render() {
-        const isCustomTheme = this.props.api.themeApi
-            .getUserThemes()
-            .some((theme) => theme.Name === this.props.CurrentTheme);
-        const disabled = this.props.accessLevel === GeneralConstants_1.ACCESS_LEVEL_READ_ONLY;
         return ((0, jsx_runtime_1.jsx)(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), children: (0, jsx_runtime_1.jsx)(FormLayout_1.default, { children: (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Select Current Theme:", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:max-w-[150px]", children: (0, jsx_runtime_1.jsx)(ThemeSelector_1.ThemeSelector, {}) }) }) }) }));
     }
-    onChangeTheme(value) {
-        this.props.SelectTheme(value);
-    }
-    handleCreateNewTheme = (variant) => {
-        let nthItem = this.props.UserThemes.length + 1;
-        let name = 'Custom-Theme-' + nthItem;
-        // make sure it is unique
-        while (this.props.UserThemes.some((theme) => theme.Name === name)) {
-            nthItem++;
-            name = 'Custom-Theme-' + nthItem;
-        }
-        const newTheme = ObjectFactory_1.default.CreateEmptyTheme(name);
-        newTheme.Variant = variant;
-        this.props.api.themeApi.addUserTheme(newTheme);
-        this.props.api.themeApi.loadTheme(newTheme.Name);
-    };
-}
-function mapStateToProps(state, ownProps) {
-    return {
-        CurrentTheme: state.Theme.CurrentTheme,
-        UserThemes: state.Theme.UserThemes,
-    };
-}
-function mapDispatchToProps(dispatch) {
-    return {
-        SelectTheme: (newTheme) => dispatch(ThemeRedux.ThemeSelect(newTheme)),
-    };
 }
-exports.ThemePopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(ThemePopupComponent);
+exports.ThemePopup = ThemePopupComponent;

package/src/View/UIHelper.js

@@ -350,7 +350,7 @@ function getButtonColourForAdaptableAlerts(adaptableAlerts, messageTypeColor) {
 }
 function getButtonTextColourForArrayandMessageType(adaptableAlerts, messageType) {
     if (ArrayExtensions_1.default.IsNullOrEmpty(adaptableAlerts)) {
-        return 'text-on-primary';
+        return 'primary-foreground';
     }
     return this.getButtonTextColourForMessageType(messageType);
 }

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -8,9 +8,9 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const react_redux_1 = require("react-redux");
 const NamedQueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NamedQueryRedux"));
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const AdaptableContext_1 = require("../AdaptableContext");
-const Tabs_1 = require("../../components/Tabs");
+const Card_1 = require("../../components/Card");
+const ButtonEdit_1 = require("../Components/Buttons/ButtonEdit");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const OnePageWizards_1 = require("./OnePageWizards");
 const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
@@ -83,20 +83,9 @@ const OnePageAdaptableWizard = (props) => {
 };
 exports.OnePageAdaptableWizard = OnePageAdaptableWizard;
 const OnePageWizardSummary = () => {
-    const { sections, data, api, moduleInfo } = useOnePageAdaptableWizardContext();
-    const { setCurrentSection } = (0, OnePageWizards_1.useOnePageWizardContext)();
-    const [namedQuery] = (0, react_1.useState)(false);
-    const renderEdit = (index) => ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { className: "twa:px-1 twa:inline-block twa:text-2 twa:underline", variant: "text", onClick: () => {
-            setCurrentSection(index);
-        }, children: "edit" }));
-    const extraContext = {
-        data,
-        api,
-        namedQuery,
-        moduleInfo: moduleInfo,
-        sections,
-    };
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-2", children: sections
+    const { data, api } = useOnePageAdaptableWizardContext();
+    const { sections: visibleSections, setCurrentSection } = (0, OnePageWizards_1.useOnePageWizardContext)();
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-3", children: visibleSections
             .map((section, index) => {
             if (section === '-') {
                 return null;
@@ -104,10 +93,7 @@ const OnePageWizardSummary = () => {
             if (!section.renderSummary) {
                 return null;
             }
-            if (section.isVisible && !section.isVisible(data, api, extraContext)) {
-                return null;
-            }
-            return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { keyboardNavigation: false, children: [(0, jsx_runtime_1.jsxs)(Tabs_1.Tabs.Tab, { children: [section.title, " ", renderEdit(index)] }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: section.renderSummary(data, api) })] }, index) }));
+            return ((0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { className: "twa:w-full", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium twa:flex-1", children: section.title }), (0, jsx_runtime_1.jsx)(ButtonEdit_1.ButtonEdit, { onClick: () => setCurrentSection(index) })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: section.renderSummary?.(data, api) })] }, `${section.title}-${index}`));
         })
             .filter(Boolean) }));
 };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -360,6 +360,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;
     updateLayoutInManagerAfterStoreHasChanged(layout?: Layout): void;
+    private getActiveAdaptableAggFuncForCol;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;

package/src/agGrid/AdaptableAgGrid.js

@@ -83,9 +83,6 @@ 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 EnvVars_1 = require("../EnvVars");
 const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
@@ -94,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");
@@ -358,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()`);
@@ -903,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;
             });
@@ -1126,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;
         });
         /**
@@ -1451,7 +1442,7 @@ class AdaptableAgGrid {
                 // dataType: 'Number',
                 // AG Grid requires either dataType or numberFormat to be set for Numbers
                 numberFormat: {
-                    format: '0.###############',
+                    format: `#,##0.00`,
                 },
             });
             // store original excel styles, we will have to revert to them after each VISUAL EXPORT
@@ -4044,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;

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) {
@@ -1468,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 ??
@@ -1481,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;