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

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

@@ -2,11 +2,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { CheckBox } from '../../../../components/CheckBox';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
-import { Tabs } from '../../../../components/Tabs';
+import { Card } from '../../../../components/Card';
 import { Tag } from '../../../../components/Tag';
-import { validateTableLayoutAggregations } from '../../../../Aggregation/validateParameterizedAggregations';
-import { getParameterizedAggregationDisplayName } from '../../../../Aggregation/parameterizedAggregationHeader';
-import { buildAggregationColumnsMap } from '../../../../Aggregation/parameterizedAggregationWizardHelpers';
+import { getDisplayAggFuncNames, } from '../../../../AdaptableState/Common/AggregationColumns';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
@@ -16,15 +14,24 @@ import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
 import { Box, Flex } from '../../../../components/Flex';
 import { SingleSelect } from '../../../../components/NewSelect';
-import { ParameterizedAggFuncPicker } from './ParameterizedAggFuncPicker';
-export const isAggregationsSectionValid = validateTableLayoutAggregations;
+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;
+};
 export const AggregationsSectionSummary = () => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const entries = layout.TableAggregationColumns || [];
     let content = null;
     if (entries.length) {
-        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))) }));
+        content = (_jsx(FormLayout, { children: entries.map(({ ColumnId, AggFunc }) => (_jsx(FormRow, { label: adaptable.api.columnApi.getFriendlyNameForColumnId(ColumnId), children: _jsx(Tag, { children: typeof AggFunc === 'object' ? AggFunc.type : AggFunc }) }, ColumnId))) }));
     }
     else {
         content = _jsx(Tag, { children: "No Aggregations" });
@@ -33,7 +40,73 @@ export const AggregationsSectionSummary = () => {
 };
 const ColumnRow = (props) => {
     const aggValue = props.layout?.TableAggregationColumns?.find((agg) => agg.ColumnId === props.column.columnId)?.AggFunc;
-    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 })] }));
+    const aggFunctionNames = getDisplayAggFuncNames(props.column);
+    const currentAggFnName = props.aggregationColumnsMap[props.column.columnId];
+    const updateAggFunc = (fnName) => {
+        let aggCols = [...(props.layout.TableAggregationColumns || [])];
+        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 updateWeightedColumn = (weightedColumnId) => {
+        let aggCols = [...(props.layout.TableAggregationColumns || [])];
+        const AggFuncValue = {
+            type: 'weightedAverage',
+            weightedColumnId: weightedColumnId,
+        };
+        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 weightColumnId = typeof aggValue === 'object' && aggValue.type === 'weightedAverage'
+        ? aggValue.weightedColumnId
+        : null;
+    const weightColumnOptions = props.numberColumns
+        .filter((col) => col.columnId !== props.column.columnId)
+        .map((col) => ({
+        label: col.friendlyName,
+        value: col.columnId,
+    }));
+    return (_jsxs(Flex, { alignItems: "center", children: [props.column.friendlyName, _jsx(ColumnGroupTag, { column: props.column }), aggValue && (_jsx(SingleSelect, { className: "twa:min-w-[140px] twa:ml-2", value: currentAggFnName, items: aggFunctionNames.map((fnName) => ({
+                    label: fnName,
+                    value: fnName,
+                })), onValueChange: updateAggFunc })), currentAggFnName === WEIGHTED_AVERAGE_AGG_FN_NAME && (_jsxs(Flex, { className: "twa:bg-primary twa:ml-3", alignItems: "center", children: [_jsx(Box, { children: "Weight" }), _jsx(SingleSelect, { className: "twa:min-w-[140px] twa:ml-2", placeholder: "Select Weight", value: weightColumnId, items: weightColumnOptions, onValueChange: updateWeightedColumn })] }))] }));
 };
 export const AggregationsSection = (props) => {
     const adaptable = useAdaptable();
@@ -43,6 +116,8 @@ 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);
         }
@@ -77,28 +152,42 @@ export const AggregationsSection = (props) => {
             acc[col.columnId] = col;
             return acc;
         }, {});
-        return buildAggregationColumnsMap(layout.TableAggregationColumns || [], allColumnsMap);
-    }, [layout, allColumns]);
+        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]);
     const handleSuppressAggFuncInHeader = (checked) => {
         props.onChange({
             ...layout,
             SuppressAggFuncInHeader: checked,
         });
     };
