@adaptabletools/adaptable 10.0.4-canary.1 → 10.0.4-canary.5

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

@@ -11,24 +11,24 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components
 const CheckBox_1 = require("../../../../components/CheckBox");
 const MESSAGE_TYPES = ['Success', 'Info', 'Warning', 'Error'];
 exports.ScheduleSettingsReminder = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d;
     const messageTypes = MESSAGE_TYPES.map((messageType) => ({
         label: messageType,
         value: messageType,
         onClick: () => {
-            props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Reminder: Object.assign(Object.assign({}, props.reminderSchedule.Reminder), { MessageType: messageType }) }));
+            props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { MessageType: messageType }));
         },
     }));
     const handleHeaderChange = (event) => {
         var _a;
-        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Reminder: Object.assign(Object.assign({}, props.reminderSchedule.Reminder), { Header: (_a = event.target) === null || _a === void 0 ? void 0 : _a.value }) }));
+        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Header: (_a = event.target) === null || _a === void 0 ? void 0 : _a.value }));
     };
     const handleMessageChange = (event) => {
         var _a;
-        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Reminder: Object.assign(Object.assign({}, props.reminderSchedule.Reminder), { Message: (_a = event.target) === null || _a === void 0 ? void 0 : _a.value }) }));
+        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Message: (_a = event.target) === null || _a === void 0 ? void 0 : _a.value }));
     };
     const handleDisplayNotificationChange = (checked) => {
-        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { Reminder: Object.assign(Object.assign({}, props.reminderSchedule.Reminder), { DisplayNotification: checked }) }));
+        props.onChange(Object.assign(Object.assign({}, props.reminderSchedule), { DisplayNotification: checked }));
     };
     return (React.createElement(rebass_1.Box, { "data-name": "schedule-settings-remainder" },
         React.createElement(Tabs_1.Tabs, { autoFocus: false },
@@ -36,11 +36,11 @@ exports.ScheduleSettingsReminder = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Header" },
-                        React.createElement(Input_1.default, { width: 300, onChange: handleHeaderChange, placeholder: "Enter Reminder Header (optional)", type: "string", value: (_b = (_a = props.reminderSchedule) === null || _a === void 0 ? void 0 : _a.Reminder) === null || _b === void 0 ? void 0 : _b.Header })),
+                        React.createElement(Input_1.default, { width: 300, onChange: handleHeaderChange, placeholder: "Enter Reminder Header (optional)", type: "string", value: (_a = props.reminderSchedule) === null || _a === void 0 ? void 0 : _a.Header })),
                     React.createElement(FormLayout_1.FormRow, { label: "Message" },
-                        React.createElement(Input_1.default, { width: 300, onChange: handleMessageChange, placeholder: "Enter Reminder Message", type: "string", value: (_d = (_c = props.reminderSchedule) === null || _c === void 0 ? void 0 : _c.Reminder) === null || _d === void 0 ? void 0 : _d.Message })),
+                        React.createElement(Input_1.default, { width: 300, onChange: handleMessageChange, placeholder: "Enter Reminder Message", type: "string", value: (_b = props.reminderSchedule) === null || _b === void 0 ? void 0 : _b.Message })),
                     React.createElement(FormLayout_1.FormRow, { label: "Type" },
-                        React.createElement(DropdownButton_1.default, { style: { width: 300 }, placeholder: "Select Option", items: messageTypes }, ((_f = (_e = props.reminderSchedule) === null || _e === void 0 ? void 0 : _e.Reminder) === null || _f === void 0 ? void 0 : _f.MessageType) || 'Select Option')),
+                        React.createElement(DropdownButton_1.default, { style: { width: 300 }, columns: ['label'], placeholder: "Select Option", items: messageTypes }, ((_c = props.reminderSchedule) === null || _c === void 0 ? void 0 : _c.MessageType) || 'Select Option')),
                     React.createElement(FormLayout_1.FormRow, { label: "" },
-                        React.createElement(CheckBox_1.CheckBox, { checked: (_g = props.reminderSchedule) === null || _g === void 0 ? void 0 : _g.Reminder.DisplayNotification, onChange: handleDisplayNotificationChange }, "Show the Reminder as a Popup")))))));
+                        React.createElement(CheckBox_1.CheckBox, { checked: (_d = props.reminderSchedule) === null || _d === void 0 ? void 0 : _d.DisplayNotification, onChange: handleDisplayNotificationChange }, "Show the Reminder as an Alert")))))));
 };

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

