@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.1

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ExportDestinationType } from '../../../../AdaptableOptions/ExportOptions';
-import { Report, ReportFormatType, ReportSchedule } from '../../../../PredefinedConfig/ExportState';
+import { Report, ReportFormatType, ReportSchedule } from '../../../../AdaptableState/ExportState';
 interface ReportScheduleProps {
     report: ReportSchedule;
     onChange: (reminder: ReportSchedule) => void;

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

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

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Tag } from '../../../../components/Tag';
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import { SummaryText, useOnePageAdaptableWizardContext, } from '../../../Wizard/OnePageAdaptableWizard';
 export const getScheduleSettingsValues = (data) => {
     if (data.ScheduleType === ScheduleType.Reminder) {

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
 interface ScheduleSettingsWizardProps {
     onChange: (schedule: BaseSchedule) => void;
 }

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import { ScheduleSettingsReminder } from './ScheduleSettingsReminder';
 import { ScheduleSettingsReport } from './ScheduleSettingsReport';
 import { ScheduleSettingsIPushPull } from './ScheduleSettingsIPushPull';

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

@@ -1,2 +1,2 @@
-import { BaseSchedule } from '../../../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../../../AdaptableState/Common/Schedule';
 export declare const isSettingsValid: (schedule: BaseSchedule) => true | "Message type not selected" | "Reminder header not specified" | "Reminder message not specified" | "Report source not specified" | "Report format not selected" | "Report not selected" | "Report folder not selected" | "Report page not selected";

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

@@ -1,4 +1,4 @@
-import { ScheduleType } from '../../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../../AdaptableState/Common/Enums';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
 export const isSettingsValid = (schedule) => {
     if (schedule.ScheduleType === ScheduleType.Reminder) {

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

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

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

@@ -4,7 +4,7 @@ import { OnePageAdaptableWizard, OnePageWizardSummary, } from '../../../View/Wiz
 import { ScheduleSettingsWizard, ScheduleSettingsSummary, isSettingsValid, } from './ScheduleSettingsWizard';
 import { ScheduleScheduleWizard, isScheduleValid } from './ScheduleScheduleWizard';
 import { ScheduleScheduleSummary } from './ScheduleScheduleSummary';
-import { ScheduleType } from '../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../AdaptableState/Common/Enums';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
 import * as ScheduleRedux from '../../../Redux/ActionsReducers/ScheduleRedux';

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
+import { Shortcut } from '../../../AdaptableState/ShortcutState';
 interface StyleScopeWizardSectionProps {
     onChange: (data: Shortcut) => void;
 }

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
+import { Shortcut } from '../../../AdaptableState/ShortcutState';
 export declare const isSettingsValid: (data: Shortcut) => string | true;
 export declare const ShortcutSettingsSummary: React.FunctionComponent;
 interface ShortcutSettingsWizardProps {

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

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

package/src/View/Shortcut/shortcutOperations.d.ts

@@ -1,2 +1,2 @@
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 export declare const shortcutOperationList: Array<MathOperation>;

package/src/View/Shortcut/shortcutOperations.js

@@ -1,4 +1,4 @@
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 export const shortcutOperationList = [
     MathOperation.Add,
     MathOperation.Subtract,

package/src/View/SmartEdit/SmartEditPopup.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { PanelWithImage } from '../Components/Panels/PanelWithImage';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -1,6 +1,6 @@
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
-import { MathOperation, StatusColour } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation, StatusColour } from '../../AdaptableState/Common/Enums';
 import * as React from 'react';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { PreviewResultsPanel } from '../Components/PreviewResultsPanel';

package/src/View/StateManagement/StateManagementPopup.js

@@ -10,18 +10,18 @@ export const StateManagementPopup = (props) => {
     return (React.createElement(PopupPanel, { className: baseClassName, headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "user-state", header: 'User State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginRight: 2, mb: 2 },
             React.createElement(HelpBlock, { marginBottom: 2 }, 'Clear all current user state that has been persisted'),
-            React.createElement(HelpBlock, { style: { color: 'var(--ab-color-warn)' } }, 'This will cause this window to close and any State you have previously created will be lost, and the initial Predefined Config will be reapplied'),
-            React.createElement(ClearButton, { "data-name": "clear-user-state-button", tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.configApi.reloadPredefinedConfig() }, "Clear User State")),
-        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "predefined-config", header: 'Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
-            React.createElement(HelpBlock, { marginTop: 2 }, 'Load Predefined Config (from a .json file) - this will cause this window to close'),
+            React.createElement(HelpBlock, { style: { color: 'var(--ab-color-warn)' } }, 'This will cause this window to close and any State you have previously created will be lost, and the Initial Adaptable State will be reapplied'),
+            React.createElement(ClearButton, { "data-name": "clear-user-state-button", tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.stateApi.reloadInitialState() }, "Clear User State")),
+        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-state", header: 'Initial Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+            React.createElement(HelpBlock, { marginTop: 2 }, 'Load Initial Adaptable State (from a .json file) - this will cause this window to close'),
             ' ',
-            React.createElement(LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json), "data-name": "load-predefined-config-button" }, "Load Predefined Config")),
+            React.createElement(LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.stateApi.reloadInitialState(json), "data-name": "load-initial-state-button" }, "Load Initial Adaptable State")),
         React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "adaptable-state", header: 'Export Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
             React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the currently persisted Adaptable State'),
             ' ',
             React.createElement(ExportDropdown, { api: props.api, type: "adaptableState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-adaptable-state-dropdown" }, "Select Export Destination")),
-        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-predefined-config", header: 'Export Initial Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
-            React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the Predefined Config which was provided at design time'),
+        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-state", header: 'Export Initial Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+            React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the Initial Adaptable State which was provided at design time'),
             ' ',
-            React.createElement(ExportDropdown, { api: props.api, type: "predefinedConfig", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-initial-predefined-config-dropdown" }, "Select Export Destination"))));
+            React.createElement(ExportDropdown, { api: props.api, type: "initialState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-initial-state-dropdown" }, "Select Export Destination"))));
 };

