@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.1

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

@@ -1,47 +1,49 @@
-import { ThemeState } from '../../PredefinedConfig/ThemeState';
-import { ShortcutState } from '../../PredefinedConfig/ShortcutState';
-import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
-import { PlusMinusState } from '../../PredefinedConfig/PlusMinusState';
-import { LayoutState } from '../../PredefinedConfig/LayoutState';
-import { FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
-import { ExportState } from '../../PredefinedConfig/ExportState';
-import { DashboardState } from '../../PredefinedConfig/DashboardState';
-import { CustomSortState } from '../../PredefinedConfig/CustomSortState';
-import { CalculatedColumnState } from '../../PredefinedConfig/CalculatedColumnState';
-import { AlertState } from '../../PredefinedConfig/AlertState';
-import { ConfigState } from '../../PredefinedConfig/ConfigState';
-import { AdaptablePersistentState, AdaptableState } from '../../PredefinedConfig/AdaptableState';
+import { ThemeState } from '../../AdaptableState/ThemeState';
+import { ShortcutState } from '../../AdaptableState/ShortcutState';
+import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
+import { PlusMinusState } from '../../AdaptableState/PlusMinusState';
+import { LayoutState } from '../../AdaptableState/LayoutState';
+import { FormatColumnState } from '../../AdaptableState/FormatColumnState';
+import { ExportState } from '../../AdaptableState/ExportState';
+import { DashboardState } from '../../AdaptableState/DashboardState';
+import { CustomSortState } from '../../AdaptableState/CustomSortState';
+import { CalculatedColumnState } from '../../AdaptableState/CalculatedColumnState';
+import { AlertState } from '../../AdaptableState/AlertState';
+import { BaseState } from '../../AdaptableState/BaseState';
+import { AdaptablePersistentState, AdaptableState } from '../../AdaptableState/AdaptableState';
 import { ApiBase } from './ApiBase';
-import { ApplicationState } from '../../PredefinedConfig/ApplicationState';
-import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState';
-import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
-import { ConfigApi } from '../ConfigApi';
-import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Common/Types';
-import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, FlashingCellState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
-import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
-import { ChartingState } from '../../PredefinedConfig/ChartingState';
-import { NoteState } from '../../PredefinedConfig/NoteState';
-export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
+import { ApplicationState } from '../../AdaptableState/ApplicationState';
+import { FreeTextColumnState } from '../../AdaptableState/FreeTextColumnState';
+import { ToolPanelState } from '../../AdaptableState/ToolPanelState';
+import { StateApi } from '../StateApi';
+import { AdaptableModule, AdaptableStateKey } from '../../AdaptableState/Common/Types';
+import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, FlashingCellState, InitialState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
+import { PredefinedConfig } from '../../AdaptableState/InitialState';
+import { ChartingState } from '../../AdaptableState/ChartingState';
+import { NoteState } from '../../AdaptableState/NoteState';
+export declare class StateApiImpl extends ApiBase implements StateApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
     copyUserStateToClipboard(): void;
     getPredefinedConfig(): PredefinedConfig | any;
+    getInitialState(): InitialState | any;
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
+    reloadInitialState(newInitialState?: InitialState): void;
     getAllState(): AdaptableState;
     getPersistedState(): AdaptablePersistentState;
-    getAllUserState(): ConfigState[];
-    loadUserState(state: PredefinedConfig): void;
+    getAllUserState(): BaseState[];
+    loadUserState(state: InitialState): void;
     getAdaptableSearchState(): AdaptableSearchState;
     getAdaptableSortState(): AdaptableSortState;
     getAdaptableOptions(): Readonly<AdaptableOptions>;
     setAdaptableStateKey(adaptableStateKey: string, config?: {
-        predefinedConfig?: PredefinedConfig;
+        initialState?: InitialState;
         flushCurrentState?: boolean;
         progressIndicatorLabel?: string;
     }): Promise<void>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;
-    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;
+    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;
     incrementUserStateRevision(stateKey: AdaptableStateKey): void;
     getAlertState(returnJson?: boolean): AlertState;
     getApplicationState(returnJson?: boolean): ApplicationState;

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

@@ -1,7 +1,7 @@
 import { InitState } from '../../Redux/Store/AdaptableStore';
 import { ApiBase } from './ApiBase';
 import Helper from '../../Utilities/Helpers/Helper';
-import { initPredefinedConfigWithUuids } from '../../Utilities/Helpers/AdaptableHelper';
+import { addUuidsToInitialState } from '../../Utilities/Helpers/AdaptableHelper';
 import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import * as DashboardRedux from '../../Redux/ActionsReducers/DashboardRedux';
 import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
@@ -22,7 +22,8 @@ import * as SystemStatusRedux from '../../Redux/ActionsReducers/SystemStatusRedu
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../../Redux/ActionsReducers/ToolPanelRedux';
-export class ConfigApiImpl extends ApiBase {
+import { logDeprecation } from '../../Utilities/logDeprecation';
+export class StateApiImpl extends ApiBase {
     configInit() {
         this.dispatchAction(InitState());
     }
@@ -39,9 +40,17 @@ export class ConfigApiImpl extends ApiBase {
         Helper.copyToClipboard(stringifiedState);
     }
     getPredefinedConfig() {
-        return this.getPredefinedConfig;
+        logDeprecation(this.getAdatableLogger(), 'StateApi', 'getPredefinedConfig', 'getInitialState');
+        return this.getInitialState();
+    }
+    getInitialState() {
+        return this._adaptable.adaptableOptions.initialState;
     }
     reloadPredefinedConfig(newPredefinedConfig) {
+        logDeprecation(this.getAdatableLogger(), 'StateApi', 'reloadPredefinedConfig', 'reloadInitialState');
+        this.reloadInitialState(newPredefinedConfig);
+    }
+    reloadInitialState(newInitialState) {
         const adaptableOptions = this.getOptions();
         const oldState = this.getPersistedState();
         // clearing filters so that AG Grid doesnt display the filter icon in a column header after grid reloads
@@ -62,7 +71,7 @@ export class ConfigApiImpl extends ApiBase {
             });
             promise.then(() => {
                 this.setAdaptableStateKey(adaptableOptions.adaptableStateKey, {
-                    predefinedConfig: newPredefinedConfig || adaptableOptions.predefinedConfig,
+                    initialState: newInitialState || adaptableOptions.initialState,
                     flushCurrentState: false,
                 }).then(() => {
                     const newState = this.getPersistedState();
@@ -83,7 +92,7 @@ export class ConfigApiImpl extends ApiBase {
     }
     loadUserState(state) {
         this.setAdaptableStateKey(this.getOptions().adaptableStateKey, {
-            predefinedConfig: state || this.getOptions().predefinedConfig,
+            initialState: state || this.getOptions().initialState,
             flushCurrentState: false,
         });
     }
@@ -118,14 +127,14 @@ export class ConfigApiImpl extends ApiBase {
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
                     this.getOptions().adaptableStateKey = adaptableStateKey;
-                    let predefinedConfig = config?.predefinedConfig;
-                    if (predefinedConfig) {
-                        predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
+                    let initialState = config?.initialState;
+                    if (initialState) {
+                        initialState = addUuidsToInitialState(initialState);
                     }
                     const promise = this.getAdaptableStore().loadStore({
                         adaptable: this._adaptable,
                         adaptableStateKey,
-                        predefinedConfig,
+                        initialState: initialState,
                         postLoadHook: (state) => {
                             const agGridOptions = {
                                 columnDefs: this._adaptable.agGridAdapter.getGridOption('columnDefs'),

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

@@ -1,4 +1,4 @@
-import { AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
+import { AdaptableStatusBar } from '../../AdaptableState/StatusBarState';
 import { StatusBarApi } from '../StatusBarApi';
 import { ApiBase } from './ApiBase';
 import { StatusPanelDef } from 'ag-grid-enterprise';

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { StyledColumnApi } from '../StyledColumnApi';
-import { StyledColumn, StyledColumnState } from '../../PredefinedConfig/StyledColumnState';
+import { StyledColumn, StyledColumnState } from '../../AdaptableState/StyledColumnState';
 import { AdaptableColumn } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { StyledColumnInternalApi } from '../Internal/StyledColumnInternalApi';

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { SystemStatusApi } from '../SystemStatusApi';
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { SystemStatusInternalApi } from '../Internal/SystemStatusInternalApi';
 export declare class SystemStatusApiImpl extends ApiBase implements SystemStatusApi {

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -3,7 +3,7 @@ import { ApiBase } from './ApiBase';
 import * as TeamSharingRedux from '../../Redux/ActionsReducers/TeamSharingRedux';
 import { TeamSharingCheckForUpdates } from '../../Redux/ActionsReducers/TeamSharingRedux';
 import { TeamSharingInternalApi } from '../Internal/TeamSharingInternalApi';
-import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../PredefinedConfig/TeamSharingState';
+import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../AdaptableState/TeamSharingState';
 export class TeamSharingApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { ThemeApi } from '../ThemeApi';
-import { AdaptableTheme, ThemeState } from '../../PredefinedConfig/ThemeState';
+import { AdaptableTheme, ThemeState } from '../../AdaptableState/ThemeState';
 import { ThemeInternalApi } from '../Internal/ThemeInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class ThemeApiImpl extends ApiBase implements ThemeApi {

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

@@ -1,9 +1,9 @@
 import { ApiBase } from './ApiBase';
 import { ToolPanelApi } from '../ToolPanelApi';
-import { ToolPanelState, ToolPanelVisibilityMode } from '../../PredefinedConfig/ToolPanelState';
+import { ToolPanelState, ToolPanelVisibilityMode } from '../../AdaptableState/ToolPanelState';
 import { CustomToolPanel, ToolPanelButtonContext } from '../../AdaptableOptions/ToolPanelOptions';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { AdaptableModuleButtons, AdaptableToolPanel } from '../../PredefinedConfig/Common/Types';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
+import { AdaptableModuleButtons, AdaptableToolPanel } from '../../AdaptableState/Common/Types';
 export declare class ToolPanelApiImpl extends ApiBase implements ToolPanelApi {
     getToolPanelState(): ToolPanelState;
     showToolPanelPopup(): void;

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

@@ -1,9 +1,9 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { AdaptableModule, AdaptableObject, AdaptableObjectTag, CustomWindowConfig } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
 import { UserInterfaceApi } from '../UserInterfaceApi';
-import { ProgressIndicatorConfig } from '../../PredefinedConfig/Common/ProgressIndicatorConfig';
+import { ProgressIndicatorConfig } from '../../AdaptableState/Common/ProgressIndicatorConfig';
 import { ApiBase } from './ApiBase';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     internalApi: UserInterfaceInternalApi;

package/src/Api/Internal/ActionColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ColDef } from 'ag-grid-enterprise';
 import { ActionColumn, ActionColumnButton, ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class ActionColumnInternalApi extends ApiBase {
     getColDefsForActionColumns(): ColDef[];

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -1,7 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import { ActionColumnRenderer, ReactActionColumnRenderer, } from '../../agGrid/cellRenderers/ActionColumnRenderer';
-import { ACTION_COLUMN_TYPE } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { ACTION_COLUMN_TYPE } from '../../AdaptableState/Common/AdaptableColumn';
 export class ActionColumnInternalApi extends ApiBase {
     getColDefsForActionColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { ApiBase } from '../Implementation/ApiBase';
 import { UIConfirmation } from '../../Utilities/Interface/MessagePopups';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { InternalState } from '../../AdaptableState/InternalState';
 import { Action } from 'redux';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableQuery, AdaptableState, BaseContext } from '../../types';
+import { AdaptableMenuItem } from '../../AdaptableState/Common/Menu';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableQuery, AdaptableState, BaseContext, InitialState } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { ICalculatedColumnExpressionService } from '../../Utilities/Services/Interface/ICalculatedColumnExpressionService';
@@ -17,12 +17,12 @@ import { IQueryLanguageService } from '../../Utilities/Services/Interface/IQuery
 import { IAlertService } from '../../Utilities/Services/Interface/IAlertService';
 import { IRowNode } from 'ag-grid-enterprise';
 import { ITeamSharingService } from '../../Utilities/Services/Interface/ITeamSharingService';
-import { ButtonStyle } from '../../PredefinedConfig/Common/ButtonStyle';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { ButtonStyle } from '../../AdaptableState/Common/ButtonStyle';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { AdaptableFrameworkComponent } from '../../agGrid/AdaptableFrameworkComponent';
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
-import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../AdaptableState/Common/AdaptableObject';
 import { AdaptableForm, CellSummmaryInfo, FormContext, RowDataChangeTrigger, RowDataChangedInfo } from '../../../types';
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { AnnotationsService } from '../../Utilities/Services/AnnotationsService';
@@ -62,7 +62,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     buildRowDataChangedInfo(dataRows: any[], rowNodes: IRowNode[], rowTrigger: RowDataChangeTrigger): RowDataChangedInfo;
     getAdaptableInstance(): IAdaptable;
     getAgGridAdapter(): AgGridAdapter;
-    getPredefinedConfig(): any;
+    getInitialState(): InitialState;
     getState(): AdaptableState;
     getValidationService(): IValidationService;
     getModuleService(): IModuleService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -72,8 +72,8 @@ export class AdaptableInternalApi extends ApiBase {
     getAgGridAdapter() {
         return this._adaptable.agGridAdapter;
     }
-    getPredefinedConfig() {
-        return this.getOptions().predefinedConfig;
+    getInitialState() {
+        return this.getOptions().initialState;
     }
     getState() {
         return this.getAdaptableState();

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -1,12 +1,12 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableAlertCommand, AlertButton, AlertButtonForm, AlertDefinition, AlertRule } from '../../PredefinedConfig/AlertState';
-import { AdaptableForm, AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
+import { AdaptableAlertCommand, AlertButton, AlertButtonForm, AlertDefinition, AlertRule } from '../../AdaptableState/AlertState';
+import { AdaptableForm, AdaptableFormData } from '../../AdaptableState/Common/AdaptableForm';
 import { AlertFormContext } from '../../AdaptableOptions/AlertOptions';
-import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
+import { AdaptablePredicateDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
 import { IRowNode } from 'ag-grid-enterprise';
 import { RowDataChangedInfo } from '../../types';
 export declare class AlertInternalApi extends ApiBase {

package/src/Api/Internal/AlertInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { isReactiveQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { isReactiveQuery } from '../../AdaptableState/Common/AdaptableQuery';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../AdaptableState/Common/AdaptableAlert';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { AlertModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { isCellDataChangedInfo } from '../../Utilities/Services/Interface/IAlertService';

package/src/Api/Internal/CalculatedColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ColDef } from 'ag-grid-enterprise';
 import { ApiBase } from '../Implementation/ApiBase';
-import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { CalculatedColumn } from '../../AdaptableState/CalculatedColumnState';
 import { AdaptableColumn } from '../../types';
 export declare class CalculatedColumnInternalApi extends ApiBase {
     /**

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { CreateEmptyCalculatedColumn, CreateInternalAlertDefinitionForMessages, } from '../../Utilities/ObjectFactory';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
-import { CALCULATED_COLUMN_TYPE } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { CALCULATED_COLUMN_TYPE } from '../../AdaptableState/Common/AdaptableColumn';
 export class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn

package/src/Api/Internal/ChartingInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { ChartContainer } from '../../types';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 export declare class ChartingInternalApi extends ApiBase {
     getContainerElement(chartContainer: ChartContainer): HTMLElement | null;
     getContainerElemetnByName(containerName: string): HTMLElement | null;

package/src/Api/Internal/ColumnFilterInternalApi.d.ts

@@ -1,9 +1,9 @@
 import { IRowNode } from 'ag-grid-enterprise';
 import * as Redux from 'redux';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { ColumnFilter } from '../../PredefinedConfig/Common/ColumnFilter';
-import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { AdaptablePredicateDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { ColumnFilter } from '../../AdaptableState/Common/ColumnFilter';
+import { GridCell } from '../../AdaptableState/Selection/GridCell';
 import { LayoutColumnFilterAction } from '../../Redux/ActionsReducers/LayoutRedux';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class ColumnFilterInternalApi extends ApiBase {

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -92,7 +92,7 @@ export class ColumnFilterInternalApi extends ApiBase {
             displayValue: gridCell.displayValue,
             node,
             column,
-            predicatesLogic: columnFilter.PredicatesLogic,
+            predicatesOperator: columnFilter.PredicatesOperator,
             ...this.getAdaptableInternalApi().buildBaseContext(),
         };
         return this.getPredicateApi().handlePredicates(columnFilter.Predicates, predicateDefHandlerContext, true);
@@ -115,7 +115,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
             this.getColumnFilterApi().isColumnFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
-            this.getColumnFilterApi().isColumnFilterActive(action.columnFilter);
+            this.getColumnFilterApi().isColumnFilterActiveForColumn(action.columnId);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
             this.getColumnFilterApi()
                 .getColumnFilters()
@@ -197,7 +197,7 @@ export class ColumnFilterInternalApi extends ApiBase {
                 value: columnId,
                 size: {
                     width: 380,
-                    height: 600,
+                    height: 450,
                 },
             },
         });

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { Column, IRowNode } from 'ag-grid-enterprise';
-import { CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { CustomSort } from '../../AdaptableState/CustomSortState';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
 import { AdaptableColumn } from '../../types';
 export declare function getAutoRowGroupColumnIdFor(columnId: string): string;

package/src/Api/Internal/ColumnInternalApi.js

@@ -1,7 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AG_GRID_GROUPED_COLUMN } from '../../Utilities/Constants/GeneralConstants';
 import uniq from 'lodash/uniq';
-import { isArray } from 'lodash';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 export function getAutoRowGroupColumnIdFor(columnId) {
     return `${AG_GRID_GROUPED_COLUMN}-${columnId}`;
@@ -23,7 +22,7 @@ export class ColumnInternalApi extends ApiBase {
             .getColumns()
             .forEach((c) => {
             const agGridColType = this.getAgGridColumnType(c.columnId);
-            if (isArray(agGridColType)) {
+            if (Array.isArray(agGridColType)) {
                 colTypes.push(...agGridColType);
             }
             else {

package/src/Api/Internal/CustomSortInternalApi.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnDataType } from '../../AdaptableState/Common/AdaptableColumn';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
-import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/AdaptableComparerFunction';
+import { AdaptableComparerFunction } from '../../AdaptableState/Common/AdaptableComparerFunction';
 export declare class CustomSortInternalApi extends ApiBase {
     getCustomSortComparer(columnId: string): ColumnValuesComparer | undefined;
     getCustomSortValue(value: any, columnDataType: AdaptableColumnDataType): any;

package/src/Api/Internal/DashboardInternalApi.d.ts

@@ -1,4 +1,4 @@
-import { DashboardState } from '../../PredefinedConfig/DashboardState';
+import { DashboardState } from '../../AdaptableState/DashboardState';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class DashboardInternalApi extends ApiBase {
     isToolbarInActiveTab(toolbarName: string, dashboardState: DashboardState): boolean;
@@ -7,7 +7,7 @@ export declare class DashboardInternalApi extends ApiBase {
     getCustomToolbarButtonsContainerId(customToolbarName: string): string;
     getCustomToolbarComponentContainerId(customToolbarName: string): string;
     getModuleToolbars(): {
-        id: import("../../PredefinedConfig/Common/Types").AdaptableDashboardToolbar;
+        id: import("../../AdaptableState/Common/Types").AdaptableDashboardToolbar;
         friendlyName: string;
     }[];
 }

package/src/Api/Internal/DashboardInternalApi.js

@@ -1,4 +1,4 @@
-import { ALL_TOOLBARS } from '../../PredefinedConfig/Common/Types';
+import { ALL_TOOLBARS } from '../../AdaptableState/Common/Types';
 import { ApiBase } from '../Implementation/ApiBase';
 export class DashboardInternalApi extends ApiBase {
     isToolbarInActiveTab(toolbarName, dashboardState) {

package/src/Api/Internal/EventInternalApi.d.ts

@@ -1,9 +1,9 @@
 import { IRowNode } from 'ag-grid-enterprise';
 import * as Redux from 'redux';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { AdaptableAlert, AdaptableFlashingCell, AdaptablePersistentState, AdaptableSharedEntity, AdaptableState, AdaptableTheme, CalculatedColumn, CreatedRowInfo, DashboardState, DataImportedInfo, DataSet, DeletedRowInfo, EditedRowInfo, LayoutState, RowDataChangedInfo, SystemStatusMessageInfo } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
-import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
+import { BaseSchedule } from '../../AdaptableState/Common/Schedule';
 export declare class EventInternalApi extends ApiBase {
     fireGridSortedEvent(): void;
     fireCellChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;

package/src/Api/Internal/EventInternalApi.js

@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 export class EventInternalApi extends ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {
-            const adaptableSortState = this.getConfigApi().getAdaptableSortState();
+            const adaptableSortState = this.getStateApi().getAdaptableSortState();
             const gridSortedInfo = {
                 adaptableSortState: adaptableSortState,
                 ...this.getAdaptableInternalApi().buildBaseContext(),

package/src/Api/Internal/ExportInternalApi.d.ts

@@ -1,9 +1,9 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { Report, ReportData, ReportFormatType, ReportNameType, SystemReportName } from '../../PredefinedConfig/ExportState';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { Report, ReportData, ReportFormatType, ReportNameType, SystemReportName } from '../../AdaptableState/ExportState';
 import { CsvCell, ExcelCell, ExcelDataType, IRowNode } from 'ag-grid-enterprise';
-import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { BaseExportContext, DataFormatType, ExportDestinationType, ExportResultData } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../AdaptableState/Common/AdaptableColumn';
+import { BaseExportContext, DataFormatType, ExportDestinationType, ExportResultData, ProcessExportContext } from '../../AdaptableOptions/ExportOptions';
 export declare class ExportInternalApi extends ApiBase {
     /**
      * Value Items for Report Name Selection
@@ -34,8 +34,7 @@ export declare class ExportInternalApi extends ApiBase {
     createCellCsv(cellContent: any): CsvCell;
     createCellExcel(cellContent: any, cellType: ExcelDataType): ExcelCell;
     createCellHeader(cellContent: any): ExcelCell;
-    getExternalReportData(externalReportName: ReportNameType, reportFormat: ReportFormatType, exportDestination: ExportDestinationType): Promise<ExportResultData | undefined>;
-    private buildGridReportColumns;
+    buildProcessExportContext(report: Report, format: ReportFormatType, destination: ExportDestinationType): ProcessExportContext;
     private buildExcelConverter;
     private buildCsvConverter;
     private executeGridExport;