@adaptabletools/adaptable 22.0.0-canary.3 → 22.0.0-canary.4

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.PivotResultColumns, onChange: (checked) => {
+                        props.onChange({
+                            ...layout,
+                            PivotResultColumns: 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/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,12 +11,26 @@ 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 '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 already exists with that name';
+    }
     if (hasCondition) {
         if (!data?.Rule?.BooleanExpression) {
             return 'No valid Rule is specified';
@@ -37,6 +50,12 @@ export const isSettingsValid = (hasCondition) => (data, api, context) => {
 };
 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/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,6 +17,12 @@ export const ScheduleSettingsReminder = (props) => {
             });
         },
     }));
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...props.reminderSchedule,
+            Name: event.target.value,
+        });
+    };
     const handleHeaderChange = (event) => {
         props.onChange({
             ...props.reminderSchedule,
@@ -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 Schedule 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 | "Name is required" | "A Schedule with this name already exists" | "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";

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

@@ -1,6 +1,15 @@
 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 '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) {

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',

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1770107045244 || Date.now(),
-    VERSION: "22.0.0-canary.3" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1770223980882 || Date.now(),
+    VERSION: "22.0.0-canary.4" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -172,5 +172,6 @@ export interface PivotLayoutModel extends BaseLayoutModel {
      * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
      */
     PivotColumnTotal?: 'before' | 'after' | boolean;
+    PivotResultColumns?: string[] | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;

package/src/layout-manager/src/index.js

@@ -166,7 +166,7 @@ export class LayoutManager extends LMEmitter {
         this.setupEvents();
         this.indexColumns();
         this.setupPivotTotals();
-        globalThis.layoutManager = this;
+        // (globalThis as any).layoutManager = this;
     }
     destroy() {
         if (this.destroyed) {
@@ -344,10 +344,11 @@ export class LayoutManager extends LMEmitter {
         const columnState = this.gridApi
             .getColumnState()
             .filter((col) => !pivotResultColumnsSet.has(col.colId));
-        let PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
+        const PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
         const layout = this.getUndecidedLayoutModelFromGrid(columnState);
         let ColumnSizing = layout.ColumnSizing || {};
         let ColumnVisibility = { ...layout.ColumnVisibility };
+        const storePivotResultColumns = !!prevLayout?.PivotResultColumns;
         //let's also include the column widths of the pivotResult columns
         pivotResultColumns.forEach((col) => {
             const colId = col.getColId();
@@ -401,6 +402,13 @@ export class LayoutManager extends LMEmitter {
             GrandTotalRow: layout.GrandTotalRow,
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
+        if (storePivotResultColumns) {
+            // Get pivot result columns in display order (not creation order)
+            const displayedPivotResultColumns = this.gridApi
+                .getAllDisplayedColumns()
+                .filter((col) => pivotResultColumnsSet.has(col.getColId()));
+            pivotLayout.PivotResultColumns = displayedPivotResultColumns.map((col) => col.getColId());
+        }
         if (layout.SuppressAggFuncInHeader) {
             pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
         }
@@ -424,20 +432,20 @@ export class LayoutManager extends LMEmitter {
         let TableColumns = columnState.map((c) => c.colId);
         // .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
         let ColumnSorts = [];
-        let RowGroupedColumns = [];
+        const RowGroupedColumns = [];
         let RowGroupValues = undefined;
         let ColumnGroupValues = undefined;
         let TableAggregationColumns = [];
-        let ColumnPinning = {};
+        const ColumnPinning = {};
         const gridState = this.gridApi.getState();
         const prevLayout = this.currentLayout;
         const prevAggColumns = prevLayout?.TableAggregationColumns ?? prevLayout?.PivotAggregationColumns;
-        let ColumnSizing = { ...prevLayout?.ColumnSizing };
+        const ColumnSizing = { ...prevLayout?.ColumnSizing };
         const prevAggColumnsMap = prevAggColumns?.reduce((acc, agg) => {
             acc[agg.ColumnId] = agg;
             return acc;
         }, {});
-        let ColumnVisibility = columnState.reduce((acc, colState) => {
+        const ColumnVisibility = columnState.reduce((acc, colState) => {
             const colId = colState.colId;
             // normally we take the initial width from this object
             let initialWidth = this.initialColumnWidths[colId];
@@ -1239,7 +1247,7 @@ export class LayoutManager extends LMEmitter {
         }
     }
     computeColumnStateForPivotLayout(layout) {
-        let columnState = {};
+        const columnState = {};
         const pivotColumnsToIndexes = (layout.PivotColumns || []).reduce((acc, colId, index) => {
             acc[colId] = index;
             return acc;
@@ -1270,6 +1278,12 @@ export class LayoutManager extends LMEmitter {
         this.computeColumnSorts(layout, columnState);
         this.computePinnedColumns(layout, columnState);
         this.computePivotAggregations(layout, columnState);
+        // Add pivot result columns to the state for ordering (will be applied with applyOrder: true later)
+        if (Array.isArray(layout.PivotResultColumns)) {
+            layout.PivotResultColumns.forEach((colId) => {
+                columnState.state.push({ colId });
+            });
+        }
         return columnState;
     }
     computePivotAggregations(layout, columnState) {
@@ -1510,6 +1524,10 @@ export class LayoutManager extends LMEmitter {
             });
             // now recompute and apply the last one
             this.computePivotAggregations(layout, columnState);
+            // Apply order only on the final call when PivotResultColumns is specified
+            if (Array.isArray(layout.PivotResultColumns)) {
+                columnState.applyOrder = true;
+            }
             this.gridApi.applyColumnState(columnState);
             // let's also include the column widths of the pivotResult columns
             // we can't simply include those in the columnState because the columnState will also apply order

package/src/layout-manager/src/normalizeLayoutModel.js

@@ -132,6 +132,9 @@ export function normalizePivotLayoutModel(layout) {
     if (!layout.ColumnPinning) {
         layout.ColumnPinning = {};
     }
+    if (!layout.PivotResultColumns) {
+        layout.PivotResultColumns = false;
+    }
     if (!layout.ColumnSizing) {
         layout.ColumnSizing = {};
     }

package/src/metamodel/adaptable.metamodel.d.ts

@@ -2157,12 +2157,20 @@ export declare const ADAPTABLE_METAMODEL: {
             name: string;
             kind: string;
             desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
             ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             ref: string;
+            isOpt?: undefined;
         })[];
     };
     CommandHandler: {
@@ -4068,6 +4076,18 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    Identifiable: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        }[];
+    };
     InFilterValue: {
         name: string;
         kind: string;
@@ -4457,6 +4477,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    NamedObject: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     NamedQuery: {
         name: string;
         kind: string;