@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.0

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

@@ -29,7 +29,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 =
@@ -42,16 +42,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 MergeStateFunction(parsedPredefinedState, parsedJsonState);
+            // we need to merge the Initial Adaptable State
+            return Promise.resolve(initialState)
+                .then((parsedInitialState) => {
+                return MergeStateFunction(parsedInitialState, parsedJsonState);
             })
                 .catch((err) => 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

@@ -8,7 +8,7 @@ import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 function customizer(objValue, srcValue) {
     if (isArray(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
@@ -48,7 +48,7 @@ export function ProcessKeepUserDefinedRevision(configState, currentUserState) {
             const stateValue = stateObject[key];
             if (Array.isArray(configValue) && Array.isArray(stateValue)) {
                 const userDefinedItems = stateValue.filter((item) => {
-                    return AdaptableHelper.isAdaptableObject(item) && item.Source !== 'Config';
+                    return AdaptableHelper.isAdaptableObject(item) && item.Source !== 'InitialState';
                 });
                 configObject[key] = configValue.concat(userDefinedItems);
                 // we probably don't need to call traverseStateObject on the array as well,
@@ -74,8 +74,8 @@ export 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') {
@@ -84,29 +84,29 @@ export 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;
 }
@@ -125,7 +125,7 @@ export function MergeState(oldState, newState) {
         }
         const oldValue = result[key];
         if (isObject(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] = mergeWith({}, 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

@@ -1,10 +1,10 @@
 import * as Redux from 'redux';
 import * as PluginsRedux from '../ActionsReducers/PluginsRedux';
 import * as PopupRedux from '../ActionsReducers/PopupRedux';
-import { PROGRESS_INDICATOR_HIDE, PROGRESS_INDICATOR_SHOW, } from '../ActionsReducers/PopupRedux';
+import { PROGRESS_INDICATOR_HIDE, PROGRESS_INDICATOR_SHOW } from '../ActionsReducers/PopupRedux';
 import { createEngine as createEngineLocal } from './AdaptableReduxLocalStorageEngine';
 import { mergeReducer } from './AdaptableReduxMerger';
-import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../AdaptableState/Common/AdaptableAlert';
 import { ERROR_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Emitter from '../../Utilities/Emitter';
@@ -38,7 +38,7 @@ import * as InternalRedux from '../ActionsReducers/InternalRedux';
 import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
 import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
-import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../PredefinedConfig/TeamSharingState';
+import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../AdaptableState/TeamSharingState';
 export const INIT_STATE = 'INIT_STATE';
 export const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -85,13 +85,13 @@ export 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(LoadState(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState))));
@@ -178,7 +178,7 @@ export 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,
@@ -500,7 +500,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.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;

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -1,17 +1,17 @@
 import { IModule, ModuleInfo, TeamSharingReferences } from './Interface/IModule';
 import { Action } from 'redux';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
-import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
+import { AdaptableModule } from '../AdaptableState/Common/Types';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
-import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
-import { AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
+import { AccessLevel } from '../AdaptableState/Common/Entitlement';
+import { CalculatedColumn } from '../AdaptableState/CalculatedColumnState';
+import { FreeTextColumn } from '../AdaptableState/FreeTextColumnState';
+import { AdaptableSystemIconName } from '../AdaptableState/Common/AdaptableIcon';
 import { AdaptableStateReloadedInfo } from '../Api/Events/AdaptableStateReloaded';
 /**
  * Base class for all strategies and does most of the work of creating menus

package/src/Strategy/AdaptableModuleBase.js

@@ -17,7 +17,7 @@ export 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);
@@ -67,8 +67,7 @@ export 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/Strategy/AlertModule.d.ts

@@ -1,9 +1,9 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AlertDefinition } from '../PredefinedConfig/AlertState';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { AlertDefinition } from '../AdaptableState/AlertState';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
+import { ContextMenuContext } from '../AdaptableState/Common/Menu';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { MenuItemShowPopup } from '../Utilities/MenuItem';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';

package/src/Strategy/BulkUpdateModule.d.ts

@@ -2,7 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { MenuItemShowPopup } from '../Utilities/MenuItem';
-import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -1,11 +1,11 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { ContextMenuContext } from '../AdaptableState/Common/Menu';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
+import { CalculatedColumn } from '../AdaptableState/CalculatedColumnState';
 import { AdaptableObjectItemView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
 import { AdaptableModuleView } from './Interface/IModule';
 export declare class CalculatedColumnModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,12 +1,12 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { CellSummmaryInfo } from '../PredefinedConfig/Common/CellSummary';
-import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { CellSummmaryInfo } from '../AdaptableState/Common/CellSummary';
+import { AccessLevel } from '../AdaptableState/Common/Entitlement';
+import { ContextMenuContext } from '../AdaptableState/Common/Menu';
+import { SelectedCellInfo } from '../AdaptableState/Selection/SelectedCellInfo';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellSummaryModule } from './Interface/ICellSummaryModule';
-import { AggregationColumnValue } from '../PredefinedConfig/Common/AggregationColumns';
+import { AggregationColumnValue } from '../AdaptableState/Common/AggregationColumns';
 import { AdaptableModuleView } from './Interface/IModule';
 export type WeightedAverageConfig = {
     ColumnId: string;

package/src/Strategy/ChartingModule.d.ts

@@ -2,7 +2,7 @@ import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/I
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn, ChartDefinition } from '../types';
-import { ExternalChartDefinition } from '../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../AdaptableState/ChartingState';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;

package/src/Strategy/ChartingModule.js

@@ -4,7 +4,7 @@ import { ShowChartButton } from '../View/Charting/ShowChartButton';
 import { ChartingWizard } from '../View/Charting/ChartingWizard';
 import * as ChartingRedux from '../Redux/ActionsReducers/ChartingRedux';
 import { ChartingStatusBarPopover } from '../View/Charting/ChartingStatusBarPopover';
-import { isAgChartDefinition, isExternalChartDefinition, } from '../PredefinedConfig/ChartingState';
+import { isAgChartDefinition, isExternalChartDefinition, } from '../AdaptableState/ChartingState';
 import Helper from '../Utilities/Helpers/Helper';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';

package/src/Strategy/ColumnFilterModule.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableContextMenuItemName, AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { AdaptableContextMenuItemName, AdaptableMenuItem, ContextMenuContext } from '../AdaptableState/Common/Menu';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ColumnFilter } from '../types';
 export declare class ColumnFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);

package/src/Strategy/ColumnFilterModule.js

@@ -55,7 +55,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             }
             const existingColumnFilter = this.api.filterApi.columnFilterApi.getColumnFilterForColumn(column.columnId);
             if (existingColumnFilter) {
-                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter.ColumnId)));
                 columnFilterMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
@@ -88,7 +88,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                 }
                 else {
                     return [
-                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)),
+                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter.ColumnId)),
                         this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
                             ? 'column-filter-unsuspend'
                             : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
@@ -145,8 +145,8 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             getCompactUnSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterUnSuspend(columnFilter),
             getSuspendAllAction: () => LayoutRedux.LayoutColumnFilterSuspendAll(),
             getUnSuspendAllAction: () => LayoutRedux.LayoutColumnFilterUnSuspendAll(),
-            getDeleteAction: LayoutRedux.LayoutColumnFilterClear,
-            getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getDeleteAction: (columnFilter) => LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId),
+            getCompactDeleteAction: (columnFilter) => LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId),
             getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,
             emptyView: `
         There are no Column Filters applied. \n

package/src/Strategy/ColumnInfoModule.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../AdaptableState/Common/Entitlement';
 import { AdaptableColumn, ContextMenuContext } from '../types';
 export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);

package/src/Strategy/CommentModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class CommentModule extends AdaptableModuleBase implements IModule {

package/src/Strategy/CustomSortModule.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { CustomSort } from '../AdaptableState/CustomSortState';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 export declare class CustomSortModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(config?: {

package/src/Strategy/DashboardModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableColumnMenuItemName, AdaptableContextMenuItemName, AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableColumnMenuItemName, AdaptableContextMenuItemName, AdaptableMenuItem, ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DashboardModule extends AdaptableModuleBase implements IModule {

package/src/Strategy/DataImportModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem } from '../AdaptableState/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class DataImportModule extends AdaptableModuleBase implements IModule {

package/src/Strategy/DataSetModule.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { DataSet } from '../AdaptableOptions/DataSetOptions';
 export declare class DataSetModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);

package/src/Strategy/DataSetModule.js

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { DataSetStatusPanelPopover } from '../View/DataSet/DataSetStatusPanelPopover';
-import { createUuid } from '../PredefinedConfig/Uuid';
+import { createUuid } from '../AdaptableState/Uuid';
 import { DataSetSelector } from '../View/DataSet/DataSetSelector';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 export class DataSetModule extends AdaptableModuleBase {

package/src/Strategy/ExportModule.d.ts

@@ -1,9 +1,9 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { Report } from '../PredefinedConfig/ExportState';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { Report } from '../AdaptableState/ExportState';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
+import { AdaptableMenuItem, ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 export declare class ExportModule extends AdaptableModuleBase {
     constructor(api: AdaptableApi);

package/src/Strategy/Fdc3Module.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../AdaptableState/Common/Menu';
 export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];

package/src/Strategy/FlashingCellModule.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { AdaptableMenuItem, ContextMenuContext } from '../AdaptableState/Common/Menu';
+import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { FlashingCellDefinition } from '../types';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
 export declare class FlashingCellModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {