@adaptabletools/adaptable 23.0.0-canary.7 → 23.0.0-canary.9

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+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';
@@ -8,9 +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 { Card } from '../../../components/Card';
+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',
@@ -34,6 +37,125 @@ const AlertButtonPreview = ({ button, messageType }) => {
 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) => {
@@ -41,22 +163,14 @@ export const AlertButtonsEditor = (props) => {
     };
     const alertDefinition = adaptableAlert.alertDefinition;
     const messageType = alertDefinition?.MessageType ?? 'Info';
-    // const rowAddedAlert =
-    //  api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
     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');
@@ -82,120 +196,39 @@ export const AlertButtonsEditor = (props) => {
             buttonCommands.push(ch.name);
         });
     }
-    return (_jsxs(Box, { className: "twa:mt-3", children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between", className: "twa:mb-3", 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: () => {
-                            onChange([
-                                ...(AlertButtons || []),
-                                {
-                                    Label: 'OK',
-                                    ButtonStyle: {
-                                        variant: 'raised',
-                                    },
-                                },
-                            ]);
-                        }, children: "Add" })] }), _jsx(Flex, { flexDirection: "column", className: "twa:gap-3", children: 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 (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { className: "twa:justify-between twa:gap-3", children: [_jsxs(Box, { className: "twa:font-medium twa:shrink-0", children: ["Button ", index + 1] }), _jsx(Flex, { justifyContent: "center", className: "twa:flex-1 twa:min-w-0", children: _jsx(AlertButtonPreview, { button: button, messageType: messageType }) }), _jsx(SimpleButton, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
-                                            onChange(AlertButtons.filter((btn) => btn !== button));
-                                        } })] }), _jsx(Card.Body, { children: _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 }) }))] }) })] }, 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/AlertNotificationWizardSection.js

@@ -6,8 +6,8 @@ import { CheckBox } from '../../../components/CheckBox';
 import { AdaptablePopupAlert } from '../../Components/Popups/AdaptablePopupAlert';
 import { AlertButtonsEditor } from './AlertButtonsEditor';
 import { AlertType } from '../Utilities/getAlertType';
-import { isScheduledAlertDefinition, scheduledAlertIncludeSuspendButton, } from '../../../Utilities/Helpers/ScheduledAlertHelper';
-import { resolveAlertFormForDefinition } from '../../../Utilities/Helpers/alertFormHelper';
+import { isScheduledAlertDefinition, scheduledAlertIncludeSuspendButton, } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
+import { resolveAlertFormForDefinition } from '../../../Utilities/Helpers/AlertHelper';
 import { Box, Flex } from '../../../components/Flex';
 import { Card } from '../../../components/Card';
 export const renderAlertNotificationSummary = (data, api) => {
@@ -133,5 +133,5 @@ export const AlertNotificationWizardSection = (props) => {
                                             } }));
                                     })()
                                     : null] })] }) }), data.AlertProperties?.DisplayNotification ? (_jsx(Box, { "data-name": "alert-preview", children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Alert Preview" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Preview how the notification will appear when triggered" })] }), _jsx(Card.Body, { children: !isScheduled &&
-                                typeof data.AlertForm === 'string' ? (_jsx(Box, { className: "twa:text-2", children: "Preview not available because form is dynamically driven" })) : (_jsx(AlertPreview, { alertDefinition: data, api: api })) })] }) })) : null] }));
+                                typeof data.AlertForm === 'string' ? (_jsx(Box, { className: "twa:text-2", children: "Preview not available because form is dynamically driven" })) : (_jsx(AlertPreview, { alertDefinition: data, api: api, focusFirstButton: false })) })] }) })) : null] }));
 };

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

@@ -1,5 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { EntityRulesEditor, EntityRulesSummary } from '../../Components/EntityRulesEditor';
 import { Tag } from '../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { isScheduledAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { isScheduledAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { isScheduleValid, ScheduleBuilderWizard, } from '../../Schedule/Wizard/ScheduleScheduleWizard';
 import { Tag } from '../../../components/Tag';

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import { NewScopeComponent } from '../../Components/NewScopeComponent';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Box, Flex } from '../../../components/Flex';

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

