@adaptabletools/adaptable 22.0.0-canary.1 → 22.0.0-canary.11

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

@@ -19,7 +19,7 @@ export const isAggregationsSectionValid = (data) => {
             AggFunc.type === 'weightedAverage')?.AggFunc
         : null;
     if (weightedAvg && !weightedAvg.weightedColumnId) {
-        return 'The Weighted Average Aggregation requires a Weighted Column';
+        return 'Weighted Average requires a weight column to be selected.';
     }
     return true;
 };

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

@@ -13,7 +13,7 @@ import { Box } from '../../../../components/Flex';
 export const isColumnFiltersValid = (layout) => {
     const invalidColumnFilters = (layout.ColumnFilters ?? [])?.filter((columnFilter) => !columnFilter?.Predicates[0]?.PredicateId);
     if (invalidColumnFilters.length > 0) {
-        return 'Please select a Predicate for each Column Filter';
+        return 'Please select a predicate for each column filter.';
     }
     return true;
 };

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

@@ -13,7 +13,7 @@ export const isGridFiltersValid = (layout, api) => {
         return true;
     }
     return (api.internalApi.getQueryLanguageService().validateBoolean(expression, GridFilterModuleId)
-        .isValid || 'Invalid Expression');
+        .isValid || 'The expression is not valid.');
 };
 export const GridFilterSectionSummary = () => {
     const { data: layout } = useOnePageAdaptableWizardContext();

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

@@ -216,7 +216,7 @@ export const isPivotAggregationsSectionValid = (data) => {
             .find((agg) => typeof agg === 'object' && agg.type === 'weightedAverage')
         : null;
     if (weightedAvg && !weightedAvg.weightedColumnId) {
-        return 'The Weighted Average Aggregation requires a Weighted Column';
+        return 'Weighted Average requires a weight column to be selected.';
     }
     return true;
 };
@@ -303,12 +303,12 @@ export const PivotAggregationsSection = (props) => {
         }
         const firstAggFuncName = getAggFuncName(aggregationColumns[0].AggFunc);
         if (layout.PivotAggregationColumns?.some((aggCol) => getAggFuncName(aggCol.AggFunc) !== firstAggFuncName)) {
-            return 'Requires identical aggregation on all columns';
+            return 'All columns must use the same aggregation function.';
         }
         // check that no Aggregation Total Column is enabled
         const hasAggregationTotalColumn = aggregationColumns.some((aggCol) => aggCol.Total !== false && aggCol.Total != null);
         if (hasAggregationTotalColumn) {
-            return 'Can only be enabled when no Aggregation Total Column is present';
+            return 'This option is not available when an Aggregation Total Column is present.';
         }
         return true;
     };

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

@@ -7,6 +7,7 @@ import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptab
 import { columnFilter } from './Utilities';
 import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 import { Box } from '../../../../components/Flex';
+import { CheckBox } from '../../../../components/CheckBox';
 export const PivotColumnsSectionSummary = () => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
@@ -28,5 +29,12 @@ export const PivotColumnsSection = (props) => {
     return (React.createElement(Tabs, { className: "twa:h-full" },
         React.createElement(Tabs.Tab, null, "Pivot Columns"),
         React.createElement(Tabs.Content, null,
+            React.createElement(Box, { className: "twa:mb-3 twa:px-2" },
+                React.createElement(CheckBox, { checked: !!layout.PivotResultColumnsOrder, onChange: (checked) => {
+                        props.onChange({
+                            ...layout,
+                            PivotResultColumnsOrder: checked,
+                        });
+                    } }, "Persist Order of Pivot Result Columns")),
             React.createElement(ValueSelector, { showFilterInput: true, filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, options: sortedPivotColumns, value: layout.PivotColumns ?? [], allowReorder: true, onChange: handleColumnsChange }))));
 };

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

