@adaptabletools/adaptable 23.0.0-canary.0 → 23.0.0-canary.10

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.d.ts

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => React.JSX.Element;
 export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => React.JSX.Element;
 type AlertBehaviourWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
-import { Tabs } from '../../../components/Tabs';
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CheckBox } from '../../../components/CheckBox';
 import { CodeBlock } from '../../../components/CodeBlock';
@@ -13,6 +12,7 @@ import { AlertType } from '../Utilities/getAlertType';
 import { Box, Flex } from '../../../components/Flex';
 import { Tag, TagBox } from '../../../components/Tag/Tag';
 import { SingleSelect } from '../../../components/NewSelect';
+import { Card } from '../../../components/Card';
 const HighlightStyle = (props) => {
     const adaptable = useAdaptable();
     const options = [
@@ -39,10 +39,6 @@ const HighlightStyle = (props) => {
                             props.onChange(style);
                         } }) }) }))] }));
 };
-export const renderAlertBehaviourWizardSummary = (alertDefinition) => {
-    const { api } = useOnePageAdaptableWizardContext();
-    return renderAlertBehaviourSummary(alertDefinition, api);
-};
 export const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
     const ruleProperties = isRuleBasedAlertDefinition(alert)
@@ -84,6 +80,7 @@ export const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
 };
 export const AlertBehaviourWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
+    const behaviourSpellingVariant = api.internalApi.getCorrectEnglishVariant('Behaviour');
     const presentationProperties = data.AlertProperties ?? {};
     const ruleProperties = isRuleBasedAlertDefinition(data)
         ? (data.AlertProperties ?? {})
@@ -107,19 +104,19 @@ export const AlertBehaviourWizardSection = (props) => {
             },
         });
     };