package/src/View/StateManagement/StateManagementViewPanel.js

@@ -10,8 +10,8 @@ export const StateManagementViewPanel = (props) => {
     const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
     return (React.createElement(Flex, { flexDirection: isToolbar ? 'row' : 'column', className: join(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__StateManagement__wrap`) },
         React.createElement(Flex, { flexDirection: "row" },
-            React.createElement(LoadButton, { tooltip: "Load Predefined Config", variant: "text", icon: "upload", onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
-            React.createElement(ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.configApi.reloadPredefinedConfig(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
+            React.createElement(LoadButton, { tooltip: "Load Initial Adaptable State", variant: "text", icon: "upload", onLoad: (json) => props.api.stateApi.reloadInitialState(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
+            React.createElement(ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.stateApi.reloadInitialState(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
         React.createElement(ExportDropdown, { api: props.api, type: "adaptableState" }, "All State"),
-        React.createElement(ExportDropdown, { api: props.api, type: "predefinedConfig" }, "Predefined Config")));
+        React.createElement(ExportDropdown, { api: props.api, type: "initialState" }, "Initial Adaptable State")));
 };

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

@@ -3,6 +3,6 @@ import { AdaptableApi } from '../../../../types';
 import { DropdownButtonProps } from '../../../components/DropdownButton';
 export interface ExportDropdownProps extends Omit<DropdownButtonProps, 'options' | 'value'> {
     api: AdaptableApi;
-    type: 'adaptableState' | 'predefinedConfig';
+    type: 'adaptableState' | 'initialState';
 }
 export declare const ExportDropdown: React.FunctionComponent<ExportDropdownProps>;

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

@@ -5,12 +5,12 @@ export const ExportDropdown = (props) => {
     const handleChange = (destination) => {
         switch (props.type) {
             case 'adaptableState':
-                const adaptableState = props.api.configApi.getPersistedState();
+                const adaptableState = props.api.stateApi.getPersistedState();
                 handleExportState(destination, 'adaptableState', adaptableState);
                 break;
-            case 'predefinedConfig':
-                const predefinedConfig = props.api.configApi.getPredefinedConfig();
-                handleExportState(destination, 'predefinedConfig', predefinedConfig);
+            case 'initialState':
+                const initialState = props.api.stateApi.getInitialState();
+                handleExportState(destination, 'initialState', initialState);
                 break;
         }
     };

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { readJSONFile } from '../../../components/FileDroppable';
 import SimpleButton from '../../../components/SimpleButton';
 export const LoadButton = (props) => {
-    const onLoadPredefinedConfig = (e) => {
+    const onLoadInitialState = (e) => {
         const nativeEvent = e.nativeEvent;
         let files;
         if (nativeEvent && nativeEvent.dataTransfer) {
@@ -17,7 +17,7 @@ export const LoadButton = (props) => {
         });
     };
     return (React.createElement(SimpleButton, { ...props, className: "ab-StateManagement__Load-Button" },
-        React.createElement("input", { type: "file", onChange: (json) => onLoadPredefinedConfig(json), accept: '.json', style: {
+        React.createElement("input", { type: "file", onChange: (json) => onLoadInitialState(json), accept: '.json', style: {
                 opacity: 0,
                 position: 'absolute',
                 cursor: 'pointer',

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

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

package/src/View/StatusBar/AdaptableStatusBar.js

@@ -1,16 +1,18 @@
 import * as React from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Flex } from 'rebass';
 import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { StatusBarPanel } from './StatusBarPanel';
+import { useRerender } from '../../components/utils/useRerender';
 export const AdaptableStatusBar = (props) => {
-    /**
-     * All state is selected so the Status Bar is re-rendered for all adaptable state changes
-     */
-    const state = useSelector((state) => state);
-    const statusPanels = getStatusPanelsSelector(state);
     const adaptable = useAdaptable();
+    const rerender = useRerender();
+    useEffect(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
+    const statusPanels = useSelector(getStatusPanelsSelector);
     const dispatch = useDispatch();
     const statusSubPanels = statusPanels.find((statusPanel) => statusPanel.Key === props.context.Key);
     const allMenuItems = useSelector((state) => state?.Internal?.SettingsPanelModuleEntries);

package/src/View/StatusBar/StatusBarPopup.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { ModuleManager } from '../../components/DragAndDropContext/ModuleManager';
 import EmptyContent from '../../components/EmptyContent';
-import { ALL_STATUS_SUB_PANELS, } from '../../PredefinedConfig/Common/Types';
+import { ALL_STATUS_SUB_PANELS } from '../../AdaptableState/Common/Types';
 import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';

package/src/View/StyledColumn/Wizard/StyledColumnWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export interface StyledColumnWizardProps extends AdaptableOnePageWizardProps<StyledColumn> {
     isNew: boolean;
 }

package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export declare const renderStyledColumnColumnSummary: (data: StyledColumn) => React.JSX.Element;
 export declare const isValidStyledColumnColumn: (data: StyledColumn) => true | string;
 export type StyledColumnWizardColumnSectionProps = {

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../../../types';
 export declare const renderFormatColumnStyleWizardSummary: (data: StyledColumn) => React.JSX.Element;
 export declare const renderStyledColumnStyleSummary: (data: StyledColumn, api: AdaptableApi) => React.JSX.Element;

package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export declare const renderStyledColumnTypeSummary: (data: StyledColumn) => React.JSX.Element;
 export interface StyledColumnWizardTypeSectionProps {
     onChange: (styledColumn: StyledColumn) => void;

package/src/View/SystemStatus/SystemStatusPopup.js

@@ -8,7 +8,7 @@ import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { SystemStatusEntityRow } from './SystemStatusEntityRow';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
 const colItems = [
     { Content: 'Message', Size: 10 },
     { Content: 'Timestamp', Size: 3 },

package/src/View/SystemStatus/SystemStatusViewPanel.d.ts

@@ -1,5 +1,5 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 import * as React from 'react';
 export interface SystemStatusViewPanelComponentProps extends ViewPanelProps {
     SystemStatusMessageInfos: SystemStatusMessageInfo[];

package/src/View/Theme/ThemeEditor.js

@@ -8,6 +8,7 @@ import { Box, Flex, Text } from 'rebass';
 import Panel from '../../components/Panel';
 import { Field } from './ThemeField';
 import { VariantSelector } from './VariantSelector';
+import { getAccessLevelForObject } from '../../Utilities/Helpers/AdaptableHelper';
 const fields = [
     {
         name: 'Primary Color',
@@ -73,10 +74,11 @@ const fields = [
 export const ThemeEditor = (props) => {
     const adaptable = useAdaptable();
     const allThemes = adaptable.api.themeApi.getUserThemes();
-    const disabled = props.accessLevel === 'ReadOnly';
     const [currentThemeObject, setCurrentThemeObject] = React.useState(() => {
         return adaptable.api.themeApi.getCurrentThemeObject();
     });
+    const currentThemeAccessLevel = getAccessLevelForObject(currentThemeObject, props.accessLevel);
+    const currentThemeIsReadOnly = currentThemeAccessLevel !== 'Full';
     // THEME variables
     const themeVariables = currentThemeObject?.CSSVariables;
     const valuesFromTheme = fields.reduce((acc, field) => {
@@ -138,22 +140,22 @@ export const ThemeEditor = (props) => {
     const saveNameDisabled = !nameHasChanged || nameIsNotUnique || currentThemeObject.Name === '';
     return (React.createElement(Panel, { header: React.createElement(Flex, { alignItems: "center", width: "100%" },
             React.createElement(Box, { flex: 1 }, " Edit Custom Theme"),
-            React.createElement(SimpleButton, { "data-name": "delete", disabled: props.accessLevel !== 'Full', icon: "delete", onClick: handleDeleteTheme, variant: "text" })) },
+            React.createElement(SimpleButton, { "data-name": "delete", accessLevel: currentThemeAccessLevel, icon: "delete", onClick: handleDeleteTheme, variant: "text" })) },
         React.createElement(FormLayout, null,
             React.createElement(FormRow, { label: "Theme Name" },
-                React.createElement(AdaptableInput, { mr: 2, onChange: (event) => setCurrentThemeObject({
+                React.createElement(AdaptableInput, { disabled: currentThemeIsReadOnly, mr: 2, onChange: (event) => setCurrentThemeObject({
                         ...currentThemeObject,
                         Name: event.target.value.replace(/ /g, '-'),
                     }), value: currentThemeObject.Name ?? '' }),
-                React.createElement(SimpleButton, { onClick: handleSaveName, disabled: saveNameDisabled, icon: "save" }),
+                React.createElement(SimpleButton, { onClick: handleSaveName, disabled: saveNameDisabled || currentThemeIsReadOnly, icon: "save", hidden: currentThemeIsReadOnly }),
                 React.createElement(Text, { fontSize: 2, marginTop: 1 }, "The name cannot contain spaces."),
                 nameIsNotUnique && (React.createElement(Text, { fontSize: 2, color: "var(--ab-color-error)" }, "Name must be unique."))),
             React.createElement(FormRow, { label: "Description" },
-                React.createElement(AdaptableInput, { onChange: (event) => handleDescriptionChange('Description', event.target.value), value: currentThemeObject?.Description ?? '' })),
+                React.createElement(AdaptableInput, { disabled: currentThemeIsReadOnly, onChange: (event) => handleDescriptionChange('Description', event.target.value), value: currentThemeObject?.Description ?? '' })),
             React.createElement(FormRow, { label: "Variant" },
-                React.createElement(VariantSelector, { onChange: handleVariantChange, theme: currentThemeObject })),
+                React.createElement(VariantSelector, { onChange: handleVariantChange, theme: currentThemeObject, disabled: currentThemeIsReadOnly })),
             fields.map((field) => {
-                return (React.createElement(Field, { disabled: disabled, key: field.name, type: field.type, name: field.name, value: valuesFromTheme[field.variable], variable: field.variable, onChange: (val) => {
+                return (React.createElement(Field, { disabled: currentThemeIsReadOnly, key: field.name, type: field.type, name: field.name, value: valuesFromTheme[field.variable], variable: field.variable, onChange: (val) => {
                         // needs a fresh copy
                         const currentThemeObject = adaptable.api.themeApi.getCurrentThemeObject();
                         let newTheme = null;

package/src/View/Theme/ThemePopup.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
+import { AdaptableTheme } from '../../AdaptableState/ThemeState';
 interface ThemePopupProps extends ModuleViewPopupProps<ThemePopupComponent> {
     CurrentTheme: string;
     UserThemes: AdaptableTheme[];

package/src/View/Theme/VariantSelector.d.ts

@@ -3,5 +3,6 @@ import { AdaptableTheme } from '../../types';
 export interface VariantSelectorProps {
     theme: AdaptableTheme;
     onChange: (variant: AdaptableTheme['Variant'] | null) => void;
+    disabled?: boolean;
 }
 export declare const VariantSelector: React.FunctionComponent<VariantSelectorProps>;

package/src/View/Theme/VariantSelector.js

@@ -2,9 +2,12 @@ import * as React from 'react';
 import DropdownButton from '../../components/DropdownButton';
 import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
+import { OS_THEME } from '../../Utilities/Constants/GeneralConstants';
 export const VariantSelector = (props) => {
     const adaptable = useAdaptable();
-    const systemTemes = adaptable.api.themeApi.getSystemThemes();
+    const systemTemes = adaptable.api.themeApi
+        .getSystemThemes()
+        .filter((theme) => theme.Name !== OS_THEME);
     const options = systemTemes.map((theme) => ({
         label: theme.Description,
         value: theme.Name,
@@ -14,6 +17,6 @@ export const VariantSelector = (props) => {
         ? options.find((theme) => theme.value === props.theme.Variant)?.label
         : 'Select a theme';
     return (React.createElement(React.Fragment, null,
-        React.createElement(DropdownButton, { mr: 2, columns: ['label'], items: options }, label),
-        React.createElement(SimpleButton, { onClick: () => props.onChange(null), disabled: !props.theme.Variant, icon: "delete" })));
+        React.createElement(DropdownButton, { mr: 2, columns: ['label'], items: options, disabled: props.disabled }, label),
+        React.createElement(SimpleButton, { onClick: () => props.onChange(null), disabled: !props.theme.Variant || props.disabled, hidden: props.disabled, icon: "delete" })));
 };

package/src/View/UIHelper.d.ts

@@ -1,11 +1,11 @@
 import { CSSProperties } from 'react';
 import { EditableConfigEntityState } from './Components/SharedProps/EditableConfigEntityState';
-import { StatusColour } from '../PredefinedConfig/Common/Enums';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
+import { StatusColour } from '../AdaptableState/Common/Enums';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { Schedule, Weekday } from '../AdaptableState/Common/Schedule';
 import { AdaptableColumnDataType, AdaptableSystemIconName, AdaptableOptions } from '../types';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
+import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
 export declare const BLACK: string;
 export declare const WHITE: string;
 export declare const LIGHT_GRAY: string;

package/src/View/UIHelper.js

@@ -1,5 +1,5 @@
 import { WizardStatus, } from './Components/SharedProps/EditableConfigEntityState';
-import { FontWeight, FontStyle, StatusColour } from '../PredefinedConfig/Common/Enums';
+import { FontWeight, FontStyle, StatusColour } from '../AdaptableState/Common/Enums';
 import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export const BLACK = 'Black';

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
 import { ModuleParams } from '../../Components/SharedProps/ModuleViewPopupProps';

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
 type ObjectTagsWizardSectionProps<T extends AdaptableObject> = {
     onChange: (data: T) => void;
 };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -8,7 +8,7 @@ import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
@@ -26,7 +26,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowFormService } from '../Utilities/Services/RowFormService';
-import { GridCellWithCount } from '../PredefinedConfig/Selection/GridCell';
+import { GridCellWithCount } from '../AdaptableState/Selection/GridCell';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
 import { AgGridThemeAdapter } from './AgGridThemeAdapter';
@@ -333,5 +333,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     refreshLayout(): void;
     private isRowGroupDifferentInLayout;
     private onLayoutChange;
+    private validateColumnDefTypes;
 }
 export {};