@@ -1,2 +1,7 @@
 import * as React from 'react';
+import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+export declare const getScheduleSettingsValues: (data: BaseSchedule) => {
+    label: string;
+    value: string;
+}[];
 export declare const ScheduleSettingsSummary: React.FunctionComponent;

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

@@ -1,70 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduleSettingsSummary = void 0;
+exports.ScheduleSettingsSummary = exports.getScheduleSettingsValues = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const CodeBlock_1 = require("../../../../components/CodeBlock");
+const Tag_1 = require("../../../../components/Tag");
 const Enums_1 = require("../../../../PredefinedConfig/Common/Enums");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
-exports.ScheduleSettingsSummary = () => {
-    var _a, _b, _c, _d;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+exports.getScheduleSettingsValues = (data) => {
     if (data.ScheduleType === Enums_1.ScheduleType.Reminder) {
         const reminder = data;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Header: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, ((_a = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _a === void 0 ? void 0 : _a.Header) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Message: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, ((_b = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _b === void 0 ? void 0 : _b.Message) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Message Type: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, ((_c = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _c === void 0 ? void 0 : _c.MessageType) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Display Toast Notification:",
-                ' ',
-                React.createElement(CodeBlock_1.CodeBlock, null, ((_d = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _d === void 0 ? void 0 : _d.DisplayNotification) ? 'True' : 'False'))));
+        return [
+            {
+                label: 'Header',
+                value: (reminder === null || reminder === void 0 ? void 0 : reminder.Header) || 'Not Specified',
+            },
+            {
+                label: 'Message',
+                value: (reminder === null || reminder === void 0 ? void 0 : reminder.Message) || 'Not Specified',
+            },
+            {
+                label: 'Message Type',
+                value: (reminder === null || reminder === void 0 ? void 0 : reminder.MessageType) || 'Not Specified',
+            },
+            {
+                label: 'Display Toast Notification',
+                value: (reminder === null || reminder === void 0 ? void 0 : reminder.DisplayNotification) ? 'True' : 'False',
+            },
+        ];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.Report) {
         const report = data;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Report Name: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.ReportName) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Export Destination: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.ExportDestination) || 'Not Specified'))));
+        return [
+            {
+                label: 'Report Name',
+                value: (report === null || report === void 0 ? void 0 : report.ReportName) || 'Not Specified',
+            },
+            {
+                label: 'Export Destination',
+                value: (report === null || report === void 0 ? void 0 : report.ExportDestination) || 'Not Specified',
+            },
+        ];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.ipushpull) {
         const report = data;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Report: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.IPushPullReport.ReportName) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Folder: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.IPushPullReport.Folder) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Page: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.IPushPullReport.Page) || 'Not Specified')),
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Export As: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.Transmission) || 'Not Specified'))));
+        return [
+            {
+                label: 'Report',
+                value: (report === null || report === void 0 ? void 0 : report.IPushPullReport.ReportName) || 'Not Specified',
+            },
+            {
+                label: 'Folder',
+                value: (report === null || report === void 0 ? void 0 : report.IPushPullReport.Folder) || 'Not Specified',
+            },
+            {
+                label: 'Page',
+                value: (report === null || report === void 0 ? void 0 : report.IPushPullReport.Page) || 'Not Specified',
+            },
+            {
+                label: 'Export As',
+                value: (report === null || report === void 0 ? void 0 : report.Transmission) || 'Not Specified',
+            },
+        ];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.Glue42) {
         const report = data;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Report: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.Glue42Report.ReportName) || 'Not Specified'))));
+        return [{ label: 'Report', value: (report === null || report === void 0 ? void 0 : report.Glue42Report.ReportName) || 'Not Specified' }];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.OpenFin) {
         const report = data;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
-                "Report: ",
-                React.createElement(CodeBlock_1.CodeBlock, null, (report === null || report === void 0 ? void 0 : report.OpenFinReport.ReportName) || 'Not Specified'))));
+        return [{ label: 'Report', value: (report === null || report === void 0 ? void 0 : report.OpenFinReport.ReportName) || 'Not Specified' }];
     }
