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

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

@@ -0,0 +1,126 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { AgChartsEnterpriseModule } from 'ag-charts-enterprise';
+import { AdaptableHelper } from '../../../../../Utilities/Helpers/AdaptableHelper';
+import { resolveSparklineOptionsForRender } from '../../../../../Utilities/Helpers/SparklineOptionsHelper';
+import { convertAdaptableStyleToCSS, hasCellBoxStyle, } from '../../../../../Utilities/Helpers/StyleHelper';
+import { Box } from '../../../../../components/Flex';
+import { Card } from '../../../../../components/Card';
+import { Tag } from '../../../../../components/Tag';
+import { useAdaptable } from '../../../../AdaptableContext';
+const FALLBACK_NUMBER_ARRAY = [12, 18, 9, 22, 15, 28, 19, 24, 17, 21];
+const PREVIEW_HEIGHT = 36;
+const PREVIEW_CELL_CLASS = 'ab-SparklinePreviewCell twa:block twa:min-w-[200px] twa:min-h-[36px] twa:px-2 twa:py-1 twa:rounded-standard twa:border twa:border-[color-mix(in_srgb,var(--ab-color-foreground)_15%,transparent)]';
+export function getSparklineCellChromeCss(cell) {
+    if (!cell || !hasCellBoxStyle(cell)) {
+        return {};
+    }
+    return convertAdaptableStyleToCSS(cell);
+}
+const resolveSparklinePreviewData = (columnId, getColumnWithColumnId, getRowNodeForIndex) => {
+    if (!columnId) {
+        return FALLBACK_NUMBER_ARRAY;
+    }
+    const column = getColumnWithColumnId(columnId);
+    if (!column) {
+        return FALLBACK_NUMBER_ARRAY;
+    }
+    for (let row = 0; row < 20; row++) {
+        const rowNode = getRowNodeForIndex(row);
+        const cellData = rowNode?.data?.[column.field];
+        if (Array.isArray(cellData) && cellData.length > 0) {
+            return cellData;
+        }
+    }
+    return FALLBACK_NUMBER_ARRAY;
+};
+const buildSparklinePreviewOptions = (sparklineStyle, container, data, width, height) => {
+    const persisted = sparklineStyle.options ?? { type: 'line' };
+    const sanitized = AdaptableHelper.removeAdaptableObjectPrimitives({
+        ...persisted,
+    });
+    const options = resolveSparklineOptionsForRender({
+        ...sanitized,
+        type: sanitized.type ?? 'line',
+        container,
+        width,
+        height,
+        data: data,
+    });
+    // Custom tooltip renderers expect AG Grid row context — use the default tooltip in preview.
+    if (options.tooltip?.renderer) {
+        const { renderer: _renderer, ...tooltipRest } = options.tooltip;
+        options.tooltip = tooltipRest;
+    }
+    return options;
+};
+/**
+ * AG Grid registers chart modules via `AgChartsEnterpriseModule.setup()` when
+ * sparklines are enabled. Standalone `AgCharts.createSparkline` needs the same
+ * setup — otherwise the settings-panel preview throws "No modules registered".
+ */
+let agChartsPreviewModulesReady = false;
+const ensureAgChartsEnterpriseModules = () => {
+    if (agChartsPreviewModulesReady) {
+        return;
+    }
+    AgChartsEnterpriseModule.setup();
+    agChartsPreviewModulesReady = true;
+};
+const createSparkline = (options) => {
+    ensureAgChartsEnterpriseModules();
+    return AgChartsEnterpriseModule.createSparkline(options);
+};
+const SparklinePreviewCanvas = ({ sparklineStyle, columnId }) => {
+    const adaptable = useAdaptable();
+    const containerRef = React.useRef(null);
+    const instanceRef = React.useRef(null);
+    const [previewError, setPreviewError] = React.useState(null);
+    const canDisplay = adaptable.api.styledColumnApi.canDisplaySparklines();
+    const optionsKey = JSON.stringify(sparklineStyle.options ?? {});
+    React.useEffect(() => {
+        return () => {
+            instanceRef.current?.destroy();
+            instanceRef.current = null;
+        };
+    }, []);
+    React.useEffect(() => {
+        const container = containerRef.current;
+        if (!container || !canDisplay) {
+            return;
+        }
+        const data = resolveSparklinePreviewData(columnId, (id) => adaptable.api.columnApi.getColumnWithColumnId(id), (index) => adaptable.api.gridApi.getRowNodeForIndex(index));
+        const width = Math.max(container.clientWidth, 200);
+        const options = buildSparklinePreviewOptions(sparklineStyle, container, data, width, PREVIEW_HEIGHT);
+        try {
+            if (!instanceRef.current) {
+                instanceRef.current = createSparkline(options);
+            }
+            else {
+                instanceRef.current.update(options);
+            }
+            setPreviewError(null);
+        }
+        catch (error) {
+            instanceRef.current?.destroy();
+            instanceRef.current = null;
+            setPreviewError(error instanceof Error ? error.message : 'Unable to render sparkline preview');
+        }
+    }, [sparklineStyle, columnId, canDisplay, adaptable.api, optionsKey]);
+    if (!canDisplay) {
+        return _jsx(Tag, { children: "Sparklines module not registered" });
+    }
+    if (previewError) {
+        return _jsx(Tag, { children: previewError });
+    }
+    return (_jsx("div", { ref: containerRef, className: "ab-SparklinePreviewCanvas", style: { width: '100%', height: PREVIEW_HEIGHT } }));
+};
+export const StyledColumnSparklinePreview = ({ data }) => {
+    const sparklineStyle = data.SparklineStyle;
+    if (!sparklineStyle) {
+        return _jsx(Tag, { children: "No Sparkline Style" });
+    }
+    const previewCellChrome = getSparklineCellChromeCss(sparklineStyle.Cell);
+    return (_jsx(Box, { className: PREVIEW_CELL_CLASS, style: previewCellChrome, children: _jsx(SparklinePreviewCanvas, { sparklineStyle: sparklineStyle, columnId: data.ColumnId }) }));
+};
+export const StyledColumnSparklinePreviewCard = ({ data }) => (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Preview" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[500px]", children: "Sample sparkline using first non-empty cell in Column (or demo data when unavailable)" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(StyledColumnSparklinePreview, { data: data }) })] }));

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

