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

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/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

@@ -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.js

@@ -3,27 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateManagementPopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const rebass_1 = require("rebass");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
 const LoadButton_1 = require("./components/LoadButton");
 const ClearButton_1 = require("./components/ClearButton");
 const ExportDropdown_1 = require("./components/ExportDropdown");
+const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 exports.StateManagementPopup = (props) => {
-    return (React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "column" },
-        React.createElement(PanelWithButton_1.PanelWithButton, { headerText: props.moduleInfo.FriendlyName, button: null, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
-            React.createElement(rebass_1.Box, null,
-                React.createElement(HelpBlock_1.default, null, 'Clear all current user state that has been applied.   When you restart / refresh Adaptable any state that you have previously created will be lost.  However your Predefined Config will then be re-applied.'),
-                React.createElement(ClearButton_1.ClearButton, { tone: "error", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.configApi.reloadPredefinedConfig() }, "Clear User State"),
+    return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
+        React.createElement(rebass_1.Box, null,
+            React.createElement(Panel_1.default, { header: 'User State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2 },
+                React.createElement(HelpBlock_1.default, null, 'Clear all current user state that has been applied.'),
+                React.createElement(HelpBlock_1.default, null, 'When you restart / refresh the Application, any state that you have previously created will be lost, and the initial Predefined Config will then be re-applied.'),
+                React.createElement(ClearButton_1.ClearButton, { tone: "error", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.configApi.reloadPredefinedConfig() }, "Clear User State")),
+            React.createElement(Panel_1.default, { header: 'Load Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2 },
                 React.createElement(HelpBlock_1.default, { marginTop: 3 }, 'Load Predefined Config (from a .json file).  This will cause this window to close.'),
                 ' ',
-                React.createElement(LoadButton_1.LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json) }, "Load Predefined Config"),
-                React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export All Adaptable State'),
-                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "allState", marginRight: 3, style: { flex: 1, maxWidth: 'none' } }, "Select Export Destination"),
-                React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export User State'),
-                ' ',
-                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "userState", marginRight: 3, style: { flex: 1, maxWidth: 'none' } }, "Select Export Destination"),
-                React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export Initial Predefined Config'),
-                ' ',
-                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "predefinedConfig", marginRight: 3, style: { flex: 1, maxWidth: 'none' } }, "Select Export Destination")))));
+                React.createElement(LoadButton_1.LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json) }, "Load Predefined Config")),
+            React.createElement(Panel_1.default, { header: 'Export All Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2 },
+                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "allState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'] }, "Select Export Destination")),
+            React.createElement(Panel_1.default, { header: 'Export User State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2 },
+                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "userState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'] }, "Select Export Destination")),
+            React.createElement(Panel_1.default, { header: 'Export Initial Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2 },
+                React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "predefinedConfig", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'] }, "Select Export Destination")))));
 };

package/src/View/SystemStatus/SystemStatusPopup.js

@@ -11,7 +11,7 @@ const AdaptableObjectCollection_1 = require("../Components/AdaptableObjectCollec
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const SystemStatusEntityRow_1 = require("./SystemStatusEntityRow");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const colItems = [
     { Content: 'Message', Size: 10 },
@@ -26,12 +26,12 @@ class SystemStatusPopupComponent extends React.Component {
         this.props.onSystemStatusMessageInfoDeleteAll();
     }
     render() {
-        let clearAllButton = (React.createElement(SimpleButton_1.default, { onClick: () => this.onSystemStatusMessageInfoDeleteAll(), tooltip: "Clear All", tone: "neutral", variant: "raised", accessLevel: this.props.accessLevel }, "Delete All Messages"));
+        let clearAllButton = (React.createElement(SimpleButton_1.default, { onClick: () => this.onSystemStatusMessageInfoDeleteAll(), tooltip: "Clear All", tone: "neutral", variant: "raised", accessLevel: this.props.accessLevel, disabled: ArrayExtensions_1.default.IsNullOrEmpty(this.props.SystemStatusMessages) }, "Delete All Messages"));
         const messages = ArrayExtensions_1.default.sortArrayWithProperty(Enums_1.SortOrder.Desc, this.props.SystemStatusMessages, 'Timestamp').map((smi, index) => {
             const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(smi, this.props.accessLevel);
             return (React.createElement(SystemStatusEntityRow_1.SystemStatusEntityRow, { adaptableObject: smi, key: 'smi' + index, onEdit: null, moduleInfo: this.props.moduleInfo, colItems: colItems, api: this.props.api, accessLevel: accessLevel, teamSharingActivated: this.props.teamSharingActivated, onDeleteConfirm: null, onShare: null }));
         });
-        return (React.createElement(PanelWithButton_1.PanelWithButton, { button: clearAllButton, variant: "primary", headerText: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), bodyProps: { padding: 2 } }, ArrayExtensions_1.default.IsNotNullOrEmpty(this.props.SystemStatusMessages) && (React.createElement(rebass_1.Flex, { marginTop: 2, flexDirection: "column" },
+        return (React.createElement(PopupPanel_1.PopupPanel, { button: clearAllButton, headerText: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }, ArrayExtensions_1.default.IsNotNullOrEmpty(this.props.SystemStatusMessages) && (React.createElement(rebass_1.Box, { className: "ab-SystemStatus-Popup-List", padding: 2 },
             React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { colItems: colItems, items: messages })))));
     }
 }

package/src/View/TeamSharing/TeamSharingPopup.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
-const PanelWithImage_1 = require("../Components/Panels/PanelWithImage");
 const PanelWithRow_1 = require("../Components/Panels/PanelWithRow");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const icons_1 = require("../../components/icons");
@@ -25,6 +24,7 @@ const NamedQuerySharedEntity_1 = require("../Query/NamedQuerySharedEntity");
 const FreeTextColumnSharedEntity_1 = require("../FreeTextColumn/FreeTextColumnSharedEntity");
 const FilterSharedEntity_1 = require("../Filter/FilterSharedEntity");
 const AlertSharedEntity_1 = require("../Alert/AlertSharedEntity");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 class TeamSharingPopupComponent extends React.Component {
     componentDidMount() {
         this.props.onTeamSharingGet();
@@ -81,7 +81,7 @@ class TeamSharingPopupComponent extends React.Component {
                     this.hasDeletionRights(x) && (React.createElement(SimpleButton_1.default, { variant: "text", tooltip: "Remove", onClick: () => this.props.onRemoveItem(x.Uuid) },
                         React.createElement(icons_1.Icon, { name: "delete" }))))));
         });
-        return (React.createElement(PanelWithImage_1.PanelWithImage, { header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), glyphicon: this.props.moduleInfo.Glyph },
+        return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), glyphicon: this.props.moduleInfo.Glyph },
             this.props.Entities.length == 0 ? (React.createElement(HelpBlock_1.default, { margin: 3 }, "Shared Items will appear here when available.")) : (React.createElement(PanelWithRow_1.PanelWithRow, { colItems: colItems })),
             sharedItems));
     }

package/src/View/Theme/ThemePopup.js

@@ -5,8 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
-const rebass_1 = require("rebass");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
 const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
 class ThemePopupComponent extends React.Component {
@@ -36,11 +35,10 @@ class ThemePopupComponent extends React.Component {
                 onClick: () => this.onChangeTheme(theme.Name),
             };
         });
-        return (React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "column" },
-            React.createElement(PanelWithButton_1.PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
-                React.createElement(FormLayout_1.default, null,
-                    React.createElement(FormLayout_1.FormRow, { label: "Current Theme:" },
-                        React.createElement(DropdownButton_1.default, { columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription))))));
+        return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
+            React.createElement(FormLayout_1.default, null,
+                React.createElement(FormLayout_1.FormRow, { label: "Current Theme:" },
+                    React.createElement(DropdownButton_1.default, { columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription)))));
     }
     onChangeTheme(value) {
         this.props.SelectTheme(value);

package/src/View/UIHelper.d.ts

@@ -2,7 +2,7 @@ import { CSSProperties } from 'react';
 import { EditableConfigEntityState } from './Components/SharedProps/EditableConfigEntityState';
 import { StatusColour } from '../PredefinedConfig/Common/Enums';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { Schedule } from '../PredefinedConfig/Common/Schedule';
+import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
 import { AdaptableOptions } from '../types';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
@@ -46,6 +46,7 @@ export declare function getGlyphForStatusColour(statusColour: StatusColour): str
 export declare function getGlyphForMessageType(messageType: AdaptableMessageType): string;
 export declare function getButtonToneForMessageType(messageType: AdaptableMessageType): 'info' | 'warning' | 'error' | 'success';
 export declare function getScheduleDescription(schedule: Schedule): string;
+export declare function getWeekDayByIndex(dayOfWeek: number): Weekday;
 export declare function getMessageTypeFromAdaptableAlerts(adaptableAlerts: AdaptableAlert[]): AdaptableMessageType;
 export declare function getButtonColourForAdaptableAlerts(adaptableAlerts: AdaptableAlert[], messageTypeColor: string): string;
 export declare function getButtonTextColourForArrayandMessageType(adaptableAlerts: AdaptableAlert[], messageType: AdaptableMessageType): string;
@@ -72,6 +73,7 @@ export declare const UIHelper: {
     getGlyphForStatusColour: typeof getGlyphForStatusColour;
     getButtonToneForMessageType: typeof getButtonToneForMessageType;
     getScheduleDescription: typeof getScheduleDescription;
+    getWeekDayByIndex: typeof getWeekDayByIndex;
     getColorByMessageType: typeof getColorByMessageType;
     getGlyphForMessageType: typeof getGlyphForMessageType;
     getStyleForMessageType: typeof getStyleForMessageType;