@@ -24,7 +24,7 @@ export const areSummaryRowsValid = (layout) => {
     layout.RowSummaries?.find((rowSummary) => {
         for (const [_, fn] of Object.entries(rowSummary.ColumnsMap ?? {})) {
             if (!fn) {
-                valid = 'All row summary columns must have an aggregation function.';
+                valid = 'Each row summary column requires an aggregation function.';
                 return true;
             }
         }

package/src/View/NamedQuery/Wizard/NamedQueryExpressionWizardSection.js

@@ -7,11 +7,11 @@ import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableW
 import { Box } from '../../../components/Flex';
 export const isValidNamedQueryExpression = (data, api) => {
     if (!data.BooleanExpression) {
-        return 'Expression is empty';
+        return 'An expression is required.';
     }
     const valid = api.expressionApi.isValidBooleanExpression(data.BooleanExpression, NamedQueryModuleId);
     if (!valid) {
-        return 'Query is not a valid Boolean Query';
+        return 'The query is not a valid Boolean expression.';
     }
     return valid;
 };

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import Input from '../../../components/Input';
-import Radio from '../../../components/Radio';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { Tabs } from '../../../components/Tabs';
 import { useOnePageAdaptableWizardContext, } from '../../Wizard/OnePageAdaptableWizard';
@@ -12,15 +11,29 @@ import { Flex } from '../../../components/Flex';
 export const PlusMinusSettingsSummary = (props) => {
     const { data } = useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
+        React.createElement(SummaryText, null,
+            "Name ",
+            React.createElement(Tag, null, data.Name || 'Not specified')),
         React.createElement(SummaryText, null,
             "Nudge Value ",
             React.createElement(Tag, null, data.NudgeValue ?? 'Not selected')),
+        React.createElement(SummaryText, null,
+            "Nudge Type ",
+            React.createElement(Tag, null, props.hasCondition ? 'Conditional' : 'Always Apply')),
         props.hasCondition && React.createElement(PlusMinusRuleSummary, null)));
 };
 export const isSettingsValid = (hasCondition) => (data, api, context) => {
+    if (!data.Name?.trim()) {
+        return 'A name is required.';
+    }
+    const allPlusMinusNudges = api.plusMinusApi.getAllPlusMinus();
+    const isDuplicateName = allPlusMinusNudges.some((nudge) => nudge.Name === data.Name && nudge.Uuid !== data.Uuid);
+    if (isDuplicateName) {
+        return 'A Plus/Minus Nudge with this name already exists.';
+    }
     if (hasCondition) {
         if (!data?.Rule?.BooleanExpression) {
-            return 'No valid Rule is specified';
+            return 'A valid rule is required.';
         }
         const ruleValidation = isAdaptableRuleValid(data, api, context);
         if (typeof ruleValidation === 'string') {
@@ -28,15 +41,21 @@ export const isSettingsValid = (hasCondition) => (data, api, context) => {
         }
     }
     if (typeof data.NudgeValue !== 'number') {
-        return 'Nudge value is not specified';
+        return 'A nudge value is required.';
     }
     if (data.NudgeValue === 0) {
-        return 'Nudge value must be different than 0';
+        return 'Nudge value must not be zero.';
     }
     return true;
 };
 export const PlusMinusSettingsWizardSection = (props) => {
     const { data } = useOnePageAdaptableWizardContext();
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...data,
+            Name: event.target.value,
+        });
+    };
     const handleNudgeValueChange = (event) => {
         const newValue = parseFloat(event.target.value);
         props.onChange({
@@ -45,15 +64,19 @@ export const PlusMinusSettingsWizardSection = (props) => {
         });
     };
     return (React.createElement(Flex, { flexDirection: "column", "data-name": "plus-minus-column-settings", className: "twa:h-full" },
-        React.createElement(Tabs, { autoFocus: false, className: "twa:p-2" },
-            React.createElement(Tabs.Tab, null, "Plus Minus Settings"),
+        React.createElement(Tabs, { className: "twa:p-2" },
+            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": "plus-minus-name", className: "twa:flex-1 twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: data.Name ?? '' })),
                     React.createElement(FormRow, { label: "Nudge Value" },
-                        React.createElement(Input, { "data-name": "nudge-value", className: "twa:flex-1 twa:mr-3", onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: data.NudgeValue ?? '' })),
-                    React.createElement(FormRow, { label: "Nudge Type" },
-                        React.createElement(Flex, null,
-                            React.createElement(Radio, { "data-name": "nudge-type-always", value: "Always", checked: !props.hasCondition, onChange: () => props.onConditionChange(false) }, "Always Apply Nudge"),
-                            React.createElement(Radio, { "data-name": "nudge-type-condition", className: "twa:ml-3", value: "Expression", checked: props.hasCondition, onChange: () => props.onConditionChange(true) }, "Create a Rule")))))),
-        props.hasCondition && (React.createElement(PlusMinusRuleWizardSection, { defaultPredicateId: "NonBlanks", onChange: props.onChange }))));
+                        React.createElement(Input, { "data-name": "nudge-value", className: "twa:flex-1 twa:mr-3", onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: data.NudgeValue ?? '' }))))),
+        React.createElement(Tabs, { className: "twa:p-2", selectedIndex: props.hasCondition ? 1 : 0, onSelectedIndexChange: (index) => props.onConditionChange(index === 1) },
+            React.createElement(Tabs.Tab, { "data-name": "nudge-type-always" }, "Always Apply"),
+            React.createElement(Tabs.Tab, { "data-name": "nudge-type-condition" }, "Conditional"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(Flex, { className: "twa:text-2 twa:py-2" }, "The nudge value is always applied when using Plus/Minus")),
+            React.createElement(Tabs.Content, { className: "twa:p-0" },
+                React.createElement(PlusMinusRuleWizardSection, { defaultPredicateId: "NonBlanks", onChange: props.onChange })))));
 };