@@ -44,19 +44,24 @@ export const renderStyledColumnRangesSummary = (data, api) => {
 };
 export const StyledColumnWizardRangesSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
-    const minMaxRangeValues = React.useMemo(() => {
+    const column = React.useMemo(() => {
         const columnId = data.ColumnId;
         if (!columnId) {
+            return undefined;
+        }
+        return api.columnApi.getColumnWithColumnId(columnId);
+    }, [data.ColumnId, api]);
+    const minMaxRangeValues = React.useMemo(() => {
+        if (!column) {
             return null;
         }
-        const column = api.columnApi.getColumnWithColumnId(columnId);
         return {
             min: api.styledColumnApi.internalApi.getMinValueForNumericColumn(column),
             max: api.styledColumnApi.internalApi.getMaxValueForNumericColumn(column),
         };
-    }, [data]);
+    }, [column, api]);
     const scope = { ColumnIds: [data.ColumnId] };
-    const disabled = !data.ColumnId;
+    const disabled = !data.ColumnId || !column;
     // Gradient updates
     const onUpdateGradientStyleRanges = (ranges) => {
         const gradientStyle = {
@@ -149,5 +154,7 @@ export const StyledColumnWizardRangesSection = (props) => {
         }
         props.onChange(newStyledColumn);
     }, [data]);