@@ -1,4 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import { useState, useCallback } from 'react';
 import { OnePageAdaptableWizard, OnePageWizardSummary } from '../../Wizard/OnePageAdaptableWizard';
 import { cloneObject } from '../../../Utilities/Helpers/Helper';
@@ -11,7 +12,7 @@ import { AlertMessageWizardSection, renderAlertMessageSummary } from './AlertMes
 import { isValidAlertMessage } from './isValidAlertMessage';
 import { renderScopeSummary } from './BaseAlertScopeWizardSection';
 import { isScopeValid } from '../../Components/NewScopeComponent';
-import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
 import * as AlertRedux from '../../../Redux/ActionsReducers/AlertRedux';
@@ -77,7 +78,14 @@ export const AlertWizard = (props) => {
         setAlertType(newAlertType);
         doSetAlertDefinition(getDefaultAlertDefinition(alertDefinition, newAlertType));
     };
-    return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, modal: props.modal, data: alertDefinition, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+    const defaultEditSectionName = React.useMemo(() => {
+        if (props.defaultCurrentSectionName || !props.data) {
+            return props.defaultCurrentSectionName;
+        }
+        const type = getAlertType(props.data);
+        return type === AlertType.Scheduled ? 'Schedule' : 'Rule';
+    }, [props.defaultCurrentSectionName, props.data]);
+    return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: defaultEditSectionName, moduleInfo: props.moduleInfo, modal: props.modal, data: alertDefinition, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Name & Type',
                 isValid: isSettingsValid,

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

@@ -1,5 +1,5 @@
 import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utilities';