-    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 })] })] }));
+    return (_jsxs(Box, { className: "twa:h-full twa:min-h-0 twa:p-2 twa:gap-2 twa:overflow-hidden twa:grid twa:grid-cols-2", children: [_jsxs(Card, { shadow: false, className: "twa:h-full twa:overflow-hidden twa:flex twa:flex-col", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Aggregation Columns" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Select a column and an aggregation function" })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:p-1", children: _jsx(ValueSelector, { style: { minHeight: 0 }, 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 }) })] }), _jsxs(Box, { className: "twa:h-full twa:min-h-0 twa:overflow-y-auto twa:flex twa:flex-col twa:gap-2", children: [_jsxs(Card, { shadow: false, children: [_jsx(Card.Title, { children: _jsx(Box, { className: "twa:font-medium", children: "Omit Aggregation from Header" }) }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader, children: "Do not show aggregation function names in column headers" }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Grand Total Row" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Set position of the grand total row in the grid" })] }), _jsx(Card.Body, { className: "twa:p-1", 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,
+                                        });
+                                    } }) })] })] })] }));
 };

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

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { DataSource, InfiniteTableGrid, } from '../../../../components/InfiniteTable';
 import * as React from 'react';
 import Input from '../../../../components/Input';
-import { Tabs } from '../../../../components/Tabs';
+import { Card } from '../../../../components/Card';
 import { isValidOrderForColumnGroups, } from '../../../../AdaptableState/Common/AdaptableColumn';
 import { useAdaptable } from '../../../AdaptableContext';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