-    return (_jsxs(Box, { children: [data?.GradientStyle && (_jsx(RangesComponent, { disabled: disabled, minMaxRangeValues: minMaxRangeValues, api: api, scope: scope, showZeroCentredTab: true, showRangeDirection: true, zeroCentred: data.GradientStyle.ZeroCentred, onApplyZeroCentred: onApplyGradientZeroCentred, ranges: data.GradientStyle.CellRanges ?? [], rangeValueType: data.GradientStyle?.RangeValueType, onRangeValueTypeChange: handleRangeValueTypeChange, columnComparison: data?.GradientStyle?.ColumnComparison, updateRanges: onUpdateGradientStyleRanges, updateColumnComparison: onUpdateGradientStyleColumnComparison })), data?.PercentBarStyle && (_jsx(RangesComponent, { disabled: disabled, minMaxRangeValues: minMaxRangeValues, api: api, scope: scope, ranges: data.PercentBarStyle?.CellRanges, rangeValueType: data.PercentBarStyle?.RangeValueType, onRangeValueTypeChange: handleRangeValueTypeChange, columnComparison: data?.PercentBarStyle?.ColumnComparison, updateRanges: onUpdatePercentBarStyleRanges, updateColumnComparison: onUpdatePercentBarStyleColumnComparison })), !data.ColumnId && (_jsx(ErrorBox, { className: "twa:mt-2", children: "You need to select a column before defining Ranges." }))] }));
+    return (_jsxs(Box, { children: [data?.GradientStyle && (_jsx(RangesComponent, { disabled: disabled, minMaxRangeValues: minMaxRangeValues, api: api, scope: scope, showZeroCentredTab: true, showRangeDirection: true, zeroCentred: data.GradientStyle.ZeroCentred, onApplyZeroCentred: onApplyGradientZeroCentred, ranges: data.GradientStyle.CellRanges ?? [], rangeValueType: data.GradientStyle?.RangeValueType, onRangeValueTypeChange: handleRangeValueTypeChange, columnComparison: data?.GradientStyle?.ColumnComparison, updateRanges: onUpdateGradientStyleRanges, updateColumnComparison: onUpdateGradientStyleColumnComparison })), data?.PercentBarStyle && (_jsx(RangesComponent, { disabled: disabled, minMaxRangeValues: minMaxRangeValues, api: api, scope: scope, ranges: data.PercentBarStyle?.CellRanges, rangeValueType: data.PercentBarStyle?.RangeValueType, onRangeValueTypeChange: handleRangeValueTypeChange, columnComparison: data?.PercentBarStyle?.ColumnComparison, updateRanges: onUpdatePercentBarStyleRanges, updateColumnComparison: onUpdatePercentBarStyleColumnComparison })), (!data.ColumnId || !column) && (_jsx(ErrorBox, { className: "twa:mt-2", children: !data.ColumnId
+                    ? 'You need to select a column before defining Ranges.'
+                    : `Column "${data.ColumnId}" was not found in the grid.` }))] }));
 };

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.d.ts

@@ -2,13 +2,9 @@ import * as React from 'react';
 import { StyledColumn } from '../../../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../../../types';
 export { renderStyledColumnRangesSummary, StyledColumnWizardRangesSection, } from './StyledColumnWizardRangesSection';
+export declare const getStyledColumnPercentBarStyleViewValues: (data: StyledColumn) => string[];
 /**
  * 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)
  */
 export declare const renderStyledColumnStyleSummary: (data: StyledColumn, _api?: AdaptableApi) => React.JSX.Element;
 export declare const renderFormatColumnStyleWizardSummary: (data: StyledColumn) => React.JSX.Element;

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

@@ -10,55 +10,78 @@ import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 import { Box, Flex } from '../../../../components/Flex';
 import Radio, { RadioGroup } from '../../../../components/Radio';
 import { Toggle, ToggleGroup } from '../../../../components/Toggle';
-import { renderFontStyleSummaryTags, StyledColumnFontStyleEditor, } from '../StyledColumnSliceStyleEditors';
+import { getCellFontStyleSummaryItems, StyledColumnFontStyleEditor, } from '../StyledColumnSliceStyleEditors';
 import { Card } from '../../../../components/Card';
+import { StyledColumnPercentBarPreviewCard } from './Components/StyledColumnPercentBarPreview';
 // Re-export the Ranges section + summary for legacy import paths.
 export { renderStyledColumnRangesSummary, StyledColumnWizardRangesSection, } from './StyledColumnWizardRangesSection';
 // ---------------------------------------------------------------------------
 // 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}`);
