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

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

@@ -1,4 +1,4 @@
-import { AlertState, AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertState, AlertDefinition } from '../../AdaptableState/AlertState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction An Alert Definition has been added

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ApplicationState, ApplicationDataEntry } from '../../PredefinedConfig/ApplicationState';
+import { ApplicationState, ApplicationDataEntry } from '../../AdaptableState/ApplicationState';
 /**
  * @ReduxAction An Application Data Entry has been added
  */

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

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

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { ChartDefinition, ChartingState, ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ChartDefinition, ChartingState, ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 /**
  * @ReduxAction Set AG Grid Charting Models
  */

package/src/Redux/ActionsReducers/ChartingRedux.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingReducer = exports.ChartingGetExternalChartDefinitions = exports.ChartingGetChartModels = exports.initialState = exports.ChartingDeleteExternalChart = exports.ChartingAddExternalChart = exports.ChartingEditExternalChart = exports.ChartingDeleteChart = exports.ChartingAddChart = exports.ChartingEditChart = exports.ChartingReady = exports.ChartingSetChartModels = exports.CHARTING_DELETE_EXTERNAL_CHART = exports.CHARTING_ADD_EXTERNAL_CHART = exports.CHARTING_EDIT_EXTERNAL_CHART = exports.CHARTING_DELETE_CHART = exports.CHARTING_ADD_CHART = exports.CHARTING_EDIT_CHART = exports.CHARTING_READY = exports.SET_CHARTING_CHARTS = void 0;
-const Uuid_1 = require("../../PredefinedConfig/Uuid");
+const Uuid_1 = require("../../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction Set AG Grid Charting Models

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { CommentThread, AdaptableComment, CommentState } from '../../PredefinedConfig/CommentState';
+import { CommentThread, AdaptableComment, CommentState } from '../../AdaptableState/CommentState';
 import { CellAddress } from '../../types';
 /**
  * @ReduxAction A Comments has been added

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

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

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

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
 import { CustomToolbar, DashboardButtonContext } from '../../AdaptableOptions/DashboardOptions';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { AdaptableDashboardToolbar, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { DashboardState, AdaptableCoordinate, DashboardTab } from '../../PredefinedConfig/DashboardState';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
+import { AdaptableDashboardToolbar, AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
+import { DashboardState, AdaptableCoordinate, DashboardTab } from '../../AdaptableState/DashboardState';
 /**
  * @ReduxAction The Module Buttons have been set in the Dashboard
  */
@@ -115,6 +115,6 @@ export declare const DashboardSetTitle: (title: string) => DashboardSetTitleActi
 export declare const DashboardReady: (dashboardState: DashboardState) => DashboardReadyAction;
 export declare const DashboardSetPinnedToolbars: (pinnedToolbars: DashboardState['PinnedToolbars']) => {
     type: string;
-    pinnedToolbars: string[] | import("../../PredefinedConfig/Common/Types").AdaptableDashboardToolbars;
+    pinnedToolbars: string[] | import("../../AdaptableState/Common/Types").AdaptableDashboardToolbars;
 };
 export declare const DashboardReducer: Redux.Reducer<DashboardState>;

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ExportState, Report, ReportFormatType } from '../../PredefinedConfig/ExportState';
+import { ExportState, Report, ReportFormatType } from '../../AdaptableState/ExportState';
 /**
  * @ReduxAction A Report has been selected
  */

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

@@ -1,6 +1,6 @@
-import { FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
+import { FlashingCellState } from '../../AdaptableState/FlashingCellState';
 import * as Redux from 'redux';
-import { FlashingCellDefinition } from '../../PredefinedConfig/FlashingCellState';
+import { FlashingCellDefinition } from '../../AdaptableState/FlashingCellState';
 /**
  * @ReduxAction A Flashing Cell Definition has been added
  */

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

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

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../AdaptableState/FreeTextColumnState';
 /**
  * @ReduxAction A Free Text Column has been added
  */

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

@@ -1,18 +1,18 @@
 import * as Redux from 'redux';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { InternalState } from '../../AdaptableState/InternalState';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { Report, ReportFormatType, ReportNameType } from '../../PredefinedConfig/ExportState';
+import { Report, ReportFormatType, ReportNameType } from '../../AdaptableState/ExportState';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
-import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 import { DataImportedInfo, DataSet, CellAddress, CellSummmaryInfo, AdaptableMenuItem, AdaptableColumn, ExportDestinationType } from '../../types';
 import { ChartModel } from 'ag-grid-enterprise';
-import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
-import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
+import { CachedQuery } from '../../AdaptableState/NamedQueryState';
+import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
 import { CellHighlightInfo, RowHighlightInfo, RowsHighlightInfo } from '../../types';
 import { IRowNode } from 'ag-grid-enterprise';
 export declare const SET_COLUMNS = "SET_COLUMNS";
@@ -337,7 +337,7 @@ export declare const CellPopupShow: (cellPosition: CellAddress, editMode?: boole
 export declare const CellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => CellPopupEditFocusedEntityAction;
 export declare const RowSummarySet: (rowSummaries: InternalState['RowSummary']['rowSummaries']) => {
     readonly type: "SUMMARY_ROW_SET";
-    readonly rowSummaries: import("../../PredefinedConfig/InternalState").SystemRowSummary[];
+    readonly rowSummaries: import("../../AdaptableState/InternalState").SystemRowSummary[];
 };
 export declare const CellPopupHide: () => CellPopupHideAction;
 export declare const DisableDeleteConfirmationSelector: (state: InternalState) => boolean;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -5,7 +5,7 @@ exports.DataChangeHistoryEnable = exports.DataChangeHistoryClearRow = exports.Da
 exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNotAssociatedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ReduxConstants_1 = require("../../Utilities/Constants/ReduxConstants");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 const AnnotationsService_1 = require("../../Utilities/Services/AnnotationsService");
 /*

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
+import { LayoutState, Layout } from '../../AdaptableState/LayoutState';
 import { ColumnFilter } from '../../types';
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
@@ -99,7 +99,8 @@ export interface LayoutColumnFilterEditAction extends LayoutColumnFilterAction {
 }
 export interface LayoutColumnFilterSetAction extends LayoutColumnFilterAction {
 }
-export interface LayoutColumnFilterClearAction extends LayoutColumnFilterAction {
+export interface LayoutColumnFilterClearAction extends Redux.Action {
+    columnId: string;
 }
 export interface LayoutColumnFilterClearAllAction extends Redux.Action {
 }
@@ -121,7 +122,7 @@ export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => Layo
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
 export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
 export declare const LayoutColumnFilterClearAll: () => LayoutColumnFilterClearAllAction;
-export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutColumnFilterClearAction;
+export declare const LayoutColumnFilterClear: (columnId: string) => LayoutColumnFilterClearAction;
 export declare const LayoutColumnFilterSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterSuspendAction;
 export declare const LayoutColumnFilterUnSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterUnSuspendAction;
 export declare const LayoutColumnFilterSuspendAll: () => LayoutColumnFilterSuspendAllAction;
@@ -180,10 +181,10 @@ export declare const getCurrentLayoutSelector: (state: AdaptableState) => Layout
 export declare const getColumnFilterSelector: (state: AdaptableState, columnId: string) => {
     ColumnId: string;
     Predicates: import("../../types").ColumnFilterPredicate[];
-    PredicatesLogic?: "AND" | "OR";
+    PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
     Uuid?: string;
-    Source?: "Config" | "User";
+    Source?: "InitialState" | "User";
     AdaptableVersion?: `${string}.${string}.${string}`;
     IsReadOnly?: boolean;
     Tags?: string[];

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -113,9 +113,9 @@ const LayoutColumnFilterClearAll = () => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL,
 });
 exports.LayoutColumnFilterClearAll = LayoutColumnFilterClearAll;
-const LayoutColumnFilterClear = (columnFilter) => ({
+const LayoutColumnFilterClear = (columnId) => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR,
-    columnFilter,
+    columnId,
 });
 exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
 const LayoutColumnFilterSuspend = (columnFilter) => ({
@@ -366,7 +366,7 @@ const LayoutReducer = (state = initialState, action) => {
             const actionTypedDelete = action;
             const columnFilters = (currentLayout.ColumnFilters ?? []).filter((cf) => {
                 // make sure we are deleting all filters on the same column
-                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+                return cf.ColumnId !== actionTypedDelete.columnId;
             });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {

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

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

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { AdaptableNote, NoteState } from '../../PredefinedConfig/NoteState';
+import { AdaptableNote, NoteState } from '../../AdaptableState/NoteState';
 import { CellAddress } from '../../types';
 /**
  * @ReduxAction A Note has been added

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
  */

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;