@adaptabletools/adaptable-cjs 20.0.0-canary.8 → 20.0.0

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

@@ -4,7 +4,7 @@ exports.ScheduleSettingsWizard = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
-const Enums_1 = require("../../../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../../../AdaptableState/Common/Enums");
 const ScheduleSettingsReminder_1 = require("./ScheduleSettingsReminder");
 const ScheduleSettingsReport_1 = require("./ScheduleSettingsReport");
 const ScheduleSettingsIPushPull_1 = require("./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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSettingsValid = void 0;
 const tslib_1 = require("tslib");
-const Enums_1 = require("../../../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../../../AdaptableState/Common/Enums");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/StringExtensions"));
 const isSettingsValid = (schedule) => {
     if (schedule.ScheduleType === Enums_1.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

@@ -8,7 +8,7 @@ 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 Enums_1 = require("../../../AdaptableState/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"));

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,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shortcutOperationList = void 0;
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 exports.shortcutOperationList = [
     Enums_1.MathOperation.Add,
     Enums_1.MathOperation.Subtract,

package/src/View/SmartEdit/SmartEditPopup.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const SmartEditRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SmartEditRedux"));
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 const PanelWithImage_1 = require("../Components/Panels/PanelWithImage");
 const AdaptablePopover_1 = require("../AdaptablePopover");
 const EnumExtensions_1 = require("../../Utilities/Extensions/EnumExtensions");

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -4,7 +4,7 @@ exports.SmartEditViewPanelControl = void 0;
 const tslib_1 = require("tslib");
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const SmartEditRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SmartEditRedux"));
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const PreviewResultsPanel_1 = require("../Components/PreviewResultsPanel");

package/src/View/StateManagement/StateManagementPopup.js

@@ -14,19 +14,19 @@ const StateManagementPopup = (props) => {
     return (React.createElement(PopupPanel_1.PopupPanel, { className: baseClassName, headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel_1.default, { className: `${baseClassName}__panel`, "data-name": "user-state", header: 'User State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginRight: 2, mb: 2 },
             React.createElement(HelpBlock_1.default, { marginBottom: 2 }, 'Clear all current user state that has been persisted'),
-            React.createElement(HelpBlock_1.default, { 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_1.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_1.default, { 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_1.default, { marginTop: 2 }, 'Load Predefined Config (from a .json file) - this will cause this window to close'),
+            React.createElement(HelpBlock_1.default, { 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_1.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_1.default, { 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_1.default, { marginTop: 2 }, 'Load Initial Adaptable State (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), "data-name": "load-predefined-config-button" }, "Load Predefined Config")),
+            React.createElement(LoadButton_1.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_1.default, { 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_1.default, { marginTop: 2, marginBottom: 2 }, 'Exports the currently persisted Adaptable State'),
             ' ',
             React.createElement(ExportDropdown_1.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_1.default, { 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_1.default, { marginTop: 2, marginBottom: 2 }, 'Exports the Predefined Config which was provided at design time'),
+        React.createElement(Panel_1.default, { 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_1.default, { marginTop: 2, marginBottom: 2 }, 'Exports the Initial Adaptable State which was provided at design time'),
             ' ',
-            React.createElement(ExportDropdown_1.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_1.ExportDropdown, { api: props.api, type: "initialState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-initial-state-dropdown" }, "Select Export Destination"))));
 };
 exports.StateManagementPopup = StateManagementPopup;

package/src/View/StateManagement/StateManagementViewPanel.js

@@ -14,9 +14,9 @@ const StateManagementViewPanel = (props) => {
     const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
     return (React.createElement(rebass_1.Flex, { flexDirection: isToolbar ? 'row' : 'column', className: (0, 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: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.configApi.reloadPredefinedConfig(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
+            React.createElement(LoadButton_1.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_1.ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.stateApi.reloadInitialState(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
         React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "adaptableState" }, "All State"),
-        React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "predefinedConfig" }, "Predefined Config")));
+        React.createElement(ExportDropdown_1.ExportDropdown, { api: props.api, type: "initialState" }, "Initial Adaptable State")));
 };
 exports.StateManagementViewPanel = StateManagementViewPanel;

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

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

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

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const FileDroppable_1 = require("../../../components/FileDroppable");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const LoadButton = (props) => {
-    const onLoadPredefinedConfig = (e) => {
+    const onLoadInitialState = (e) => {
         const nativeEvent = e.nativeEvent;
         let files;
         if (nativeEvent && nativeEvent.dataTransfer) {
@@ -21,7 +21,7 @@ const LoadButton = (props) => {
         });
     };
     return (React.createElement(SimpleButton_1.default, { ...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

@@ -3,18 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableStatusBar = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const StatusBarRedux_1 = require("../../Redux/ActionsReducers/StatusBarRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const StatusBarPanel_1 = require("./StatusBarPanel");
+const useRerender_1 = require("../../components/utils/useRerender");
 const AdaptableStatusBar = (props) => {
-    /**
-     * All state is selected so the Status Bar is re-rendered for all adaptable state changes
-     */
-    const state = (0, react_redux_1.useSelector)((state) => state);
-    const statusPanels = (0, StatusBarRedux_1.getStatusPanelsSelector)(state);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const rerender = (0, useRerender_1.useRerender)();
+    (0, react_1.useEffect)(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
+    const statusPanels = (0, react_redux_1.useSelector)(StatusBarRedux_1.getStatusPanelsSelector);
     const dispatch = (0, react_redux_1.useDispatch)();
     const statusSubPanels = statusPanels.find((statusPanel) => statusPanel.Key === props.context.Key);
     const allMenuItems = (0, react_redux_1.useSelector)((state) => state?.Internal?.SettingsPanelModuleEntries);

package/src/View/StatusBar/StatusBarPopup.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const ModuleManager_1 = require("../../components/DragAndDropContext/ModuleManager");
 const EmptyContent_1 = tslib_1.__importDefault(require("../../components/EmptyContent"));
-const Types_1 = require("../../PredefinedConfig/Common/Types");
+const Types_1 = require("../../AdaptableState/Common/Types");
 const StatusBarRedux_1 = require("../../Redux/ActionsReducers/StatusBarRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const PopupPanel_1 = require("../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

@@ -12,7 +12,7 @@ const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpe
 const SystemStatusEntityRow_1 = require("./SystemStatusEntityRow");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../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/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/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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIHelper = exports.isBrowserDocumentAvailable = exports.setCSSVariableValue = exports.getCSSVariableValue = exports.getSimpleButtonPaddingWidth = 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.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 Enums_1 = require("../AdaptableState/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 exports.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 {};

package/src/agGrid/AdaptableAgGrid.js

@@ -28,7 +28,7 @@ const AlertService_1 = require("../Utilities/Services/AlertService");
 const TeamSharingService_1 = require("../Utilities/Services/TeamSharingService");
 const MetamodelService_1 = require("../Utilities/Services/MetamodelService");
 const LicenseService_1 = require("../Utilities/Services/LicenseService");
-const Types_1 = require("../PredefinedConfig/Common/Types");
+const Types_1 = require("../AdaptableState/Common/Types");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const DashboardModule_1 = require("../Strategy/DashboardModule");
@@ -71,7 +71,7 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const uuid_1 = require("../components/utils/uuid");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const AdaptableToolPanel_1 = require("../View/Components/ToolPanel/AdaptableToolPanel");
-const StatusBarState_1 = require("../PredefinedConfig/StatusBarState");
+const StatusBarState_1 = require("../AdaptableState/StatusBarState");
 const AdaptableStatusBar_1 = require("../View/StatusBar/AdaptableStatusBar");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const AgGridMenuAdapter_1 = require("./AgGridMenuAdapter");
@@ -81,9 +81,9 @@ const AgGridOptionsService_1 = require("./AgGridOptionsService");
 const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
 const AgGridColumnAdapter_1 = require("./AgGridColumnAdapter");
 const getScrollbarSize_1 = tslib_1.__importDefault(require("../Utilities/getScrollbarSize"));
-const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColumns");
+const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
 const RowFormService_1 = require("../Utilities/Services/RowFormService");
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../AdaptableState/Common/Enums");
 const EnvVars_1 = require("../EnvVars");
 const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
 const Modal_1 = require("../components/Modal");
@@ -91,18 +91,24 @@ const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoa
 const react_1 = require("react");
 const createAgStatusPanelComponent_1 = require("../Utilities/createAgStatusPanelComponent");
 const weightedAverage_1 = require("../Utilities/weightedAverage");
-const RowSummary_1 = require("../PredefinedConfig/Common/RowSummary");
+const RowSummary_1 = require("../AdaptableState/Common/RowSummary");
 const FlashingCellService_1 = require("../Utilities/Services/FlashingCellService");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
 const LayoutHelpers_1 = require("../Api/Implementation/LayoutHelpers");
 const src_1 = require("../layout-manager/src");
 const isPivotLayoutModel_1 = require("../layout-manager/src/isPivotLayoutModel");
-const AdaptableColumn_1 = require("../PredefinedConfig/Common/AdaptableColumn");
+const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const AgGridThemeAdapter_1 = require("./AgGridThemeAdapter");
+const VersionUpgrade20_1 = require("../migration/VersionUpgrade20");
 const LocalEventService_Prototype = ag_grid_enterprise_1.LocalEventService.prototype;
 const LocalEventService_dispatchEvent = LocalEventService_Prototype.dispatchEvent;
 LocalEventService_Prototype.dispatchEvent = function (event) {
+    const agGridApi = event.api;
+    if (agGridApi?.isDestroyed()) {
+        // do nothing if AG Grid was destroyed in the meantime
+        return;
+    }
     LocalEventService_dispatchEvent.apply(this, arguments);
     if (event.type === 'cellChanged' || event.type === 'dataChanged') {
         const eventRowNode = event.node;
@@ -122,6 +128,10 @@ LocalEventService_Prototype.dispatchEvent = function (event) {
                     // so IGNORE IT
                     return;
                 }
+                if (adaptable.isDestroyed) {
+                    // do nothing if adaptable is destroyed (this is a rare case and happens when Adaptable is quickly destroyed and recreated)
+                    return;
+                }
                 // we're on the correct instance, so do this
                 //@ts-ignore
                 const fn = adaptable.rowListeners ? adaptable.rowListeners[event.type] : null;
@@ -357,9 +367,10 @@ class AdaptableAgGrid {
         this.lifecycleState = 'initAgGrid';
         this.agGridAdapter.initialGridOptions = gridOptions;
         const perfInitAgGrid = this.logger.beginPerf(`initAgGrid()`);
-        // AG Grid evaluates early on the floatingFilter params, so we need to "suppres" the floating filter temporarily
+        // AG Grid evaluates early on the floatingFilter params, so we need to "suppress" the floating filter temporarily
         // we will reset it once Adaptable is ready
         this.agGridColumnAdapter.setupColumnFloatingFilterTemporarily(gridOptions);
+        this.validateColumnDefTypes(gridOptions.columnDefs);
         const agGridApi = await this.initializeAgGrid(gridOptions, config.modules, config.renderAgGridFrameworkComponent);
         if (agGridApi === false) {
             this.midwayDestroy();
@@ -486,7 +497,7 @@ class AdaptableAgGrid {
         // ensure that at least one Layout has been provided
         if (!layoutState || !layoutState.Layouts?.length) {
             this.logger
-                .consoleError(`You have not defined any Layout in your predefinedConfig.Layout.Layouts[] state!
+                .consoleError(`You have not defined any Layout in your InitialState.Layout.Layouts[] state!
 
 You need to define at least one Layout!`);
         }
@@ -520,7 +531,7 @@ You need to define at least one Layout!`);
                 isTree: !!gridOptions.treeData,
             };
             // it's very important that we do this here
-            // as the layout may not be fully specified in the predefinedConfig
+            // as the layout may not be fully specified in the initialState
             // eg: might not include the generated row group columns in the column order
             // but the normalization does this for us
             state.Layout.Layouts = state.Layout.Layouts.map((layout) => (0, LayoutHelpers_1.normalizeLayout)(layout, normalizeOptions));
@@ -531,7 +542,7 @@ You need to define at least one Layout!`);
         if (state?.ToolPanel?.ToolPanels) {
             return state;
         }
-        // no predefined config provided, we will display all the panels collapsed (custom & module)
+        // no Initial Adaptable State provided, we will display all the panels collapsed (custom & module)
         const defaultToolPanels = [];
         this.adaptableOptions.toolPanelOptions?.customToolPanels?.forEach((customToolPanel) => defaultToolPanels.push({ Name: customToolPanel.name }));
         Types_1.ALL_TOOL_PANELS.forEach((moduleToolPanel) => defaultToolPanels.push({ Name: moduleToolPanel }));
@@ -541,11 +552,12 @@ You need to define at least one Layout!`);
         return state;
     }
     applyFiltering() {
-        this.agGridAdapter.getAgGridApi().onFilterChanged();
+        const agGridApi = this.agGridAdapter.getAgGridApi();
         this._emit('AdapTableFiltersApplied');
         this.refreshSelectedCellsState();
         this.refreshSelectedRowsState();
         this.agGridAdapter.updateColumnFilterActiveState();
+        agGridApi.onFilterChanged();
     }
     // refreshAgGridWithAdaptableState() {
     //   this.refreshColDefs();
@@ -2625,7 +2637,7 @@ You need to define at least one Layout!`);
         themeClassNamesToRemove.forEach((cssClassName) => el.classList.remove(cssClassName));
         // remove infinite table classnames
         themesToRemove.forEach((theme) => {
-            el.classList.remove(`infinite-${theme.Name}`);
+            el.classList.remove(`infinite-theme-mode--${theme.Name}`);
         });
         // VARIANT
         let variantTheme = '';
@@ -2641,10 +2653,10 @@ You need to define at least one Layout!`);
         }
         if (isSystemTheme) {
             // add infinite table classname for theme
-            el.classList.add(`infinite-${themeName}`);
+            el.classList.add(`infinite-theme-mode--${themeName}`);
         }
         else if (variantTheme) {
-            el.classList.add(`infinite-${variantTheme}`);
+            el.classList.add(`infinite-theme-mode--${variantTheme}`);
         }
         // Update AG THEME
         this.agGridThemeAdapter.applyAgGridThemeOnAdaptableThemeChange(newTheme, variantTheme, container, themesToRemove);
@@ -3292,5 +3304,25 @@ You need to define at least one Layout!`);
         this.__prevLayoutForOnChange = layout;
         this.api.layoutApi.createOrUpdateLayout(layout);
     }
+    validateColumnDefTypes(columnDefs) {
+        // in Adaptable version 20 we switched from colDef.type to colDef.cellDataType
+        // although we documented this change and try to infer the correct cellDataTypes, it's best to also check if the client dev forgot to adjust his colDefs
+        columnDefs.forEach((colDef) => {
+            if (colDef.children?.length) {
+                this.validateColumnDefTypes(colDef.children);
+            }
+            const columnDefinition = colDef;
+            const colDefType = columnDefinition.type;
+            const colDefTypes = typeof colDefType === 'string' ? [colDefType] : colDefType || [];
+            colDefTypes
+                .filter((colType) => colType.startsWith('abColDef'))
+                .forEach((colType) => {
+                const newValidCellDataType = (0, VersionUpgrade20_1.mapOldTypeToDataType)(colType);
+                if (newValidCellDataType) {
+                    this.logger.consoleWarn(`Column ${columnDefinition.colId ?? columnDefinition.field} has a type of ${colType} which is no longer in use${newValidCellDataType !== 'unknown' ? `. Please use 'colDef.cellDataType' instead: ${newValidCellDataType}` : ''}`);
+                }
+            });
+        });
+    }
 }
 exports.AdaptableAgGrid = AdaptableAgGrid;

package/src/agGrid/AdaptableLogger.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
 export declare const errorOnce: (message: string) => void;
 export declare class AdaptableLogger {
     private adaptableId;

package/src/agGrid/AgGridAdapter.d.ts

@@ -1,8 +1,8 @@
 import { ColDef, ColGroupDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleName } from 'ag-grid-enterprise';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
+import { AdaptableColumn, AdaptableColumnGroup } from '../AdaptableState/Common/AdaptableColumn';
+import { SelectedCellInfo } from '../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../AdaptableState/Selection/SelectedRowInfo';
 export type AgGridThemeMode = 'legacy' | 'themingApi';
 export declare class AgGridAdapter {
     private _adaptableInstance;