-    return (_jsxs(Tabs, { children: [_jsx(Tabs.Tab, { children: api.internalApi.getCorrectEnglishVariant('Behaviour') }), _jsxs(Tabs.Content, { className: "twa:flex twa:flex-col twa:gap-1", children: [hasPreventCellEdit && (_jsxs(CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: ruleProperties.PreventEdit, disabled: true, children: ["Prevent Cell Edit", _jsx(Box, { className: "twa:text-2 twa:mt-1", children: "(automatically undo data change which triggered Alert)" })] })), hasHighlightCell && (_jsx(HighlightStyle, { dataName: "highlight-cell", highlight: ruleProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
-                            onChange({ HighlightCell });
-                        } })), hasHighlightRow && (_jsx(HighlightStyle, { dataName: "highlight-row", highlight: ruleProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
-                            onChange({ HighlightRow });
-                        } })), hasJumpToCell && (_jsx(CheckBox, { "data-name": "jump-to-cell", checked: ruleProperties.JumpToCell, onChange: (JumpToCell) => {
-                            onChange({ JumpToCell });
-                        }, children: "Jump To Cell" })), hasJumpToRow && (_jsx(CheckBox, { "data-name": "jump-to-row", checked: ruleProperties.JumpToRow, onChange: (JumpToRow) => {
-                            onChange({ JumpToRow });
-                        }, children: "Jump To Row" })), showInSeparateDiv && (_jsxs(CheckBox, { "data-name": "show-in-div", checked: presentationProperties.ShowInDiv, onChange: (ShowInDiv) => {
-                            onChange({ ShowInDiv });
-                        }, children: ["Show in separate ", _jsx(CodeBlock, { children: `<div />` }), " element"] })), logToConsole && (_jsx(CheckBox, { "data-name": "log-to-console", checked: presentationProperties.LogToConsole, onChange: (LogToConsole) => {
-                            onChange({ LogToConsole });
-                        }, children: "Log To Console" })), showSystemStatusMessage && (_jsx(CheckBox, { "data-name": "system-status-message", checked: presentationProperties.DisplaySystemStatusMessage, onChange: (DisplaySystemStatusMessage) => {
-                            onChange({ DisplaySystemStatusMessage });
-                        }, children: "Show as System Status Message" }))] })] }));
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: behaviourSpellingVariant }), _jsxs(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: ["Configure ", behaviourSpellingVariant.toLowerCase(), "s for the Alert when it fires"] })] }), _jsxs(Card.Body, { className: "twa:gap-1", children: [hasPreventCellEdit && (_jsxs(CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: ruleProperties.PreventEdit, disabled: true, children: ["Prevent Cell Edit", _jsx(Box, { className: "twa:text-2 twa:mt-1", children: "(automatically undo data change which triggered Alert)" })] })), hasHighlightCell && (_jsx(HighlightStyle, { dataName: "highlight-cell", highlight: ruleProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
+                                onChange({ HighlightCell });
+                            } })), hasHighlightRow && (_jsx(HighlightStyle, { dataName: "highlight-row", highlight: ruleProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
+                                onChange({ HighlightRow });
+                            } })), hasJumpToCell && (_jsx(CheckBox, { "data-name": "jump-to-cell", checked: ruleProperties.JumpToCell, onChange: (JumpToCell) => {
+                                onChange({ JumpToCell });
+                            }, children: "Jump To Cell" })), hasJumpToRow && (_jsx(CheckBox, { "data-name": "jump-to-row", checked: ruleProperties.JumpToRow, onChange: (JumpToRow) => {
+                                onChange({ JumpToRow });
+                            }, children: "Jump To Row" })), showInSeparateDiv && (_jsxs(CheckBox, { "data-name": "show-in-div", checked: presentationProperties.ShowInDiv, onChange: (ShowInDiv) => {
+                                onChange({ ShowInDiv });
+                            }, children: ["Show in separate ", _jsx(CodeBlock, { children: `<div />` }), " element"] })), logToConsole && (_jsx(CheckBox, { "data-name": "log-to-console", checked: presentationProperties.LogToConsole, onChange: (LogToConsole) => {
+                                onChange({ LogToConsole });
+                            }, children: "Log To Console" })), showSystemStatusMessage && (_jsx(CheckBox, { "data-name": "system-status-message", checked: presentationProperties.DisplaySystemStatusMessage, onChange: (DisplaySystemStatusMessage) => {
+                                onChange({ DisplaySystemStatusMessage });
+                            }, children: "Show as System Status Message" }))] })] }) }));
 };

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { ButtonNew } from '../../Components/Buttons/ButtonNew';
 import SimpleButton from '../../../components/SimpleButton';
 import Input from '../../../components/Input';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
@@ -7,8 +8,12 @@ import { cloneObject } from '../../../Utilities/Helpers/Helper';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { Box, Flex } from '../../../components/Flex';
-import sentenceCase from '../../../Utilities/utils/sentenceCase';
+import { sentenceCase } from '../../../Utilities/Extensions/StringExtensions';
 import { SingleSelect } from '../../../components/NewSelect';
+import { Tag } from '../../../components/Tag';
+import { CollapsibleWizardCard, getWizardAccordionSectionClassName, useWizardCardAccordion, } from '../../Wizard/CollapsibleWizardCard';
+import { cn } from '../../../lib/utils';
+const alertButtonCardId = (index) => `alert-button-${index}`;
 const TONE_OPTIONS = [
     {
         label: 'Tone: Use Alert Tone',
@@ -21,31 +26,151 @@ const TONE_OPTIONS = [
         };
     }),
 ];
