@adaptabletools/adaptable 22.1.1-canary.1 → 23.0.0-canary.0

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import * as LayoutRedux from '../../../Redux/ActionsReducers/LayoutRedux';
 import { OnePageAdaptableWizard, OnePageWizardSummary } from '../../Wizard/OnePageAdaptableWizard';
@@ -72,7 +73,7 @@ export const LayoutWizard = (props) => {
         props.onFinishWizard(layout);
     };
     const layoutSupportedFeatures = adaptable.api.layoutApi.internalApi.getLayoutSupportedFeatures();
-    return isPivotLayout(layout) ? (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: layout, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+    return isPivotLayout(layout) ? (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: layout, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
                 details: 'Configure Pivot Layout',
@@ -85,81 +86,72 @@ export const LayoutWizard = (props) => {
                     }
                     return true;
                 },
-                renderSummary: () => React.createElement(SettingsSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(SettingsSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(SettingsSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(SettingsSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Pivot Row Groups',
                 isVisible: () => layoutSupportedFeatures.PivotColumns && layoutSupportedFeatures.RowGroupedColumns,
                 details: 'Configure Pivot Row Grouping',
-                renderSummary: () => React.createElement(PivotRowGroupingSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(PivotRowGroupingSection, { onChange: (newLayout) => {
+                renderSummary: () => _jsx(PivotRowGroupingSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(PivotRowGroupingSection, { onChange: (newLayout) => {
                             setLayout(newLayout);
-                        } }))),
+                        } }) })),
             },
             {
                 title: 'Pivot Columns',
                 details: 'Select Pivot Columns',
                 isVisible: () => layoutSupportedFeatures.PivotColumns,
-                renderSummary: () => React.createElement(PivotColumnsSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(PivotColumnsSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(PivotColumnsSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(PivotColumnsSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Pivot Aggregations',
                 isVisible: () => layoutSupportedFeatures.PivotAggregationColumns && layoutSupportedFeatures.PivotColumns,
                 details: 'Select Pivot Column Aggregations',
-                renderSummary: () => React.createElement(PivotAggregationsSectionSummary, null),
+                renderSummary: () => _jsx(PivotAggregationsSectionSummary, {}),
                 isValid: (data) => isPivotAggregationsSectionValid(data),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(PivotAggregationsSection, { onChange: (layout) => {
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(PivotAggregationsSection, { onChange: (layout) => {
                             const newLayout = cloneObject(layout);
                             setLayout(newLayout);
-                        } }))),
+                        } }) })),
             },
             {
                 title: 'Sort',
                 isVisible: () => layoutSupportedFeatures.ColumnSorts,
-                renderSummary: () => React.createElement(SortSectionSummary, null),
+                renderSummary: () => _jsx(SortSectionSummary, {}),
                 details: 'Configure Aggregated Column Sorts',
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(SortSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(SortSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Column Filters',
                 isVisible: () => layoutSupportedFeatures.ColumnFilters,
                 isValid: (layout) => isColumnFiltersValid(layout),
                 details: 'Set Aggregated Column Filters',
-                renderSummary: () => React.createElement(FilterSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(FilterSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(FilterSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(FilterSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Grid Filter',
                 isVisible: () => layoutSupportedFeatures.GridFilter,
                 isValid: (layout) => isGridFiltersValid(layout, adaptable.api),
                 details: 'Set Grid Filter',
-                renderSummary: () => React.createElement(GridFilterSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(GridFilterSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(GridFilterSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(GridFilterSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Row Selection',
                 details: 'Configure Row Selection',
-                renderSummary: () => React.createElement(RowSelectionSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(RowSelectionSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(RowSelectionSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(RowSelectionSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             '-',
             {
                 details: 'Review your Pivot Layout',
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(OnePageWizardSummary, null))),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(OnePageWizardSummary, {}) })),
                 title: 'Summary',
             },
-        ] })) : (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: layout, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+        ] })) : (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: layout, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
                 details: 'Configure Table Layout',
@@ -172,35 +164,31 @@ export const LayoutWizard = (props) => {
                     }
                     return true;
                 },
-                renderSummary: () => React.createElement(SettingsSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(SettingsSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(SettingsSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(SettingsSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Row Groups',
                 isVisible: () => layoutSupportedFeatures.RowGroupedColumns,
                 isValid: areSummaryRowsValid,
                 details: 'Configure Row Grouping',
-                renderSummary: () => React.createElement(RowGroupingSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(RowGroupingSection, { onChange: setLayout }))),
+                renderSummary: () => _jsx(RowGroupingSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(RowGroupingSection, { onChange: setLayout }) })),
             },
             {
                 title: 'Columns',
                 details: 'Select Columns',
                 isVisible: () => true,
-                renderSummary: () => React.createElement(ColumnsSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(ColumnsSection, { onChange: setLayout }))),
+                renderSummary: () => _jsx(ColumnsSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(ColumnsSection, { onChange: setLayout }) })),
             },
             {
                 title: 'Aggregations',
                 isVisible: () => layoutSupportedFeatures.TableAggregationColumns,
                 details: 'Select Column Aggregations',
-                renderSummary: () => React.createElement(AggregationsSectionSummary, null),
+                renderSummary: () => _jsx(AggregationsSectionSummary, {}),
                 isValid: (data) => isAggregationsSectionValid(data),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(AggregationsSection, { onChange: (layout) => {
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(AggregationsSection, { onChange: (layout) => {
                             let newLayout = cloneObject(layout);
                             // if we do not have an weighted avg col, we need to clear the row summary if one exists
                             if (newLayout.RowSummaries) {
@@ -229,54 +217,48 @@ export const LayoutWizard = (props) => {
                                 });
                             }
                             setLayout(newLayout);
-                        } }))),
+                        } }) })),
             },
             {
                 title: 'Row Summaries',
                 details: 'Configure Row Summaries',
-                renderSummary: () => React.createElement(RowSummarySectionSummary, null),
+                renderSummary: () => _jsx(RowSummarySectionSummary, {}),
                 isVisible: () => layoutSupportedFeatures.RowSummaries,
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(RowSummarySection, { onChange: setLayout }))),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(RowSummarySection, { onChange: setLayout }) })),
             },
             {
                 title: 'Sort',
                 isVisible: () => layoutSupportedFeatures.ColumnSorts,
-                renderSummary: () => React.createElement(SortSectionSummary, null),
+                renderSummary: () => _jsx(SortSectionSummary, {}),
                 details: 'Configure Column Sorts',
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(SortSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(SortSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Column Filters',
                 isVisible: () => layoutSupportedFeatures.ColumnFilters,
                 isValid: (layout) => isColumnFiltersValid(layout),
                 details: 'Set Column Filters',
-                renderSummary: () => React.createElement(FilterSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(FilterSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(FilterSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(FilterSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Grid Filter',
                 isVisible: () => layoutSupportedFeatures.GridFilter,
                 isValid: (layout) => isGridFiltersValid(layout, adaptable.api),
                 details: 'Set Grid Filter',
-                renderSummary: () => React.createElement(GridFilterSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                    React.createElement(GridFilterSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(GridFilterSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(GridFilterSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             {
                 title: 'Row Selection',
                 details: 'Configure Row Selection',
-                renderSummary: () => React.createElement(RowSelectionSectionSummary, null),
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(RowSelectionSection, { onChange: (newLayout) => setLayout(newLayout) }))),
+                renderSummary: () => _jsx(RowSelectionSectionSummary, {}),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(RowSelectionSection, { onChange: (newLayout) => setLayout(newLayout) }) })),
             },
             '-',
             {
                 details: 'Review your Table Layout',
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(OnePageWizardSummary, null))),
+                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(OnePageWizardSummary, {}) })),
                 title: 'Summary',
             },
         ] }));