+    }
+    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(' + ');
+export const getStyledColumnPercentBarStyleViewValues = (data) => {
+    const pb = data.PercentBarStyle;
+    if (!pb) {
+        return [];
+    }
+    return buildStyledColumnPercentBarStyleSummaryStrings(pb, {
+        includeEmptyCellText: false,
+        includeEmptyTooltip: false,
+    });
 };
 /**
  * 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)
  */
 export const renderStyledColumnStyleSummary = (data, _api) => {
     const pb = data.PercentBarStyle;
     if (!pb) {
         return _jsx(Tag, { children: "No Styling Defined" });
     }
-    const parts = [
-        _jsxs(Box, { className: "twa:mr-2", children: ["Origin: ", _jsx(Tag, { children: formatOriginLabel(pb.Origin) })] }, "origin"),
-    ];
-    if (pb.CellText && pb.CellText.length > 0) {
-        parts.push(_jsxs(Box, { className: "twa:mr-2", children: ["Text: ", _jsx(Tag, { children: formatCellText(pb.CellText) }), " (", pb.CellTextPosition ?? 'Below', ")"] }, "text"));
-        parts.push(_jsxs(Box, { className: "twa:mr-2", children: ["Align: ", _jsx(Tag, { children: formatAlignmentLabel(pb.CellTextAlignment) })] }, "align"));
-    }
-    const fontTags = renderFontStyleSummaryTags(pb.Font);
-    if (fontTags) {
-        parts.push(_jsxs(Box, { className: "twa:mr-2", children: ["Font: ", fontTags] }, "font"));
-    }
-    return (_jsx(Flex, { alignItems: "center", className: "twa:flex-wrap", children: parts }));
+    const items = buildStyledColumnPercentBarStyleSummaryStrings(pb, {
+        includeEmptyCellText: true,
+        includeEmptyTooltip: true,
+    });
+    return (_jsx(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item) => (_jsx(Tag, { children: item }, item))) }));
 };
 // Legacy wrapper kept for any external consumers; safe no-op here.
 export const renderFormatColumnStyleWizardSummary = (data) => {
@@ -170,5 +193,5 @@ export const StyledColumnWizardStyleSection = (props) => {
                                             delete cleaned.Font;
                                             props.onChange({ ...data, PercentBarStyle: cleaned });
                                         }
-                                    } }) })] })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Style" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Configure Tooltip and Background Colour" })] }), _jsx(Card.Body, { children: _jsxs(FormLayout, { sizes: [...STYLE_FORM_SIZES], children: [_jsxs(FormRow, { label: "Tooltip Display:", children: [_jsx(CheckBox, { disabled: disabled, checked: pb.ToolTipText?.includes('CellValue'), onChange: (checked) => onToolTipTextChanged('CellValue', checked), children: "Cell Value" }), ' ', _jsx(CheckBox, { disabled: disabled, className: "twa:ml-3", checked: pb.ToolTipText?.includes('PercentageValue'), onChange: (checked) => onToolTipTextChanged('PercentageValue', checked), children: "Percent Value" })] }), _jsx(FormRow, { label: `Back ${api.internalApi.getCorrectEnglishVariant('Colour')}:`, children: _jsxs(Flex, { alignItems: "center", children: [_jsx(CheckBox, { disabled: disabled, checked: !!pb.BackColor, onChange: onUseBackColorChanged, className: "twa:mr-2" }), pb.BackColor != undefined && (_jsx(ColorPicker, { disabled: disabled, api: api, value: pb.BackColor, onChange: onBackColorChange }))] }) })] }) })] })] }));
+                                    } }) })] })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Style" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Configure Tooltip and Background Colour" })] }), _jsx(Card.Body, { children: _jsxs(FormLayout, { sizes: [...STYLE_FORM_SIZES], children: [_jsxs(FormRow, { label: "Tooltip Display:", children: [_jsx(CheckBox, { disabled: disabled, checked: pb.ToolTipText?.includes('CellValue'), onChange: (checked) => onToolTipTextChanged('CellValue', checked), children: "Cell Value" }), ' ', _jsx(CheckBox, { disabled: disabled, className: "twa:ml-3", checked: pb.ToolTipText?.includes('PercentageValue'), onChange: (checked) => onToolTipTextChanged('PercentageValue', checked), children: "Percent Value" })] }), _jsx(FormRow, { label: `Back ${api.internalApi.getCorrectEnglishVariant('Colour')}:`, children: _jsxs(Flex, { alignItems: "center", children: [_jsx(CheckBox, { disabled: disabled, checked: !!pb.BackColor, onChange: onUseBackColorChanged, className: "twa:mr-2" }), pb.BackColor != undefined && (_jsx(ColorPicker, { disabled: disabled, api: api, value: pb.BackColor, onChange: onBackColorChange }))] }) })] }) })] }), _jsx(StyledColumnPercentBarPreviewCard, { data: data })] }));
 };

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