+const AlertButtonPreview = ({ button, messageType }) => {
+    const buttonStyle = button.ButtonStyle ?? {};
+    const variant = (buttonStyle.variant ?? 'raised');
+    const tone = (buttonStyle.tone ??
+        messageType.toLowerCase());
+    const icon = button.icon && 'name' in button.icon && button.icon.name ? button.icon : undefined;
+    return (_jsx(SimpleButton, { variant: variant, tone: tone, icon: icon, className: "twa:cursor-default twa:pointer-events-none", tabIndex: -1, children: button.Label || 'Untitled' }));
+};
 function renderTone(option) {
     return (_jsxs(Flex, { flexDirection: "row", alignItems: "center", children: [_jsx(SimpleButton, { className: "twa:mr-2 twa:w-[10px] twa:h-[10px] twa:line-height-0 twa:rounded-[100%] twa:bg-current", tone: option.value, variant: "text" }), option.label] }));
 }
+const getButtonCommands = (button) => {
+    if (button.Command && typeof button.Command === 'string') {
+        return [button.Command];
+    }
+    if (button.Command && Array.isArray(button.Command)) {
+        return button.Command;
+    }
+    return [];
+};
+const AlertButtonActionTags = ({ button }) => {
+    const commands = getButtonCommands(button);
+    if (!commands.length) {
+        return null;
+    }
+    return (_jsx(_Fragment, { children: commands.map((command) => (_jsx(Tag, { className: "twa:shrink-0", children: sentenceCase(command) }, command))) }));
+};
+const AlertButtonCardSummary = ({ button }) => {
+    const commands = getButtonCommands(button);
+    if (!commands.length) {
+        return _jsx(Tag, { children: "No actions" });
+    }
+    return (_jsx(Flex, { flexWrap: "wrap", className: "twa:gap-1", children: _jsx(AlertButtonActionTags, { button: button }) }));
+};
+const AlertButtonCompactSummary = ({ button }) => (_jsxs(Flex, { alignItems: "center", className: "twa:gap-1 twa:min-w-0 twa:overflow-hidden twa:flex-wrap", children: [_jsx(Tag, { className: "twa:shrink-0", children: button.Label || 'Untitled' }), _jsx(AlertButtonActionTags, { button: button })] }));
+const AlertButtonEditorForm = ({ button, index, alertButtons, buttonCommands, onChange, }) => {
+    const buttonStyle = button.ButtonStyle;
+    const buttonLabel = button.Label;
+    const btnCommands = getButtonCommands(button);
+    const btnUserFunctions = btnCommands.filter((command) => !buttonCommands.includes(command));
+    const setVariant = (variant) => {
+        onChange(alertButtons.map((btn, i) => {
+            if (i === index) {
+                const nextButtonStyle = { ...btn.ButtonStyle };
+                nextButtonStyle.variant = variant;
+                return {
+                    ...btn,
+                    ButtonStyle: nextButtonStyle,
+                };
+            }
+            return btn;
+        }));
+    };
+    const setTone = (tone) => {
+        onChange(alertButtons.map((btn, i) => {
+            if (i === index) {
+                const nextButtonStyle = { ...btn.ButtonStyle };
+                if (tone == null) {
+                    delete nextButtonStyle.tone;
+                }
+                else {
+                    nextButtonStyle.tone = tone;
+                }
+                return {
+                    ...btn,
+                    ButtonStyle: nextButtonStyle,
+                };
+            }
+            return btn;
+        }));
+    };
+    const handleCommandChange = (checked, commandName) => {
+        let commands = btnCommands;
+        if (!checked) {
+            commands = commands.filter((a) => a !== commandName);
+        }
+        else {
+            commands = [...commands, commandName];
+        }
+        onChange(alertButtons.map((btn, i) => {
+            if (i === index) {
+                return {
+                    ...btn,
+                    Command: commands.length ? commands : undefined,
+                };
+            }
+            return btn;
+        }));
+    };
+    let iconSelector = null;
+    if (!button.icon || (button.icon && 'name' in button.icon)) {
+        iconSelector = (_jsx(AdaptableIconSelector, { value: button.icon && 'name' in button.icon ? button?.icon?.name : '', onChange: (iconName) => {
+                onChange(alertButtons.map((btn) => {
+                    if (btn === button) {
+                        return {
+                            ...btn,
+                            icon: {
+                                name: iconName,
+                            },
+                        };
+                    }
+                    return btn;
+                }));
+            } }));
+    }
+    return (_jsxs(FormLayout, { children: [_jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Button Text" }), children: _jsx(Input, { value: buttonLabel, className: "twa:max-w-[200px]", onChange: (e) => {
+                        onChange(alertButtons.map((btn, i) => {
+                            if (i === index) {
+                                return { ...btn, Label: e.target.value };
+                            }
+                            return btn;
+                        }));
+                    } }) }), _jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Style" }), children: _jsxs(Flex, { flexDirection: "row", className: "twa:gap-2 twa:flex-wrap", children: [_jsx(SingleSelect, { items: ['text', 'outlined', 'raised'].map((variant) => {
+                                return {
+                                    label: StringExtensions.CapitaliseFirstLetter(variant),
+                                    value: variant,
+                                };
+                            }), renderValue: (option) => `Variant: ${option.label}`, value: buttonStyle?.variant, onValueChange: (value) => {
+                                setVariant(value);
+                            } }), _jsx(SingleSelect, { items: TONE_OPTIONS, onValueChange: (value) => {
+                                if (value === 'text') {
+                                    setTone(null);
+                                    return;
+                                }
+                                setTone(value);
+                            }, value: buttonStyle?.tone ?? 'text' })] }) }), _jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Actions" }), children: _jsxs(Flex, { flexDirection: "row", className: "twa:gap-3 twa:flex-wrap", children: [buttonCommands.map((commandName) => {
+                            return (_jsx(CheckBox, { onChange: (checked) => handleCommandChange(checked, commandName), checked: button.Command === commandName ||
+                                    (Array.isArray(button.Command) && button.Command.includes(commandName)), children: _jsx(Box, { className: "twa:text-2", children: sentenceCase(commandName) }) }, commandName));
+                        }), btnUserFunctions.length ? (_jsx(CheckBox, { checked: true, disabled: true, children: _jsxs(Box, { className: "twa:text-2", children: ["User function", btnUserFunctions.length > 1 ? 's' : '', ": ", btnUserFunctions.join(', ')] }) })) : null] }) }), iconSelector && (_jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Icon" }), children: _jsx(Box, { children: iconSelector }) }))] }));
+};
 export const AlertButtonsEditor = (props) => {
     const { api, adaptableAlert } = props;
     const onChange = (newButtons) => {
         props.onChange(newButtons);
     };
     const alertDefinition = adaptableAlert.alertDefinition;
-    // const rowAddedAlert =
-    //  api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
+    const messageType = alertDefinition?.MessageType ?? 'Info';
     const isRowRemovedAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
-    // except row change
     const hasHighlightCell = props.alertType !== 'RowChange';
-    // all, except row removed
     const hasHighlightRow = !isRowRemovedAlert;
-    // except row removed
     const hasJumpToCell = props.alertType !== 'RowChange';
-    // all
     const hasJumpToRow = !isRowRemovedAlert;
-    // all
     const hasSuspend = true;
-    // only data change
     const hasUndo = props.alertType === 'DataChange';
-    const AlertButtons = cloneObject(props.AlertButtons || []) || [];
+    const alertButtons = cloneObject(props.AlertButtons || []) || [];
     const buttonCommands = [];
     if (hasHighlightRow) {
         buttonCommands.push('highlight-row');
@@ -71,119 +196,39 @@ export const AlertButtonsEditor = (props) => {
             buttonCommands.push(ch.name);
         });
     }