package/src/View/PlusMinus/Wizard/PlusMinusWizard.js

@@ -9,7 +9,7 @@ import * as PlusMinusRedux from '../../../Redux/ActionsReducers/PlusMinusRedux';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 import { Box } from '../../../components/Flex';
 export const PlusMinusWizard = (props) => {
-    const [plusMinus, setPlusMinus] = React.useState(() => {
+    const [plusMinus, doSetPlusMinus] = React.useState(() => {
         const newPlusMinus = {
             ...(props.data ? props.data : ObjectFactory.CreateEmptyPlusMinusNudge()),
             Scope: props?.data?.Scope ?? { All: true },
@@ -22,19 +22,24 @@ export const PlusMinusWizard = (props) => {
         }
         return newPlusMinus;
     });
+    const setPlusMinus = React.useCallback((data) => {
+        doSetPlusMinus(data);
+    }, []);
     const [hasCondition, setHasCondition] = React.useState(() => {
         // true if on edit and it has a condition
         return Boolean(props?.data?.Rule);
     });
     React.useEffect(() => {
-        const preparedData = { ...plusMinus };
-        if (hasCondition) {
-            preparedData.Rule = preparedData.Rule ?? { BooleanExpression: '' };
-        }
-        else {
-            delete preparedData.Rule;
-        }
-        setPlusMinus(preparedData);
+        doSetPlusMinus((prev) => {
+            const preparedData = { ...prev };
+            if (hasCondition) {
+                preparedData.Rule = preparedData.Rule ?? { BooleanExpression: '' };
+            }
+            else {
+                delete preparedData.Rule;
+            }
+            return preparedData;
+        });
     }, [hasCondition]);
     const dispatch = useDispatch();
     const handleFinish = () => {
@@ -47,6 +52,12 @@ export const PlusMinusWizard = (props) => {
         props.onFinishWizard(plusMinus);
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: plusMinus, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Settings',
+                isValid: isSettingsValid(hasCondition),
+                renderSummary: () => React.createElement(PlusMinusSettingsSummary, { hasCondition: hasCondition }),
+                render: () => (React.createElement(PlusMinusSettingsWizardSection, { hasCondition: hasCondition, onConditionChange: setHasCondition, onChange: setPlusMinus })),
+            },
             {
                 title: 'Target',
                 isValid: isScopeValid,
@@ -59,12 +70,6 @@ export const PlusMinusWizard = (props) => {
                 render: () => (React.createElement(Box, { className: "twa:p-2" },
                     React.createElement(PlusMinusScopeWizardSection, { onChange: setPlusMinus }))),
             },
-            {
-                title: 'Settings',
-                isValid: isSettingsValid(hasCondition),
-                renderSummary: () => React.createElement(PlusMinusSettingsSummary, { hasCondition: hasCondition }),
-                render: () => (React.createElement(PlusMinusSettingsWizardSection, { hasCondition: hasCondition, onConditionChange: setHasCondition, onChange: setPlusMinus })),
-            },
             {
                 details: 'Select Plus/Minus Tags',
                 title: 'Tags',

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -35,7 +35,10 @@ const QuickSearchPopupComponent = (props) => {
             React.createElement(Card, null,
                 React.createElement(Card.Title, null, "Behaviour"),
                 React.createElement(Card.Body, { className: "twa:p-1", gap: 2 },
-                    React.createElement(HelpBlock, { className: "twa:text-2 twa:w-fit" }, "Filters the Grid to only show rows with matching cells; use with care as can cause performance issues"),
+                    React.createElement(HelpBlock, { className: "twa:text-2 twa:w-fit" },
+                        "Filter Grid when searching to only show rows with matching cells; ",
+                        React.createElement("b", null, "use with care"),
+                        " as can cause performance issues"),
                     React.createElement(CheckBox, { "data-name": "filter-quick-search-results", value: "existing", checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Filter using Quick Search Results"))),
             React.createElement(Card.Title, { border: false, className: "twa:pt-3" }, "Cell Matching Style"),
             React.createElement(Card, null,

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsIPushPull.js

@@ -1,11 +1,18 @@
 import * as React from 'react';
 import { Tabs } from '../../../../components/Tabs';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
+import Input from '../../../../components/Input';
 import Radio from '../../../../components/Radio';
 import DropdownButton from '../../../../components/DropdownButton';
 import { FormDescriptionText } from '../../../Wizard/OnePageAdaptableWizard';
 import { Box } from '../../../../components/Flex';
 export const ScheduleSettingsIPushPull = (props) => {
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...props.iPushPull,
+            Name: event.target.value,
+        });
+    };
     const reportOptions = props.allReports.map((report) => ({
         label: report.Name,
         value: report.Name,
@@ -45,9 +52,13 @@ export const ScheduleSettingsIPushPull = (props) => {
     });
     return (React.createElement(Box, { "data-name": "schedule-settings-ipushpull" },
         React.createElement(Tabs, { autoFocus: false },
-            React.createElement(Tabs.Tab, null, "Ipushpull Schedule Settings"),
+            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": "schedule-name", className: "twa:w-[300px]", onChange: handleNameChange, placeholder: "Enter Schedule Name", type: "string", value: props.iPushPull?.Name ?? '' })),
+                    React.createElement(FormRow, { label: "" },
+                        React.createElement(Box, { className: "twa:h-2" })),
                     React.createElement(FormRow, { label: "Select Report" },
                         React.createElement(DropdownButton, { "data-name": "report-name", disabled: props.allReports.length == 0, items: reportOptions, className: "twa:w-[300px]" }, props?.iPushPull?.IPushPullReport?.ReportName || 'Select Report')),
                     React.createElement(FormRow, { label: "Select Folder" },

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsOpenFin.js

@@ -1,9 +1,16 @@
 import * as React from 'react';
 import { Tabs } from '../../../../components/Tabs';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
+import Input from '../../../../components/Input';
 import DropdownButton from '../../../../components/DropdownButton';
 import { Box } from '../../../../components/Flex';
 export const ScheduleSettingsOpenFin = (props) => {
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...props.openFin,
+            Name: event.target.value,
+        });
+    };
     const reportOptions = props.allReports.map((report) => ({
         label: report.Name,
         value: report.Name,
@@ -17,9 +24,13 @@ export const ScheduleSettingsOpenFin = (props) => {
     }));
     return (React.createElement(Box, { "data-name": "schedule-settings-openfin" },
         React.createElement(Tabs, { autoFocus: false },
-            React.createElement(Tabs.Tab, null, "OpenFin Schedule Settings"),
+            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": "schedule-name", className: "twa:w-[300px]", onChange: handleNameChange, placeholder: "Enter Schedule Name", type: "string", value: props.openFin?.Name ?? '' })),
+                    React.createElement(FormRow, { label: "" },
+                        React.createElement(Box, { className: "twa:h-2" })),
                     React.createElement(FormRow, { label: "Select Report" },
                         React.createElement(DropdownButton, { "data-name": "select-report", columns: ['label'], className: "twa:w-[300px]", disabled: props.allReports.length == 0, items: reportOptions }, props?.openFin?.OpenFinReport?.ReportName || 'Select Report')))))));
 };

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReminder.js

@@ -17,16 +17,22 @@ export const ScheduleSettingsReminder = (props) => {
             });
         },
     }));
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...props.reminderSchedule,
+            Name: event.target.value,
+        });
+    };
     const handleHeaderChange = (event) => {
         props.onChange({
             ...props.reminderSchedule,
-            Header: event.target?.value,
+            Header: event.target.value,
         });
     };
     const handleMessageChange = (event) => {
         props.onChange({
             ...props.reminderSchedule,
-            Message: event.target?.value,
+            Message: event.target.value,
         });
     };
     const handleDisplayNotificationChange = (checked) => {
@@ -41,11 +47,15 @@ export const ScheduleSettingsReminder = (props) => {
             DisplaySystemStatusMessage: checked,
         });
     };
-    return (React.createElement(Box, { "data-name": "schedule-settings-remainder" },
+    return (React.createElement(Box, { "data-name": "schedule-settings-reminder" },
         React.createElement(Tabs, { autoFocus: false },
-            React.createElement(Tabs.Tab, null, "Reminder Schedule Settings"),
+            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": "schedule-name", className: "twa:w-[300px]", onChange: handleNameChange, placeholder: "Enter Reminder Name", type: "string", value: props.reminderSchedule?.Name ?? '' })),
+                    React.createElement(FormRow, { label: "" },
+                        React.createElement(Box, { className: "twa:h-2" })),
                     React.createElement(FormRow, { label: "Header" },
                         React.createElement(Input, { "data-name": "header", className: "twa:w-[300px]", onChange: handleHeaderChange, placeholder: "Enter Reminder Header", type: "string", value: props.reminderSchedule?.Header })),
                     React.createElement(FormRow, { label: "Message" },

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.js

@@ -1,9 +1,16 @@
 import * as React from 'react';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
+import Input from '../../../../components/Input';
 import { Select } from '../../../../components/Select';
 import { Tabs } from '../../../../components/Tabs';
 import { Box } from '../../../../components/Flex';
 export const ScheduleSettingsReport = (props) => {
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...props.report,
+            Name: event.target.value,
+        });
+    };
     const reportOptions = props.allReports.map((report) => ({
         label: report.Name,
         value: report.Name,
@@ -30,9 +37,13 @@ export const ScheduleSettingsReport = (props) => {
     }));
     return (React.createElement(Box, { "data-name": "schedule-settings-report" },
         React.createElement(Tabs, { autoFocus: false, className: "twa:mb-3" },
-            React.createElement(Tabs.Tab, null, "Report Settings"),
+            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": "schedule-name", className: "twa:w-[300px]", onChange: handleNameChange, placeholder: "Enter Schedule Name", type: "string", value: props.report?.Name ?? '' })),
+                    React.createElement(FormRow, { label: "" },
+                        React.createElement(Box, { className: "twa:h-2" })),
                     React.createElement(FormRow, { label: "Export" },
                         React.createElement(Box, { className: "twa:max-w-[300px]" },
                             React.createElement(Select, { "data-name": "select-report", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/isSettingsValid.d.ts

@@ -1,2 +1,3 @@
+import { AdaptableApi } from '../../../../Api/AdaptableApi';
 import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
-export declare const isSettingsValid: (schedule: BaseSchedule) => true | "Message type not selected" | "Reminder header not specified" | "Reminder message not specified" | "Report source not specified" | "Report format not selected" | "Report not selected" | "Report folder not selected" | "Report page not selected";
+export declare const isSettingsValid: (schedule: BaseSchedule, api: AdaptableApi) => true | "A name is required." | "A Schedule with this name already exists." | "Please select a message type." | "A reminder header is required." | "A reminder message is required." | "Please select a report." | "Please select a report format." | "Please select a report folder." | "Please select a report page.";

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/isSettingsValid.js

@@ -1,43 +1,52 @@
 import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
-export const isSettingsValid = (schedule) => {
+export const isSettingsValid = (schedule, api) => {
+    // Validate Name - mandatory and unique
+    if (!schedule.Name?.trim()) {
+        return 'A name is required.';
+    }
+    const allSchedules = api.scheduleApi.getSchedules();
+    const isDuplicateName = allSchedules.some((s) => s.Name === schedule.Name && s.Uuid !== schedule.Uuid);
+    if (isDuplicateName) {
+        return 'A Schedule with this name already exists.';
+    }
     if (schedule.ScheduleType === ScheduleType.Reminder) {
         const reminder = schedule;
         if (!reminder.MessageType) {
-            return 'Message type not selected';
+            return 'Please select a message type.';
         }
         if (StringExtensions.IsNullOrEmpty(reminder?.Header)) {
-            return 'Reminder header not specified';
+            return 'A reminder header is required.';
         }
         if (StringExtensions.IsNullOrEmpty(reminder?.Message)) {
-            return 'Reminder message not specified';
+            return 'A reminder message is required.';
         }
     }
     if (schedule.ScheduleType === ScheduleType.Report) {
         const report = schedule;
         if (StringExtensions.IsNullOrEmpty(report?.ReportName)) {
-            return 'Report source not specified';
+            return 'Please select a report.';
         }
         if (StringExtensions.IsNullOrEmpty(report?.ReportFormat)) {
-            return 'Report format not selected';
+            return 'Please select a report format.';
         }
     }
     if (schedule.ScheduleType === ScheduleType.ipushpull) {
         const ipushpull = schedule;
         if (StringExtensions.IsNullOrEmpty(ipushpull?.IPushPullReport?.ReportName)) {
-            return 'Report not selected';
+            return 'Please select a report.';
         }
         if (StringExtensions.IsNullOrEmpty(ipushpull?.IPushPullReport?.Folder)) {
-            return 'Report folder not selected';
+            return 'Please select a report folder.';
         }
         if (StringExtensions.IsNullOrEmpty(ipushpull?.IPushPullReport?.Page)) {
-            return 'Report page not selected';
+            return 'Please select a report page.';
         }
     }
     if (schedule.ScheduleType === ScheduleType.OpenFin) {
         const openfin = schedule;
         if (StringExtensions.IsNullOrEmpty(openfin?.OpenFinReport?.ReportName)) {
-            return 'Report not selected';
+            return 'Please select a report.';
         }
     }
     return true;

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { Shortcut } from '../../../AdaptableState/ShortcutState';
-export declare const isSettingsValid: (data: Shortcut) => string | true;
+import { AdaptableApi } from '../../../types';
+export declare const isSettingsValid: (data: Shortcut, api: AdaptableApi) => string | true;
 export declare const ShortcutSettingsSummary: React.FunctionComponent;
 interface ShortcutSettingsWizardProps {
     availableKeys: Array<string>;

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.js

@@ -9,7 +9,15 @@ import { Tag } from '../../../components/Tag';
 import HelpBlock from '../../../components/HelpBlock';
 import { Select } from '../../../components/Select';
 import { Box, Flex } from '../../../components/Flex';
-export const isSettingsValid = (data) => {
+export const isSettingsValid = (data, api) => {
+    if (!data.Name?.trim()) {
+        return 'Name is required';
+    }
+    const allShortcuts = api.shortcutApi.getShortcuts();
+    const isDuplicateName = allShortcuts.some((s) => s.Name === data.Name && s.Uuid !== data.Uuid);
+    if (isDuplicateName) {
+        return 'A Shortcut already exists with that name';
+    }
     const shortcutKey = data.ShortcutKey && typeof data.ShortcutKey === 'string' ? '' : 'Shortcut key is not selected';
     const shortcutValue = typeof data.ShortcutValue === 'number' ? '' : 'Shortcut value is not specified';
     const shortcutOperation = data.ShortcutOperation && typeof data.ShortcutOperation === 'string'
@@ -21,6 +29,9 @@ export const isSettingsValid = (data) => {
 export const ShortcutSettingsSummary = () => {
     const { data: shortcut } = useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
+        React.createElement(SummaryText, null,
+            "Name ",
+            React.createElement(Tag, null, shortcut.Name || 'Not specified')),
         React.createElement(SummaryText, null,
             "Shortcut Key ",
             React.createElement(Tag, null, shortcut.ShortcutKey || 'Not selected')),
@@ -33,6 +44,12 @@ export const ShortcutSettingsSummary = () => {
 };
 export const ShortcutSettingsWizard = (props) => {
     const { data: shortcut } = useOnePageAdaptableWizardContext();
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...shortcut,
+            Name: event.target.value,
+        });
+    };
     const handleKeyChange = React.useCallback((ShortcutKey) => {
         props.onChange({
             ...shortcut,
@@ -63,17 +80,21 @@ export const ShortcutSettingsWizard = (props) => {
             React.createElement(Tabs.Tab, null, "Shortcut Settings"),
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
-                    React.createElement(FormRow, null,
+                    React.createElement(FormRow, { label: "Name" },
+                        React.createElement(Input, { "data-name": "shortcut-name", className: "twa:flex-1 twa:max-w-[200px] twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: shortcut.Name ?? '' })),
+                    React.createElement(FormRow, { label: "" },
+                        React.createElement(Box, { className: "twa:h-2" })),
+                    React.createElement(FormRow, { label: "" },
                         React.createElement(HelpBlock, { className: "twa:text-2 twa:mb-0" }, "Keyboard key that, when pressed, triggers the Shortcut")),
                     React.createElement(FormRow, { label: "Key" },
                         React.createElement(Flex, { flexDirection: "row" },
                             React.createElement(Select, { "data-name": "shortcut-key", placeholder: "Select Key", options: optionKeys, onChange: (key) => handleKeyChange(key), value: shortcut.ShortcutKey || 'Select Key' }))),
-                    React.createElement(FormRow, null,
+                    React.createElement(FormRow, { label: "" },
                         React.createElement(HelpBlock, { className: "twa:text-2 twa:mb-0" }, "Mathematical operation performed on Cell's current value (using the Shortcut's 'value') - used to calculate the Cell's new total")),
                     React.createElement(FormRow, { label: "Operation" },
                         React.createElement(Flex, { flexDirection: "row" },
                             React.createElement(Select, { "data-name": "shortcut-operation", placeholder: "Select Operation", options: optionActions, onChange: (operation) => handleOperationChange(operation), value: shortcut.ShortcutOperation }))),
-                    React.createElement(FormRow, null,
+                    React.createElement(FormRow, { label: "" },
                         React.createElement(HelpBlock, { className: "twa:text-2 twa:mb-0" }, "Number that is used - together with the 'Operation' and the current cell value - to calculate the new total for the cell")),
                     React.createElement(FormRow, { label: "Value" },
                         React.createElement(Flex, { flexDirection: "row" },

package/src/View/Shortcut/Wizard/ShortcutWizard.js

@@ -11,8 +11,9 @@ import { shortcutKeys } from '../shortcutKeys';
 import { useAdaptable } from '../../AdaptableContext';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 import { Box } from '../../../components/Flex';
+import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 export const ShortcutWizard = (props) => {
-    const [shortcut, setShortcut] = React.useState(() => {
+    const [shortcut, doSetShortcut] = React.useState(() => {
         const shortcut = props.data ? cloneObject(props.data) : ObjectFactory.CreateEmptyShortcut();
         shortcut.Scope = shortcut.Scope ?? { All: true };
         if (props.popupParams?.column && props.popupParams?.action === 'New') {
@@ -22,10 +23,13 @@ export const ShortcutWizard = (props) => {
         }
         return shortcut;
     });
+    const setShortcut = React.useCallback((data) => {
+        doSetShortcut(data);
+    }, []);
     const adaptable = useAdaptable();
     const availableKeys = React.useMemo(() => {
         const availableKeys = shortcutKeys.filter((key) => adaptable.api.shortcutApi.getShortcuts().every((shortcut) => shortcut.ShortcutKey !== key));
-        if (shortcut) {
+        if (shortcut && StringExtensions.IsNotNullOrEmptyOrWhiteSpace(shortcut.ShortcutKey)) {
             availableKeys.push(shortcut.ShortcutKey);
         }
         availableKeys.sort();
@@ -42,18 +46,6 @@ export const ShortcutWizard = (props) => {
         props.onFinishWizard(shortcut);
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: shortcut, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
-            {
-                title: 'Target',
-                isValid: isScopeValid,
-                details: 'Specify where Shortcut should be applied',
-                renderSummary: () => renderScopeSummary(shortcut.Scope, {
-                    scopeWholeRow: 'Shortcut is triggered for all numeric cells',
-                    scopeColumns: 'Shortcut is triggered for cells in selected columns',
-                    scopeDataTypes: 'Shortcut is triggered for all numeric cells',
-                }),
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(ShortcutScopeWizardSection, { onChange: setShortcut }))),
-            },
             {
                 title: 'Settings',
                 isValid: isSettingsValid,
@@ -69,6 +61,18 @@ export const ShortcutWizard = (props) => {
                 render: () => (React.createElement(Box, { className: "twa:p-2" },
                     React.createElement(ShortcutSettingsWizard, { availableKeys: props.availableKeys ?? availableKeys, onChange: setShortcut }))),
             },
+            {
+                title: 'Target',
+                isValid: isScopeValid,
+                details: 'Specify where Shortcut should be applied',
+                renderSummary: () => renderScopeSummary(shortcut.Scope, {
+                    scopeWholeRow: 'Shortcut is triggered for all numeric cells',
+                    scopeColumns: 'Shortcut is triggered for cells in selected columns',
+                    scopeDataTypes: 'Shortcut is triggered for all numeric cells',
+                }),
+                render: () => (React.createElement(Box, { className: "twa:p-2" },
+                    React.createElement(ShortcutScopeWizardSection, { onChange: setShortcut }))),
+            },
             {
                 details: 'Select Shortcut Tags',
                 title: 'Tags',