@@ -3,7 +3,7 @@ export const getStatusItemStyle = (systemStatusMessageInfo) => {
     const background = UIHelper.getColorByMessageType(systemStatusMessageInfo?.statusType ?? 'Success');
     const color = systemStatusMessageInfo
         ? UIHelper.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

@@ -1,47 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { connect } from 'react-redux';
-import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import FormLayout, { FormRow } from '../../components/FormLayout';
-import ObjectFactory from '../../Utilities/ObjectFactory';
-import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
 import { ThemeSelector } from './ThemeSelector';
 import { Box } from '../../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 === ACCESS_LEVEL_READ_ONLY;
         return (_jsx(PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), children: _jsx(FormLayout, { children: _jsx(FormRow, { label: "Select Current Theme:", children: _jsx(Box, { className: "twa:max-w-[150px]", children: _jsx(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.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)),
-    };
 }
-export let ThemePopup = connect(mapStateToProps, mapDispatchToProps)(ThemePopupComponent);
+export let ThemePopup = ThemePopupComponent;

package/src/View/UIHelper.js

@@ -314,7 +314,7 @@ export function getButtonColourForAdaptableAlerts(adaptableAlerts, messageTypeCo
 }
 export function getButtonTextColourForArrayandMessageType(adaptableAlerts, messageType) {
     if (ArrayExtensions.IsNullOrEmpty(adaptableAlerts)) {
-        return 'text-on-primary';
+        return 'primary-foreground';
     }
     return this.getButtonTextColourForMessageType(messageType);
 }

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -1,11 +1,11 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import * as NamedQueryRedux from '../../Redux/ActionsReducers/NamedQueryRedux';
-import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
-import { Tabs } from '../../components/Tabs';
+import { Card } from '../../components/Card';
+import { ButtonEdit } from '../Components/Buttons/ButtonEdit';
 import { NamedQueryContext, } from '../../components/ExpressionEditor/NamedQueryContext';
 import { OnePageWizard, useOnePageWizardContext } from './OnePageWizards';
 import kebabCase from '../../Utilities/utils/kebabCase';
@@ -74,20 +74,9 @@ export const OnePageAdaptableWizard = (props) => {
     return (_jsx(OnePageAdaptableWizardContext.Provider, { value: extraContext, children: _jsx(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery }, children: _jsx(OnePageWizard, { ...props, name: name, sections: sections, onFinish: handleClickFinish, moduleName: props.moduleName ?? props.moduleInfo.FriendlyName }) }) }));
 };
 export const OnePageWizardSummary = () => {
-    const { sections, data, api, moduleInfo } = useOnePageAdaptableWizardContext();
-    const { setCurrentSection } = useOnePageWizardContext();
-    const [namedQuery] = useState(false);
-    const renderEdit = (index) => (_jsx(SimpleButton, { 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 (_jsx(Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-2", children: sections
+    const { data, api } = useOnePageAdaptableWizardContext();
+    const { sections: visibleSections, setCurrentSection } = useOnePageWizardContext();
+    return (_jsx(Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-3", children: visibleSections
             .map((section, index) => {
             if (section === '-') {
                 return null;
@@ -95,10 +84,7 @@ export const OnePageWizardSummary = () => {
             if (!section.renderSummary) {
                 return null;
             }
-            if (section.isVisible && !section.isVisible(data, api, extraContext)) {
-                return null;
-            }
-            return (_jsx(_Fragment, { children: _jsxs(Tabs, { keyboardNavigation: false, children: [_jsxs(Tabs.Tab, { children: [section.title, " ", renderEdit(index)] }), _jsx(Tabs.Content, { children: section.renderSummary(data, api) })] }, index) }));
+            return (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { className: "twa:w-full", children: [_jsx(Box, { className: "twa:font-medium twa:flex-1", children: section.title }), _jsx(ButtonEdit, { onClick: () => setCurrentSection(index) })] }), _jsx(Card.Body, { className: "twa:p-1", children: section.renderSummary?.(data, api) })] }, `${section.title}-${index}`));
         })
             .filter(Boolean) }));
 };

package/src/View/renderWithAdaptableContext.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from 'react-redux';
 import AdaptableContext from './AdaptableContext';
-import { WithAdaptableComputedCSSVars } from './AdaptableComputedCSSVarsContext';
-import { TooltipProvider } from '../components/ui/tooltip';
+import { TooltipProvider } from "../components/ui/tooltip";
 export const renderWithAdaptableContext = (children, adaptable) => {
-    return (_jsx(TooltipProvider, { delay: 300, children: _jsx(Provider, { store: adaptable.adaptableStore.TheStore, children: _jsx(WithAdaptableComputedCSSVars, { children: _jsx(AdaptableContext.Provider, { value: adaptable, children: children }) }) }) }));
+    return (_jsx(TooltipProvider, { delay: 300, children: _jsx(Provider, { store: adaptable.adaptableStore.TheStore, children: _jsx(AdaptableContext.Provider, { value: adaptable, children: children }) }) }));
 };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -97,7 +97,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private LicenseService;
     private ChartingService;
     private rowListeners;
-    private throttleFilterOnDataChange;
     private debouncedSetSelectedRows;
     private debouncedSetSelectedCells;
     private agGridListenerKeydown;
@@ -361,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;