@adaptabletools/adaptable-cjs 20.0.0-canary.23 → 20.0.0-canary.25

package/src/AdaptableState/PopupState.d.ts

@@ -1,5 +1,5 @@
 import { ScreenPopup, ConfirmationPopup, PromptPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { ProgressIndicatorConfig } from './Common/ProgressIndicatorConfig';
 export interface ProgressIndicator extends ProgressIndicatorConfig {
     active: boolean;
@@ -7,7 +7,7 @@ export interface ProgressIndicator extends ProgressIndicatorConfig {
 /**
  * Internal state to manage open popups - NOT persisted by Redux
  */
-export interface PopupState extends ConfigState {
+export interface PopupState extends BaseState {
     ScreenPopup: ScreenPopup;
     WindowPopup: WindowPopup;
     FormPopup: FormPopup;

package/src/AdaptableState/QuickSearchState.d.ts

@@ -1,9 +1,9 @@
 import { AdaptableStyle } from './Common/AdaptableStyle';
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 /**
  * Adaptable State Section for Quick Search Module
  */
-export interface QuickSearchState extends ConfigState {
+export interface QuickSearchState extends BaseState {
     /**
      * Last Quick Search that was run (and will run again at start up)
      */

package/src/AdaptableState/ScheduleState.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { IPushPullSchedule } from './IPushPullState';
 import { OpenFinSchedule } from './OpenFinState';
 import { AdaptableMessageType, ReportSchedule } from '../types';
@@ -7,7 +7,7 @@ import { BaseSchedule } from './Common/Schedule';
  * Adaptable State Section for the Schedule Module
  *
  */
-export interface ScheduleState extends ConfigState {
+export interface ScheduleState extends BaseState {
     /**
      * Schedules connected to Reports (created in the Export function)
      */

package/src/AdaptableState/ShortcutState.d.ts

@@ -1,10 +1,10 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { ColumnScope } from './Common/ColumnScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
  * Adaptable State Section for Shortcut Module
  */
-export interface ShortcutState extends ConfigState {
+export interface ShortcutState extends BaseState {
     /**
      * Collection of Shortcuts - designed to speed up data entry
      */

package/src/AdaptableState/StatusBarState.d.ts

@@ -1,9 +1,9 @@
-import { ConfigState } from '../types';
+import { BaseState } from '../types';
 import { AdaptableStatusBarPanel } from './Common/Types';
 /**
  * Adaptable State Section for the Adaptable Status Bar
  */
-export interface StatusBarState extends ConfigState {
+export interface StatusBarState extends BaseState {
     /**
      * Adaptable Status Bars to display - can be unlimited and displayed in 3 locations
      * @defaultValue null

package/src/AdaptableState/StyledColumnState.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { AdaptableCustomIcon, AdaptableSystemIcon, AdaptablePredicate, AdaptableStyle, AdaptableBooleanQuery } from '../types';
 import { TypeHint } from './Common/Types';
@@ -7,7 +7,7 @@ import { AgSparklineOptions } from 'ag-charts-types';
 /**
  * Adaptable State Section for Styled Column Module
  */
-export interface StyledColumnState extends ConfigState {
+export interface StyledColumnState extends BaseState {
     /**
      * Collection of Special Column Styles
      */

package/src/AdaptableState/TeamSharingState.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { AdaptableObject, AdaptableObjectTag } from './Common/AdaptableObject';
 import { AdaptableModule } from '../types';
 import { TypeUuid } from './Uuid';
@@ -6,7 +6,7 @@ import * as Redux from 'redux';
 /**
  * State for Team Sharing; internal so not designed to be provided as part of Initial Adaptable State
  */
-export interface TeamSharingState extends ConfigState {
+export interface TeamSharingState extends BaseState {
     /**
      * List of objects currently being Team Shared
      */

package/src/AdaptableState/ThemeState.d.ts

@@ -1,10 +1,10 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { TypeHint } from './Common/Types';
 /**
  * Theme section of Adaptable State
  */
-export interface ThemeState extends ConfigState {
+export interface ThemeState extends BaseState {
     /**
      * Name of current theme (or theme to set at startup); leave blank if using 'Light Theme', set to 'dark' for 'Dark Theme' or provide name of Custom Theme
      */

package/src/AdaptableState/ToolPanelState.d.ts

@@ -1,9 +1,9 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { AdaptableModuleButtons, AdaptableToolPanel } from './Common/Types';
 /**
  * Adaptable State Section for the AdapTable ToolPanel
  */
-export interface ToolPanelState extends ConfigState {
+export interface ToolPanelState extends BaseState {
     /**
      * Adaptable Tool Panels which are viaible
      * @defaultValue ToolPanels for all available Modules (subject to Entitlement rules)

package/src/Api/AdaptableApi.d.ts

@@ -5,7 +5,7 @@ import { BulkUpdateApi } from './BulkUpdateApi';
 import { CalendarApi } from './CalendarApi';
 import { CalculatedColumnApi } from './CalculatedColumnApi';
 import { CellSummaryApi } from './CellSummaryApi';
-import { ConfigApi } from './ConfigApi';
+import { StateApi } from './StateApi';
 import { CustomSortApi } from './CustomSortApi';
 import { DashboardApi } from './DashboardApi';
 import { ToolPanelApi } from './ToolPanelApi';
@@ -95,7 +95,7 @@ export interface AdaptableApi {
     /**
      * Methods giving access to Adaptable State
      */
-    configApi: ConfigApi;
+    stateApi: StateApi;
     /**
      * Provides access to the Custom Sort Module
      */

package/src/Api/Implementation/AdaptableApiImpl.d.ts

@@ -6,7 +6,7 @@ import { BulkUpdateApi } from '../BulkUpdateApi';
 import { CalendarApi } from '../CalendarApi';
 import { CalculatedColumnApi } from '../CalculatedColumnApi';
 import { CellSummaryApi } from '../CellSummaryApi';
-import { ConfigApi } from '../ConfigApi';
+import { StateApi } from '../StateApi';
 import { CustomSortApi } from '../CustomSortApi';
 import { DashboardApi } from '../DashboardApi';
 import { ToolPanelApi } from '../ToolPanelApi';
@@ -57,7 +57,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     calculatedColumnApi: CalculatedColumnApi;
     cellSummaryApi: CellSummaryApi;
     columnApi: ColumnApi;
-    configApi: ConfigApi;
+    stateApi: StateApi;
     customSortApi: CustomSortApi;
     dashboardApi: DashboardApi;
     dataSetApi: DataSetApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -8,7 +8,7 @@ const PluginsApiImpl_1 = require("./PluginsApiImpl");
 const BulkUpdateApiImpl_1 = require("./BulkUpdateApiImpl");
 const CalculatedColumnApiImpl_1 = require("./CalculatedColumnApiImpl");
 const CellSummaryApiImpl_1 = require("./CellSummaryApiImpl");
-const ConfigApiImpl_1 = require("./ConfigApiImpl");
+const StateApiImpl_1 = require("./StateApiImpl");
 const CustomSortApiImpl_1 = require("./CustomSortApiImpl");
 const DashboardApiImpl_1 = require("./DashboardApiImpl");
 const ToolPanelApiImpl_1 = require("./ToolPanelApiImpl");
@@ -70,7 +70,7 @@ class AdaptableApiImpl {
         this.columnApi = new ColumnApiImpl_1.ColumnApiImpl(adaptable);
         this.columnMenuApi = new ColumnMenuApiImpl_1.ColumnMenuApiImpl(adaptable);
         this.contextMenuApi = new ContextMenuApiImpl_1.ContextMenuApiImpl(adaptable);
-        this.configApi = new ConfigApiImpl_1.ConfigApiImpl(adaptable);
+        this.stateApi = new StateApiImpl_1.StateApiImpl(adaptable);
         this.customSortApi = new CustomSortApiImpl_1.CustomSortApiImpl(adaptable);
         this.dashboardApi = new DashboardApiImpl_1.DashboardApiImpl(adaptable);
         this.dataSetApi = new DataSetApiImpl_1.DataSetApiImpl(adaptable);
@@ -131,7 +131,7 @@ class AdaptableApiImpl {
         this.cellSummaryApi = null;
         this.chartingApi = null;
         this.columnApi = null;
-        this.configApi = null;
+        this.stateApi = null;
         this.customSortApi = null;
         this.dashboardApi = null;
         this.dataChangeHistoryApi = null;

package/src/Api/Implementation/ApiBase.d.ts

@@ -8,7 +8,7 @@ import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { GridApi as AgGridApi } from 'ag-grid-enterprise';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, FilterApi, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions, FilterOptions, ColumnFilterApi, OptionsApi } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, FilterApi, ColumnOptions, CommentOptions, StateApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions, FilterOptions, ColumnFilterApi, OptionsApi } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
@@ -105,7 +105,7 @@ export declare abstract class ApiBase {
     protected getCalculatedColumnApi(): CalculatedColumnApi;
     protected getCellSummaryApi(): CellSummaryApi;
     protected getColumnApi(): ColumnApi;
-    protected getConfigApi(): ConfigApi;
+    protected getStateApi(): StateApi;
     protected getCustomSortApi(): CustomSortApi;
     protected getDashboardApi(): DashboardApi;
     protected getDataSetApi(): DataSetApi;

package/src/Api/Implementation/ApiBase.js

@@ -243,8 +243,8 @@ class ApiBase {
     getColumnApi() {
         return this.getAdaptableApi().columnApi;
     }
-    getConfigApi() {
-        return this.getAdaptableApi().configApi;
+    getStateApi() {
+        return this.getAdaptableApi().stateApi;
     }
     getCustomSortApi() {
         return this.getAdaptableApi().customSortApi;

package/src/Api/Implementation/{ConfigApiImpl.d.ts → StateApiImpl.d.ts}

@@ -9,29 +9,29 @@ import { DashboardState } from '../../AdaptableState/DashboardState';
 import { CustomSortState } from '../../AdaptableState/CustomSortState';
 import { CalculatedColumnState } from '../../AdaptableState/CalculatedColumnState';
 import { AlertState } from '../../AdaptableState/AlertState';
-import { ConfigState } from '../../AdaptableState/ConfigState';
+import { BaseState } from '../../AdaptableState/BaseState';
 import { AdaptablePersistentState, AdaptableState } from '../../AdaptableState/AdaptableState';
 import { ApiBase } from './ApiBase';
 import { ApplicationState } from '../../AdaptableState/ApplicationState';
 import { FreeTextColumnState } from '../../AdaptableState/FreeTextColumnState';
 import { ToolPanelState } from '../../AdaptableState/ToolPanelState';
-import { ConfigApi } from '../ConfigApi';
+import { StateApi } from '../StateApi';
 import { AdaptableModule, AdaptableStateKey } from '../../AdaptableState/Common/Types';
 import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, FlashingCellState, InitialState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
 import { PredefinedConfig } from '../../AdaptableState/InitialState';
 import { ChartingState } from '../../AdaptableState/ChartingState';
 import { NoteState } from '../../AdaptableState/NoteState';
-export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
+export declare class StateApiImpl extends ApiBase implements StateApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
     copyUserStateToClipboard(): void;
     getPredefinedConfig(): PredefinedConfig | any;
-    getInitialState(): PredefinedConfig | any;
+    getInitialState(): InitialState | any;
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
     reloadInitialState(newInitialState?: InitialState): void;
     getAllState(): AdaptableState;
     getPersistedState(): AdaptablePersistentState;
-    getAllUserState(): ConfigState[];
+    getAllUserState(): BaseState[];
     loadUserState(state: InitialState): void;
     getAdaptableSearchState(): AdaptableSearchState;
     getAdaptableSortState(): AdaptableSortState;
@@ -43,7 +43,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     }): Promise<void>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;
-    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;
+    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;
     incrementUserStateRevision(stateKey: AdaptableStateKey): void;
     getAlertState(returnJson?: boolean): AlertState;
     getApplicationState(returnJson?: boolean): ApplicationState;

package/src/Api/Implementation/{ConfigApiImpl.js → StateApiImpl.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigApiImpl = void 0;
+exports.StateApiImpl = void 0;
 const tslib_1 = require("tslib");
 const AdaptableStore_1 = require("../../Redux/Store/AdaptableStore");
 const ApiBase_1 = require("./ApiBase");
@@ -27,7 +27,7 @@ const SmartEditRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers
 const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
 const ToolPanelRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ToolPanelRedux"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
-class ConfigApiImpl extends ApiBase_1.ApiBase {
+class StateApiImpl extends ApiBase_1.ApiBase {
     configInit() {
         this.dispatchAction((0, AdaptableStore_1.InitState)());
     }
@@ -44,14 +44,14 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         Helper_1.default.copyToClipboard(stringifiedState);
     }
     getPredefinedConfig() {
-        (0, logDeprecation_1.logDeprecation)(this.getAdatableLogger(), 'ConfigApi', 'getPredefinedConfig', 'getInitialState');
+        (0, logDeprecation_1.logDeprecation)(this.getAdatableLogger(), 'StateApi', 'getPredefinedConfig', 'getInitialState');
         return this.getInitialState();
     }
     getInitialState() {
         return this._adaptable.adaptableOptions.initialState;
     }
     reloadPredefinedConfig(newPredefinedConfig) {
-        (0, logDeprecation_1.logDeprecation)(this.getAdatableLogger(), 'ConfigApi', 'reloadPredefinedConfig', 'reloadInitialState');
+        (0, logDeprecation_1.logDeprecation)(this.getAdatableLogger(), 'StateApi', 'reloadPredefinedConfig', 'reloadInitialState');
         this.reloadInitialState(newPredefinedConfig);
     }
     reloadInitialState(newInitialState) {
@@ -393,4 +393,4 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         }
     }
 }
-exports.ConfigApiImpl = ConfigApiImpl;
+exports.StateApiImpl = StateApiImpl;

package/src/Api/Internal/EventInternalApi.js

@@ -7,7 +7,7 @@ const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 class EventInternalApi extends ApiBase_1.ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {
-            const adaptableSortState = this.getConfigApi().getAdaptableSortState();
+            const adaptableSortState = this.getStateApi().getAdaptableSortState();
             const gridSortedInfo = {
                 adaptableSortState: adaptableSortState,
                 ...this.getAdaptableInternalApi().buildBaseContext(),

package/src/Api/{ConfigApi.d.ts → StateApi.d.ts}

@@ -8,7 +8,7 @@ import { DashboardState } from '../AdaptableState/DashboardState';
 import { CustomSortState } from '../AdaptableState/CustomSortState';
 import { CalculatedColumnState } from '../AdaptableState/CalculatedColumnState';
 import { AlertState } from '../AdaptableState/AlertState';
-import { ConfigState } from '../AdaptableState/ConfigState';
+import { BaseState } from '../AdaptableState/BaseState';
 import { PlusMinusState } from '../AdaptableState/PlusMinusState';
 import { ApplicationState } from '../AdaptableState/ApplicationState';
 import { AdaptablePersistentState, AdaptableState } from '../AdaptableState/AdaptableState';
@@ -19,7 +19,7 @@ import { AdaptableSearchState, AdaptableSortState, ChartingState, FlashingCellSt
 /**
  * Range of functions to access Initial and Full Adaptable State
  */
-export interface ConfigApi {
+export interface StateApi {
     /**
      * Changes the key used for persisting the AdaptableState into localStorage. Optionally provides a initialState to load.
      * @param adaptableStateKey - key for persisting the AdaptableState into localStorage
@@ -62,7 +62,7 @@ export interface ConfigApi {
      * Loads supplied user state, replacing (NOT merging) existing User(persisted) State.
      * @param state
      */
-    loadUserState(config: InitialState): void;
+    loadUserState(state: InitialState): void;
     /**
      * Retrieves ALL state which is currently stored by Adaptable (both persistent and transient/internal)
      */
@@ -94,7 +94,7 @@ export interface ConfigApi {
      * @param stateKey section of State to return
      * @param returnJson whether to return section as JSON or object
      */
-    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;
+    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;
     /**
      * Adds '1' to current revision number of State element
      * @param stateKey Adaptable State Key to update

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -54,8 +54,8 @@ class AdaptableReduxLocalStorageEngine {
         }).then((parsedJsonState) => {
             // we need to merge the Initial Adaptable State
             return Promise.resolve(initialState)
-                .then((parsedPredefinedState) => {
-                return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
+                .then((parsedInitialState) => {
+                return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedInitialState, parsedJsonState);
             })
                 .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
         });

package/src/Redux/Store/AdaptableReduxMerger.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from '../../AdaptableState/ConfigState';
+import { BaseState } from '../../AdaptableState/BaseState';
 import { AdaptableState } from '../../AdaptableState/AdaptableState';
 export declare function AddStateSource(stateObject: any, source: 'Config' | 'User'): any;
 export declare function ProcessKeepUserDefinedRevision(configState: any, currentUserState: any): any;
@@ -7,7 +7,7 @@ export declare function MergeState(oldState: any, newState: any): any;
 type TypeReducer = (state: AdaptableState, action: {
     type: string;
     State?: {
-        [s: string]: ConfigState;
+        [s: string]: BaseState;
     };
 }) => AdaptableState;
 export declare const mergeReducer: (rootReducer: TypeReducer, LOAD_STATE_TYPE: string) => TypeReducer;

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -80,7 +80,7 @@ function MergeStateFunction(oldState, newState) {
     if (newState === '') {
         newState = {};
     }
-    // add source 'Config' only to predefined objects
+    // add source 'Config' only to initial state objects
     const config = AddStateSource(oldState, 'Config');
     // source 'User' will be added to all other objects, after the merge (see bottom of this function)
     let state = newState;

package/src/Redux/Store/AdaptableStore.d.ts

@@ -1,7 +1,7 @@
 import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../AdaptableState/AdaptableState';
-import { ConfigState } from '../../AdaptableState/ConfigState';
+import { BaseState } from '../../AdaptableState/BaseState';
 import { IAdaptableStore, LoadStoreConfig } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
@@ -13,12 +13,12 @@ export interface InitStateAction extends Redux.Action {
 }
 export interface LoadStateAction extends Redux.Action {
     State: {
-        [s: string]: ConfigState;
+        [s: string]: BaseState;
     };
 }
 export declare const InitState: () => ResetUserDataAction;
 export declare const LoadState: (State: {
-    [s: string]: ConfigState;
+    [s: string]: BaseState;
 }) => LoadStateAction;
 export declare class AdaptableStore implements IAdaptableStore {
     TheStore: Redux.Store<AdaptableState, Redux.Action>;

package/src/Strategy/AdaptableModuleBase.js

@@ -21,7 +21,7 @@ class AdaptableModuleBase {
         this.api = api;
         this.api.eventApi.on('AdaptableReady', () => {
             this.onAdaptableReady();
-            this.api.configApi.dispatchStateReadyAction(this.moduleInfo.ModuleName);
+            this.api.stateApi.dispatchStateReadyAction(this.moduleInfo.ModuleName);
         });
         this.api.eventApi.on('AdaptableStateReloaded', (adaptableStateReloadedInfo) => {
             this.onAdaptableStateReloaded(adaptableStateReloadedInfo);
@@ -71,8 +71,7 @@ class AdaptableModuleBase {
         // override where necessary in base classes
     }
     setModuleEntitlement() {
-        this.AccessLevel = this.api.entitlementApi
-            .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+        this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
     }
     createModuleMenuItem(source) {
         if (this.isModuleAvailable() && this.moduleInfo.Popup) {

package/src/View/StateManagement/StateManagementPopup.js

@@ -15,18 +15,18 @@ const StateManagementPopup = (props) => {
         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 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.configApi.reloadInitialState() }, "Clear User State")),
-        React.createElement(Panel_1.default, { className: `${baseClassName}__panel`, "data-name": "predefined-config", header: 'Initial Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+            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.reloadInitialState(json), "data-name": "load-predefined-config-button" }, "Load Initial Adaptable State")),
+            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 Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+        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: "initialState", 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,8 +14,8 @@ 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 Initial Adaptable State", variant: "text", icon: "upload", onLoad: (json) => props.api.configApi.reloadInitialState(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
-            React.createElement(ClearButton_1.ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.configApi.reloadInitialState(), 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: "initialState" }, "Initial Adaptable State")));
 };

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

@@ -9,11 +9,11 @@ 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 'initialState':
-                const initialState = props.api.configApi.getInitialState();
+                const initialState = props.api.stateApi.getInitialState();
                 (0, handleExportState_1.handleExportState)(destination, 'initialState', initialState);
                 break;
         }

package/src/agGrid/AgGridExportAdapter.js

@@ -478,6 +478,10 @@ class AgGridExportAdapter {
                 const colDef = colDefs[columnIndex];
                 const columnId = column.getId();
                 const adaptableColumn = getAdaptableColumnWithColumnId(columnId);
+                if (!adaptableColumn) {
+                    this.logger.warn(`Export Styling: Column with id ${columnId} not found in Adaptable`);
+                    return;
+                }
                 const isDateCellExportedAsFormattedValue = this.isDateCellExportedAsFormattedValue(adaptableColumn);
                 let cellClassParams;
                 const getLazyCellClassParams = () => {

package/src/components/Select/Select.js

@@ -155,7 +155,7 @@ const Select = function (props) {
             });
             const title = typeof customRenderValue === 'string' ? customRenderValue : '';
             children = customRenderValue ? (React.createElement(rebass_1.Box, { display: 'flex', flexDirection: 'row', flex: 1, flexWrap: 'nowrap', alignItems: 'center', overflow: 'hidden' },
-                React.createElement("span", { title: title, style: {
+                React.createElement("span", { title: title, "data-name": "multi-value-text", style: {
                         flex: '0 1 auto',
                         appearance: 'none',
                         border: 'none',
@@ -352,7 +352,16 @@ const Select = function (props) {
         focusedRef.current = false;
         props.onBlur?.();
     }, [props.onBlur]);
-    return (React.createElement(SelectComponent, { ref: ref, onInputChange: props.onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: (0, join_1.default)(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', isSearchable: props.searchable, hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
+    const [inputValue, setInputValue] = React.useState('');
+    const onInputChange = React.useCallback((value, actionMeta) => {
+        if (isMulti && actionMeta.action === 'set-value') {
+            // when selecting an option, don't clear the input filter
+            return;
+        }
+        setInputValue(value);
+        props.onInputChange?.(value);
+    }, [props.onInputChange, isMulti]);
+    return (React.createElement(SelectComponent, { ref: ref, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: (0, join_1.default)(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', isSearchable: props.searchable, hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
         // This needed so the menu is not clipped by overflow: hidden
         menuPortalTarget: props.menuPortalTarget === undefined ? document.body : null, isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
             if (isMulti) {

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1742557812158 || Date.now(),
-    VERSION: "20.0.0-canary.23" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1742730875874 || Date.now(),
+    VERSION: "20.0.0-canary.25" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1525,6 +1525,17 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
+    BaseState: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
+    };
     BroadcastConfig: {
         name: string;
         kind: string;
@@ -2106,17 +2117,6 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    ConfigState: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-        }[];
-    };
     ContainerOptions: {
         name: string;
         kind: string;