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

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

@@ -1,25 +1,30 @@
-import * as React from 'react';
+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 { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { CodeBlock } from '../../../components/CodeBlock';
+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 = () => {
+export const renderAlertMessageSummary = (alertType) => {
     const { data } = useOnePageAdaptableWizardContext();
-    return (React.createElement(Box, { className: "twa:text-2" },
-        "Message Type ",
-        React.createElement(CodeBlock, null, data.MessageType)));
+    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(SummaryText, { children: ["Message Type: ", _jsx(Tag, { children: data.MessageType })] }));
 };
 export const AlertMessageWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const messageType = data.MessageType;
-    const messageText = api.alertApi.internalApi.getAlertDescriptionForDataChange(data);
-    const messageHeader = data.MessageHeader;
+    const isScheduled = props.alertType === AlertType.Scheduled;
+    const messageText = isScheduled
+        ? data.MessageText ?? ''
+        : api.alertApi.internalApi.getAlertDescriptionForDataChange(data);
+    const messageHeader = data.MessageHeader ?? '';
     const showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
     const onMessageTextChange = (e) => {
         const { value } = e.target;
@@ -35,32 +40,14 @@ export const AlertMessageWizardSection = (props) => {
             MessageHeader: value,
         });
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Tabs, { "data-name": "message-type" },
-            React.createElement(Tabs.Tab, null, "Message Type"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(RadioGroup, { value: messageType, name: "messageType", orientation: "horizontal", onRadioChange: (MessageType) => {
-                        props.onChange({
-                            ...data,
-                            MessageType,
-                        });
-                    } },
-                    React.createElement(Radio, { className: "twa:ml-1", value: "Info" }, "Info"),
-                    React.createElement(Radio, { className: "twa:ml-4", value: "Success" }, "Success"),
-                    React.createElement(Radio, { className: "twa:ml-4", value: "Warning" }, "Warning"),
-                    React.createElement(Radio, { className: "twa:ml-4", value: "Error" }, "Error")))),
-        React.createElement(Tabs, { "data-name": "message-text", className: "twa:mt-2 twa:mb-3", autoFocus: false },
-            React.createElement(Tabs.Tab, null, "Message Text"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(Box, { className: "twa:text-2 twa:mt-3 twa:mb-2" }, "Text to display as the Alert Message (leave blank to show automated Message based on Alert Type)"),
-                React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Header" },
-                        React.createElement(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, placeholder: "(Use Default Header Message)", type: 'text', autoFocus: false, value: messageHeader ?? '', 
-                            // placeholder="defaults to column name"
-                            onChange: (e) => onMessageHeaderChange(e) })),
-                    React.createElement(FormRow, { label: "Message" },
-                        React.createElement(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, type: 'text', autoFocus: false, value: messageText ?? '', onChange: (e) => onMessageTextChange(e) }))),
-                showDocumentationLinks && (React.createElement(HelpBlock, { "data-name": "alert-message-documentation", className: "twa:mt-3 twa:mb-2 twa:p-0 twa:text-3" },
-                    React.createElement(ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(AlertMessageDocsLink, '_blank') }),
-                    "See how to create dynamic Alert Messages using placeholders"))))));
+    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"] }))] })] })] }));
 };

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

@@ -1,17 +1,21 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import { Tabs } from '../../../components/Tabs';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CheckBox } from '../../../components/CheckBox';
 import { AdaptablePopupAlert } from '../../Components/Popups/AdaptablePopupAlert';
 import { AlertButtonsEditor } from './AlertButtonsEditor';