package/src/View/Layout/Wizard/getGridFilterPreview.js

@@ -1,10 +1,9 @@
-import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { ExpressionPreview } from '../../../components/ExpressionEditor/ExpressionPreview';
 import { Tag } from '../../../components/Tag';
 export const getGridFilterViewItems = (layout) => {
     return {
         name: 'Grid Filter',
-        view: (React.createElement(Tag, null,
-            React.createElement(ExpressionPreview, { query: { BooleanExpression: layout.GridFilter?.Expression } }))),
+        view: (_jsx(Tag, { children: _jsx(ExpressionPreview, { query: { BooleanExpression: layout.GridFilter?.Expression } }) })),
     };
 };

package/src/View/Layout/Wizard/sections/AggregationsSection.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { Layout, TableLayout } from '../../../../../types';
-export declare const isAggregationsSectionValid: (data: Layout) => true | string;
+import { TableLayout } from '../../../../../types';
+import { validateTableLayoutAggregations } from '../../../../Aggregation/validateParameterizedAggregations';
+export declare const isAggregationsSectionValid: typeof validateTableLayoutAggregations;
 export declare const AggregationsSectionSummary: React.FunctionComponent;
 interface AggregationsSectionProps {
     onChange: (data: TableLayout) => void;

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -1,140 +1,39 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { CheckBox } from '../../../../components/CheckBox';
-import DropdownButton from '../../../../components/DropdownButton';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
+import { validateTableLayoutAggregations } from '../../../../Aggregation/validateParameterizedAggregations';
+import { getParameterizedAggregationDisplayName } from '../../../../Aggregation/parameterizedAggregationHeader';
+import { buildAggregationColumnsMap } from '../../../../Aggregation/parameterizedAggregationWizardHelpers';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
 import { ColumnGroupTag } from '../../../Components/ColumnGroupTag';
 import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
-import { Select } from '../../../../components/Select';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
 import { Box, Flex } from '../../../../components/Flex';
-const WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
-export const isAggregationsSectionValid = (data) => {
-    const weightedAvg = data.TableAggregationColumns
-        ? (data.TableAggregationColumns || []).find(({ AggFunc }) => typeof AggFunc === 'object' &&
-            AggFunc.type === 'weightedAverage')?.AggFunc
-        : null;
-    if (weightedAvg && !weightedAvg.weightedColumnId) {
-        return 'Weighted Average requires a weight column to be selected.';
-    }
-    return true;
-};
+import { SingleSelect } from '../../../../components/NewSelect';
+import { ParameterizedAggFuncPicker } from './ParameterizedAggFuncPicker';
+export const isAggregationsSectionValid = validateTableLayoutAggregations;
 export const AggregationsSectionSummary = () => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const entries = layout.TableAggregationColumns || [];
     let content = null;
     if (entries.length) {
-        content = (React.createElement(FormLayout, null, entries.map(({ ColumnId, AggFunc }) => (React.createElement(FormRow, { key: ColumnId, label: adaptable.api.columnApi.getFriendlyNameForColumnId(ColumnId) },
-            React.createElement(Tag, null, typeof AggFunc === 'object' ? AggFunc.type : AggFunc))))));
+        content = (_jsx(FormLayout, { children: entries.map(({ ColumnId, AggFunc }) => (_jsx(FormRow, { label: adaptable.api.columnApi.getFriendlyNameForColumnId(ColumnId), children: _jsx(Tag, { children: getParameterizedAggregationDisplayName(adaptable.api, AggFunc, ColumnId) }) }, ColumnId))) }));
     }
     else {
-        content = React.createElement(Tag, null, "No Aggregations");
+        content = _jsx(Tag, { children: "No Aggregations" });
     }
-    return React.createElement(Box, null, content);
+    return _jsx(Box, { children: content });
 };
 const ColumnRow = (props) => {
-    const adaptable = useAdaptable();
     const aggValue = props.layout?.TableAggregationColumns?.find((agg) => agg.ColumnId === props.column.columnId)?.AggFunc;
-    const adaptableAggFunctions = [];
-    if (props.column.dataType === 'number' && props.column.aggregatable) {
-        adaptableAggFunctions.push(WEIGHTED_AVERAGE_AGG_FN_NAME);
-    }
-    // props.column.availableAggregationFunctions is null for non-aggregatable columns
-    // but we want to support non-aggregatable columns that are specified to be aggregated by default
-    // so we need to allow this. as soon as they will be unchecked from aggregation, they will no longer be displayed in the aggregation wizard.
-    // but until the user checks them off, we want to allow them.
-    const availableAggregationFunctions = props.column.availableAggregationFunctions || [];
-    const aggOptions = [...new Set([...availableAggregationFunctions, ...adaptableAggFunctions])].map((fnName) => {
-        return {
-            label: fnName,
-            onClick: () => {
-                let aggCols = props.layout.TableAggregationColumns || [];
-                if (!aggCols) {
-                    return;
-                }
-                const AggFuncValue = fnName === WEIGHTED_AVERAGE_AGG_FN_NAME
-                    ? {
-                        type: 'weightedAverage',
-                        weightedColumnId: null,
-                    }
-                    : fnName;
-                let found = false;
-                aggCols = aggCols.map(({ ColumnId, AggFunc }) => {
-                    if (ColumnId === props.column.columnId) {
-                        found = true;
-                        return {
-                            ColumnId,
-                            AggFunc: AggFuncValue,
-                        };
-                    }
-                    return { ColumnId, AggFunc };
-                });
-                if (!found) {
-                    aggCols.push({
-                        ColumnId: props.column.columnId,
-                        AggFunc: AggFuncValue,
-                    });
-                }
-                props.onChangeAggFunction(aggCols);
-            },
-        };
-    });
-    const numericColumnsOptions = props.numberColumns
-        .filter((col) => col.columnId !== props.column.columnId)
-        .map((col) => {
-        return {
-            label: col.friendlyName,
-            onClick: () => {
-                let aggCols = [...(props.layout.TableAggregationColumns || [])];
-                if (!aggCols || !aggCols.length) {
-                    return;
-                }
-                const AggFuncValue = {
-                    type: 'weightedAverage',
-                    weightedColumnId: col.columnId,
-                };
-                let found = false;
-                aggCols = aggCols.map(({ ColumnId, AggFunc }) => {
-                    if (ColumnId === props.column.columnId) {
-                        found = true;
-                        return {
-                            ColumnId,
-                            AggFunc: AggFuncValue,
-                        };
-                    }
-                    return { ColumnId, AggFunc };
-                });
-                if (!found) {
-                    aggCols.push({
-                        ColumnId: props.column.columnId,
-                        AggFunc: AggFuncValue,
-                    });
-                }
-                props.onChangeAggFunction(aggCols);
-            },
-        };
-    });
-    const currentAggFnName = props.aggregationColumnsMap[props.column.columnId];
-    let weightName = null;
-    if (typeof aggValue === 'object' && aggValue.type === 'weightedAverage') {
-        weightName = aggValue.weightedColumnId
-            ? adaptable.api.columnApi.getFriendlyNameForColumnId(aggValue.weightedColumnId)
-            : 'Select Weight';
-    }
-    return (React.createElement(Flex, { alignItems: "center" },
-        props.column.friendlyName,
-        React.createElement(ColumnGroupTag, { column: props.column }),
-        aggValue && (React.createElement(DropdownButton, { columns: ['label'], items: aggOptions, className: "twa:ml-2" }, currentAggFnName)),
-        currentAggFnName === WEIGHTED_AVERAGE_AGG_FN_NAME && (React.createElement(Flex, { className: "twa:bg-primary twa:ml-3", alignItems: "center" },
-            React.createElement(Box, null, "Weight"),
-            ' ',
-            React.createElement(DropdownButton, { columns: ['label'], items: numericColumnsOptions, className: "twa:ml-2" }, weightName)))));
+    return (_jsxs(Flex, { alignItems: "center", children: [props.column.friendlyName, _jsx(ColumnGroupTag, { column: props.column }), _jsx(ParameterizedAggFuncPicker, { column: props.column, aggValue: aggValue, aggregationColumnsMap: props.aggregationColumnsMap, numberColumns: props.numberColumns, aggregationEntries: props.layout.TableAggregationColumns || [], onChangeEntries: props.onChangeAggFunction })] }));
 };
 export const AggregationsSection = (props) => {
     const adaptable = useAdaptable();
@@ -144,8 +43,6 @@ export const AggregationsSection = (props) => {
     const numberColumns = adaptable.api.columnApi.getNumericColumns();
     const allAggregatableColumnIds = allAggregableColumns.map((col) => col.columnId);
     (layout.TableAggregationColumns || []).forEach((agg) => {
-        // we need to also display the columns currently aggregated,
-        // even if they are not aggregatable
         if (!allAggregatableColumnIds.includes(agg.ColumnId)) {
             allAggregatableColumnIds.push(agg.ColumnId);
         }
@@ -180,46 +77,28 @@ export const AggregationsSection = (props) => {
             acc[col.columnId] = col;
             return acc;
         }, {});
-        return (layout.TableAggregationColumns || []).reduce((acc, { ColumnId: colId, AggFunc }) => {
-            let fn = AggFunc;
-            let fnName = '';
-            if (typeof fn === 'boolean') {
-                fnName = allColumnsMap[colId].aggregationFunction;
-            }
-            if (typeof fn === 'object' && fn.type === 'weightedAverage') {
-                fnName = WEIGHTED_AVERAGE_AGG_FN_NAME;
-            }
-            else if (typeof fn === 'string') {
-                fnName = fn;
-            }
-            acc[colId] = fnName;
-            return acc;
-        }, {});
-    }, [layout]);
+        return buildAggregationColumnsMap(layout.TableAggregationColumns || [], allColumnsMap);
+    }, [layout, allColumns]);
     const handleSuppressAggFuncInHeader = (checked) => {
         props.onChange({
             ...layout,
             SuppressAggFuncInHeader: checked,
         });
     };
