@adaptabletools/adaptable-cjs 20.0.0-canary.9 → 20.0.1

package/src/Redux/ActionsReducers/PluginsRedux.js

@@ -5,129 +5,36 @@ exports.PluginsReducer = exports.PluginsSetPluginState = exports.OPENFIN_SET_CUR
  * @ReduxAction Plugins have been instantiated
  */
 exports.PLUGINS_SET_PLUGIN_STATE = 'PLUGINS_SET_PLUGIN_STATE';
-/**
- * @ReduxAction Throttle time for live reports has been set
- */
 exports.IPUSHPULL_SET_THROTTLE_TIME = 'IPUSHPULL_SET_THROTTLE_TIME';
-/**
- * @ReduxAction A snapshot report has been sent
- */
 exports.IPUSHPULL_SEND_SNAPSHOT = 'IPUSHPULL_SEND_SNAPSHOT';
-/**
- * @ReduxAction An ipushpull report has been selected
- */
 exports.IPUSHPULL_REPORT_SELECT = 'IPUSHPULL_REPORT_SELECT';
-/**
- * @ReduxAction Live data has been sent to ipushpull
- */
 exports.IPUSHPULL_START_LIVE_DATA = 'IPUSHPULL_START_LIVE_DATA';
-/**
- * @ReduxAction Live data to ipushpull has been stopped
- */
 exports.IPUSHPULL_STOP_LIVE_DATA = 'IPUSHPULL_STOP_LIVE_DATA';
-/**
- * @ReduxAction A new ipushpull page has been added
- */
 exports.IPUSHPULL_ADD_PAGE = 'IPUSHPULL_ADD_PAGE';
-/**
- * @ReduxAction Logged in to ipushpull
- */
 exports.IPUSHPULL_LOGIN = 'IPUSHPULL_LOGIN';
-/**
- * @ReduxAction Logged out from ipushpull
- */
 exports.IPUSHPULL_LOGOUT = 'IPUSHPULL_LOGOUT';
-/**
- * @ReduxAction Error message set from failed login
- */
 exports.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = 'IPUSHPULL_SET_LOGIN_ERROR_MESSAGE';
-/**
- * @ReduxAction Login details to ipushpull have been set
- */
 exports.IPUSHPULL_SET_LOGIN_DETAILS = 'IPUSHPULL_SET_LOGIN_DETAILS';
-/**
- * @ReduxAction ipushpull has been made available
- */
 exports.IPUSHPULL_SET_AVAILABLE_ON = 'IPUSHPULL_SET_AVAILABLE_ON';
-/**
- * @ReduxAction ipushpull has been made unavailable
- */
 exports.IPUSHPULL_SET_AVAILABLE_OFF = 'SET_IPUSHPULL_AVAILABLE_OFF';
-/**
- * @ReduxAction ipushpull is now running
- */
 exports.IPUSHPULL_SET_RUNNING_ON = 'IPUSHPULL_SET_RUNNING_ON';
-/**
- * @ReduxAction ipushpull is no longer running
- */
 exports.IPUSHPULL_SET_RUNNING_OFF = 'IPUSHPULL_SET_RUNNING_OFF';
-/**
- * @ReduxAction A live report to ipuspull has been set
- */
 exports.IPUSHPULL_LIVE_REPORT_SET = 'IPUSHPULL_LIVE_REPORT_SET';
-/**
- * @ReduxAction The live report to ipuspull has been cleared
- */
 exports.IPUSHPULL_LIVE_REPORT_CLEAR = 'IPUSHPULL_LIVE_REPORT_CLEAR';
-/**
- * @ReduxAction ipushpull domain pages have been set
- */
 exports.IPUSHPULL_DOMAIN_PAGES_SET = 'IPUSHPULL_DOMAIN_PAGES_SET';
-/**
- * @ReduxAction ipushpull domain pages have been cleared
- */
 exports.IPUSHPULL_DOMAIN_PAGES_CLEAR = 'IPUSHPULL_DOMAIN_PAGES_CLEAR';
-/**
- * @ReduxAction ipushpull set current(selected) report name
- */
 exports.IPUSHPULL_SET_CURRENT_REPORTNAME = 'IPUSHPULL_SET_CURRENT_REPORTNAME';