-    return React.createElement(React.Fragment, null);
+    return [];
+};
+exports.ScheduleSettingsSummary = () => {
+    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    return (React.createElement(React.Fragment, null, exports.getScheduleSettingsValues(data).map((description, index) => (React.createElement(OnePageAdaptableWizard_1.SummaryText, { key: index },
+        description.label,
+        ": ",
+        React.createElement(Tag_1.Tag, null, description.value))))));
 };

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

@@ -21,7 +21,7 @@ exports.ScheduleSettingsWizard = (props) => {
         return (React.createElement(ScheduleSettingsReport_1.ScheduleSettingsReport, { allReports: allReports !== null && allReports !== void 0 ? allReports : [], customDestinations: customDestinations || [], report: data, onChange: props.onChange }));
     }
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.ipushpull) {
-        const ippApi = api.pluginsApi.getPluginApi('ipushpull');
+        const ippApi = api.pluginsApi.getipushpullPluginApi();
         const allFolders = ippApi && ippApi.getIPushPullDomains();
         const folderName = data.IPushPullReport.Folder;
         const availablePages = ippApi && folderName && ippApi.getPagesForIPushPullDomain(folderName);

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

@@ -5,16 +5,16 @@ const tslib_1 = require("tslib");
 const Enums_1 = require("../../../../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/StringExtensions"));
 exports.isSettingsValid = (schedule) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e;
     if (schedule.ScheduleType === Enums_1.ScheduleType.Reminder) {
         const reminder = schedule;
-        if (!reminder.Reminder.MessageType) {
+        if (!reminder.MessageType) {
             return 'Message type not selected';
         }
-        if (StringExtensions_1.default.IsNullOrEmpty((_a = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _a === void 0 ? void 0 : _a.Header)) {
+        if (StringExtensions_1.default.IsNullOrEmpty(reminder === null || reminder === void 0 ? void 0 : reminder.Header)) {
             return 'Reminder header not specified';
         }
-        if (StringExtensions_1.default.IsNullOrEmpty((_b = reminder === null || reminder === void 0 ? void 0 : reminder.Reminder) === null || _b === void 0 ? void 0 : _b.Message)) {
+        if (StringExtensions_1.default.IsNullOrEmpty(reminder === null || reminder === void 0 ? void 0 : reminder.Message)) {
             return 'Reminder message not specified';
         }
     }
@@ -29,25 +29,25 @@ exports.isSettingsValid = (schedule) => {
     }
     if (schedule.ScheduleType === Enums_1.ScheduleType.ipushpull) {
         const ipushpull = schedule;
-        if (StringExtensions_1.default.IsNullOrEmpty((_c = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _c === void 0 ? void 0 : _c.ReportName)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_a = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _a === void 0 ? void 0 : _a.ReportName)) {
             return 'Report not selected';
         }
-        if (StringExtensions_1.default.IsNullOrEmpty((_d = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _d === void 0 ? void 0 : _d.Folder)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_b = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _b === void 0 ? void 0 : _b.Folder)) {
             return 'Report folder not selected';
         }
-        if (StringExtensions_1.default.IsNullOrEmpty((_e = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _e === void 0 ? void 0 : _e.Page)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_c = ipushpull === null || ipushpull === void 0 ? void 0 : ipushpull.IPushPullReport) === null || _c === void 0 ? void 0 : _c.Page)) {
             return 'Report page not selected';
         }
     }
     if (schedule.ScheduleType === Enums_1.ScheduleType.Glue42) {
         const glue43 = schedule;
-        if (StringExtensions_1.default.IsNullOrEmpty((_f = glue43 === null || glue43 === void 0 ? void 0 : glue43.Glue42Report) === null || _f === void 0 ? void 0 : _f.ReportName)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_d = glue43 === null || glue43 === void 0 ? void 0 : glue43.Glue42Report) === null || _d === void 0 ? void 0 : _d.ReportName)) {
             return 'Report not selected';
         }
     }
     if (schedule.ScheduleType === Enums_1.ScheduleType.OpenFin) {
         const openfin = schedule;
-        if (StringExtensions_1.default.IsNullOrEmpty((_g = openfin === null || openfin === void 0 ? void 0 : openfin.OpenFinReport) === null || _g === void 0 ? void 0 : _g.ReportName)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_e = openfin === null || openfin === void 0 ? void 0 : openfin.OpenFinReport) === null || _e === void 0 ? void 0 : _e.ReportName)) {
             return 'Report not selected';
         }
     }