-import { isScheduledAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { isScheduledAlertDefinition } from '../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
 export const isValidAlertRules = (alert, api, context) => {
     if (isScheduledAlertDefinition(alert)) {
         return true;

package/src/View/Charting/ChartingWizard/AgChargingWizard/PreviewChartSection.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useSelector } from 'react-redux';
-import isEqual from '../../../../Utilities/utils/isEqual';
+import { isEqual } from '../../../../Utilities/Extensions/ObjectExtensions';
 import * as InternalRedux from '../../../../Redux/ActionsReducers/InternalRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 export const PreviewChartSection = (props) => {

package/src/View/Charting/ChartingWizard/AgChargingWizard/SettingsSection.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CheckBox } from '../../../../components/CheckBox';
 import { SingleSelect } from '../../../../components/NewSelect';
-import { validateChartName } from '../../../../Utilities/Helpers/chartingHelper';
+import { validateChartName } from '../../../../Utilities/Helpers/ChartHelper';
 import { Box, Flex } from '../../../../components/Flex';
 import { Card } from '../../../../components/Card';
 import Input from '../../../../components/Input';

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/SettingsSection.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { validateChartName } from '../../../../Utilities/Helpers/chartingHelper';
+import { validateChartName } from '../../../../Utilities/Helpers/ChartHelper';
 import { Box, Flex } from '../../../../components/Flex';
 import { Card } from '../../../../components/Card';
 import Input from '../../../../components/Input';

package/src/View/Comments/CommentsEditor.js

@@ -8,7 +8,7 @@ import * as CommentsRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { CommentsAndNotesSelector } from '../../Redux/ActionsReducers/InternalRedux';
 import { useAdaptable } from '../AdaptableContext';
 import AdaptableInput from '../Components/AdaptableInput';
-import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import FormatHelper from '../../Utilities/Helpers/DisplayFormatHelper';
 import { Box, Flex } from '../../components/Flex';
 import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
 // Edit Mode

package/src/View/Comments/CommentsPopup.js

@@ -6,7 +6,7 @@ import Panel from '../../components/Panel';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
-import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import FormatHelper from '../../Utilities/Helpers/DisplayFormatHelper';
 import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
 import { Box, Flex } from '../../components/Flex';
 const tableDOMProps = {

package/src/View/Components/AdaptableObjectList/AdaptableObjectCompactList.js

@@ -5,6 +5,7 @@ import SimpleButton from '../../../components/SimpleButton';
 import { useAdaptable } from '../../AdaptableContext';
 import { Box, Flex } from '../../../components/Flex';
 import { TagList } from '../../../components/Tag/Tag';
+import { objectListActionButtonClassName } from './objectListActionButtonStyles';
 const baseClassName = 'ab-Adaptable-Object-Compact-List';
 const ICON_SIZE = 20;
 export const AdaptableObjectCompactListItem = (props) => {
@@ -41,7 +42,7 @@ export const AdaptableObjectCompactListItem = (props) => {
                         ? React.createElement(objectView.item.view, {
                             data: props.abObject,
                         })
-                        : objectView.item.view, Boolean(objectView.item?.values && objectView.item?.values?.length) && (_jsx(Box, { className: `${baseClassName}__Item__Values`, children: _jsx(TagList, { tags: objectView.item.values, variant: objectView.item.tagVariant }) }))] }), suspendAction && unSuspendAction && (_jsx(SimpleButton, { onMouseDown: handleSuspendUnSuspend, tone: isSuspended ? 'neutral' : 'success', variant: "text", icon: isSuspended ? 'resume' : 'pause' })), _jsx(Flex, { className: "twa:ml-1 twa:flex-[0_0_auto]", children: deleteAction && (_jsx(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel })) })] }));
+                        : objectView.item.view, Boolean(objectView.item?.values && objectView.item?.values?.length) && (_jsx(Box, { className: `${baseClassName}__Item__Values`, children: _jsx(TagList, { tags: objectView.item.values, variant: objectView.item.tagVariant }) }))] }), suspendAction && unSuspendAction && (_jsx(SimpleButton, { onMouseDown: handleSuspendUnSuspend, tone: "neutral", variant: "text", iconSize: ICON_SIZE, icon: isSuspended ? 'resume' : 'pause', tooltip: isSuspended ? 'Resume' : 'Suspend', className: objectListActionButtonClassName('suspend', isSuspended ? 'twa:opacity-60' : undefined) })), _jsx(Flex, { className: "twa:ml-1 twa:flex-[0_0_auto] twa:gap-1", children: deleteAction && (_jsx(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel, className: objectListActionButtonClassName('delete') })) })] }));
 };
 export const AdaptableObjectCompactList = (props) => {
     const adaptable = useAdaptable();
@@ -64,7 +65,7 @@ export const AdaptableObjectCompactList = (props) => {
             dispatch(unSuspendAllAction);
         }
     }, [isAtLeastOneAbObjectActive]);