-    return (_jsxs(_Fragment, { children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between", children: [_jsx(Box, { className: "twa:text-2 twa:mt-3 twa:mb-2", children: "Add Buttons to the Alert Notification, and set Actions to perform when the Button is clicked" }), _jsx(SimpleButton, { icon: "plus", onClick: () => {
-                            onChange([
-                                ...(AlertButtons || []),
-                                {
-                                    Label: 'OK',
-                                    ButtonStyle: {
-                                        variant: 'raised',
-                                    },
-                                },
-                            ]);
-                        }, children: "Add" })] }), AlertButtons.map((button, index) => {
-                let buttonStyle = button.ButtonStyle;
-                let buttonLabel = button.Label;
-                let btnCommands = [];
-                if (button.Command && typeof button.Command === 'string') {
-                    btnCommands = [button.Command];
-                }
-                else if (button.Command && Array.isArray(button.Command)) {
-                    btnCommands = button.Command;
-                }
-                // filter out the adaptable standard commands
-                const btnUserFunctions = btnCommands.filter((command) => !buttonCommands.includes(command));
-                const setVariant = (variant) => {
-                    onChange(AlertButtons.map((btn, i) => {
-                        if (i === index) {
-                            const buttonStyle = { ...btn.ButtonStyle };
-                            buttonStyle.variant = variant;
-                            return {
-                                ...btn,
-                                ButtonStyle: buttonStyle,
-                            };
-                        }
-                        return btn;
-                    }));
-                };
-                const setTone = (tone) => {
-                    onChange(AlertButtons.map((btn, i) => {
-                        if (i === index) {
-                            const buttonStyle = { ...btn.ButtonStyle };
-                            if (tone == null) {
-                                delete buttonStyle.tone;
-                            }
-                            else {
-                                buttonStyle.tone = tone;
-                            }
-                            return {
-                                ...btn,
-                                ButtonStyle: buttonStyle,
-                            };
-                        }
-                        return btn;
-                    }));
-                };
-                const handleCommandChange = (checked, commandName) => {
-                    let commands = btnCommands;
-                    if (!checked) {
-                        // remove current Command
-                        commands = commands.filter((a) => a !== commandName);
-                    }
-                    else {
-                        commands = [...commands, commandName];
-                    }
-                    onChange(AlertButtons.map((btn, i) => {
-                        if (i === index) {
-                            return {
-                                ...btn,
-                                Command: commands.length ? commands : undefined,
-                            };
-                        }
-                        return btn;
-                    }));
-                };
-                let iconSelector = null;
-                if (!button.icon || (button.icon && 'name' in button.icon)) {
-                    iconSelector = (_jsx(AdaptableIconSelector, { value: button.icon && 'name' in button.icon ? button?.icon?.name : '', onChange: (iconName) => {
-                            onChange(AlertButtons.map((btn) => {
-                                if (btn === button) {
-                                    return {
-                                        ...btn,
-                                        icon: {
-                                            name: iconName,
-                                        },
-                                    };
-                                }
-                                return btn;
-                            }));
-                        } }));
-                }
-                return (_jsx(Box, { className: `twa:ml-3 ${index ? 'twa:border-t twa:border-dashed twa:border-input-border' : ''}`, children: _jsxs(FormLayout, { className: "twa:mb-2 twa:pt-2", children: [_jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2 twa:whitespace-nowrap", children: "Button Text" }), children: _jsxs(Flex, { flexDirection: "row", children: [_jsx(Input, { value: buttonLabel, className: "twa:mr-2 twa:w-[80px]", onChange: (e) => {
-                                                onChange(AlertButtons.map((btn, i) => {
-                                                    if (i === index) {
-                                                        return { ...btn, Label: e.target.value };
-                                                    }
-                                                    return btn;
-                                                }));
-                                            } }), _jsx(SingleSelect, { items: ['text', 'outlined', 'raised'].map((variant) => {
-                                                return {
-                                                    label: StringExtensions.CapitaliseFirstLetter(variant),
-                                                    value: variant,
-                                                };
-                                            }), renderValue: (option) => `Variant: ${option.label}`, value: buttonStyle?.variant, onValueChange: (value) => {
-                                                setVariant(value);
-                                            } }), _jsx(SingleSelect, { className: "twa:ml-2", items: TONE_OPTIONS, onValueChange: (value) => {
-                                                if (value === 'text') {
-                                                    setTone(null);
-                                                    return;
-                                                }
-                                                setTone(value);
-                                            }, value: buttonStyle?.tone ?? 'text' }), _jsx(SimpleButton, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, className: "twa:ml-1", variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
-                                                onChange(AlertButtons.filter((btn) => btn !== button));
-                                            } })] }) }), _jsxs(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Actions" }), children: [buttonCommands.map((commandName) => {
-                                        return (_jsx(CheckBox, { className: "twa:mr-3", onChange: (checked) => handleCommandChange(checked, commandName), checked: button.Command === commandName ||
-                                                (Array.isArray(button.Command) && button.Command.includes(commandName)), children: _jsx(Box, { className: "twa:text-2", children: sentenceCase(commandName) }) }, commandName));
-                                    }), btnUserFunctions.length ? (_jsx(CheckBox, { checked: true, disabled: true, children: _jsxs(Box, { className: "twa:text-2", children: ["User function", btnUserFunctions.length > 1 ? 's' : '', ":", ' ', btnUserFunctions.join(', ')] }) })) : null] }), iconSelector && (_jsx(FormRow, { label: _jsx(Box, { className: "twa:text-2", children: "Icon" }), children: _jsx(Box, { children: iconSelector }) }))] }) }, index));
-            })] }));
+    const { bindCard, hasExpandedCard, expandedFillsSpace, expandedId, setExpandedId } = useWizardCardAccordion(null);
+    const handleAddButton = () => {
+        const newIndex = alertButtons.length;
+        onChange([
+            ...(alertButtons || []),
+            {
+                Label: 'OK',
+                ButtonStyle: {
+                    variant: 'raised',
+                },
+            },
+        ]);
+        setExpandedId(alertButtonCardId(newIndex));
+    };
+    const handleDeleteButton = (index) => {
+        if (alertButtons.length <= 1) {
+            return;
+        }
+        const cardId = alertButtonCardId(index);
+        onChange(alertButtons.filter((_, i) => i !== index));
+        if (expandedId === cardId) {
+            setExpandedId(null);
+            return;
+        }
+        if (expandedId?.startsWith('alert-button-')) {
+            const expandedIndex = Number(expandedId.replace('alert-button-', ''));
+            if (!Number.isNaN(expandedIndex) && expandedIndex > index) {
+                setExpandedId(alertButtonCardId(expandedIndex - 1));
+            }
+        }
+    };
+    return (_jsxs(Box, { className: cn(getWizardAccordionSectionClassName(hasExpandedCard, expandedFillsSpace), 'twa:mt-3'), children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between", className: "twa:mb-2 twa:shrink-0", children: [_jsx(Box, { className: "twa:text-2 twa:max-w-[520px]", children: "Add buttons to the notification and set actions to perform when clicked" }), _jsx(ButtonNew, { onClick: handleAddButton, children: "Add" })] }), _jsx(Flex, { flexDirection: "column", className: "twa:gap-3 twa:min-h-0", children: alertButtons.map((button, index) => {
+                    const cardBinding = bindCard(alertButtonCardId(index));
+                    return (_jsx(CollapsibleWizardCard, { ...cardBinding, surface: "panel", "data-name": `alert-button-${index}`, title: `Button ${index + 1}`, help: "Set button text, style, icon, and actions", collapsedHelp: false, compactSummary: _jsx(AlertButtonCompactSummary, { button: button }), headerVisual: _jsxs(Flex, { alignItems: "center", justifyContent: "space-end", className: "twa:gap-1 twa:min-w-0 twa:overflow-hidden twa:flex-wrap", children: [_jsx(AlertButtonPreview, { button: button, messageType: messageType }), cardBinding.compact ? _jsx(AlertButtonActionTags, { button: button }) : null] }), headerActions: _jsx(SimpleButton, { icon: "delete", disabled: alertButtons.length <= 1, variant: "text", tooltip: alertButtons.length <= 1 ? 'Cannot remove last button' : 'Delete button', onClick: () => handleDeleteButton(index) }), summary: _jsx(AlertButtonCardSummary, { button: button }), bodyClassName: "twa:!pt-0", children: _jsx(AlertButtonEditorForm, { button: button, index: index, alertButtons: alertButtons, buttonCommands: buttonCommands, onChange: onChange }) }, alertButtonCardId(index)));
+                }) })] }));
 };