@@ -373,87 +373,87 @@ export const ColumnsSection = (props) => {
             .map((col) => col.columnId)
         : currentOrder.map((col) => col.columnId);
     const visibleIdsCurrentlyDisplayed = visibleIds.filter((colId) => currentlyDisplayedColumnIds.includes(colId));
-    return (_jsxs(Tabs, { className: "twa:h-full", children: [_jsx(Tabs.Tab, { children: "Columns" }), _jsx(Tabs.Content, { children: _jsxs(Box, { className: "twa:gap-2 twa:overflow-hidden twa:grid twa:grid-cols-2 twa:h-full", children: [_jsx(Box, { className: "twa:gap-2 twa:focus:outline-none twa:flex-1 twa:max-h-full twa:overflow-hidden", "data-name": "columns-container", tabIndex: -1, onKeyDown: (event) => {
-                                const scrollIntoView = (columnId) => {
-                                    const el = event.currentTarget.querySelector(`[data-id="${columnId}"]`);
-                                    el?.scrollIntoView({ block: 'nearest' });
-                                    const input = el?.querySelector('input[type="checkbox"]');
-                                    input?.focus();
-                                };
-                                if (event.key === 'ArrowDown') {
-                                    event.preventDefault();
-                                    event.stopPropagation();
-                                    const index = currentlyDisplayedColumnIds.indexOf(selectedColumnId);
-                                    if (index === -1) {
-                                        return;
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:h-full", children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2 twa:gap-3 twa:border-b twa:mb-2 twa:border-b-foreground/20", children: [_jsx(Box, { className: "twa:text-4 twa:font-medium twa:shrink-0", children: "Columns" }), _jsx(Flex, { flexDirection: "column", className: "twa:flex-1 twa:min-w-0 twa:text-xs twa:opacity-70 twa:font-normal twa:gap-0.5", children: _jsx(Box, { children: "Drag to reorder and use checkboxes to show or hide columns; click a column to edit in right side panel" }) })] }), _jsxs(Box, { className: "twa:flex-1 twa:min-h-0 twa:p-2 twa:gap-2 twa:overflow-hidden twa:grid twa:grid-cols-2", children: [_jsx(Card, { shadow: false, className: "twa:h-full twa:overflow-hidden twa:flex twa:flex-col", children: _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:p-1", children: _jsx(Box, { className: "twa:gap-2 twa:focus:outline-none twa:flex-1 twa:max-h-full twa:overflow-hidden twa:h-full", "data-name": "columns-container", tabIndex: -1, onKeyDown: (event) => {
+                                    const scrollIntoView = (columnId) => {
+                                        const el = event.currentTarget.querySelector(`[data-id="${columnId}"]`);
+                                        el?.scrollIntoView({ block: 'nearest' });
+                                        const input = el?.querySelector('input[type="checkbox"]');
+                                        input?.focus();
+                                    };
+                                    if (event.key === 'ArrowDown') {
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                        const index = currentlyDisplayedColumnIds.indexOf(selectedColumnId);
+                                        if (index === -1) {
+                                            return;
+                                        }
+                                        const nextColumnId = currentlyDisplayedColumnIds[index + 1];
+                                        const nextColumn = colIdToCol[nextColumnId];
+                                        if (nextColumn) {
+                                            setSelectedColumnId(nextColumn.columnId);
+                                            scrollIntoView(nextColumn.columnId);
+                                        }
                                     }
-                                    const nextColumnId = currentlyDisplayedColumnIds[index + 1];
-                                    const nextColumn = colIdToCol[nextColumnId];
-                                    if (nextColumn) {
-                                        setSelectedColumnId(nextColumn.columnId);
-                                        scrollIntoView(nextColumn.columnId);
+                                    if (event.key === 'ArrowUp') {
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                        const index = currentlyDisplayedColumnIds.indexOf(selectedColumnId);
+                                        if (index === -1) {
+                                            return;
+                                        }
+                                        const previousColumnId = currentlyDisplayedColumnIds[index - 1];
+                                        const previousColumn = colIdToCol[previousColumnId];
+                                        if (previousColumn) {
+                                            setSelectedColumnId(previousColumn.columnId);
+                                            scrollIntoView(previousColumn.columnId);
+                                        }
                                     }
-                                }
-                                if (event.key === 'ArrowUp') {
-                                    event.preventDefault();
-                                    event.stopPropagation();
-                                    const index = currentlyDisplayedColumnIds.indexOf(selectedColumnId);
-                                    if (index === -1) {
-                                        return;
+                                    if (event.key === ' ') {
+                                        const target = event.target;
+                                        if (target.tagName === 'INPUT' &&
+                                            target.type === 'checkbox') {
+                                            return;
+                                        }
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                        const selectedColumn = colIdToCol[selectedColumnId];
+                                        if (!selectedColumn) {
+                                            return;
+                                        }
+                                        const visible = isColumnVisible({ columnId: selectedColumnId, layout });
+                                        handleColumnVisibilityChange(selectedColumnId, !visible);
                                     }
-                                    const previousColumnId = currentlyDisplayedColumnIds[index - 1];
-                                    const previousColumn = colIdToCol[previousColumnId];
-                                    if (previousColumn) {
-                                        setSelectedColumnId(previousColumn.columnId);
-                                        scrollIntoView(previousColumn.columnId);
-                                    }
-                                }
-                                if (event.key === ' ') {
-                                    const target = event.target;
-                                    if (target.tagName === 'INPUT' &&
-                                        target.type === 'checkbox') {
-                                        return;
-                                    }
-                                    event.preventDefault();
-                                    event.stopPropagation();
-                                    const selectedColumn = colIdToCol[selectedColumnId];
-                                    if (!selectedColumn) {
-                                        return;
-                                    }
-                                    const visible = isColumnVisible({ columnId: selectedColumnId, layout });
-                                    handleColumnVisibilityChange(selectedColumnId, !visible);
-                                }
-                            }, children: _jsxs(Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:h-full twa:overflow-hidden twa:p-1", children: [_jsx(AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Search Columns...", className: "twa:w-full twa:p-1" }), _jsx(Box, { className: clsx('twa:font-bold', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard'), children: _jsx(CheckBox, { checked: currentlyDisplayedColumnIds.length
-                                                ? currentlyDisplayedColumnIds.length === visibleIdsCurrentlyDisplayed.length
-                                                    ? true
-                                                    : visibleIdsCurrentlyDisplayed.length
-                                                        ? null
-                                                        : false
-                                                : false, onChange: (checked) => {
-                                                handleColumnVisibilityChange(currentlyDisplayedColumnIds, checked);
-                                            }, children: "Select All" }) }), _jsx(ReorderDraggable, { className: "twa:overflow-y-auto", toIdentifier: (option) => `${option.columnId}`, isOptionDraggable: (option) => {
-                                            return option.moveable;
-                                        }, optionClassName: (option) => {
-                                            const baseCls = 'ab-Layout-Wizard__ColumnRow twa:cursor-pointer twa:rounded-standard';
-                                            if (selectedColumnId !== option.columnId) {
-                                                return baseCls;
-                                            }
-                                            return clsx(baseCls, 'twa:after:border-accent twa:relative twa:after:border-2 twa:after:rounded-standard twa:after:pointer-events-none twa:after:inset-0 twa:after:absolute twa:after:bg-accent/15');
-                                        }, order: currentOrder, onOptionClick: (option, event) => {
-                                            if (event.ctrlKey || option.columnId === selectedColumnId) {
-                                                setSelectedColumnId(null);
-                                            }
-                                            else {
-                                                setSelectedColumnId(option.columnId);
-                                                const row = event.target.closest?.(`[data-id="${option.columnId}"]`);
-                                                const input = row?.querySelector('input[type="checkbox"]');
-                                                input?.focus();
-                                            }
-                                        }, renderOption: (option) => {
-                                            return (_jsx(ColumnRow, { onColumnNameChange: handleColumnNameChange, onColumnWidthChange: handleColumnWidthChange, onColumnFlexChange: handleColumnFlexChange, onColumnMinWidthChange: handleColumnMinWidthChange, onColumnMaxWidthChange: handleColumnMaxWidthChange, onColumnVisibilityChange: handleColumnVisibilityChange, onPinChange: handlePinChange, onCheckboxFocus: setSelectedColumnId, layout: layout, column: option }));
-                                        }, onChange: handleColumnsChange })] }) }), currentOrderIds.length ? (_jsx(ColumnPropertiesEditor, { column: selectedColumnId && currentOrderIds.includes(selectedColumnId)
-                                ? colIdToCol[selectedColumnId] ?? null
-                                : null, layout: layout, onPinChange: handlePinChange, onColumnNameChange: handleColumnNameChange, onColumnWidthChange: handleColumnWidthChange, onColumnFlexChange: handleColumnFlexChange, onColumnMinWidthChange: handleColumnMinWidthChange, onColumnMaxWidthChange: handleColumnMaxWidthChange, onColumnVisibilityChange: handleColumnVisibilityChange })) : null] }) })] }));
+                                }, children: _jsxs(Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:h-full twa:overflow-hidden twa:p-1", children: [_jsx(AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Search Columns...", className: "twa:w-full twa:p-1" }), _jsx(Box, { className: clsx('twa:font-bold', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard'), children: _jsx(CheckBox, { checked: currentlyDisplayedColumnIds.length
+                                                    ? currentlyDisplayedColumnIds.length === visibleIdsCurrentlyDisplayed.length
+                                                        ? true
+                                                        : visibleIdsCurrentlyDisplayed.length
+                                                            ? null
+                                                            : false
+                                                    : false, onChange: (checked) => {
+                                                    handleColumnVisibilityChange(currentlyDisplayedColumnIds, checked);
+                                                }, children: "Select All" }) }), _jsx(ReorderDraggable, { className: "twa:overflow-y-auto", toIdentifier: (option) => `${option.columnId}`, isOptionDraggable: (option) => {
+                                                return option.moveable;
+                                            }, optionClassName: (option) => {
+                                                const baseCls = 'ab-Layout-Wizard__ColumnRow twa:cursor-pointer twa:rounded-standard';
+                                                if (selectedColumnId !== option.columnId) {
+                                                    return baseCls;
+                                                }
+                                                return clsx(baseCls, 'twa:after:border-accent twa:relative twa:after:border-2 twa:after:rounded-standard twa:after:pointer-events-none twa:after:inset-0 twa:after:absolute twa:after:bg-accent/15');
+                                            }, order: currentOrder, onOptionClick: (option, event) => {
+                                                if (event.ctrlKey || option.columnId === selectedColumnId) {
+                                                    setSelectedColumnId(null);
+                                                }
+                                                else {
+                                                    setSelectedColumnId(option.columnId);
+                                                    const row = event.target.closest?.(`[data-id="${option.columnId}"]`);
+                                                    const input = row?.querySelector('input[type="checkbox"]');
+                                                    input?.focus();
+                                                }
+                                            }, renderOption: (option) => {
+                                                return (_jsx(ColumnRow, { onColumnNameChange: handleColumnNameChange, onColumnWidthChange: handleColumnWidthChange, onColumnFlexChange: handleColumnFlexChange, onColumnMinWidthChange: handleColumnMinWidthChange, onColumnMaxWidthChange: handleColumnMaxWidthChange, onColumnVisibilityChange: handleColumnVisibilityChange, onPinChange: handlePinChange, onCheckboxFocus: setSelectedColumnId, layout: layout, column: option }));
+                                            }, onChange: handleColumnsChange })] }) }) }) }), currentOrderIds.length ? (_jsx(ColumnPropertiesEditor, { column: selectedColumnId && currentOrderIds.includes(selectedColumnId)
+                            ? colIdToCol[selectedColumnId] ?? null
+                            : null, layout: layout, onPinChange: handlePinChange, onColumnNameChange: handleColumnNameChange, onColumnWidthChange: handleColumnWidthChange, onColumnFlexChange: handleColumnFlexChange, onColumnMinWidthChange: handleColumnMinWidthChange, onColumnMaxWidthChange: handleColumnMaxWidthChange, onColumnVisibilityChange: handleColumnVisibilityChange })) : null] })] }));
 };
 const hr = (_jsx("hr", { className: "twa:my-3 twa:mb-0 twa:w-full twa:h-[0.5px] twa:bg-input-border/50 twa:border-none" }));
 const ColumnPropertiesEditor = (props) => {

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

@@ -2,8 +2,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { getLayoutFilterViewItems } from '../../../../Strategy/Utilities/Layout/getLayoutFilterViewItems';
 import * as ModuleConstants from '../../../../Utilities/Constants/ModuleConstants';
-import FormLayout, { FormRow } from '../../../../components/FormLayout';
-import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
 import { useAdaptable } from '../../../AdaptableContext';
 import { AdaptableObjectListItemView } from '../../../Components/AdaptableObjectList/AdaptableObjectList';
@@ -11,6 +9,7 @@ import { ColumnSelector } from '../../../Components/Selectors/ColumnSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { LayoutColumnFilter } from '../../../Components/ColumnFilter/LayoutColumnFilter';
 import { Box } from '../../../../components/Flex';
+import { Card } from '../../../../components/Card';
 export const isColumnFiltersValid = (layout) => {
     const invalidColumnFilters = (layout.ColumnFilters ?? [])?.filter((columnFilter) => !columnFilter?.Predicates[0]?.PredicateId);
     if (invalidColumnFilters.length > 0) {
@@ -41,34 +40,34 @@ export const FilterSection = (props) => {
             ColumnFilters: layoutFilters.map((layoutFilter) => layoutFilter.ColumnId === columnFilter.ColumnId ? { ...columnFilter } : layoutFilter),
         });
     }, [layout.ColumnFilters]);