package/src/View/Schedule/Wizard/ScheduleWizard.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../../View/Wizard/Interface/IAdaptableWizard';
 import { BaseSchedule } from '../../../PredefinedConfig/Common/Schedule';
-interface ScheduleWizardProps extends AdaptableOnePageWizardProps<BaseSchedule> {
+export interface ScheduleWizardProps extends AdaptableOnePageWizardProps<BaseSchedule> {
 }
 export declare const ScheduleWizard: React.FunctionComponent<ScheduleWizardProps>;
-export {};

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -8,12 +8,85 @@ const OnePageAdaptableWizard_1 = require("../../../View/Wizard/OnePageAdaptableW
 const ScheduleSettingsWizard_1 = require("./ScheduleSettingsWizard");
 const ScheduleScheduleWizard_1 = require("./ScheduleScheduleWizard");
 const ScheduleScheduleSummary_1 = require("./ScheduleScheduleSummary");
+const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const react_redux_1 = require("react-redux");
+const ScheduleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ScheduleRedux"));
 exports.ScheduleWizard = (props) => {
+    var _a;
+    const scheduleType = props.data
+        ? props.data.ScheduleType
+        : (_a = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _a === void 0 ? void 0 : _a.name;
     const [schedule, setSchedule] = React.useState(() => {
-        return props.data;
+        if (props.data) {
+            return props.data;
+        }
+        let data = null;
+        switch (scheduleType) {
+            case Enums_1.ScheduleType.Reminder:
+                data = ObjectFactory_1.default.CreateEmptyReminderSchedule();
+                break;
+            case Enums_1.ScheduleType.Report:
+                data = ObjectFactory_1.default.CreateEmptyReportSchedule();
+                break;
+            case Enums_1.ScheduleType.ipushpull:
+                data = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
+                break;
+            case Enums_1.ScheduleType.Glue42:
+                data = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
+                break;
+            case Enums_1.ScheduleType.OpenFin:
+                data = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
+                break;
+        }
+        return data;
     });
     const [isOneOff, setIsOneOff] = React.useState(false);
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { moduleInfo: props.moduleInfo, data: schedule, onHide: props.onCloseWizard, onFinish: props.onFinishWizard, sections: [
+    const dispatch = react_redux_1.useDispatch();
+    const handleFinish = () => {
+        let action = null;
+        if (props.data) {
+            switch (scheduleType) {
+                case Enums_1.ScheduleType.Reminder:
+                    action = ScheduleRedux.ReminderScheduleEdit(schedule);
+                    break;
+                case Enums_1.ScheduleType.Report:
+                    action = ScheduleRedux.ReportScheduleEdit(schedule);
+                    break;
+                case Enums_1.ScheduleType.ipushpull:
+                    action = ScheduleRedux.IPushPullScheduleEdit(schedule);
+                    break;
+                case Enums_1.ScheduleType.Glue42:
+                    action = ScheduleRedux.Glue42ScheduleEdit(schedule);
+                    break;
+                case Enums_1.ScheduleType.OpenFin:
+                    action = ScheduleRedux.OpenFinScheduleEdit(schedule);
+                    break;
+            }
+        }
+        else {
+            switch (scheduleType) {
+                case Enums_1.ScheduleType.Reminder:
+                    action = ScheduleRedux.ReminderScheduleAdd(schedule);
+                    break;
+                case Enums_1.ScheduleType.Report:
+                    action = ScheduleRedux.ReportScheduleAdd(schedule);
+                    break;
+                case Enums_1.ScheduleType.ipushpull:
+                    action = ScheduleRedux.IPushPullScheduleAdd(schedule);
+                    break;
+                case Enums_1.ScheduleType.Glue42:
+                    action = ScheduleRedux.Glue42ScheduleAdd(schedule);
+                    break;
+                case Enums_1.ScheduleType.OpenFin:
+                    action = ScheduleRedux.OpenFinScheduleAdd(schedule);
+                    break;
+            }
+        }
+        dispatch(action);
+        props.onFinishWizard(schedule);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: schedule, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
                 isValid: ScheduleSettingsWizard_1.isSettingsValid,

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

@@ -10,9 +10,9 @@ const shortcutOperations_1 = require("../shortcutOperations");
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Tabs_1 = require("../../../components/Tabs");
-const CodeBlock_1 = require("../../../components/CodeBlock");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const OnePageAdaptableWizard_2 = require("../../../View/Wizard/OnePageAdaptableWizard");
+const Tag_1 = require("../../../components/Tag");
 exports.isSettingsValid = (data) => {
     const shortcutKey = data.ShortcutKey && typeof data.ShortcutKey === 'string' ? '' : 'Shortcut key is not selected';
     const shortcutValue = typeof data.ShortcutValue === 'number' ? '' : 'Shortcut value is not specified';
@@ -28,13 +28,13 @@ exports.ShortcutSettingsSummary = () => {
     return (React.createElement(React.Fragment, null,
         React.createElement(OnePageAdaptableWizard_2.SummaryText, null,
             "Shortcut Key ",
-            React.createElement(CodeBlock_1.CodeBlock, null, shortcut.ShortcutKey || 'Not selected')),
+            React.createElement(Tag_1.Tag, null, shortcut.ShortcutKey || 'Not selected')),
         React.createElement(OnePageAdaptableWizard_2.SummaryText, null,
             "Value ",
-            React.createElement(CodeBlock_1.CodeBlock, null, (_a = shortcut.ShortcutValue) !== null && _a !== void 0 ? _a : 'Not specified')),
+            React.createElement(Tag_1.Tag, null, (_a = shortcut.ShortcutValue) !== null && _a !== void 0 ? _a : 'Not specified')),
         React.createElement(OnePageAdaptableWizard_2.SummaryText, null,
             "Operation ",
-            React.createElement(CodeBlock_1.CodeBlock, null, (_b = shortcut.ShortcutOperation) !== null && _b !== void 0 ? _b : 'Not Specified'))));
+            React.createElement(Tag_1.Tag, null, (_b = shortcut.ShortcutOperation) !== null && _b !== void 0 ? _b : 'Not Specified'))));
 };
 exports.ShortcutSettingsWizard = (props) => {
     var _a;
@@ -63,11 +63,11 @@ exports.ShortcutSettingsWizard = (props) => {
                 React.createElement(FormLayout_1.default, { width: 400 },
                     React.createElement(FormLayout_1.FormRow, { label: "Key" },
                         React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                            React.createElement(DropdownButton_1.default, { style: { flex: 1 }, marginRight: 3, items: optionKeys }, shortcut.ShortcutKey || 'Select Key'),
+                            React.createElement(DropdownButton_1.default, { style: { flex: 1 }, marginRight: 3, items: optionKeys, columns: ['label'] }, shortcut.ShortcutKey || 'Select Key'),
                             React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: "Shortcut: Key", bodyText: ['The keyboard key that, when pressed, triggers the shortcut.'] }))),
                     React.createElement(FormLayout_1.FormRow, { label: "Operation" },
                         React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                            React.createElement(DropdownButton_1.default, { style: { flex: 1 }, marginRight: 3, items: optionActions }, shortcut.ShortcutOperation || 'Select Operation'),
+                            React.createElement(DropdownButton_1.default, { style: { flex: 1 }, marginRight: 3, items: optionActions, columns: ['label'] }, shortcut.ShortcutOperation || 'Select Operation'),
                             React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: 'Shortcut: Operation', bodyText: [
                                     "The mathematical operation that is performed on the cell's current value - using the shortcut's 'value' - in order to calculate the new total for the cell.",
                                 ] }))),

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

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../../View/Wizard/Interface/IAdaptableWizard';
 import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