-    return (React.createElement(Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs.Tab, null, "Column Aggregations"),
-        React.createElement(Tabs.Content, null,
-            React.createElement(Flex, null,
-                React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: 'Omit Aggregation from Header' },
-                        React.createElement(CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader })),
-                    React.createElement(FormRow, { label: 'Grand Total Row' },
-                        React.createElement(Select, { style: { width: 160 }, options: ['top', 'bottom', 'pinnedTop', 'pinnedBottom'].map((position) => {
-                                return {
-                                    label: StringExtensions.CamelCaseToHumanText(position),
-                                    value: position,
-                                };
-                            }), placeholder: "Off", value: layout.GrandTotalRow, onChange: (value) => {
-                                props.onChange({
-                                    ...layout,
-                                    GrandTotalRow: value,
-                                });
-                            }, isClearable: true })))),
-            React.createElement(ValueSelector, { showFilterInput: true, filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (column) => (React.createElement(ColumnRow, { onChangeAggFunction: handleAggregationChange, layout: layout, column: column, aggregationColumnsMap: aggregationColumnsMap, numberColumns: numberColumns })), options: sortedAggregableColumns, value: (layout.TableAggregationColumns || []).map((agg) => agg.ColumnId), allowReorder: () => true, onChange: handleColumnsSelectionChange }))));
+    return (_jsxs(Tabs, { style: { height: '100%' }, children: [_jsx(Tabs.Tab, { children: "Column Aggregations" }), _jsxs(Tabs.Content, { children: [_jsx(Flex, { children: _jsxs(FormLayout, { children: [_jsx(FormRow, { label: 'Omit Aggregation from Header', children: _jsx(CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader }) }), _jsx(FormRow, { label: 'Grand Total Row', children: _jsx(SingleSelect, { className: "twa:w-[180px]", items: [
+                                            {
+                                                label: 'Off',
+                                                value: null,
+                                            },
+                                        ].concat(['top', 'bottom', 'pinnedTop', 'pinnedBottom'].map((position) => {
+                                            return {
+                                                label: StringExtensions.CamelCaseToHumanText(position),
+                                                value: position,
+                                            };
+                                        })), placeholder: "Off", value: layout.GrandTotalRow, onValueChange: (value) => {
+                                            props.onChange({
+                                                ...layout,
+                                                GrandTotalRow: value,
+                                            });
+                                        } }) })] }) }), _jsx(ValueSelector, { showFilterInput: true, filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (column) => (_jsx(ColumnRow, { onChangeAggFunction: handleAggregationChange, layout: layout, column: column, aggregationColumnsMap: aggregationColumnsMap, numberColumns: numberColumns })), options: sortedAggregableColumns, value: (layout.TableAggregationColumns || []).map((agg) => agg.ColumnId), allowReorder: () => true, onChange: handleColumnsSelectionChange })] })] }));
 };