-    return (_jsxs(Tabs, { className: "twa:h-full", children: [_jsx(Tabs.Tab, { children: "Column Filters" }), _jsxs(Tabs.Content, { children: [_jsx(FormLayout, { className: "twa:mb-2", children: _jsx(FormRow, { label: "Add Column Filter", children: _jsx(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select Column to create Filter", onChange: (option) => {
-                                    props.onChange({
-                                        ...layout,
-                                        ColumnFilters: [
-                                            ...layoutFilters,
-                                            {
-                                                ColumnId: option,
-                                                Predicates: [],
-                                            },
-                                        ],
-                                    });
-                                } }) }) }), layoutFilters?.length > 0 && (_jsx(Box, { className: "twa:p-0", as: "ul", children: layoutFilters.map((columnFilter) => {
-                            const moduleItems = filterModule.toView(columnFilter).items;
-                            const column = adaptable.api.columnApi.getColumnWithColumnId(columnFilter.ColumnId);
-                            const columnGroupItems = column?.columnGroup && column.columnGroup.groupCount > 1
-                                ? [{ name: 'Column Group', values: [column.columnGroup.friendlyName] }]
-                                : [];
-                            const items = [
-                                moduleItems[0],
-                                ...columnGroupItems,
-                                ...moduleItems.slice(1),
-                                {
-                                    name: 'Column Filter',
-                                    view: (_jsx(LayoutColumnFilter, { columnFilter: columnFilter, onColumnFilterChange: (columnFilter) => {
-                                            handlePredicateEdit(columnFilter);
-                                        } })),
-                                },
-                            ];
-                            return (_jsx(AdaptableObjectListItemView, { module: filterModule, abObject: columnFilter, entityType: "Column Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter) }, columnFilter.ColumnId));
-                        }) }))] })] }));
+    return (_jsxs(Box, { className: "twa:gap-3 twa:p-3 twa:flex twa:flex-col", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Add Column Filter" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Select a column and then create a Filter" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select a Column", onChange: (option) => {
+                                props.onChange({
+                                    ...layout,
+                                    ColumnFilters: [
+                                        ...layoutFilters,
+                                        {
+                                            ColumnId: option,
+                                            Predicates: [],
+                                        },
+                                    ],
+                                });
+                            } }) })] }), layoutFilters?.length > 0 && (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Column Filters" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Configure predicates for each column filter in this Layout" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Box, { className: "twa:p-0", as: "ul", children: layoutFilters.map((columnFilter) => {
+                                const moduleItems = filterModule.toView(columnFilter).items;
+                                const column = adaptable.api.columnApi.getColumnWithColumnId(columnFilter.ColumnId);
+                                const columnGroupItems = column?.columnGroup && column.columnGroup.groupCount > 1
+                                    ? [{ name: 'Column Group', values: [column.columnGroup.friendlyName] }]
+                                    : [];
+                                const items = [
+                                    moduleItems[0],
+                                    ...columnGroupItems,
+                                    ...moduleItems.slice(1),
+                                    {
+                                        name: 'Column Filter',
+                                        view: (_jsx(LayoutColumnFilter, { columnFilter: columnFilter, onColumnFilterChange: (columnFilter) => {
+                                                handlePredicateEdit(columnFilter);
+                                            } })),
+                                    },
+                                ];
+                                return (_jsx(AdaptableObjectListItemView, { module: filterModule, abObject: columnFilter, entityType: "Column Filter", showActions: true, showEditButton: false, items: items, onDelete: () => handleDelete(columnFilter) }, columnFilter.ColumnId));
+                            }) }) })] }))] }));
 };

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAdaptable } from '../../../AdaptableContext';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
@@ -8,6 +8,7 @@ import { GridFilterModuleId } from '../../../../Utilities/Constants/ModuleConsta
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
 import { useGridFilterOptionsForExpressionEditorProps } from '../../../GridFilter/useGridFilterOptionsForExpressionEditor';
 import { Box } from '../../../../components/Flex';