-    return (_jsxs(Flex, { flexDirection: "column", className: baseClassName, children: [_jsxs(Flex, { className: `${baseClassName}__Header twa:text-3`, children: [_jsx(Flex, { className: `${baseClassName}__Title`, alignItems: 'center', children: props.module.moduleInfo.FriendlyName }), _jsx(Box, { className: "twa:flex-1" }), suspendAllAction && unSuspendAllAction && (_jsx(SimpleButton, { className: "twa:mr-2", onMouseDown: handleSuspendUnsuspendAll, tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel, children: isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All' })), deleteAllAction && (_jsx(SimpleButton, { onMouseDown: () => dispatch(deleteAllAction), variant: "raised", tone: "neutral", accessLevel: accessLevel, children: "Clear All" }))] }), _jsx(Box, { className: `${baseClassName}__Body`, children: props.abObjects.map((abObject) => {
+    return (_jsxs(Flex, { flexDirection: "column", className: baseClassName, children: [_jsxs(Flex, { className: `${baseClassName}__Header twa:text-3`, children: [_jsx(Flex, { className: `${baseClassName}__Title`, alignItems: 'center', children: props.module.moduleInfo.FriendlyName }), _jsx(Box, { className: "twa:flex-1" }), suspendAllAction && unSuspendAllAction && (_jsx(SimpleButton, { className: "twa:mr-2", onMouseDown: handleSuspendUnsuspendAll, tone: "neutral", variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel, children: isAtLeastOneAbObjectActive ? 'Suspend All' : 'Resume All' })), deleteAllAction && (_jsx(SimpleButton, { onMouseDown: () => dispatch(deleteAllAction), variant: "raised", tone: "neutral", accessLevel: accessLevel, children: "Clear All" }))] }), _jsx(Box, { className: `${baseClassName}__Body`, children: props.abObjects.map((abObject) => {
                     return (_jsx(AdaptableObjectCompactListItem, { abObject: abObject, module: props.module }, abObject.Uuid));
                 }) })] }));
 };

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -13,6 +13,7 @@ import { SuspendToggleButton } from '../Buttons/SuspendToggleButton/SuspendToggl
 import { Box, Flex } from '../../../components/Flex';
 import { twMerge } from '../../../twMerge';
 import { TagList } from '../../../components/Tag/Tag';
+import { objectListActionButtonClassName } from './objectListActionButtonStyles';
 const ICON_SIZE = 26;
 const LIST_BASE_CLASS_NAME = 'ab-Adaptable-Object-List';
 const ITEM_BASE_CLASS_NAME = `${LIST_BASE_CLASS_NAME}__Item`;
@@ -35,7 +36,7 @@ export const AdaptableObjectListItemView = (props) => {
             dispatch(props.deleteAction);
         };
     }
-    const deleteActionButton = _jsx(ButtonDelete, { ...deleteActionProps });
+    const deleteActionButton = (_jsx(ButtonDelete, { ...deleteActionProps, className: twMerge(objectListActionButtonClassName('delete'), deleteActionProps.className) }));
     return (_jsxs(Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", className: twMerge(baseClassName, 'twa:rounded-standard', props.className), style: props.style, children: [_jsx(Box, { className: `twa:flex-1 ${baseClassName}__rows twa:gap-2 twa:flex twa:flex-col`, children: props.items.filter?.(Boolean)?.map((tag, index) => {
                     const labelElement = typeof tag.label === 'function'
                         ? React.createElement(tag.label, { key: index, data: props.abObject })
@@ -53,7 +54,7 @@ export const AdaptableObjectListItemView = (props) => {
                                             module: props.module,
                                         })
                                         : tag.viewAfter] })] }, `${index}-${tag.name}`));
-                }) }), props.showActions && (_jsxs(Flex, { flexDirection: "column", className: `${baseClassName}__buttons twa:ml-3 twa:pl-3 twa:text-right twa:min-w-[80px]`, children: [_jsxs(Flex, { className: "twa:justify-end", children: [props.actions, props.teamSharingActivated && (_jsx(ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare })), props.onDelete && (_jsx(SimpleButton, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "delete", onClick: props.onDelete, variant: "text" })), props.deleteAction ? deleteActionButton : null, props.showEditButton && (_jsx(ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, onClick: () => props.handleOnEdit() }))] }), props.suspendedEnabled && (_jsxs(_Fragment, { children: [_jsx(Box, { className: "twa:flex-1 twa:min-h-[20px]" }), _jsx(Flex, { className: "twa:justify-end", children: _jsx(SuspendToggleButton, { onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel }) })] }))] }))] }));
+                }) }), props.showActions && (_jsx(Flex, { flexDirection: "column", className: `${baseClassName}__buttons twa:ml-3 twa:pl-3 twa:text-right twa:min-w-[80px]`, children: _jsxs(Flex, { className: "twa:justify-end twa:items-center twa:gap-1", children: [props.actions, props.teamSharingActivated && (_jsx(ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare, className: objectListActionButtonClassName('share') })), props.showEditButton && (_jsx(ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, className: objectListActionButtonClassName('edit'), onClick: () => props.handleOnEdit() })), props.suspendedEnabled && (_jsx(SuspendToggleButton, { iconSize: ICON_SIZE, className: objectListActionButtonClassName('suspend'), onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel })), props.onDelete && (_jsx(SimpleButton, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "delete", onClick: props.onDelete, variant: "text", className: objectListActionButtonClassName('delete') })), props.deleteAction ? deleteActionButton : null] }) }))] }));
 };
 export const AdaptableObjectListItem = (props) => {
     const adaptable = useAdaptable();

package/src/View/Components/AdaptableObjectList/objectListActionButtonStyles.d.ts

@@ -0,0 +1,2 @@
+export type ObjectListActionKind = 'edit' | 'suspend' | 'delete' | 'share';
+export declare const objectListActionButtonClassName: (kind: ObjectListActionKind, className?: string) => string;

package/src/View/Components/AdaptableObjectList/objectListActionButtonStyles.js

@@ -0,0 +1,2 @@
+import { cn } from '../../../lib/utils';
+export const objectListActionButtonClassName = (kind, className) => cn('ab-ObjectListActionButton', `ab-ObjectListActionButton--${kind}`, className);

package/src/View/Components/Buttons/EntityListActionButtons.js

@@ -37,6 +37,6 @@ export class EntityListActionButtons extends React.Component {
             'twa:justify-center': justifyContent === 'center',
             'twa:justify-end': justifyContent === 'end',
         }) || 'twa:justify-center';
