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

package/src/View/StateManagement/StateManagementPopup.js

@@ -3,120 +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 react_redux_1 = require("react-redux");
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
-const UIHelper_1 = require("../UIHelper");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const rebass_1 = require("rebass");
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
-const Dropdown_1 = tslib_1.__importDefault(require("../../components/Dropdown"));
-const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
-const FileDroppable_1 = require("../../components/FileDroppable");
-class StateManagementPopupComponent extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = UIHelper_1.UIHelper.getEmptyConfigState();
-    }
-    render() {
-        // sort out actions
-        let destinationOptions = [
-            {
-                value: 'Clipboard',
-                label: 'Clipboard',
-            },
-            {
-                value: 'Console',
-                label: 'Console',
-            },
-            {
-                value: 'JSON',
-                label: 'JSON',
-            },
-        ];
-        let clearButton = (React.createElement(SimpleButton_1.default, { onClick: () => this.onClearLocalStorage(), tooltip: "Clear User State", tone: "error", variant: "raised", marginTop: 2, accessLevel: this.props.accessLevel }, "Clear User State"));
-        let loadButton = (React.createElement(SimpleButton_1.default, { marginTop: 2, tone: "info", variant: "raised", accessLevel: this.props.accessLevel },
-            React.createElement("input", { type: "file", onChange: (json) => this.onLoadPredefinedConfig(json), accept: '.json', style: {
-                    opacity: 0,
-                    position: 'absolute',
-                    cursor: 'pointer',
-                    fontSize: 0,
-                    lineHeight: 0,
-                    top: 0,
-                    left: 0,
-                    width: '100%',
-                    height: '100%',
-                    zIndex: 1,
-                } }),
-            ' ',
-            "Load Predefined Config"));
-        return (React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "column" },
-            React.createElement(PanelWithButton_1.PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, button: null, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.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.'),
-                    clearButton,
-                    React.createElement(HelpBlock_1.default, { marginTop: 3 }, 'Load Predefined Config (from a .json file).  This will cause this window to close.'),
-                    ' ',
-                    loadButton,
-                    React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export All Adaptable State'),
-                    React.createElement(Dropdown_1.default, { key: 'exportAllState', placeholder: "Select Export Destination", style: { flex: 1, maxWidth: 'none' }, value: undefined, onChange: (x) => this.onExportAllState(x), marginRight: 3, options: destinationOptions }),
-                    React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export User State'),
-                    ' ',
-                    React.createElement(Dropdown_1.default, { key: 'exportUserState', placeholder: "Select Export Destination", style: { flex: 1, maxWidth: 'none' }, value: undefined, onChange: (x) => this.onExportUserState(x), marginRight: 3, options: destinationOptions }),
-                    React.createElement(HelpBlock_1.default, { marginTop: 3, marginBottom: 2 }, 'Export Initial Predefined Config'),
-                    ' ',
-                    React.createElement(Dropdown_1.default, { key: 'exportPredefinedConfig', placeholder: "Select Export Destination", style: { flex: 1, maxWidth: 'none' }, value: undefined, onChange: (x) => this.onExportPredefinedConfig(x), marginRight: 3, options: destinationOptions })))));
-    }
-    onClearLocalStorage() {
-        this.props.api.configApi.reloadPredefinedConfig();
-    }
-    onLoadPredefinedConfig(e) {
-        let nativeEvent = e.nativeEvent;
-        let files;
-        if (nativeEvent && nativeEvent.dataTransfer) {
-            files = nativeEvent.dataTransfer.files;
-        }
-        else {
-            files = e.target.files;
-        }
-        const file = files[0];
-        FileDroppable_1.readJSONFile(file).then((json) => {
-            this.props.api.configApi.reloadPredefinedConfig(json);
-        });
-    }
-    onExportAllState(type) {
-        let allState = this.props.api.configApi.getAllState();
-        this.onExportState(type, 'allState', allState);
-    }
-    onExportUserState(type) {
-        let userState = this.props.api.configApi.getAllUserState();
-        this.onExportState(type, 'userState', userState);
-    }
-    onExportPredefinedConfig(type) {
-        let predefinedConfig = this.props.api.configApi.getPredefinedConfig();
-        this.onExportState(type, 'predefinedConfig', predefinedConfig);
-    }
-    onExportState(type, name, state) {
-        switch (type) {
-            case 'Clipboard':
-                let stringifiedState = JSON.stringify(state);
-                Helper_1.default.copyToClipboard(stringifiedState);
-                break;
-            case 'Console':
-                LoggingHelper_1.ConsoleLog(state);
-                break;
-            case 'JSON':
-                const jsonFileName = name + '.json';
-                const jsonContent = JSON.stringify(state);
-                Helper_1.default.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
-                break;
-        }
-    }
-}
-function mapStateToProps(state, ownProps) {
-    return {};
-}
-function mapDispatchToProps(dispatch) {
-    return {};
-}
-exports.StateManagementPopup = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(StateManagementPopupComponent);
+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(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(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/StateManagement/StateManagementViewPanel.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
+export interface ThemeViewPanelComponentProps extends ViewPanelProps {
+}
+export declare const StateManagementViewPanel: React.FunctionComponent<ThemeViewPanelComponentProps>;

package/src/View/StateManagement/StateManagementViewPanel.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StateManagementViewPanel = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const join_1 = tslib_1.__importDefault(require("../../components/utils/join"));
+const GeneralConstants = tslib_1.__importStar(require("../../Utilities/Constants/GeneralConstants"));
+const LoadButton_1 = require("./components/LoadButton");
+const ClearButton_1 = require("./components/ClearButton");
+const rebass_1 = require("rebass");
+const ExportDropdown_1 = require("./components/ExportDropdown");
+exports.StateManagementViewPanel = (props) => {
+    const isToolbar = props.viewType === 'Toolbar';
+    const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
+    return (React.createElement(rebass_1.Flex, { flexDirection: isToolbar ? 'row' : 'column', className: join_1.default(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__StateManagement__wrap`) },
+        React.createElement(rebass_1.Flex, { flexDirection: "row" },
+            React.createElement(LoadButton_1.LoadButton, { tooltip: "Load Predefined Config", variant: "text", icon: "upload", onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
+            React.createElement(ClearButton_1.ClearButton, { icon: "trash", tooltip: "Clear User State", variant: "text", onClick: () => props.api.configApi.reloadPredefinedConfig(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
+        React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "allState" }, "All State"),
+        React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "userState" }, "User State"),
+        React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "predefinedConfig" }, "Predefined Config")));
+};

package/src/View/StateManagement/components/ClearButton.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { SimpleButtonProps } from '../../../components/SimpleButton';
+interface ClearButtonProps extends SimpleButtonProps {
+}
+export declare const ClearButton: React.FunctionComponent<ClearButtonProps>;
+export {};

package/src/View/StateManagement/components/ClearButton.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClearButton = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
+exports.ClearButton = (props) => {
+    return (React.createElement(SimpleButton_1.default, Object.assign({}, props, { className: "ab-StateManagement__Clear-Button", tooltip: "Clear User State" }), props.children));
+};

package/src/View/StateManagement/components/ExportDropdown.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { AdaptableApi } from '../../../../types';
+import { DropdownButtonProps } from '../../../components/DropdownButton';
+export interface ExportDropdownProps extends Omit<DropdownButtonProps, 'options' | 'value'> {
+    api: AdaptableApi;
+    type: 'allState' | 'userState' | 'predefinedConfig';
+}
+export declare const ExportDropdown: React.FunctionComponent<ExportDropdownProps>;

package/src/View/StateManagement/components/ExportDropdown.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportDropdown = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
+const handleExportState_1 = require("../handleExportState");
+exports.ExportDropdown = (props) => {
+    const handleChange = (destination) => {
+        switch (props.type) {
+            case 'allState':
+                const allState = props.api.configApi.getAllState();
+                handleExportState_1.handleExportState(destination, 'allState', allState);
+                break;
+            case 'userState':
+                const userState = props.api.configApi.getAllUserState();
+                handleExportState_1.handleExportState(destination, 'userState', userState);
+                break;
+            case 'predefinedConfig':
+                const predefinedConfig = props.api.configApi.getPredefinedConfig();
+                handleExportState_1.handleExportState(destination, 'predefinedConfig', predefinedConfig);
+                break;
+        }
+    };
+    const destinationOptions = [
+        {
+            value: 'Clipboard',
+            label: 'Clipboard',
+            onClick: () => handleChange('Clipboard'),
+        },
+        {
+            value: 'Console',
+            label: 'Console',
+            onClick: () => handleChange('Console'),
+        },
+        {
+            value: 'JSON',
+            label: 'JSON',
+            onClick: () => handleChange('JSON'),
+        },
+    ];
+    return (React.createElement(DropdownButton_1.default, Object.assign({ className: "ab-StateManagement__Export-Dropdown" }, props, { items: destinationOptions, value: undefined })));
+};

package/src/View/StateManagement/components/LoadButton.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { SimpleButtonProps } from '../../../components/SimpleButton';
+interface LoadButtonProps extends SimpleButtonProps {
+    onLoad: (json: any) => void;
+}
+export declare const LoadButton: React.FunctionComponent<LoadButtonProps>;
+export {};

package/src/View/StateManagement/components/LoadButton.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadButton = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const FileDroppable_1 = require("../../../components/FileDroppable");
+const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
+exports.LoadButton = (props) => {
+    const onLoadPredefinedConfig = (e) => {
+        const nativeEvent = e.nativeEvent;
+        let files;
+        if (nativeEvent && nativeEvent.dataTransfer) {
+            files = nativeEvent.dataTransfer.files;
+        }
+        else {
+            files = e.target.files;
+        }
+        const file = files[0];
+        FileDroppable_1.readJSONFile(file).then((json) => {
+            props.onLoad(json);
+        });
+    };
+    return (React.createElement(SimpleButton_1.default, Object.assign({}, props, { className: "ab-StateManagement__Load-Button" }),
+        React.createElement("input", { type: "file", onChange: (json) => onLoadPredefinedConfig(json), accept: '.json', style: {
+                opacity: 0,
+                position: 'absolute',
+                cursor: 'pointer',
+                fontSize: 0,
+                lineHeight: 0,
+                top: 0,
+                left: 0,
+                width: '100%',
+                height: '100%',
+                zIndex: 1,
+            } }),
+        ' ',
+        props.children));
+};

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

@@ -0,0 +1 @@
+export declare const handleExportState: (type: 'Clipboard' | 'Console' | 'JSON', name: string, state: any) => void;

package/src/View/StateManagement/handleExportState.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleExportState = void 0;
+const tslib_1 = require("tslib");
+const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+exports.handleExportState = (type, name, state) => {
+    switch (type) {
+        case 'Clipboard':
+            let stringifiedState = JSON.stringify(state);
+            Helper_1.default.copyToClipboard(stringifiedState);
+            break;
+        case 'Console':
+            LoggingHelper_1.ConsoleLog(state);
+            break;
+        case 'JSON':
+            const jsonFileName = name + '.json';
+            const jsonContent = JSON.stringify(state);
+            Helper_1.default.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
+            break;
+    }
+};

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/Theme/ThemeViewPanel.js

@@ -35,7 +35,7 @@ class ThemeViewPanelComponent extends React.Component {
                 textOverflow: 'ellipsis',
                 fontSize: 'small',
             }
-            : { minWidth: 168, fontSize: 'small' };
+            : { minWidth: '100%', fontSize: 'small' };
         return (React.createElement("div", { className: join_1.default(this.props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Theme__wrap`) },
             React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__Theme__select`, style: dropDownStyle, items: themes, columns: ['label'], accessLevel: this.props.accessLevel }, currentThemeDescription)));
     }

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;

package/src/View/UIHelper.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UIHelper = exports.isBrowserDocumentAvailable = exports.setCSSVariableValue = exports.getCSSVariableValue = exports.getAdaptableToolPanelWidth = exports.getButtonTextColourForMessageType = exports.getButtonTextColourForArrayandMessageType = exports.getButtonColourForAdaptableAlerts = exports.getMessageTypeFromAdaptableAlerts = exports.getScheduleDescription = exports.getButtonToneForMessageType = exports.getGlyphForMessageType = exports.getGlyphForStatusColour = exports.getStyleForMessageType = exports.getStyleForStatusColour = exports.getColorByMessageType = exports.getGlyphByMessageType = exports.getButtonToneByMessageType = exports.getMessageTypeByStatusColour = exports.IsNotEmptyStyle = exports.IsEmptyStyle = exports.isValidUserChartContainer = exports.getChartContainer = exports.getModalContainer = exports.getPlaceHolderforDataType = exports.getDescriptionForDataType = exports.getEmptyConfigState = exports.getDefaultColors = exports.getHexForName = exports.ORANGE = exports.LIGHT_RED = exports.RED = exports.DARK_RED = exports.PURPLE = exports.MAGENTA = exports.CYAN = exports.LIGHT_BLUE = exports.BLUE = exports.DARK_BLUE = exports.LIGHT_YELLOW = exports.YELLOW = exports.LIME_GREEN = exports.GREEN = exports.DARK_GREEN = exports.BROWN = exports.GRAY = exports.LIGHT_GRAY = exports.WHITE = exports.BLACK = void 0;
+exports.UIHelper = exports.isBrowserDocumentAvailable = exports.setCSSVariableValue = exports.getCSSVariableValue = exports.getAdaptableToolPanelWidth = exports.getButtonTextColourForMessageType = exports.getButtonTextColourForArrayandMessageType = exports.getButtonColourForAdaptableAlerts = exports.getMessageTypeFromAdaptableAlerts = exports.getWeekDayByIndex = exports.getScheduleDescription = exports.getButtonToneForMessageType = exports.getGlyphForMessageType = exports.getGlyphForStatusColour = exports.getStyleForMessageType = exports.getStyleForStatusColour = exports.getColorByMessageType = exports.getGlyphByMessageType = exports.getButtonToneByMessageType = exports.getMessageTypeByStatusColour = exports.IsNotEmptyStyle = exports.IsEmptyStyle = exports.isValidUserChartContainer = exports.getChartContainer = exports.getModalContainer = exports.getPlaceHolderforDataType = exports.getDescriptionForDataType = exports.getEmptyConfigState = exports.getDefaultColors = exports.getHexForName = exports.ORANGE = exports.LIGHT_RED = exports.RED = exports.DARK_RED = exports.PURPLE = exports.MAGENTA = exports.CYAN = exports.LIGHT_BLUE = exports.BLUE = exports.DARK_BLUE = exports.LIGHT_YELLOW = exports.YELLOW = exports.LIME_GREEN = exports.GREEN = exports.DARK_GREEN = exports.BROWN = exports.GRAY = exports.LIGHT_GRAY = exports.WHITE = exports.BLACK = void 0;
 const tslib_1 = require("tslib");
 const EditableConfigEntityState_1 = require("./Components/SharedProps/EditableConfigEntityState");
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
-const Schedule_1 = require("../PredefinedConfig/Common/Schedule");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 exports.BLACK = 'Black';
 exports.WHITE = 'White';
@@ -352,13 +351,13 @@ function getScheduleDescription(schedule) {
     }
     let dateString;
     if (schedule.OneOffDate == null) {
-        if (ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Monday) &&
-            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Tuesday) &&
-            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Wednesday) &&
-            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Thursday) &&
-            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Friday)) {
-            if (ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Sunday) &&
-                ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, Schedule_1.DayOfWeek.Saturday)) {
+        if (ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Monday') &&
+            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Tuesday') &&
+            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Wednesday') &&
+            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Thursday') &&
+            ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Friday')) {
+            if (ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Sunday') &&
+                ArrayExtensions_1.default.ContainsItem(schedule.DaysOfWeek, 'Saturday')) {
                 dateString = 'Everyday';
             }
             else {
@@ -378,22 +377,41 @@ function getScheduleDescription(schedule) {
 exports.getScheduleDescription = getScheduleDescription;
 function getShortenedDayString(dayOfWeek) {
     switch (dayOfWeek) {
-        case Schedule_1.DayOfWeek.Sunday:
+        case 'Sunday':
             return 'Sun';
-        case Schedule_1.DayOfWeek.Monday:
+        case 'Monday':
             return 'Mon';
-        case Schedule_1.DayOfWeek.Tuesday:
+        case 'Tuesday':
             return 'Tues';
-        case Schedule_1.DayOfWeek.Wednesday:
+        case 'Wednesday':
             return 'Weds';
-        case Schedule_1.DayOfWeek.Thursday:
+        case 'Thursday':
             return 'Thurs';
-        case Schedule_1.DayOfWeek.Friday:
+        case 'Friday':
             return 'Fri';
-        case Schedule_1.DayOfWeek.Saturday:
+        case 'Saturday':
             return 'Sat';
     }
 }
+function getWeekDayByIndex(dayOfWeek) {
+    switch (dayOfWeek) {
+        case 0:
+            return 'Sunday';
+        case 1:
+            return 'Monday';
+        case 2:
+            return 'Tuesday';
+        case 3:
+            return 'Wednesday';
+        case 4:
+            return 'Thursday';
+        case 5:
+            return 'Friday';
+        case 6:
+            return 'Saturday';
+    }
+}
+exports.getWeekDayByIndex = getWeekDayByIndex;
 function addLeadingZero(item) {
     item = item || 0;
     if (item < 10) {
@@ -489,6 +507,7 @@ exports.UIHelper = {
     getGlyphForStatusColour,
     getButtonToneForMessageType,
     getScheduleDescription,
+    getWeekDayByIndex,
     getColorByMessageType,
     getGlyphForMessageType,
     getStyleForMessageType,

package/src/View/Wizard/Interface/IAdaptableWizard.d.ts

@@ -39,4 +39,9 @@ export interface AdaptableOnePageWizardProps<T extends AdaptableObject> {
     wizardStartIndex?: number;
     onCloseWizard: VoidFunction;
     onFinishWizard: (data: T) => void;
+    defaultCurrentSectionName?: string;
+    abObjectType?: {
+        name: string;
+        label?: string;
+    };
 }

package/src/View/Wizard/OnePageAdaptableWizard.d.ts

@@ -12,6 +12,7 @@ export declare type OnePageAdaptableWizardContextType<T> = {
     setCurrentSection: (index: number) => void;
     namedQuery: ExpressionEditorNamedQuery;
 };
+export declare const SummaryTag: React.FunctionComponent<TextProps>;
 export declare const SummaryText: React.FunctionComponent<TextProps>;
 export declare const FormDescriptionText: React.FunctionComponent<TextProps>;
 export declare const OnePageAdaptableWizardContext: React.Context<OnePageAdaptableWizardContextType<any>>;
@@ -29,6 +30,7 @@ export interface OnePageAdaptableWizardProps<ENTITY> {
     sections: (OnePageWizardSection<ENTITY> | '-')[];
     currentIndex?: number;
     defaultCurrentIndex?: number;
+    defaultCurrentSectionName?: string;
     onSectionChange?: (index: number) => void;
     onHide?: VoidFunction;
     onFinish?: (data: ENTITY) => any;

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnePageWizardSummary = exports.OnePageAdaptableWizard = exports.useOnePageWizardContext = exports.OnePageAdaptableWizardContext = exports.FormDescriptionText = exports.SummaryText = void 0;
+exports.OnePageWizardSummary = exports.OnePageAdaptableWizard = exports.useOnePageWizardContext = exports.OnePageAdaptableWizardContext = exports.FormDescriptionText = exports.SummaryText = exports.SummaryTag = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
@@ -19,6 +19,7 @@ const icons_1 = require("../../components/icons");
 const ResizeObserver_1 = require("../../components/ResizeObserver");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const useKeyboardNavigation_1 = require("./useKeyboardNavigation");
+exports.SummaryTag = (props) => React.createElement(rebass_1.Text, Object.assign({}, props));
 exports.SummaryText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mb: 3 }, props)));
 exports.FormDescriptionText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mt: 1 }, props)));
 exports.OnePageAdaptableWizardContext = React.createContext({
@@ -38,7 +39,14 @@ exports.OnePageAdaptableWizard = (props) => {
     const dispatch = react_redux_1.useDispatch();
     const saveNamedQuery = React.useCallback((namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery)), []);
     const { api } = AdaptableContext_1.useAdaptable();
-    const [currentSection, setCurrentSection] = useProperty_1.default(props, 'currentIndex', 0, {
+    let defaultCurrentIndex = 0;
+    if (props.defaultCurrentSectionName) {
+        const candidate = props.sections.findIndex((section) => section !== '-' && section.title === props.defaultCurrentSectionName);
+        if (candidate >= 0) {
+            defaultCurrentIndex = candidate;
+        }
+    }
+    const [currentSection, setCurrentSection] = useProperty_1.default(props, 'currentIndex', defaultCurrentIndex, {
         onChange: (index) => {
             var _a;
             (_a = props.onSectionChange) === null || _a === void 0 ? void 0 : _a.call(props, index);