@adaptabletools/adaptable 20.0.0-canary.22 → 20.0.0-canary.23

package/src/Utilities/Constants/ObjectDefaultConstants.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
 /**
  * Object Factory
  */

package/src/Utilities/Constants/ReduxConstants.d.ts

@@ -1,5 +1,5 @@
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
+import { AdaptableTheme } from '../../AdaptableState/ThemeState';
 export declare const CELL_SUMMARY_DEFAULT_OPERATION: SummaryOperation | string;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/ReduxConstants.js

@@ -1,4 +1,4 @@
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
 import { LIGHT_YELLOW, BLACK, getHexForName } from '../../View/UIHelper';
 import { LIGHT_THEME, DARK_THEME, OS_THEME } from './GeneralConstants';
 // Cells Summary

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableSettingsPanel } from '../../PredefinedConfig/Common/Types';
+import { AdaptableSettingsPanel } from '../../AdaptableState/Common/Types';
 /**
  * This constant determines the items, and order, which appear in Settings Panel
  */

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -2,7 +2,7 @@ import { IRowNode } from 'ag-grid-enterprise';
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
 import { AggregateParams } from './scalarAggregationHelper';
-import { TypeHint } from '../../PredefinedConfig/Common/Types';
+import { TypeHint } from '../../AdaptableState/Common/Types';
 import { AdaptableColumnDataType } from '../../types';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.d.ts