-        return (_jsxs(Flex, { className: `${justifyContentClassName} twa:m-0 twa:p-0`, onClick: stopPropagation, children: [this.props.showEdit && (_jsx(ButtonEdit, { onClick: () => (this.props.editClick ? this.props.editClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-action-edit-foreground twa:bg-action-edit twa:fill-action-edit-foreground`, disabled: this.props.overrideDisableEdit || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipEdit, accessLevel: this.props.accessLevel })), this.props.showClone && (_jsx(ButtonClone, { onClick: () => (this.props.cloneClick ? this.props.cloneClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-action-clone-foreground twa:bg-action-clone twa:fill-action-clone-foreground`, children: null, disabled: this.props.overrideDisableClone || this.props.cloneAccessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipClone, accessLevel: this.props.cloneAccessLevel })), this.props.showDelete && (_jsx(ButtonDelete, { "data-name": "delete", className: `twa:mx-[px] twa:my-[2px] twa:text-action-delete-foreground twa:bg-action-delete twa:fill-action-delete-foreground`, disabled: this.props.overrideDisableDelete || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipDelete, ConfirmAction: this.props.confirmDeleteAction, ConfirmationMsg: 'Are you sure you want to delete this ' + this.props.entityType + '?', ConfirmationTitle: 'Delete ' + this.props.entityType, accessLevel: this.props.accessLevel })), this.props.showShare && (_jsx(ButtonShare, { className: `twa:mx-[1px] twa:my-[2px] twa:text-action-share-foreground twa:bg-action-share twa:fill-action-share-foreground`, onShare: (config) => this.props.shareClick ? this.props.shareClick(config) : null, Header: `TeamSharing ${this.props.entityType}`, disabled: this.props.overrideDisableShare || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipShare, accessLevel: this.props.accessLevel })), this.props.showSuspend && this.props.suspendableObject && (_jsx(SuspendToggleButton, { className: `twa:ml-[2px] twa:align-self-center`, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend, suspendableObject: this.props.suspendableObject, disabled: this.props.accessLevel == ACCESS_LEVEL_READ_ONLY }))] }));
+        return (_jsxs(Flex, { className: `${justifyContentClassName} twa:m-0 twa:p-0`, onClick: stopPropagation, children: [this.props.showEdit && (_jsx(ButtonEdit, { onClick: () => (this.props.editClick ? this.props.editClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-action-edit-foreground twa:bg-action-edit twa:fill-action-edit-foreground`, disabled: this.props.overrideDisableEdit || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipEdit, accessLevel: this.props.accessLevel })), this.props.showClone && (_jsx(ButtonClone, { onClick: () => (this.props.cloneClick ? this.props.cloneClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-action-clone-foreground twa:bg-action-clone twa:fill-action-clone-foreground`, children: null, disabled: this.props.overrideDisableClone || this.props.cloneAccessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipClone, accessLevel: this.props.cloneAccessLevel })), this.props.showDelete && (_jsx(ButtonDelete, { "data-name": "delete", className: `twa:mx-[px] twa:my-[2px] twa:text-action-delete-foreground twa:bg-action-delete twa:fill-action-delete-foreground`, disabled: this.props.overrideDisableDelete || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipDelete, ConfirmAction: this.props.confirmDeleteAction, ConfirmationMsg: 'Are you sure you want to delete this ' + this.props.entityType + '?', ConfirmationTitle: 'Delete ' + this.props.entityType, accessLevel: this.props.accessLevel })), this.props.showShare && (_jsx(ButtonShare, { className: `twa:mx-[1px] twa:my-[2px] twa:text-action-share-foreground twa:bg-action-share twa:fill-action-share-foreground`, onShare: (config) => this.props.shareClick ? this.props.shareClick(config) : null, Header: `TeamSharing ${this.props.entityType}`, disabled: this.props.overrideDisableShare || this.props.accessLevel == ACCESS_LEVEL_READ_ONLY, tooltip: this.props.overrideTooltipShare, accessLevel: this.props.accessLevel })), this.props.showSuspend && this.props.suspendableObject && (_jsx(SuspendToggleButton, { className: "twa:align-self-center", iconSize: 24, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend, suspendableObject: this.props.suspendableObject, disabled: this.props.accessLevel == ACCESS_LEVEL_READ_ONLY }))] }));
     }
 }