package/src/View/Alert/Wizard/AlertMessageWizardSection.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertMessageSummary: (alertType?: AlertType) => React.JSX.Element;
+export declare const renderAlertMessageSummary: (alertType: AlertType | undefined, data: AlertDefinition) => React.JSX.Element;
 type AlertDisplayWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;
     alertType: AlertType;

package/src/View/Alert/Wizard/AlertMessageWizardSection.js

@@ -1,19 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Tabs } from '../../../components/Tabs';
 import Radio, { RadioGroup } from '../../../components/Radio';
 import { SummaryText, useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
-import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { AlertType } from '../Utilities/getAlertType';
 import { ButtonInfo } from '../../Components/Buttons/ButtonInfo';
 import { AlertMessageDocsLink } from '../../../Utilities/Constants/DocumentationLinkConstants';
 import Textarea from '../../../components/Textarea';
 import HelpBlock from '../../../components/HelpBlock';
-import { Box } from '../../../components/Flex';
-export const renderAlertMessageSummary = (alertType) => {
-    const { data } = useOnePageAdaptableWizardContext();
+import { Box, Flex } from '../../../components/Flex';
+import { Card } from '../../../components/Card';
+export const renderAlertMessageSummary = (alertType, data) => {
     if (alertType === AlertType.Scheduled) {
-        return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Message Type: ", _jsx(Tag, { children: data.MessageType })] }), _jsxs(SummaryText, { children: ["Header: ", _jsx(Tag, { children: data.MessageHeader || 'Not specified' })] }), _jsxs(SummaryText, { children: ["Message: ", _jsx(Tag, { children: data.MessageText || 'Not specified' })] })] }));
+        return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Message Type: ", _jsx(Tag, { children: data.MessageType })] }), _jsxs(SummaryText, { children: ["Header: ", _jsx(Tag, { children: data.MessageHeader || 'Not specified' })] }), _jsxs(SummaryText, { children: ["Body: ", _jsx(Tag, { children: data.MessageText || 'Not specified' })] })] }));
     }
     return (_jsxs(SummaryText, { children: ["Message Type: ", _jsx(Tag, { children: data.MessageType })] }));
 };
@@ -40,14 +38,14 @@ export const AlertMessageWizardSection = (props) => {
             MessageHeader: value,
         });
     };