-import { Box } from '../../../components/Flex';
+import { AlertType } from '../Utilities/getAlertType';
+import { isScheduledAlertDefinition, scheduledAlertIncludeSuspendButton, } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { resolveAlertFormForDefinition } from '../../../Utilities/Helpers/alertFormHelper';
+import { Box, Flex } from '../../../components/Flex';
 import clsx from 'clsx';
 export const renderAlertNotificationSummary = () => {
     const { data, api } = useOnePageAdaptableWizardContext();
     if (!data.AlertProperties?.DisplayNotification) {
-        return React.createElement(Box, { className: "twa:text-2" }, "No Alert Notification will be displayed");
+        return _jsx(Box, { className: "twa:text-2", children: "No Alert Notification will be displayed" });
     }
-    return React.createElement(AlertPreview, { api: api, alertDefinition: data });
+    return _jsx(AlertPreview, { api: api, alertDefinition: data });
 };
 export const AlertPreview = ({ alertDefinition, api, focusFirstButton, ...boxProps }) => {
     const mapButtons = React.useCallback((button) => {
@@ -28,78 +32,107 @@ export const AlertPreview = ({ alertDefinition, api, focusFirstButton, ...boxPro
         return button;
     }, [alertDefinition?.MessageType]);
     const alertToPreview = React.useMemo(() => {
-        const alertForm = alertDefinition.AlertForm || api.alertApi.internalApi.getDefaultAlertNotificationForm();
+        const defaultForm = api.alertApi.internalApi.getDefaultAlertNotificationForm();
+        const alertForm = resolveAlertFormForDefinition(alertDefinition, defaultForm);
         if (typeof alertForm !== 'string') {
             alertForm.Buttons = (alertForm.Buttons ?? []).map(mapButtons);
         }
         const result = {
             alertType: 'generic',
-            header: api.alertApi.internalApi.getAlertMessageHeaderForDataChange(alertDefinition),
-            message: api.alertApi.internalApi.getAlertDescriptionForDataChange(alertDefinition),
-            alertDefinition: {
-                ...alertDefinition,
-                AlertForm: alertForm,
-            },
+            header: alertDefinition.MessageHeader ??
+                api.alertApi.internalApi.getAlertMessageHeaderForDataChange(alertDefinition),
+            message: alertDefinition.MessageText ??
+                api.alertApi.internalApi.getAlertDescriptionForDataChange(alertDefinition),
+            alertDefinition: isScheduledAlertDefinition(alertDefinition)
+                ? alertDefinition
+                : {
+                    ...alertDefinition,
+                    AlertForm: alertForm,
+                },
         };
         return result;
-    }, [alertDefinition]);
-    return (React.createElement(Box, { ...boxProps, className: clsx('ab-AlertPreview', boxProps.className), style: {
-            border: '1px solid var(--ab-color-inputborder)',
+    }, [alertDefinition, api, mapButtons]);
+    return (_jsx(Box, { ...boxProps, className: clsx('ab-AlertPreview', boxProps.className), style: {
+            border: '1px solid var(--ab-color-input-border)',
             ...boxProps.style,
-        } },
-        React.createElement(AdaptablePopupAlert, { headless: true, focusFirstButton: focusFirstButton, adaptableAlert: alertToPreview, onClose: () => { } })));
+        }, children: _jsx(AdaptablePopupAlert, { headless: true, focusFirstButton: focusFirstButton, adaptableAlert: alertToPreview, onClose: () => { } }) }));
 };
 export const AlertNotificationWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
+    const isScheduled = props.alertType === AlertType.Scheduled;
+    const scheduledData = isScheduledAlertDefinition(data) ? data : null;
+    const includeSuspendButton = scheduledData
+        ? scheduledAlertIncludeSuspendButton(scheduledData)
+        : false;
     const adaptableAlert = {
         alertType: 'generic',
-        header: data.MessageType,
-        message: '',
+        header: data.MessageHeader ?? data.MessageType,
+        message: data.MessageText ?? '',
         alertDefinition: data,
     };