package/src/View/Components/Buttons/SuspendToggleButton/SuspendToggleButton.d.ts

@@ -9,6 +9,7 @@ interface EntityListSuspendButtonProps {
     disabled?: boolean;
     accessLevel?: AccessLevel;
     className?: string;
+    iconSize?: number;
 }
 export declare const SuspendToggleButton: React.FunctionComponent<EntityListSuspendButtonProps>;
 export {};

package/src/View/Components/Buttons/SuspendToggleButton/SuspendToggleButton.js

@@ -1,18 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { ToggleButton } from '../../../../components/ToggleButton';
+import SimpleButton from '../../../../components/SimpleButton';
 import { ACCESS_LEVEL_READ_ONLY } from '../../../../Utilities/Constants/GeneralConstants';
 import { cn } from '../../../../lib/utils';
-export const SuspendToggleButton = React.memo(({ suspendableObject, onUnSuspend, onSuspend, style, disabled, accessLevel, className }) => {
-    const handleOnChange = React.useCallback((checked) => {
-        if (checked) {
+export const SuspendToggleButton = React.memo(({ suspendableObject, onUnSuspend, onSuspend, style, disabled, accessLevel, className, iconSize = 26, }) => {
+    const preparedDisabled = (accessLevel && accessLevel === ACCESS_LEVEL_READ_ONLY) || disabled;
+    const isSuspended = suspendableObject.IsSuspended;
+    const handleClick = React.useCallback(() => {
+        if (isSuspended) {
             onUnSuspend(suspendableObject);
         }
         else {
             onSuspend(suspendableObject);
         }
-    }, [onUnSuspend, onSuspend]);
-    const preparedDisabled = (accessLevel && accessLevel === ACCESS_LEVEL_READ_ONLY) || disabled;
-    const isSuspended = suspendableObject.IsSuspended;
-    return (_jsx(ToggleButton, { className: cn(`ab-SuspendButton`, className), "data-name": suspendableObject.IsSuspended ? 'un-suspend' : 'suspend', disabled: preparedDisabled, style: style, onChange: handleOnChange, checked: !isSuspended, children: isSuspended ? 'inactive' : 'active' }));
+    }, [isSuspended, onSuspend, onUnSuspend, suspendableObject]);
+    return (_jsx(SimpleButton, { className: cn('ab-SuspendButton', isSuspended && 'twa:opacity-60', className), "data-name": isSuspended ? 'resume' : 'suspend', disabled: preparedDisabled, style: style, variant: "text", tone: "neutral", iconSize: iconSize, icon: isSuspended ? 'resume' : 'pause', tooltip: isSuspended ? 'Resume' : 'Suspend', accessLevel: accessLevel, onClick: handleClick }));
 });