-    return (_jsxs(_Fragment, { children: [_jsxs(Tabs, { "data-name": "message-type", children: [_jsx(Tabs.Tab, { children: "Message Type" }), _jsx(Tabs.Content, { children: _jsxs(RadioGroup, { value: messageType, name: "messageType", orientation: "horizontal", onRadioChange: (MessageType) => {
-                                props.onChange({
-                                    ...data,
-                                    MessageType,
-                                });
-                            }, children: [_jsx(Radio, { className: "twa:ml-1", value: "Info", children: "Info" }), _jsx(Radio, { className: "twa:ml-4", value: "Success", children: "Success" }), _jsx(Radio, { className: "twa:ml-4", value: "Warning", children: "Warning" }), _jsx(Radio, { className: "twa:ml-4", value: "Error", children: "Error" })] }) })] }), _jsxs(Tabs, { "data-name": "message-text", className: "twa:mt-2 twa:mb-3", autoFocus: false, children: [_jsx(Tabs.Tab, { children: "Message Text" }), _jsxs(Tabs.Content, { children: [_jsx(Box, { className: "twa:text-2 twa:mt-3 twa:mb-2", children: isScheduled
-                                    ? 'Enter the header and message shown when this scheduled alert fires.'
-                                    : 'Text to display as the Alert Message (leave blank to show automated Message based on Alert Type)' }), _jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Header", children: _jsx(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, placeholder: isScheduled ? 'Enter header (required)' : '(Use Default Header Message)', type: 'text', autoFocus: false, value: messageHeader, 
-                                            // placeholder="defaults to column name"
-                                            onChange: (e) => onMessageHeaderChange(e) }) }), _jsx(FormRow, { label: "Message", children: _jsx(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, type: 'text', autoFocus: false, placeholder: isScheduled ? 'Enter message (required)' : undefined, value: messageText, onChange: (e) => onMessageTextChange(e) }) })] }), showDocumentationLinks && !isScheduled && (_jsxs(HelpBlock, { "data-name": "alert-message-documentation", className: "twa:mt-3 twa:mb-2 twa:p-0 twa:text-3", children: [_jsx(ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(AlertMessageDocsLink, '_blank') }), "See how to create dynamic Alert Messages using placeholders"] }))] })] })] }));
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [_jsx(Box, { "data-name": "message-type", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Message Type" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose how the Alert message is styled" })] }), _jsx(Card.Body, { children: _jsxs(RadioGroup, { value: messageType, name: "messageType", orientation: "horizontal", onRadioChange: (MessageType) => {
+                                    props.onChange({
+                                        ...data,
+                                        MessageType,
+                                    });
+                                }, children: [_jsx(Radio, { className: "twa:ml-1", value: "Info", children: "Info" }), _jsx(Radio, { className: "twa:ml-4", value: "Success", children: "Success" }), _jsx(Radio, { className: "twa:ml-4", value: "Warning", children: "Warning" }), _jsx(Radio, { className: "twa:ml-4", value: "Error", children: "Error" })] }) })] }) }), _jsx(Box, { "data-name": "message-header", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Header" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: isScheduled
+                                        ? 'Enter the header shown when this scheduled alert fires'
+                                        : 'Optional header text (leave blank to use the default)' })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Textarea, { className: "twa:min-w-[300px] twa:w-full twa:max-w-[500px]", rows: 3, placeholder: isScheduled ? 'Enter header (required)' : '(Use Default Header Message)', type: 'text', autoFocus: false, value: messageHeader, onChange: (e) => onMessageHeaderChange(e) }) })] }) }), _jsx(Box, { "data-name": "message-body", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Body" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: isScheduled
+                                        ? 'Enter the message body shown when this scheduled alert fires'
+                                        : 'Alert message body (leave blank to show automated message based on Alert Type)' })] }), _jsxs(Card.Body, { className: "twa:p-1", children: [_jsx(Textarea, { className: "twa:min-w-[300px] twa:w-full twa:max-w-[500px]", rows: 3, type: 'text', autoFocus: false, placeholder: isScheduled ? 'Enter message (required)' : undefined, value: messageText, onChange: (e) => onMessageTextChange(e) }), showDocumentationLinks && !isScheduled && (_jsxs(HelpBlock, { "data-name": "alert-message-documentation", className: "twa:mt-3 twa:p-0 twa:text-3", children: [_jsx(ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(AlertMessageDocsLink, '_blank') }), "See how to create dynamic Alert Messages using placeholders"] }))] })] }) })] }));
 };

package/src/View/Alert/Wizard/AlertNotificationWizardSection.d.ts

@@ -3,7 +3,7 @@ import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
 import { AlertType } from '../Utilities/getAlertType';
 import { BoxProps } from '../../../components/Flex';
-export declare const renderAlertNotificationSummary: () => React.JSX.Element;
+export declare const renderAlertNotificationSummary: (data: AlertDefinition, api: AdaptableApi) => React.JSX.Element;
 interface AlertPreviewProps extends BoxProps {
     className?: string;
     style?: React.CSSProperties;