-interface ShortcutWizardProps extends AdaptableOnePageWizardProps<Shortcut> {
+export interface ShortcutWizardProps extends AdaptableOnePageWizardProps<Shortcut> {
     availableKeys: string[];
 }
 export declare const ShortcutWizard: React.FunctionComponent<ShortcutWizardProps>;
-export {};

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

@@ -9,14 +9,38 @@ const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const ShortcutScopeWizardSection_1 = require("./ShortcutScopeWizardSection");
 const ShortcutSettingsWizard_1 = require("./ShortcutSettingsWizard");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const react_redux_1 = require("react-redux");
+const ShortcutRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ShortcutRedux"));
+const shortcutKeys_1 = require("../shortcutKeys");
+const AdaptableContext_1 = require("../../AdaptableContext");
 exports.ShortcutWizard = (props) => {
     const [shortcut, setShortcut] = React.useState(() => {
         var _a;
-        const shortcut = Helper_1.cloneObject(props.data);
+        const shortcut = props.data ? Helper_1.cloneObject(props.data) : ObjectFactory_1.default.CreateEmptyShortcut();
         shortcut.Scope = (_a = shortcut.Scope) !== null && _a !== void 0 ? _a : { All: true };
         return shortcut;
     });
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { moduleInfo: props.moduleInfo, data: shortcut, onHide: props.onCloseWizard, onFinish: props.onFinishWizard, sections: [
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const availableKeys = React.useMemo(() => {
+        const availableKeys = shortcutKeys_1.shortcutKeys.filter((key) => adaptable.api.shortcutApi.getAllShortcut().every((shortcut) => shortcut.ShortcutKey !== key));
+        if (shortcut) {
+            availableKeys.push(shortcut.ShortcutKey);
+        }
+        availableKeys.sort();
+        return availableKeys;
+    }, []);
+    const dispatch = react_redux_1.useDispatch();
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(ShortcutRedux.ShortcutEdit(shortcut));
+        }
+        else {
+            dispatch(ShortcutRedux.ShortcutAdd(shortcut));
+        }
+        props.onFinishWizard(shortcut);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: shortcut, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Target',
                 isValid: NewScopeComponent_1.isScopeValid,
@@ -41,8 +65,11 @@ exports.ShortcutWizard = (props) => {
                     React.createElement("b", null, "Key"),
                     " is pressed.")),
                 renderSummary: () => React.createElement(ShortcutSettingsWizard_1.ShortcutSettingsSummary, null),
-                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
-                    React.createElement(ShortcutSettingsWizard_1.ShortcutSettingsWizard, { availableKeys: props.availableKeys, onChange: setShortcut }))),
+                render: () => {
+                    var _a;
+                    return (React.createElement(rebass_1.Box, { padding: 2 },
+                        React.createElement(ShortcutSettingsWizard_1.ShortcutSettingsWizard, { availableKeys: (_a = props.availableKeys) !== null && _a !== void 0 ? _a : availableKeys, onChange: setShortcut })));
+                },
             },
             {
                 render: () => {

package/src/View/SmartEdit/SmartEditPopup.js

@@ -29,7 +29,7 @@ class SmartEditPopupComponent extends React.Component {
     render() {
         let col;
         if (this.props.PreviewInfo) {
-            col = this.props.api.columnApi.getColumnFromId(this.props.PreviewInfo.columnId);
+            col = this.props.PreviewInfo.column;
         }
         let globalValidationMessage = PreviewHelper_1.PreviewHelper.GetValidationMessage(this.props.PreviewInfo, `${this.props.SmartEditValue}`);
         let showPanel = this.props.PreviewInfo && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(`${this.props.SmartEditValue}`);
@@ -42,9 +42,9 @@ class SmartEditPopupComponent extends React.Component {
                 },
             };
         });
-        return (React.createElement(PanelWithImage_1.PanelWithImage, { variant: "primary", style: { height: '100%' }, bodyProps: {
+        return (React.createElement(PanelWithImage_1.PanelWithImage, { flex: 1, style: { height: '100%' }, variant: "primary", bodyProps: {
                 style: { display: 'flex', flexFlow: 'column' },
-            }, header: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), bodyScroll: true, onKeyDown: (e) => {
+            }, bodyScroll: true, glyphicon: this.props.moduleInfo.Glyph, header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), onKeyDown: (e) => {
                 if (e.key === 'Enter') {
                     this.submit();
                 }

package/src/View/StateManagement/StateManagementPopup.d.ts

@@ -1,16 +1,6 @@
 import * as React from 'react';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-interface StateManagementPopupProps extends ModuleViewPopupProps<StateManagementPopupComponent> {
+interface StateManagementPopupProps extends ModuleViewPopupProps<typeof StateManagementPopup> {
 }
-declare class StateManagementPopupComponent extends React.Component<StateManagementPopupProps, {}> {
-    constructor(props: StateManagementPopupProps);
-    render(): JSX.Element;
-    onClearLocalStorage(): void;
-    onLoadPredefinedConfig(e: any): void;
-    onExportAllState(type: any): void;
-    onExportUserState(type: any): void;
-    onExportPredefinedConfig(type: any): void;
-    onExportState(type: any, name: string, state: any): void;
-}
-export declare let StateManagementPopup: import("react-redux").ConnectedComponent<typeof StateManagementPopupComponent, any>;
+export declare const StateManagementPopup: React.FunctionComponent<StateManagementPopupProps>;
 export {};