+import { Card } from '../../../../components/Card';
 export const isGridFiltersValid = (layout, api) => {
     const expression = layout?.GridFilter?.Expression;
     if (StringExtensions.IsNullOrEmpty(expression)) {
@@ -25,14 +26,13 @@ export const GridFilterSection = (props) => {
     const { data: layout } = useOnePageAdaptableWizardContext();
     const initialData = React.useMemo(() => api.internalApi.getQueryPreviewData(), []);
     const expressionEditorProps = useGridFilterOptionsForExpressionEditorProps();
-    const expressionEditorContent = (_jsx(ExpressionEditor, { ...expressionEditorProps, allowSaveNamedQuery: false, type: 'boolean', module: GridFilterModuleId, value: layout?.GridFilter?.Expression ?? '', onChange: (expression) => {
-            props.onChange({
-                ...layout,
-                GridFilter: {
-                    ...layout.GridFilter,
-                    Expression: expression,
-                },
-            });
-        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
-    return _jsx("div", { children: expressionEditorContent });
+    return (_jsx(Box, { className: "twa:p-3", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Grid Filter" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Define a boolean expression to filter rows across the entire grid in this Layout" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(ExpressionEditor, { ...expressionEditorProps, allowSaveNamedQuery: false, type: 'boolean', module: GridFilterModuleId, value: layout?.GridFilter?.Expression ?? '', onChange: (expression) => {
+                            props.onChange({
+                                ...layout,
+                                GridFilter: {
+                                    ...layout.GridFilter,
+                                    Expression: expression,
+                                },
+                            });
+                        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }) })] }) }));
 };

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

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { PivotLayout } from '../../../../../types';
-import { validatePivotLayoutAggregations } from '../../../../Aggregation/validateParameterizedAggregations';
-export declare const isPivotAggregationsSectionValid: typeof validatePivotLayoutAggregations;
+export declare const isPivotAggregationsSectionValid: (data: PivotLayout) => true | string;
 export declare const PivotAggregationsSectionSummary: React.FunctionComponent;
 interface PivotAggregationsSectionProps {
     onChange: (data: PivotLayout) => void;