-    if (data.AlertProperties.DisplayNotification && data.AlertForm == undefined) {
-        data.AlertForm = api.alertApi.internalApi.getDefaultAlertNotificationForm();
-    }
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Tabs, { "data-name": "display-options", className: "twa:mt-2 twa:mb-3", autoFocus: false },
-            React.createElement(Tabs.Tab, null, "Notification Options"),
-            React.createElement(Tabs.Content, null,
-                React.createElement("div", null,
-                    React.createElement(CheckBox, { checked: data.AlertProperties?.DisplayNotification, onChange: (DisplayNotification) => {
-                            const newAlertDefinition = {
-                                ...data,
-                                AlertProperties: {
-                                    ...data.AlertProperties,
-                                    DisplayNotification,
-                                },
-                            };
-                            if (!DisplayNotification && typeof newAlertDefinition.AlertForm === 'object') {
-                                delete newAlertDefinition.AlertForm.Buttons;
-                            }
-                            if (DisplayNotification && newAlertDefinition.AlertForm == undefined) {
-                                newAlertDefinition.AlertForm =
-                                    api.alertApi.internalApi.getDefaultAlertNotificationForm();
-                            }
-                            // make sure we have at least one button
-                            if (typeof newAlertDefinition.AlertForm === 'object' &&
-                                (!newAlertDefinition.AlertForm?.Buttons ||
-                                    newAlertDefinition.AlertForm?.Buttons?.length === 0)) {
-                                newAlertDefinition.AlertForm.Buttons = [
-                                    api.alertApi.internalApi.getDefaultButton(),
-                                ];
-                            }
-                            props.onChange(newAlertDefinition);
-                        } }, "Display a Notification when Alert is triggered (with action buttons)")),
-                data.AlertProperties?.DisplayNotification ? (typeof data.AlertForm === 'string' ? (React.createElement(Box, { className: "twa:text-2" }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor, { alertType: props.alertType, AlertButtons: data.AlertForm?.Buttons, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
-                        props.onChange({
-                            ...data,
-                            AlertForm: {
-                                ...data.AlertForm,
-                                Buttons: buttons,
-                            },
-                        });
-                    } }))) : null)),
-        data.AlertProperties?.DisplayNotification ? (React.createElement(Tabs, { "data-name": "alert-preview", autoFocus: false },
-            React.createElement(Tabs.Tab, null, "Alert Preview"),
-            React.createElement(Tabs.Content, null, typeof data.AlertForm === 'string' ? (React.createElement(Box, { className: "twa:text-2" }, "Preview not available because form is dynamically driven")) : (React.createElement(AlertPreview, { alertDefinition: data, api: api }))))) : null));
+    const updateScheduledProperties = (partial) => {
+        if (!scheduledData) {
+            return;
+        }
+        props.onChange({
+            ...scheduledData,
+            AlertProperties: {
+                ...scheduledData.AlertProperties,
+                ...partial,
+            },
+        });
+    };
+    return (_jsxs(_Fragment, { children: [_jsxs(Tabs, { "data-name": "display-options", className: "twa:mt-2 twa:mb-3", autoFocus: false, children: [_jsx(Tabs.Tab, { children: "Notification Options" }), _jsxs(Tabs.Content, { children: [_jsxs(Flex, { flexDirection: "column", alignItems: "flex-start", className: isScheduled ? 'twa:gap-2' : undefined, children: [_jsx(CheckBox, { className: isScheduled ? 'twa:my-0' : undefined, checked: data.AlertProperties?.DisplayNotification, onChange: (DisplayNotification) => {
+                                            if (isScheduled && scheduledData) {
+                                                updateScheduledProperties({ DisplayNotification });
+                                                return;
+                                            }
+                                            const ruleData = data;
+                                            const newAlertDefinition = {
+                                                ...ruleData,
+                                                AlertProperties: {
+                                                    ...ruleData.AlertProperties,
+                                                    DisplayNotification,
+                                                },
+                                            };
+                                            if (!DisplayNotification && typeof newAlertDefinition.AlertForm === 'object') {
+                                                delete newAlertDefinition.AlertForm.Buttons;
+                                            }
+                                            if (DisplayNotification) {
+                                                newAlertDefinition.AlertForm =
+                                                    newAlertDefinition.AlertForm ??
+                                                        api.alertApi.internalApi.getDefaultAlertNotificationForm();
+                                            }
+                                            if (DisplayNotification &&
+                                                typeof newAlertDefinition.AlertForm === 'object' &&
+                                                (!newAlertDefinition.AlertForm?.Buttons ||
+                                                    newAlertDefinition.AlertForm?.Buttons?.length === 0)) {
+                                                newAlertDefinition.AlertForm.Buttons = [
+                                                    api.alertApi.internalApi.getDefaultButton(),
+                                                ];
+                                            }
+                                            props.onChange(newAlertDefinition);
+                                        }, children: isScheduled
+                                            ? 'Display a Notification when the Schedule is triggered'
+                                            : 'Display a Notification when Alert is triggered (with action buttons)' }), isScheduled && scheduledData && data.AlertProperties?.DisplayNotification ? (_jsx(CheckBox, { className: "twa:my-0", checked: includeSuspendButton, onChange: (IncludeSuspendButton) => {
+                                            updateScheduledProperties({ IncludeSuspendButton });
+                                        }, children: "Include Suspend button on notification" })) : null] }), data.AlertProperties?.DisplayNotification && !isScheduled
+                                ? (() => {
+                                    const ruleData = data;
+                                    const alertForm = ruleData.AlertForm;
+                                    if (typeof alertForm === 'string') {
+                                        return (_jsx(Box, { className: "twa:text-2", children: "Alert buttons cannot be customized because form is dynamically driven" }));
+                                    }
+                                    return (_jsx(AlertButtonsEditor, { alertType: props.alertType, AlertButtons: alertForm?.Buttons, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
+                                            props.onChange({
+                                                ...ruleData,
+                                                AlertForm: {
+                                                    ...(alertForm ?? { fields: [] }),
+                                                    Buttons: buttons,
+                                                },
+                                            });
+                                        } }));
+                                })()
+                                : null] })] }), data.AlertProperties?.DisplayNotification ? (_jsxs(Tabs, { "data-name": "alert-preview", autoFocus: false, children: [_jsx(Tabs.Tab, { children: "Alert Preview" }), _jsx(Tabs.Content, { 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] }));
 };

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

@@ -1,4 +1,5 @@
-import * as React from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
 import { EntityRulesEditor, EntityRulesSummary } from '../../Components/EntityRulesEditor';
 import { Tag } from '../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
@@ -10,34 +11,29 @@ import { Box } from '../../../components/Flex';
 export const getRuleStepDescription = (alertType) => {
     switch (alertType) {
         case 'DataChange':
-            return (React.createElement(React.Fragment, null,
-                "Build the Rule ",
-                React.createElement("b", null, "when"),
-                " the Alert should trigger (using a Predicate or a Query)"));
+            return (_jsxs(_Fragment, { children: ["Build the Rule ", _jsx("b", { children: "when" }), " the Alert should trigger (using a Predicate or a Query)"] }));
         case 'RowChange':
-            return React.createElement(React.Fragment, null, "Specify which type of Row Change will trigger the Alert");
+            return _jsx(_Fragment, { children: "Specify which type of Row Change will trigger the Alert" });
         case 'Validation':
-            return (React.createElement(React.Fragment, null, "Create the Validation Rule which will trigger the Alert (using a Predicate or a Query)"));
+            return (_jsx(_Fragment, { children: "Create the Validation Rule which will trigger the Alert (using a Predicate or a Query)" }));
         case 'Aggregation':
-            return React.createElement(React.Fragment, null, "Build an Aggregation Boolean Rule to specify when the Alert should trigger");
+            return _jsx(_Fragment, { children: "Build an Aggregation Boolean Rule to specify when the Alert should trigger" });
         case 'Observable':
-            return React.createElement(React.Fragment, null, "Build an Observable Rule to specify when the Alert should trigger");
+            return _jsx(_Fragment, { children: "Build an Observable Rule to specify when the Alert should trigger" });
+        case 'Scheduled':
+            return _jsx(_Fragment, { children: "Scheduled alerts fire at the configured date and time" });
     }
     return '';
 };
 export const renderAlertRulesSummary = (alertDefinition) => {
-    return (React.createElement(EntityRulesSummary, { data: alertDefinition, renderPredicate: (contents) => {
-            return (React.createElement(React.Fragment, null,
-                "Alert Rule ",
-                React.createElement(Tag, null, contents)));
+    return (_jsx(EntityRulesSummary, { data: alertDefinition, renderPredicate: (contents) => {
+            return (_jsxs(_Fragment, { children: ["Alert Rule ", _jsx(Tag, { children: contents })] }));
         }, renderQueryExpression: (contents) => {
-            return (React.createElement(React.Fragment, null,
-                "Alert when ",
-                React.createElement(Tag, null, contents)));
+            return (_jsxs(_Fragment, { children: ["Alert when ", _jsx(Tag, { children: contents })] }));
         } }));
 };
 const RowChangeEditor = (props) => {
-    const expression = props.alert.Rule?.ObservableExpression;
+    const expression = props.alert.Rule.ObservableExpression;
     const handleRowAddedChange = () => {
         props.onChange({
             ...props.alert,
@@ -54,15 +50,14 @@ const RowChangeEditor = (props) => {
             },
         });
     };
-    return (React.createElement(Box, { className: "twa:p-2" },
-        React.createElement(Tabs, null,
-            React.createElement(Tabs.Tab, null, "Row Change"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(Radio, { onClick: () => handleRowAddedChange(), checked: expression?.includes(OBSERVABLE_EXPRESSION_ROW_ADDED) }, "Row Added"),
-                React.createElement(Radio, { onClick: () => handleRowRemovedChange(), checked: expression?.includes(OBSERVABLE_EXPRESSION_ROW_REMOVED) }, "Row Removed")))));
+    return (_jsx(Box, { className: "twa:p-2", children: _jsxs(Tabs, { children: [_jsx(Tabs.Tab, { children: "Row Change" }), _jsxs(Tabs.Content, { children: [_jsx(Radio, { onClick: () => handleRowAddedChange(), checked: expression?.includes(OBSERVABLE_EXPRESSION_ROW_ADDED), children: "Row Added" }), _jsx(Radio, { onClick: () => handleRowRemovedChange(), checked: expression?.includes(OBSERVABLE_EXPRESSION_ROW_REMOVED), children: "Row Removed" })] })] }) }));
 };
 export const AlertRulesWizardSection = (props) => {
-    const { data, api, moduleInfo } = useOnePageAdaptableWizardContext();
+    const { data: alertData, api, moduleInfo } = useOnePageAdaptableWizardContext();
+    if (!isRuleBasedAlertDefinition(alertData)) {
+        return null;
+    }
+    const data = alertData;
     const predicateDefs = getAvailablePredicateDefinitions(api, data.Scope, props.alertType);
     const showObservable = props.alertType === 'Observable';
     const showAggregation = props.alertType === 'Aggregation';
@@ -70,21 +65,12 @@ export const AlertRulesWizardSection = (props) => {
     const showPredicate = props.alertType === 'DataChange' || props.alertType == 'Validation';
     const enablePredicateColumnId = props.alertType === 'DataChange' || props.alertType == 'Validation';
     if (props.alertType === 'RowChange') {
-        return React.createElement(RowChangeEditor, { alert: data, onChange: props.onChange });
+        return _jsx(RowChangeEditor, { alert: data, onChange: props.onChange });
     }
-    return (React.createElement(EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "AnyChange", data: data, predicateDefs: predicateDefs, enablePredicateColumnId: enablePredicateColumnId, getPredicateDefsForColId: (colId) => getAvailablePredicateDefinitions(api, { ColumnIds: [colId] }, props.alertType), onChange: props.onChange, showAggregation: showAggregation, showObservable: showObservable, showBoolean: showBoolean, showPredicate: showPredicate, descriptions: {
+    return (_jsx(EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "AnyChange", data: data, predicateDefs: predicateDefs, enablePredicateColumnId: enablePredicateColumnId, getPredicateDefsForColId: (colId) => getAvailablePredicateDefinitions(api, { ColumnIds: [colId] }, props.alertType), onChange: props.onChange, showAggregation: showAggregation, showObservable: showObservable, showBoolean: showBoolean, showPredicate: showPredicate, descriptions: {
             selectPredicate: 'Build the Predicate',
-            useBooleanQuery: (React.createElement(React.Fragment, null,
-                "Use an BooleanQuery if ",
-                React.createElement("i", null, "Scope"),
-                " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression")),
-            useObservableQuery: (React.createElement(React.Fragment, null,
-                "Use an ObservableQuery if ",
-                React.createElement("i", null, "Scope"),
-                " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression")),
-            useAggregationQuery: (React.createElement(React.Fragment, null,
-                "Use an AggregatedBooleanQuery if ",
-                React.createElement("i", null, "Scope"),
-                " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+            useBooleanQuery: (_jsxs(_Fragment, { children: ["Use an BooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression"] })),
+            useObservableQuery: (_jsxs(_Fragment, { children: ["Use an ObservableQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression"] })),
+            useAggregationQuery: (_jsxs(_Fragment, { children: ["Use an AggregatedBooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression"] })),
         } }));
 };

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

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { AlertDefinition } from '../../../AdaptableState/AlertState';
+export declare const isScheduledAlertTimeValid: (alert: AlertDefinition) => true | string;
+export declare const renderAlertScheduledSummary: () => React.JSX.Element;
+type AlertScheduledWizardSectionProps = {
+    onChange: (alert: AlertDefinition) => void;
+};
+export declare const AlertScheduledWizardSection: React.FunctionComponent<AlertScheduledWizardSectionProps>;
+export {};

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

@@ -0,0 +1,31 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { isScheduledAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+import { isScheduleValid, ScheduleBuilderWizard, } from '../../Schedule/Wizard/ScheduleScheduleWizard';
+import { Tag } from '../../../components/Tag';
+import { SummaryText } from '../../Wizard/OnePageAdaptableWizard';
+import UIHelper from '../../../View/UIHelper';
+import { Box } from '../../../components/Flex';
+export const isScheduledAlertTimeValid = (alert) => {
+    if (!isScheduledAlertDefinition(alert)) {
+        return 'Schedule is not specified';
+    }
+    return isScheduleValid({ Schedule: alert.Schedule });
+};
+export const renderAlertScheduledSummary = () => {
+    const { data } = useOnePageAdaptableWizardContext();
+    if (!isScheduledAlertDefinition(data)) {
+        return null;
+    }
+    return (_jsxs(SummaryText, { children: ["Schedule: ", _jsx(Tag, { children: UIHelper.getScheduleDescription(data.Schedule) })] }));
+};
+export const AlertScheduledWizardSection = (props) => {
+    const { data } = useOnePageAdaptableWizardContext();
+    const handleScheduleChange = (scheduleData) => {
+        props.onChange({
+            ...data,
+            Schedule: scheduleData.Schedule,
+        });
+    };
+    return (_jsx(Box, { className: "twa:p-3", children: _jsx(ScheduleBuilderWizard, { onChange: handleScheduleChange }) }));
+};

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

@@ -1,18 +1,22 @@
-import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isRuleBasedAlertDefinition } from '../../../Utilities/Helpers/ScheduledAlertHelper';
 import { NewScopeComponent } from '../../Components/NewScopeComponent';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Flex } from '../../../components/Flex';
 import { isScopeColumnIds } from '../../../AdaptableState/Common/ColumnScope';
 export const AlertScopeWizardSection = (props) => {
-    const { data, api } = useOnePageAdaptableWizardContext();
+    const { data: alertData, api } = useOnePageAdaptableWizardContext();
+    if (!isRuleBasedAlertDefinition(alertData)) {
+        return null;
+    }
+    const data = alertData;
     let disableDataTypes = true;
     let disableColumns = true;
     if (props.alertType === 'DataChange' || props.alertType == 'Validation') {
         disableDataTypes = false;
         disableColumns = false;
     }
-    return (React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
-        React.createElement(NewScopeComponent, { disableColumns: disableColumns, disableDataTypes: disableDataTypes, descriptions: {
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full", children: _jsx(NewScopeComponent, { disableColumns: disableColumns, disableDataTypes: disableDataTypes, descriptions: {
                 rowScope: 'Changes in any Column in the row will trigger an Alert',
                 columnScope: 'Changes in selected Columns will trigger an Alert',
                 dataTypeScope: 'Changes in any Column which is of the selected Data Type(s) will trigger an Alert',
@@ -48,5 +52,5 @@ export const AlertScopeWizardSection = (props) => {
                     newData.Rule.BooleanExpression = '';
                 }
                 props.onChange(newData);
-            } })));
+            } }) }));
 };

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

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Tabs } from '../../../components/Tabs';
 import { AlertType, getAlertTypeText } from '../Utilities/getAlertType';
 import { TypeRadio } from '../../Wizard/TypeRadio';
@@ -22,13 +22,7 @@ export const isSettingsValid = (data, api) => {
 export const renderAlertTypeSummary = (alertType) => {
     const { data } = useOnePageAdaptableWizardContext();
     const text = getAlertTypeText(alertType);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(SummaryText, null,
-            "Name ",
-            React.createElement(Tag, null, data.Name || 'Not specified')),
-        React.createElement(SummaryText, null,
-            "Type ",
-            React.createElement(Tag, null, text))));
+    return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Name ", _jsx(Tag, { children: data.Name || 'Not specified' })] }), _jsxs(SummaryText, { children: ["Type ", _jsx(Tag, { children: text })] })] }));
 };
 export const AlertTypeWizardSection = (props) => {
     const { data } = useOnePageAdaptableWizardContext();
@@ -38,20 +32,5 @@ export const AlertTypeWizardSection = (props) => {
             Name: event.target.value,
         });
     };
-    return (React.createElement(Flex, { flexDirection: "column" },
-        React.createElement(Tabs, null,
-            React.createElement(Tabs.Tab, null, "Settings"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Name" },
-                        React.createElement(Input, { "data-name": "alert-name", className: "twa:flex-1 twa:max-w-[200px] twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: data.Name ?? '' }))))),
-        React.createElement(Tabs, { className: "twa:mt-2" },
-            React.createElement(Tabs.Tab, null, "Alert Type"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(Flex, { flexDirection: "column" },
-                    React.createElement(TypeRadio, { text: getAlertTypeText(AlertType.DataChange), description: "A change has been made to the Grid's underlying data", checked: props.alertType === AlertType.DataChange, onClick: () => props.onAlertTypeChange(AlertType.DataChange) }),
-                    React.createElement(TypeRadio, { text: getAlertTypeText(AlertType.RowChange), description: "A Row was added or removed from the data source", checked: props.alertType === AlertType.RowChange, onClick: () => props.onAlertTypeChange(AlertType.RowChange) }),
-                    React.createElement(TypeRadio, { text: getAlertTypeText(AlertType.Aggregation), description: "A change has been made to aggregated data (i.e. from multiple Rows)", onClick: () => props.onAlertTypeChange(AlertType.Aggregation), checked: props.alertType === AlertType.Aggregation }),
-                    React.createElement(TypeRadio, { text: getAlertTypeText(AlertType.Observable), description: "A specified change (or lack of change) over time has been observed in the Grid", onClick: () => props.onAlertTypeChange(AlertType.Observable), checked: props.alertType === AlertType.Observable }),
-                    React.createElement(TypeRadio, { text: getAlertTypeText(AlertType.Validation), description: "A change has broken a data validation rule", checked: props.alertType === AlertType.Validation, onClick: () => props.onAlertTypeChange(AlertType.Validation) }))))));
+    return (_jsxs(Flex, { flexDirection: "column", children: [_jsxs(Tabs, { children: [_jsx(Tabs.Tab, { children: "Settings" }), _jsx(Tabs.Content, { children: _jsx(FormLayout, { children: _jsx(FormRow, { label: "Name", children: _jsx(Input, { "data-name": "alert-name", className: "twa:flex-1 twa:max-w-[200px] twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: data.Name ?? '' }) }) }) })] }), _jsxs(Tabs, { className: "twa:mt-2", children: [_jsx(Tabs.Tab, { children: "Alert Type" }), _jsx(Tabs.Content, { children: _jsxs(Flex, { flexDirection: "column", children: [_jsx(TypeRadio, { text: getAlertTypeText(AlertType.DataChange), description: "A change has been made to the Grid's underlying data", checked: props.alertType === AlertType.DataChange, onClick: () => props.onAlertTypeChange(AlertType.DataChange) }), _jsx(TypeRadio, { text: getAlertTypeText(AlertType.RowChange), description: "A Row was added or removed from the data source", checked: props.alertType === AlertType.RowChange, onClick: () => props.onAlertTypeChange(AlertType.RowChange) }), _jsx(TypeRadio, { text: getAlertTypeText(AlertType.Aggregation), description: "A change has been made to aggregated data (i.e. from multiple Rows)", onClick: () => props.onAlertTypeChange(AlertType.Aggregation), checked: props.alertType === AlertType.Aggregation }), _jsx(TypeRadio, { text: getAlertTypeText(AlertType.Observable), description: "A specified change (or lack of change) over time has been observed in the Grid", onClick: () => props.onAlertTypeChange(AlertType.Observable), checked: props.alertType === AlertType.Observable }), _jsx(TypeRadio, { text: getAlertTypeText(AlertType.Validation), description: "A change has broken a data validation rule", checked: props.alertType === AlertType.Validation, onClick: () => props.onAlertTypeChange(AlertType.Validation) }), _jsx(TypeRadio, { text: getAlertTypeText(AlertType.Scheduled), description: "A reminder fires at a date and time you choose", checked: props.alertType === AlertType.Scheduled, onClick: () => props.onAlertTypeChange(AlertType.Scheduled) })] }) })] })] }));
 };