-/**
- * @ReduxAction ipushpull set current(selected) folder
- */
 exports.IPUSHPULL_SET_CURRENT_FOLDER = 'IPUSHPULL_SET_CURRENT_FOLDER';
-/**
- * @ReduxAction ipushpull set current(selected) page
- */
 exports.IPUSHPULL_SET_CURRENT_PAGE = 'IPUSHPULL_SET_CURRENT_PAGE';
-/**
- * @ReduxAction ipushpull set available pages (depending on current folder)
- */
 exports.IPUSHPULL_SET_AVAILABLE_PAGES = 'IPUSHPULL_SET_AVAILABLE_PAGES';
-/**
- * @ReduxAction Live data has been sent to OpenFin
- */
 exports.OPENFIN_START_LIVE_DATA = 'OPENFIN_START_LIVE_DATA';
-/**
- * @ReduxAction Live data is not longer sent to OpenFin
- */
 exports.OPENFIN_STOP_LIVE_DATA = 'OPENFIN_STOP_LIVE_DATA';
-/**
- * @ReduxAction An OpenFin live report has started
- */
 exports.OPENFIN_LIVE_REPORT_SET = 'OPENFIN_LIVE_REPORT_SET';
-/**
- * @ReduxAction An OpenFin live report has stopped
- */
 exports.OPENFIN_LIVE_REPORT_CLEAR = 'OPENFIN_LIVE_REPORT_CLEAR';
-/**
- * @ReduxAction OpenFin is now available
- */
 exports.OPENFIN_SET_AVAILABLE_ON = 'OPENFIN_SET_AVAILABLE_ON';
-/**
- * @ReduxAction OpenFin is no longer available
- */
 exports.OPENFIN_SET_AVAILABLE_OFF = 'OPENFIN_SET_AVAILABLE_OFF';
-/**
- * @ReduxAction OpenFin is now running
- */
 exports.OPENFIN_SET_RUNNING_ON = 'OPENFIN_SET_RUNNING_ON';
-/**
- * @ReduxAction OpenFin is no longer running
- */
 exports.OPENFIN_SET_RUNNING_OFF = 'OPENFIN_SET_RUNNING_OFF';