@@ -1,7 +1,7 @@
 import { ExpressionContext } from '../../parser/src/types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Observable } from 'rxjs';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { RowDataChangedInfo } from '../../types';
 export interface BaseParameter<T = string, N = string> {
     type: T;

package/src/Utilities/Extensions/ArrayExtensions.d.ts

@@ -1,5 +1,5 @@
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
-import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
+import { GridCell } from '../../AdaptableState/Selection/GridCell';
 export type NonEmptyArray<T> = [T, ...Array<T>];
 export declare function GetLength(arrayToCheck: any[]): number;
 export declare function CorrectLength(arrayToCheck: any[], requiredLength: number): boolean;

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -1,4 +1,4 @@
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
 export function GetLength(arrayToCheck) {
     return IsNotNull(arrayToCheck) ? arrayToCheck.length : 0;
 }

package/src/Utilities/Extensions/EnumExtensions.js

@@ -1,4 +1,4 @@
-import { FontSize } from '../../PredefinedConfig/Common/Enums';
+import { FontSize } from '../../AdaptableState/Common/Enums';
 export function getNames(e) {
     const vals = Object.keys(e).map((k) => e[k]);
     return vals.filter((v) => typeof v === 'string');

package/src/Utilities/Helpers/AdaptableHelper.d.ts

@@ -1,14 +1,14 @@
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
-import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
-import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
-export declare function initPredefinedConfigWithUuids(predefinedConfig: PredefinedConfig): PredefinedConfig;
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
+import { InitialState } from '../../AdaptableState/InitialState';
+import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
+export declare function addUuidsToInitialState(initialState: InitialState): InitialState;
 export declare function getAccessLevelForObject(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function addAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function removeAdaptableObjectPrimitivesInline(target: any): any;
 export declare function removeAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function isAdaptableObject(object: unknown): object is AdaptableObject;
 export declare const AdaptableHelper: {
-    initPredefinedConfigWithUuids: typeof initPredefinedConfigWithUuids;
+    addUuidsToInitialState: typeof addUuidsToInitialState;
     getAccessLevelForObject: typeof getAccessLevelForObject;
     addAdaptableObjectPrimitives: typeof addAdaptableObjectPrimitives;
     removeAdaptableObjectPrimitives: typeof removeAdaptableObjectPrimitives;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -1,6 +1,6 @@
 import cloneDeepWith from 'lodash/cloneDeepWith';
 import isPlainObject from 'lodash/isPlainObject';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import packageJson from '../../../package.json';
 const GET_CURRENT_VERSION = () => {
     const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
@@ -8,12 +8,12 @@ const GET_CURRENT_VERSION = () => {
         ? globalObject['GET_CURRENT_ADAPTABLE_VERSION']()
         : packageJson.version) ?? packageJson.version);
 };
-export function initPredefinedConfigWithUuids(predefinedConfig) {
+export function addUuidsToInitialState(initialState) {
     const customizer = (value) => {
         // so whenever we clone a plain object,
         // we add a Uuid property
         // jw added 9/8/20: unless there is on there already
-        if (isPlainObject(value) && value != predefinedConfig) {
+        if (isPlainObject(value) && value != initialState) {
             if (value.Uuid == null || value.Uuid == undefined) {
                 value.Uuid = createUuid();
             }
@@ -22,7 +22,7 @@ export function initPredefinedConfigWithUuids(predefinedConfig) {
             }
         }
     };
-    return cloneDeepWith(predefinedConfig, customizer);
+    return cloneDeepWith(initialState, customizer);
 }
 export function getAccessLevelForObject(adaptableObject, moduleAccessLevel) {
     // we always return the Module Access Level unless the following condition is met:
@@ -75,7 +75,7 @@ export function isAdaptableObject(object) {
     return object != undefined && typeof object['Uuid'] === 'string';
 }
 export const AdaptableHelper = {
-    initPredefinedConfigWithUuids,
+    addUuidsToInitialState: addUuidsToInitialState,
     getAccessLevelForObject,
     addAdaptableObjectPrimitives,
     removeAdaptableObjectPrimitives,

package/src/Utilities/Helpers/FormatHelper.d.ts

@@ -1,4 +1,4 @@
-import { NumberFormatterOptions, DateFormatterOptions, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
+import { NumberFormatterOptions, DateFormatterOptions, StringFormatterOptions } from '../../AdaptableState/Common/AdaptableFormat';
 import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableApi, AdaptableColumn } from '../../types';
 /**

package/src/Utilities/Helpers/PreviewHelper.d.ts

@@ -1,5 +1,5 @@
 import { PreviewResult, PreviewValidationSummary, PreviewInfo } from '../Interface/Preview';
-import { CellUpdateRequest, GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
 export declare function GetPreviewValidationSummary(previewResults: PreviewResult[]): PreviewValidationSummary;
 export declare function GetValidationMessage(previewInfo: PreviewInfo, newValue: string): string;
 export declare function GetCellInfosFromPreview(previewInfo: PreviewInfo, bypassValidationWarnings: boolean): GridCell[];

package/src/Utilities/Interface/ColumnFilterProps.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export interface ColumnFilterProps {
     Column: AdaptableColumn;

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -1,6 +1,6 @@
 import { Action } from 'redux';
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { AdaptableForm, BaseContext } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export interface UIConfirmation {

package/src/Utilities/Interface/Preview.d.ts

@@ -1,4 +1,4 @@
-import { AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertDefinition } from '../../AdaptableState/AlertState';
 import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableColumn } from '../../../types';
 export interface PreviewInfo {

package/src/Utilities/MenuItem.d.ts

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
+import { AdaptableModule } from '../AdaptableState/Common/Types';
+import { AdaptableIcon, AdaptableSystemIconName } from '../AdaptableState/Common/AdaptableIcon';
 export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;

package/src/Utilities/ObjectFactory.d.ts

@@ -1,31 +1,31 @@
-import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
-import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
-import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { ScheduleType } from '../PredefinedConfig/Common/Enums';
-import { BaseSchedule, Schedule } from '../PredefinedConfig/Common/Schedule';
-import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
-import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { Report, ReportFormatType, ReportNameType, ReportSchedule } from '../PredefinedConfig/ExportState';
-import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
-import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
-import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
-import { Layout } from '../PredefinedConfig/LayoutState';
-import { OpenFinReport, OpenFinSchedule } from '../PredefinedConfig/OpenFinState';
-import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
-import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
-import { Shortcut } from '../PredefinedConfig/ShortcutState';
-import { IPushPullReport } from '../PredefinedConfig/InternalState';
+import { AlertDefinition, AlertProperties } from '../AdaptableState/AlertState';
+import { CalculatedColumn } from '../AdaptableState/CalculatedColumnState';
+import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../AdaptableState/Common/AdaptableAlert';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { CellDataChangedInfo } from '../AdaptableState/Common/CellDataChangedInfo';
+import { ScheduleType } from '../AdaptableState/Common/Enums';
+import { BaseSchedule, Schedule } from '../AdaptableState/Common/Schedule';
+import { SystemStatusMessageInfo } from '../AdaptableState/Common/SystemStatusMessageInfo';
+import { CustomSort } from '../AdaptableState/CustomSortState';
+import { Report, ReportFormatType, ReportNameType, ReportSchedule } from '../AdaptableState/ExportState';
+import { FormatColumn } from '../AdaptableState/FormatColumnState';
+import { FreeTextColumn } from '../AdaptableState/FreeTextColumnState';
+import { IPushPullSchedule } from '../AdaptableState/IPushPullState';
+import { Layout } from '../AdaptableState/LayoutState';
+import { OpenFinReport, OpenFinSchedule } from '../AdaptableState/OpenFinState';
+import { PlusMinusNudge } from '../AdaptableState/PlusMinusState';
+import { ReminderSchedule } from '../AdaptableState/ScheduleState';
+import { Shortcut } from '../AdaptableState/ShortcutState';
+import { IPushPullReport } from '../AdaptableState/InternalState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
-import { CellSummmaryInfo } from '../PredefinedConfig/Common/CellSummary';
+import { CellSummmaryInfo } from '../AdaptableState/Common/CellSummary';
 import { AdaptableTheme, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, RowDataChangedInfo, SpecialColumnSettings, SystemFilterPredicateId } from '../types';
 import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableApi, AdaptableComment, BadgeStyleDefinition, CellAddress, NamedQuery, PivotLayout } from '../../types';
 import { ToastOptions } from '../components/Toastify';
-import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../AdaptableState/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateAdaptableComment(text: string, api: AdaptableApi): AdaptableComment;
 export declare function CreateEmptyCalculatedColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): CalculatedColumn;
@@ -38,7 +38,6 @@ export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
 export declare function CreateEmptyReport(): Report;
-export declare function CreateExternalReport(reportName: string): Report;
 export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
@@ -85,7 +84,6 @@ export declare const ObjectFactory: {
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
-    CreateExternalReport: typeof CreateExternalReport;
     CreateEmptyReport: typeof CreateEmptyReport;
     CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
     CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;

package/src/Utilities/ObjectFactory.js

@@ -1,5 +1,5 @@
-import { MathOperation, ScheduleType } from '../PredefinedConfig/Common/Enums';
-import { createUuid } from '../PredefinedConfig/Uuid';
+import { MathOperation, ScheduleType } from '../AdaptableState/Common/Enums';
+import { createUuid } from '../AdaptableState/Uuid';
 import { EMPTY_STRING } from './Constants/GeneralConstants';
 import { ALERT_DEFAULT_MESSAGE_TYPE, ALERT_DEFAULT_SHOW_POPUP, PLUS_MINUS_DEFAULT_NUDGE_VALUE, } from './Constants/ObjectDefaultConstants';
 import { Bounce, Flip, Slide, Zoom } from '../components/Toastify';
@@ -126,16 +126,6 @@ export function CreateEmptyReport() {
         Query: undefined,
     };
 }
-export function CreateExternalReport(reportName) {
-    return {
-        Uuid: createUuid(),
-        Name: reportName,
-        Scope: undefined,
-        ReportColumnScope: 'AllColumns',
-        ReportRowScope: 'AllRows',
-        Query: undefined,
-    };
-}
 export function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: createUuid(),
@@ -437,7 +427,6 @@ export const ObjectFactory = {
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
-    CreateExternalReport,
     CreateEmptyReport,
     CreateEmptyBaseSchedule,
     CreateEmptyReminderSchedule,

package/src/Utilities/Services/AggregatedScalarLiveValue.d.ts

@@ -1,6 +1,6 @@
 import { AggregatedScalarExpressionEvaluation } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableModule as ModuleConstants } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule as ModuleConstants } from '../../AdaptableState/Common/Types';
 import { IRowNode } from 'ag-grid-enterprise';
 import { XOR } from '../Extensions/TypeExtensions';
 export declare class AggregatedScalarLiveValue {

package/src/Utilities/Services/AlertService.d.ts

@@ -1,5 +1,5 @@
 import { IAlertService } from './Interface/IAlertService';
-import { AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertDefinition } from '../../AdaptableState/AlertState';
 import { EmitterCallback } from '../Emitter';
 import { AdaptableApi } from '../../types';
 export declare class AlertService implements IAlertService {

package/src/Utilities/Services/CalculatedColumnExpressionService.d.ts

@@ -1,8 +1,8 @@
 import { ICalculatedColumnExpressionService } from './Interface/ICalculatedColumnExpressionService';
 import { IRowNode } from 'ag-grid-enterprise';
-import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../PredefinedConfig/CalculatedColumnState';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowDataChangedInfo } from '../../PredefinedConfig/Common/RowDataChangedInfo';
+import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../AdaptableState/CalculatedColumnState';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../AdaptableState/Common/RowDataChangedInfo';
 import { AdaptableApi } from '../../../types';
 export declare class CalculatedColumnExpressionService implements ICalculatedColumnExpressionService {
     private adaptableApi;

package/src/Utilities/Services/DataService.d.ts

@@ -1,6 +1,6 @@
 import { IDataService } from './Interface/IDataService';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { EmitterCallback } from '../../Utilities/Emitter';
 import { Observable } from 'rxjs';
 import { RowDataChangedInfo } from '../../types';

package/src/Utilities/Services/Fdc3Service.js

@@ -1,5 +1,5 @@
-import { ContextConfiguration } from '../../PredefinedConfig/Common/Fdc3Context';
-import { Fdc3IntentConfiguration } from '../../PredefinedConfig/Common/Fdc3Intent';
+import { ContextConfiguration } from '../../AdaptableState/Common/Fdc3Context';
+import { Fdc3IntentConfiguration } from '../../AdaptableState/Common/Fdc3Intent';
 export class Fdc3Service {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;

package/src/Utilities/Services/FlashingCellService.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi, AdaptableFlashingCell } from '../../types';
-import { TypeUuid } from '../../PredefinedConfig/Uuid';
+import { TypeUuid } from '../../AdaptableState/Uuid';
 import { IAdaptableService } from './Interface/IAdaptableService';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 /**

package/src/Utilities/Services/Interface/IAlertService.d.ts

@@ -1,6 +1,6 @@
-import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
-import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
+import { AlertDefinition } from '../../../AdaptableState/AlertState';
+import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../../AdaptableState/Common/RowDataChangedInfo';
 import { IAdaptableService } from './IAdaptableService';
 export type ReactiveAlertInfo = ReactiveRowDataChangedAlertInfo | ReactiveCellDataChangedAlertInfo;
 export type ReactiveRowDataChangedAlertInfo = {

package/src/Utilities/Services/Interface/ICalculatedColumnExpressionService.d.ts

@@ -1,8 +1,8 @@
 import { IAdaptableService } from './IAdaptableService';
 import { IRowNode } from 'ag-grid-enterprise';
-import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../../PredefinedConfig/CalculatedColumnState';
-import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
+import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../../AdaptableState/CalculatedColumnState';
+import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../../AdaptableState/Common/RowDataChangedInfo';
 export interface ICalculatedColumnExpressionService extends IAdaptableService {
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
     evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: IRowNode): any;

package/src/Utilities/Services/Interface/IDataService.d.ts

@@ -1,4 +1,4 @@
-import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
 import { RowDataChangedInfo } from '../../../types';

package/src/Utilities/Services/Interface/IModuleService.d.ts

@@ -1,8 +1,8 @@
 import { IModule, ModuleInfo, IModuleCollection } from '../../../Strategy/Interface/IModule';
-import { TeamSharingImportInfo } from '../../../PredefinedConfig/TeamSharingState';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { TeamSharingImportInfo } from '../../../AdaptableState/TeamSharingState';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { IAdaptableService } from './IAdaptableService';
-import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../../AdaptableState/Common/Types';
 export interface IModuleService extends IAdaptableService {
     isModuleAvailable(adaptableModule: AdaptableModule): boolean;
     isModuleEditable(adaptableModule: AdaptableModule): boolean;

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
 import { IRowNode } from 'ag-grid-enterprise';
-import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
-import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
+import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../../AdaptableState/Common/RowDataChangedInfo';
+import { AdaptableModule } from '../../../AdaptableState/Common/Types';
 import { AggregatedScalarFunctionName, ScalarAggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AggregatedBooleanFunctionName, BooleanAggregationParameter } from '../../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
 import { BooleanFunctionName } from '../../ExpressionFunctions/booleanExpressionFunctions';

package/src/Utilities/Services/Interface/ITeamSharingService.d.ts

@@ -1,8 +1,8 @@
 import { IAdaptableService } from './IAdaptableService';
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
-import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntityConfig, CustomSharedEntity } from '../../../PredefinedConfig/TeamSharingState';
-import { TypeUuid } from '../../../PredefinedConfig/Uuid';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
+import { AdaptableModule } from '../../../AdaptableState/Common/Types';
+import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntityConfig, CustomSharedEntity } from '../../../AdaptableState/TeamSharingState';
+import { TypeUuid } from '../../../AdaptableState/Uuid';
 export interface ITeamSharingService extends IAdaptableService {
     buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: AdaptableSharedEntityConfig): AdaptableSharedEntity[];
     getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: AdaptableSharedEntity[]): AdaptableSharedEntity[];

package/src/Utilities/Services/Interface/IValidationService.d.ts

@@ -1,5 +1,5 @@
-import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
+import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
+import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { IAdaptableService } from './IAdaptableService';
 export interface IValidationService extends IAdaptableService {
     getValidationRulesForDataChange(cellDataChangedInfo: CellDataChangedInfo): AlertDefinition[];

package/src/Utilities/Services/ModuleService.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModule } from '../../types';
 import { IModule, ModuleInfo, IModuleCollection } from '../../Strategy/Interface/IModule';
-import { TeamSharingImportInfo } from '../../PredefinedConfig/TeamSharingState';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
+import { TeamSharingImportInfo } from '../../AdaptableState/TeamSharingState';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
 import { IModuleService } from './Interface/IModuleService';
 import { AdaptableApi } from '../../../types';
 export declare class ModuleService implements IModuleService {

package/src/Utilities/Services/ModuleService.js

@@ -1,6 +1,6 @@
 import Helper from '../Helpers/Helper';
 import { HOST_URL_DOCS } from '../Constants/DocumentationLinkConstants';
-import { ALL_MODULES } from '../../PredefinedConfig/Common/Types';
+import { ALL_MODULES } from '../../AdaptableState/Common/Types';
 export class ModuleService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;

package/src/Utilities/Services/QueryLanguageService.d.ts

@@ -3,8 +3,8 @@ import { Observable } from 'rxjs';
 import { AdaptableApi, RowDataChangedInfo } from '../../../types';
 import { GlobalExpressionFunctionsContext } from '../../AdaptableOptions/ExpressionOptions';
 import { ExpressionFunction } from '../../parser/src/types';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { BooleanAggregationParameter } from '../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
 import { ScalarAggregationParameter } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { IQueryLanguageService, ModuleExpressionFunctionsMap } from './Interface/IQueryLanguageService';

package/src/Utilities/Services/RowSummaryService.js

@@ -1,4 +1,4 @@
-import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../AdaptableState/Common/RowSummary';
 import { RowSummarySet } from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Helper from '../Helpers/Helper';

package/src/Utilities/Services/TeamSharingService.d.ts

@@ -1,8 +1,8 @@
 import { ITeamSharingService } from './Interface/ITeamSharingService';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig } from '../../PredefinedConfig/TeamSharingState';
-import { TypeUuid } from '../../PredefinedConfig/Uuid';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
+import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig } from '../../AdaptableState/TeamSharingState';
+import { TypeUuid } from '../../AdaptableState/Uuid';
 import { AdaptableApi } from '../../../types';
 export declare class TeamSharingService implements ITeamSharingService {
     private adaptableApi;

package/src/Utilities/Services/TeamSharingService.js

@@ -1,4 +1,4 @@
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import ObjectFactory from '../ObjectFactory';
 export class TeamSharingService {
     constructor(adaptableApi) {

package/src/Utilities/Services/ValidationService.d.ts

@@ -1,6 +1,6 @@
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { IValidationService } from './Interface/IValidationService';
-import { AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertDefinition } from '../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
 export declare class ValidationService implements IValidationService {
     private adaptableApi;

package/src/View/AdaptablePopover/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
 import { OverlayShowParams } from '../../components/InfiniteTable';
 export interface AdaptablePopoverProps extends React.ClassAttributes<React.PropsWithChildren<AdaptablePopover>> {
     headerText?: string;

package/src/View/AdaptableViewFactory.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ConnectedComponent } from 'react-redux';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../AdaptableState/Common/Types';
 export declare const AdaptableViewFactory: IAdaptableViewFactory;
 export declare const AdaptableViewPanelFactory: Map<AdaptableModule, React.FunctionComponent<any> | ConnectedComponent<any, any>>;
 export interface IAdaptableViewFactory {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -44,7 +44,7 @@ export const ConfigurationWizard = (props) => {
             });
             const columnDefs = adaptableConfig.gridOptions.columnDefs;
             // handle the layout creation
-            let Layouts = newAdaptableOptions.predefinedConfig?.Layout?.Layouts || [];
+            let Layouts = newAdaptableOptions.initialState?.Layout?.Layouts || [];
             const NewLayout = {
                 TableColumns: columnDefs.map((col) => col.colId ?? col.field),
                 Name: 'Default Layout',
@@ -75,10 +75,10 @@ export const ConfigurationWizard = (props) => {
                     Layouts.push(NewLayout);
                 }
             }
-            newAdaptableOptions.predefinedConfig = {
-                ...newAdaptableOptions.predefinedConfig,
+            newAdaptableOptions.initialState = {
+                ...newAdaptableOptions.initialState,
                 Layout: {
-                    ...newAdaptableOptions.predefinedConfig.Layout,
+                    ...newAdaptableOptions.initialState.Layout,
                     Layouts: Layouts,
                     CurrentLayout: currentLayoutName,
                 },

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizardColumnsStep.js

@@ -2,9 +2,9 @@ import * as React from 'react';
 import ColumnsList from './ColumnsList';
 export const ConfigurationWizardColumnsStep = (props) => {
     let theme = 'light';
-    if (typeof props.adaptableConfig.adaptableOptions.predefinedConfig === 'object' &&
-        props.adaptableConfig.adaptableOptions.predefinedConfig.Theme?.CurrentTheme) {
-        theme = props.adaptableConfig.adaptableOptions.predefinedConfig.Theme.CurrentTheme;
+    if (typeof props.adaptableConfig.adaptableOptions.initialState === 'object' &&
+        props.adaptableConfig.adaptableOptions.initialState.Theme?.CurrentTheme) {
+        theme = props.adaptableConfig.adaptableOptions.initialState.Theme.CurrentTheme;
     }
     return (React.createElement(ColumnsList, { theme: theme, handle: props.columnsHandle, onValidityChange: (valid) => {
             props.setPrimaryKeyIsNotSelected(valid);

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import HelpBlock from '../../../components/HelpBlock';
-import { ALL_MODULES } from '../../../PredefinedConfig/Common/Types';
+import { ALL_MODULES } from '../../../AdaptableState/Common/Types';
 import { Box, Flex } from 'rebass';
 import Radio from '../../../components/Radio';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
@@ -90,9 +90,9 @@ const EntitlementsListForm = (props) => {
     };
     const data = ALL_ENTITLEMENTS_MODULES.map((module) => ({ name: ADAPTABLE_MODULE_MAP[module] }));
     let theme = 'light';
-    if (typeof props.adaptableOptions.predefinedConfig === 'object' &&
-        props.adaptableOptions.predefinedConfig.Theme?.CurrentTheme) {
-        theme = props.adaptableOptions.predefinedConfig.Theme.CurrentTheme;
+    if (typeof props.adaptableOptions.initialState === 'object' &&
+        props.adaptableOptions.initialState.Theme?.CurrentTheme) {
+        theme = props.adaptableOptions.initialState.Theme.CurrentTheme;
     }
     return (React.createElement(Box, { flex: 1, height: "100%", className: theme },
         React.createElement(DataSource, { data: data, primaryKey: "name" },