-/**
- * @ReduxAction set current(selected) report name
- */
 exports.OPENFIN_SET_CURRENT_REPORTNAME = 'OPENFIN_SET_CURRENT_REPORTNAME';
 const PluginsSetPluginState = (pluginId, pluginState) => ({
     type: exports.PLUGINS_SET_PLUGIN_STATE,

package/src/Redux/ActionsReducers/PlusMinusRedux.d.ts

@@ -1,6 +1,6 @@
-import { PlusMinusState, PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusState, PlusMinusNudge } from '../../AdaptableState/PlusMinusState';
 import * as Redux from 'redux';
-import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
+import { CellUpdateRequest } from '../../AdaptableState/Selection/GridCell';
 /**
  * @ReduxAction A Plus Minus Rule has been applied
  */

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
-import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { FormContext } from '../../PredefinedConfig/Common/FormContext';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { PopupState } from '../../PredefinedConfig/PopupState';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { FormContext } from '../../AdaptableState/Common/FormContext';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { PopupState } from '../../AdaptableState/PopupState';
 import { AdaptableForm, BaseContext, ProgressIndicatorConfig } from '../../types';
 import { InputAction, UIConfirmation, UIPrompt } from '../../Utilities/Interface/MessagePopups';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';

package/src/Redux/ActionsReducers/QuickSearchRedux.d.ts

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
-import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 /**
  * @ReduxAction Runs Quick Search
  */

package/src/Redux/ActionsReducers/ScheduleRedux.d.ts

@@ -1,10 +1,10 @@
 import * as Redux from 'redux';
-import { ScheduleState } from '../../PredefinedConfig/ScheduleState';
+import { ScheduleState } from '../../AdaptableState/ScheduleState';
 import { ReminderSchedule, ReportSchedule } from '../../types';
-import { IPushPullSchedule } from '../../PredefinedConfig/IPushPullState';
-import { OpenFinSchedule } from '../../PredefinedConfig/OpenFinState';
-import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
-import { ScheduleType } from '../../PredefinedConfig/Common/Enums';
+import { IPushPullSchedule } from '../../AdaptableState/IPushPullState';
+import { OpenFinSchedule } from '../../AdaptableState/OpenFinState';
+import { BaseSchedule } from '../../AdaptableState/Common/Schedule';
+import { ScheduleType } from '../../AdaptableState/Common/Enums';
 /**
  * @ReduxAction Runs a Scheduled job
  */
@@ -65,61 +65,19 @@ export declare const REMINDER_SCHEDULE_SUSPEND_ALL = "REMINDER_SCHEDULE_SUSPEND_
  * @ReduxAction All Reminder Schedules have been unsuspended or activated
  */
 export declare const REMINDER_SCHEDULE_UNSUSPEND_ALL = "REMINDER_SCHEDULE_UNSUSPEND_ALL";
-/**
- * @ReduxAction An ipushpull Schedule has been added
- */
 export declare const IPUSHPULL_SCHEDULE_ADD = "IPUSHPULL_SCHEDULE_ADD";
-/**
- * @ReduxAction An ipushpull Schedule has been edited
- */
 export declare const IPUSHPULL_SCHEDULE_EDIT = "IPUSHPULL_SCHEDULE_EDIT";
-/**
- * @ReduxAction An ipushpull Schedule has been deleted
- */
 export declare const IPUSHPULL_SCHEDULE_DELETE = "IPUSHPULL_SCHEDULE_DELETE";
-/**
- * @ReduxAction An ipushpull Schedule has been suspended
- */
 export declare const IPUSHPULL_SCHEDULE_SUSPEND = "IPUSHPULL_SCHEDULE_SUSPEND";
-/**
- * @ReduxAction An ipushpull Schedule has been unsuspended or activated
- */
 export declare const IPUSHPULL_SCHEDULE_UNSUSPEND = "IPUSHPULL_SCHEDULE_UNSUSPEND";
-/**
- * @ReduxAction All ipushpull Schedules have been suspended
- */
 export declare const IPUSHPULL_SCHEDULE_SUSPEND_ALL = "IPUSHPULL_SCHEDULE_SUSPEND_ALL";
-/**
- * @ReduxAction All ipushpull Schedules have been unsuspended or activated
- */
 export declare const IPUSHPULL_SCHEDULE_UNSUSPEND_ALL = "IPUSHPULL_SCHEDULE_UNSUSPEND_ALL";
-/**
- * @ReduxAction An OpenFin Schedule has been added
- */
 export declare const OPENFIN_SCHEDULE_ADD = "OPENFIN_SCHEDULE_ADD";
-/**
- * @ReduxAction An OpenFin Schedule has been edited
- */
 export declare const OPENFIN_SCHEDULE_EDIT = "OPENFIN_SCHEDULE_EDIT";
-/**
- * @ReduxAction An OpenFin Schedule has been deleted
- */
 export declare const OPENFIN_SCHEDULE_DELETE = "OPENFIN_SCHEDULE_DELETE";
-/**
- * @ReduxAction An OpenFin Schedule has been suspended
- */
 export declare const OPENFIN_SCHEDULE_SUSPEND = "OPENFIN_SCHEDULE_SUSPEND";
-/**
- * @ReduxAction An OpenFin Schedule has been unsuspended or activated
- */
 export declare const OPENFIN_SCHEDULE_UNSUSPEND = "OPENFIN_SCHEDULE_UNSUSPEND";
-/**
- * @ReduxAction All OpenFin Schedules have been suspended
- */
 export declare const OPENFIN_SCHEDULE_SUSPEND_ALL = "OPENFIN_SCHEDULE_SUSPEND_ALL";
-/**
- * @ReduxAction All OpenFin Schedules have been unsuspended or activated
- */
 export declare const OPENFIN_SCHEDULE_UNSUSPEND_ALL = "OPENFIN_SCHEDULE_UNSUSPEND_ALL";
 /**
  * @ReduxAction Schedule Module is ready

package/src/Redux/ActionsReducers/ScheduleRedux.js

@@ -66,61 +66,19 @@ exports.REMINDER_SCHEDULE_SUSPEND_ALL = 'REMINDER_SCHEDULE_SUSPEND_ALL';
  * @ReduxAction All Reminder Schedules have been unsuspended or activated
  */
 exports.REMINDER_SCHEDULE_UNSUSPEND_ALL = 'REMINDER_SCHEDULE_UNSUSPEND_ALL';
-/**
- * @ReduxAction An ipushpull Schedule has been added
- */
 exports.IPUSHPULL_SCHEDULE_ADD = 'IPUSHPULL_SCHEDULE_ADD';
-/**
- * @ReduxAction An ipushpull Schedule has been edited
- */
 exports.IPUSHPULL_SCHEDULE_EDIT = 'IPUSHPULL_SCHEDULE_EDIT';
-/**
- * @ReduxAction An ipushpull Schedule has been deleted
- */
 exports.IPUSHPULL_SCHEDULE_DELETE = 'IPUSHPULL_SCHEDULE_DELETE';
-/**
- * @ReduxAction An ipushpull Schedule has been suspended
- */
 exports.IPUSHPULL_SCHEDULE_SUSPEND = 'IPUSHPULL_SCHEDULE_SUSPEND';
-/**
- * @ReduxAction An ipushpull Schedule has been unsuspended or activated
- */
 exports.IPUSHPULL_SCHEDULE_UNSUSPEND = 'IPUSHPULL_SCHEDULE_UNSUSPEND';
-/**
- * @ReduxAction All ipushpull Schedules have been suspended
- */
 exports.IPUSHPULL_SCHEDULE_SUSPEND_ALL = 'IPUSHPULL_SCHEDULE_SUSPEND_ALL';
-/**
- * @ReduxAction All ipushpull Schedules have been unsuspended or activated
- */
 exports.IPUSHPULL_SCHEDULE_UNSUSPEND_ALL = 'IPUSHPULL_SCHEDULE_UNSUSPEND_ALL';
-/**
- * @ReduxAction An OpenFin Schedule has been added
- */
 exports.OPENFIN_SCHEDULE_ADD = 'OPENFIN_SCHEDULE_ADD';
-/**
- * @ReduxAction An OpenFin Schedule has been edited
- */
 exports.OPENFIN_SCHEDULE_EDIT = 'OPENFIN_SCHEDULE_EDIT';
-/**
- * @ReduxAction An OpenFin Schedule has been deleted
- */
 exports.OPENFIN_SCHEDULE_DELETE = 'OPENFIN_SCHEDULE_DELETE';
-/**
- * @ReduxAction An OpenFin Schedule has been suspended
- */
 exports.OPENFIN_SCHEDULE_SUSPEND = 'OPENFIN_SCHEDULE_SUSPEND';
-/**
- * @ReduxAction An OpenFin Schedule has been unsuspended or activated
- */
 exports.OPENFIN_SCHEDULE_UNSUSPEND = 'OPENFIN_SCHEDULE_UNSUSPEND';
-/**
- * @ReduxAction All OpenFin Schedules have been suspended
- */
 exports.OPENFIN_SCHEDULE_SUSPEND_ALL = 'OPENFIN_SCHEDULE_SUSPEND_ALL';
-/**
- * @ReduxAction All OpenFin Schedules have been unsuspended or activated
- */
 exports.OPENFIN_SCHEDULE_UNSUSPEND_ALL = 'OPENFIN_SCHEDULE_UNSUSPEND_ALL';
 /**
  * @ReduxAction Schedule Module is ready

package/src/Redux/ActionsReducers/ShortcutRedux.d.ts

@@ -1,4 +1,4 @@
-import { ShortcutState, Shortcut } from '../../PredefinedConfig/ShortcutState';
+import { ShortcutState, Shortcut } from '../../AdaptableState/ShortcutState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Shortcut has been added

package/src/Redux/ActionsReducers/StatusBarRedux.d.ts

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { StatusBarState, AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
+import { StatusBarState, AdaptableStatusBar } from '../../AdaptableState/StatusBarState';
 /**
  * @ReduxAction Sets Status Bar panels
  */

package/src/Redux/ActionsReducers/StyledColumnRedux.d.ts

@@ -1,4 +1,4 @@
-import { StyledColumnState, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { StyledColumnState, StyledColumn } from '../../AdaptableState/StyledColumnState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Special Column Style has been added

package/src/Redux/ActionsReducers/SystemStatusRedux.d.ts

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 /**
  * @ReduxAction A System Status Message is set
  */

package/src/Redux/ActionsReducers/TeamSharingRedux.d.ts

@@ -1,7 +1,7 @@
-import { TeamSharingState, SharedEntity, AdaptableSharedEntityConfig, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntityConfig } from '../../PredefinedConfig/TeamSharingState';
+import { TeamSharingState, SharedEntity, AdaptableSharedEntityConfig, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntityConfig } from '../../AdaptableState/TeamSharingState';
 import * as Redux from 'redux';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 export declare const TEAMSHARING_GET = "TEAMSHARING_GET";
 export declare const TEAMSHARING_SET = "TEAMSHARING_SET";
 export declare const TEAMSHARING_SHARE = "TEAMSHARING_SHARE";

package/src/Redux/ActionsReducers/ThemeRedux.d.ts

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ThemeState, AdaptableTheme } from '../../PredefinedConfig/ThemeState';
+import { ThemeState, AdaptableTheme } from '../../AdaptableState/ThemeState';
 /**
  * @ReduxAction System Themes have been set
  */

package/src/Redux/ActionsReducers/ToolPanelRedux.d.ts

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
-import { AdaptableToolPanelDefinition, ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
-import { AdaptableToolPanel, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
+import { AdaptableToolPanelDefinition, ToolPanelState } from '../../AdaptableState/ToolPanelState';
+import { AdaptableToolPanel, AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
 /**
  * @ReduxAction Tool Panels have been set in AdapTable ToolPanel Component
  */

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

@@ -1,11 +1,11 @@
 import IStorageEngine from './Interface/IStorageEngine';
-import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
+import { InitialState } from '../../AdaptableState/InitialState';
 import { AdaptableLoadStateFunction, AdaptablePersistStateFunction } from '../../AdaptableOptions/StateOptions';
 export declare function createEngine(config: {
     adaptableId: string;
     adaptableStateKey: string;
     userName: string;
-    predefinedConfig: PredefinedConfig;
+    initialState: InitialState;
     loadState?: AdaptableLoadStateFunction;
     persistState?: AdaptablePersistStateFunction;
     debounceStateDelay: number;

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -33,7 +33,7 @@ class AdaptableReduxLocalStorageEngine {
         this.adaptableId = config.adaptableId;
         this.adaptableStateKey = config.adaptableStateKey;
         this.userName = config.userName;
-        this.predefinedConfig = config.predefinedConfig;
+        this.initialState = config.initialState;
         this.loadState = config.loadState;
         this.persistState = config.persistState;
         this.save =
@@ -46,16 +46,16 @@ class AdaptableReduxLocalStorageEngine {
     setStateKey(adaptableStateKey) {
         this.adaptableStateKey = adaptableStateKey;
     }
-    load(predefinedConfig = this.predefinedConfig) {
+    load(initialState = this.initialState) {
         return (this.loadState || loadState)({
             adaptableId: this.adaptableId,
             adaptableStateKey: this.adaptableStateKey,
             userName: this.userName,
         }).then((parsedJsonState) => {
-            // we need to merge the predefined config
-            return Promise.resolve(predefinedConfig)
-                .then((parsedPredefinedState) => {
-                return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
+            // we need to merge the Initial Adaptable State
+            return Promise.resolve(initialState)
+                .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,13 +1,13 @@
-import { ConfigState } from '../../PredefinedConfig/ConfigState';
-import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
-export declare function AddStateSource(stateObject: any, source: 'Config' | 'User'): any;
+import { BaseState } from '../../AdaptableState/BaseState';
+import { AdaptableState } from '../../AdaptableState/AdaptableState';
+export declare function AddStateSource(stateObject: any, source: 'InitialState' | 'User'): any;
 export declare function ProcessKeepUserDefinedRevision(configState: any, currentUserState: any): any;
 export declare function MergeStateFunction(oldState: any, newState: any): any;
 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

@@ -12,7 +12,7 @@ const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpe
 function customizer(objValue, srcValue) {
     if ((0, isArray_1.default)(objValue)) {
         if (!Array.isArray(srcValue)) {
-            // TODO AFL: clarify if this is still relevant, after the config/options refactoring
+            // TODO AFL: clarify if this is still relevant, after the state & options refactoring
             /**
              * the new value might be a function: eg: UserInterface.ContextMenuItems defaults to an array
              * in the redux state, while the user might provide a function
@@ -53,7 +53,7 @@ function ProcessKeepUserDefinedRevision(configState, currentUserState) {
             const stateValue = stateObject[key];
             if (Array.isArray(configValue) && Array.isArray(stateValue)) {
                 const userDefinedItems = stateValue.filter((item) => {
-                    return AdaptableHelper_1.default.isAdaptableObject(item) && item.Source !== 'Config';
+                    return AdaptableHelper_1.default.isAdaptableObject(item) && item.Source !== 'InitialState';
                 });
                 configObject[key] = configValue.concat(userDefinedItems);
                 // we probably don't need to call traverseStateObject on the array as well,
@@ -80,8 +80,8 @@ function MergeStateFunction(oldState, newState) {
     if (newState === '') {
         newState = {};
     }
-    // add source 'Config' only to predefined objects
-    const config = AddStateSource(oldState, 'Config');
+    // add source 'InitialState' only to initial state objects
+    const initialState = AddStateSource(oldState, 'InitialState');
     // source 'User' will be added to all other objects, after the merge (see bottom of this function)
     let state = newState;
     if (!state || typeof state !== 'object') {
@@ -90,29 +90,29 @@ function MergeStateFunction(oldState, newState) {
         state = {};
     }
     // any Module in config that doesn't exist in state will be added
-    for (const configModuleName in config) {
-        state[configModuleName] = state[configModuleName] ?? config[configModuleName];
+    for (const initialStateModuleName in initialState) {
+        state[initialStateModuleName] = state[initialStateModuleName] ?? initialState[initialStateModuleName];
     }
     // any Module in state that has an older revision than the config will be replaced
     for (const stateModuleName in state) {
-        if (config[stateModuleName] != undefined) {
+        if (initialState[stateModuleName] != undefined) {
             // explicitly use double equals, as we want to avoid null as well
             const stateRevision = state[stateModuleName].Revision ?? 0;
-            const configRevision = config[stateModuleName].Revision ?? 0;
+            const initialStateRevision = initialState[stateModuleName].Revision ?? 0;
             const stateRevisionKey = typeof stateRevision === 'object' ? stateRevision.Key : stateRevision;
-            const configRevisionBehaviour = typeof configRevision === 'object' ? configRevision.Behavior : 'Override';
-            const configRevisionKey = typeof configRevision === 'object' ? configRevision.Key : configRevision;
-            if (configRevisionKey > stateRevisionKey) {
-                if (configRevisionBehaviour === 'Override') {
-                    state[stateModuleName] = config[stateModuleName];
+            const initialStateRevisionBehaviour = typeof initialStateRevision === 'object' ? initialStateRevision.Behavior : 'Override';
+            const initialStateRevisionKey = typeof initialStateRevision === 'object' ? initialStateRevision.Key : initialStateRevision;
+            if (initialStateRevisionKey > stateRevisionKey) {
+                if (initialStateRevisionBehaviour === 'Override') {
+                    state[stateModuleName] = initialState[stateModuleName];
                 }
                 else {
-                    state[stateModuleName] = ProcessKeepUserDefinedRevision(deepClone(config[stateModuleName]), state[stateModuleName]);
+                    state[stateModuleName] = ProcessKeepUserDefinedRevision(deepClone(initialState[stateModuleName]), state[stateModuleName]);
                 }
             }
         }
     }
-    // add 'User' source to all state objects which do NOT have 'Config' yet
+    // add 'User' source to all state objects which do NOT have 'InitialState'
     const finalState = AddStateSource(state, 'User');
     return finalState;
 }
@@ -132,7 +132,7 @@ function MergeState(oldState, newState) {
         }
         const oldValue = result[key];
         if ((0, isObject_1.default)(value) && !Array.isArray(value)) {
-            // use both lodash functions so that we can merge from State onto Predefined Config where it exists but from the former where it doesnt.
+            // use both lodash functions so that we can merge from State onto Initial Adaptable State where it exists but from the former where it doesnt.
             result[key] = (0, mergeWith_1.default)({}, oldValue, value, customizer);
         }
         else {

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

@@ -1,7 +1,7 @@
 import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
-import { ConfigState } from '../../PredefinedConfig/ConfigState';
+import { AdaptableState } from '../../AdaptableState/AdaptableState';
+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/Redux/Store/AdaptableStore.js

@@ -8,7 +8,7 @@ const PopupRedux = tslib_1.__importStar(require("../ActionsReducers/PopupRedux")
 const PopupRedux_1 = require("../ActionsReducers/PopupRedux");
 const AdaptableReduxLocalStorageEngine_1 = require("./AdaptableReduxLocalStorageEngine");
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
-const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
+const AdaptableAlert_1 = require("../../AdaptableState/Common/AdaptableAlert");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
@@ -42,7 +42,7 @@ const InternalRedux = tslib_1.__importStar(require("../ActionsReducers/InternalR
 const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
-const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
+const TeamSharingState_1 = require("../../AdaptableState/TeamSharingState");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -91,13 +91,13 @@ class AdaptableStore {
             return this.emitter.emit(eventName, data);
         };
         this.loadStore = (config) => {
-            const { adaptable, adaptableStateKey, predefinedConfig, postLoadHook } = config;
+            const { adaptable, adaptableStateKey, initialState, postLoadHook } = config;
             const postProcessState = postLoadHook ?? ((state) => state);
             this.storageEngine.setStateKey(adaptableStateKey);
             // START STATE LOAD
             this.loadStorageInProgress = true;
             return (this.Load = this.storageEngine
-                .load(predefinedConfig)
+                .load(initialState)
                 .then((storedState) => {
                 if (storedState && this.loadStateOnStartup) {
                     this.TheStore.dispatch((0, exports.LoadState)(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState))));
@@ -184,7 +184,7 @@ class AdaptableStore {
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
             userName: adaptable.adaptableOptions.userName,
-            predefinedConfig: adaptable.adaptableOptions.predefinedConfig,
+            initialState: adaptable.adaptableOptions.initialState,
             loadState: adaptable.adaptableOptions.stateOptions.loadState,
             persistState: adaptable.adaptableOptions.stateOptions.persistState,
             debounceStateDelay: adaptable.adaptableOptions.stateOptions.debounceStateDelay,
@@ -507,7 +507,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let returnAction = next(action);
                     adaptable.api.gridApi.refreshAllCells(true);
                     // if set then return a query on the text
-                    if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
+                    if (adaptable.adaptableOptions.quickSearchOptions.filterGridAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {

package/src/Redux/Store/Interface/IAdaptableStore.d.ts

@@ -1,11 +1,11 @@
 import * as Redux from 'redux';
-import { AdaptableState } from '../../../PredefinedConfig/AdaptableState';
-import { PredefinedConfig } from '../../../types';
+import { AdaptableState } from '../../../AdaptableState/AdaptableState';
+import { InitialState } from '../../../types';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
 export interface LoadStoreConfig {
     adaptable: IAdaptable;
     adaptableStateKey: string;
-    predefinedConfig?: PredefinedConfig;
+    initialState?: InitialState;
     postLoadHook?: (state: AdaptableState) => AdaptableState;
 }
 export interface IAdaptableStore {

package/src/Redux/Store/Interface/IStorageEngine.d.ts

@@ -1,8 +1,8 @@
 import { AdaptableSaveStateFunction } from '../../../AdaptableOptions/StateOptions';
-import { AdaptableState } from '../../../PredefinedConfig/AdaptableState';
-import { PredefinedConfig } from '../../../PredefinedConfig/PredefinedConfig';
+import { AdaptableState } from '../../../AdaptableState/AdaptableState';
+import { InitialState } from '../../../AdaptableState/InitialState';
 export default interface IStorageEngine {
-    load(predefinedConfig?: string | PredefinedConfig): Promise<any>;
+    load(initialState?: string | InitialState): Promise<any>;
     save(state: AdaptableState, getEnhancedState?: AdaptableSaveStateFunction): Promise<any>;
     saveNow(state: AdaptableState, getEnhancedState?: AdaptableSaveStateFunction): Promise<any>;
     setStateKey(stateKey: string): void;