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

package/src/Api/GridApi.d.ts

@@ -1,18 +1,18 @@
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
-import { CellUpdateRequest, GridCell } from '../PredefinedConfig/Selection/GridCell';
-import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
-import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
-import { CellSummmaryInfo } from '../PredefinedConfig/Common/CellSummary';
+import { SelectedCellInfo } from '../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../AdaptableState/Selection/SelectedRowInfo';
+import { ColumnSort } from '../AdaptableState/Common/ColumnSort';
+import { CellUpdateRequest, GridCell } from '../AdaptableState/Selection/GridCell';
+import { DataUpdateConfig } from '../AdaptableState/Common/DataUpdateConfig';
+import { CellDataChangedInfo } from '../AdaptableState/Common/CellDataChangedInfo';
+import { CellHighlightInfo } from '../AdaptableState/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../AdaptableState/Common/RowHighlightInfo';
+import { CellSummmaryInfo } from '../AdaptableState/Common/CellSummary';
 import { ColDef, ColGroupDef, Column, ColumnState, IRowNode, RowModelType } from 'ag-grid-enterprise';
-import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
-import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
-import { TransposeConfig } from '../PredefinedConfig/Common/TransposeConfig';
+import { GridCellRange } from '../AdaptableState/Selection/GridCellRange';
+import { RowsHighlightInfo } from '../AdaptableState/Common/RowsHighlightInfo';
+import { TransposeConfig } from '../AdaptableState/Common/TransposeConfig';
 import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
-import { InternalState } from '../PredefinedConfig/InternalState';
+import { InternalState } from '../AdaptableState/InternalState';
 /**
  * Provides access to important properties and functionalities of AdapTable e.g. sorting, selected cells etc.
  */

package/src/Api/IPushPullApi.d.ts

@@ -1,5 +1,5 @@
-import { IPushPullReport } from '../PredefinedConfig/InternalState';
-import { IPushPullDomain, IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
+import { IPushPullReport } from '../AdaptableState/InternalState';
+import { IPushPullDomain, IPushPullSchedule } from '../AdaptableState/IPushPullState';
 /**
  * Provides run-time access to ipushpull Plugin
  */

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

@@ -1,9 +1,9 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { AlertApi } from '../AlertApi';
-import { AlertDefinition, AlertProperties, AlertState } from '../../PredefinedConfig/AlertState';
-import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableObjectLookupCriteria } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AlertDefinition, AlertProperties, AlertState } from '../../AdaptableState/AlertState';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { AdaptableMessageType } from '../../AdaptableState/Common/AdaptableMessageType';
+import { AdaptableObjectLookupCriteria } from '../../AdaptableState/Common/AdaptableObject';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AlertInternalApi } from '../Internal/AlertInternalApi';
 export declare class AlertApiImpl extends ApiBase implements AlertApi {

package/src/Api/Implementation/AlertApiImpl.js

@@ -4,7 +4,7 @@ import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ObjectFactory from '../../Utilities/ObjectFactory';
-import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../AdaptableState/Common/AdaptableAlert';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { AlertInternalApi } from '../Internal/AlertInternalApi';
 export class AlertApiImpl extends ApiBase {

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

@@ -1,8 +1,8 @@
 import { Action } from 'redux';
 import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableState } from '../../AdaptableState/AdaptableState';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
 import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';

package/src/Api/Implementation/ApiBase.js

@@ -1,5 +1,5 @@
 import Helper from '../../Utilities/Helpers/Helper';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 // Base class for the Api - provides checking dispatching methods
 export class ApiBase {
     /**

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { CalculatedColumnApi } from '../CalculatedColumnApi';
-import { CalculatedColumn, CalculatedColumnState } from '../../PredefinedConfig/CalculatedColumnState';
+import { CalculatedColumn, CalculatedColumnState } from '../../AdaptableState/CalculatedColumnState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CalculatedColumnInternalApi } from '../Internal/CalculatedColumnInternalApi';
 export declare class CalculatedColumnApiImpl extends ApiBase implements CalculatedColumnApi {

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { CellSummaryApi } from '../CellSummaryApi';
-import { CustomCellSummaryOperation } from '../../PredefinedConfig/Common/CellSummary';
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
+import { CustomCellSummaryOperation } from '../../AdaptableState/Common/CellSummary';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
 export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryApi {
     openCellSummaryPopupSettingsPanel(): void;
     getCurrentCellSummaryOperation(): CustomCellSummaryOperation | string;

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
 export class CellSummaryApiImpl extends ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);

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

@@ -3,7 +3,7 @@ import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
 import { ChartContainer, ChartDefinition } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     constructor(_adaptable: IAdaptable);
     isChartingEnabled(): boolean;

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

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../AdaptableState/Common/AdaptableColumn';
 import { Layout } from '../../types';
 import { ColumnApi } from '../ColumnApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
-import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptablePredicateDef, ColumnFilterDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { ColumnFilter, ColumnFilterPredicate } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnFilterInternalApi } from '../Internal/ColumnFilterInternalApi';
@@ -28,6 +28,7 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
     columnFilterToString(columnFilter: ColumnFilter): string;
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
     private getColumnFilterById;
+    isColumnFilterActiveForColumn(columnId: string): boolean;
     /**
      * Checks if a filter is applied. It is applied when:
      * - has no inputs

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -123,6 +123,10 @@ export class ColumnFilterApiImpl extends ApiBase {
     getColumnFilterById(id) {
         return this.getColumnFilters()?.find((columnFilter) => columnFilter.Uuid === id);
     }
+    isColumnFilterActiveForColumn(columnId) {
+        const columnFilter = this.getColumnFilterForColumn(columnId);
+        return columnFilter ? this.isColumnFilterActive(columnFilter) : false;
+    }
     /**
      * Checks if a filter is applied. It is applied when:
      * - has no inputs
@@ -134,6 +138,9 @@ export class ColumnFilterApiImpl extends ApiBase {
         if (!filter || !filter.Predicates?.length) {
             return false;
         }
+        if (filter.IsSuspended) {
+            return false;
+        }
         return filter.Predicates.some((predicate) => {
             const predicateDef = this.getPredicateApi().getPredicateDefById(predicate.PredicateId);
             if (ArrayExtensions.IsNull(predicateDef.inputs) &&
@@ -141,7 +148,7 @@ export class ColumnFilterApiImpl extends ApiBase {
                 !this.getPredicateApi().internalApi.hasPredicateValues(predicate)) {
                 return true;
             }
-            const inputs = predicate.Inputs;
+            const inputs = predicate.Inputs || [];
             if (ArrayExtensions.IsEmpty(inputs)) {
                 return false;
             }

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

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnScope, ScopeDataType } from '../../PredefinedConfig/Common/ColumnScope';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { ColumnScope, ScopeDataType } from '../../AdaptableState/Common/ColumnScope';
 import { ColumnScopeApi } from '../ColumnScopeApi';
-import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
+import { CellColorRange } from '../../AdaptableState/StyledColumnState';
 export declare class ColumnScopeApiImpl extends ApiBase implements ColumnScopeApi {
     isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
     getColumnsInScope(scope: ColumnScope): AdaptableColumn[];

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

@@ -1,41 +1,43 @@
-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 { ConfigState } from '../../AdaptableState/ConfigState';
+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 { ApplicationState } from '../../AdaptableState/ApplicationState';
+import { FreeTextColumnState } from '../../AdaptableState/FreeTextColumnState';
+import { ToolPanelState } from '../../AdaptableState/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';
+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 ConfigApiImpl extends ApiBase implements ConfigApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
     copyUserStateToClipboard(): void;
     getPredefinedConfig(): PredefinedConfig | any;
+    getInitialState(): PredefinedConfig | any;
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
+    reloadInitialState(newInitialState?: InitialState): void;
     getAllState(): AdaptableState;
     getPersistedState(): AdaptablePersistentState;
     getAllUserState(): ConfigState[];
-    loadUserState(state: PredefinedConfig): void;
+    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>;

package/src/Api/Implementation/ConfigApiImpl.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,6 +22,7 @@ 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';
+import { logDeprecation } from '../../Utilities/logDeprecation';
 export class ConfigApiImpl 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(), 'ConfigApi', 'getPredefinedConfig', 'getInitialState');
+        return this.getInitialState();
+    }
+    getInitialState() {
+        return this._adaptable.adaptableOptions.initialState;
     }
     reloadPredefinedConfig(newPredefinedConfig) {
+        logDeprecation(this.getAdatableLogger(), 'ConfigApi', '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/CustomSortApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { CustomSortApi } from '../CustomSortApi';
-import { CustomSort, CustomSortState } from '../../PredefinedConfig/CustomSortState';
+import { CustomSort, CustomSortState } from '../../AdaptableState/CustomSortState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CustomSortInternalApi } from '../Internal/CustomSortInternalApi';
 export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi {

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

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
 import { DashboardApi } from '../DashboardApi';
-import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardState';
-import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { DashboardState, DashboardTab } from '../../AdaptableState/DashboardState';
+import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { CustomToolbar, DashboardButtonContext } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { DashboardInternalApi } from '../Internal/DashboardInternalApi';

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

@@ -1,6 +1,6 @@
 import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { ApiBase } from './ApiBase';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { GridCell } from '../../types';
 export declare class DataChangeHistoryApiImpl extends ApiBase implements DataChangeHistoryApi {
     getDataChangeHistoryMode(): 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';

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

@@ -1,7 +1,7 @@
 import { ExportApi } from '../ExportApi';
-import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../PredefinedConfig/ExportState';
+import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../AdaptableState/ExportState';
 import { ApiBase } from './ApiBase';
-import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
+import { AdaptableForm } from '../../AdaptableState/Common/AdaptableForm';
 import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';

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

@@ -1,8 +1,8 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 import { ExpressionApi } from '../ExpressionApi';
-import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableQuery } from '../../AdaptableState/Common/AdaptableQuery';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -60,7 +60,7 @@ export class ExpressionApiImpl extends ApiBase {
             return Array.from(new Set(columnIds));
         }
         catch (error) {
-            // defensive programing, this should happen only if someone botched the predefined configs
+            // defensive programing, this should happen only if someone botched Initial Adaptable State
             this.logWarn(`QueryApi.getColumnsFromExpressionInvalid received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];

package/src/Api/Implementation/Fdc3ApiImpl.js

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { Fdc3InternalApi } from '../Internal/Fdc3InternalApi';
-import { ContextConfiguration } from '../../PredefinedConfig/Common/Fdc3Context';
+import { ContextConfiguration } from '../../AdaptableState/Common/Fdc3Context';
 export class Fdc3ApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);

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

@@ -1,9 +1,9 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
-import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
+import { AdaptableFlashingCell } from '../../AdaptableState/Common/AdaptableFlashingCell';
 import { FlashingCellApi } from '../FlashingCellApi';
-import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
+import { FlashingCellDefinition, FlashingCellState } from '../../AdaptableState/FlashingCellState';
+import { AdaptablePredicateDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
 import { FlashingCellInternalApi } from '../Internal/FlashingCellInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableObjectLookupCriteria } from '../../types';

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

@@ -1,8 +1,8 @@
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { ApiBase } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumn, FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { FormatColumn, FormatColumnState } from '../../AdaptableState/FormatColumnState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { AdaptableFormat } from '../../types';
 import { AdaptableObjectLookupCriteria } from '../../../types';
 import { FormatColumnInternalApi } from '../Internal/FormatColumnInternalApi';

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { FreeTextColumnApi } from '../FreeTextColumnApi';
-import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../AdaptableState/FreeTextColumnState';
 import { IRowNode } from 'ag-grid-enterprise';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { FreeTextColumnInternalApi } from '../Internal/FreeTextColumnInternalApi';

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

@@ -1,21 +1,21 @@
 import { ApiBase } from './ApiBase';
 import { ColDefWithId, GridApi } from '../GridApi';
-import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
-import { CellUpdateRequest, GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
-import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
-import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
+import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
+import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
+import { ColumnSort } from '../../AdaptableState/Common/ColumnSort';
+import { DataUpdateConfig } from '../../AdaptableState/Common/DataUpdateConfig';
+import { CellHighlightInfo } from '../../AdaptableState/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../AdaptableState/Common/RowHighlightInfo';
 import { ColDef, ColGroupDef, Column, ColumnState, IRowNode, RowModelType } from 'ag-grid-enterprise';
-import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
+import { GridCellRange } from '../../AdaptableState/Selection/GridCellRange';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { RowsHighlightInfo } from '../../AdaptableState/Common/RowsHighlightInfo';
 import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { GridInternalApi } from '../Internal/GridInternalApi';
-import { TransposeConfig } from '../../PredefinedConfig/Common/TransposeConfig';
+import { TransposeConfig } from '../../AdaptableState/Common/TransposeConfig';
 import { CellSummmaryInfo } from '../../types';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { InternalState } from '../../AdaptableState/InternalState';
 export declare class GridApiImpl extends ApiBase implements GridApi {
     internalApi: GridInternalApi;
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/GridApiImpl.js

@@ -4,7 +4,7 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { GridInternalApi } from '../Internal/GridInternalApi';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
-import { ROW_SUMMARY_ROW_ID } from '../../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID } from '../../AdaptableState/Common/RowSummary';
 import { errorOnce } from '../../agGrid/AdaptableLogger';
 export class GridApiImpl extends ApiBase {
     constructor(_adaptable) {

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

@@ -1,12 +1,12 @@
 import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
-import { Layout, LayoutState, PivotLayout, TableLayout } from '../../PredefinedConfig/LayoutState';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
+import { Layout, LayoutState, PivotLayout, TableLayout } from '../../AdaptableState/LayoutState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { ColumnSort } from '../../AdaptableState/Common/ColumnSort';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
-import { ExtendedLayoutInfo } from '../../PredefinedConfig/Common/ExtendedLayoutInfo';
+import { ExtendedLayoutInfo } from '../../AdaptableState/Common/ExtendedLayoutInfo';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     internalApi: LayoutInternalApi;
     constructor(_adaptable: IAdaptable);

package/src/Api/Implementation/LayoutApiImpl.js

@@ -5,7 +5,7 @@ import { ApiBase } from './ApiBase';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import Helper from '../../Utilities/Helpers/Helper';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 import { isPivotLayout, normalizeLayout } from './LayoutHelpers';

package/src/Api/Implementation/LayoutHelpers.js

@@ -2,7 +2,7 @@ import isEqual from 'lodash/isEqual';
 import { isPivotLayoutModel } from '../../layout-manager/src/isPivotLayoutModel';
 import { normalizeTableLayoutModel, normalizePivotLayoutModel, } from '../../layout-manager/src/normalizeLayoutModel';
 import { simplifyTableLayoutModel, simplifyPivotLayoutModel, } from '../../layout-manager/src/simplifyLayoutModel';
-import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../PredefinedConfig/Common/AggregationColumns';
+import { isWeightedAverageAggregation, WEIGHTED_AVERAGE_AGG_FN_NAME, isWeightedAverageAggFuncName, } from '../../AdaptableState/Common/AggregationColumns';
 import { removeAdaptableObjectPrimitivesInline } from '../../Utilities/Helpers/AdaptableHelper';
 export const layoutStateToLayoutModel = (layout) => {
     if (isPivotLayout(layout)) {

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { NoteApi } from '../NoteApi';
-import { AdaptableNote, AdaptableNotes, NoteState } from '../../PredefinedConfig/NoteState';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../../AdaptableState/NoteState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { NoteInternalApi } from '../Internal/NoteInternalApi';
 import { CellAddress } from '../../types';

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

@@ -1,7 +1,7 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
-import { PlusMinusNudge, PlusMinusState } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusNudge, PlusMinusState } from '../../AdaptableState/PlusMinusState';
 import { PlusMinusApi } from '../PlusMinusApi';
-import { CellUpdateRequest, GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { CellUpdateRequest, GridCell } from '../../AdaptableState/Selection/GridCell';
 export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     getPlusMinusState(): PlusMinusState;
     getAllPlusMinus(config?: LayoutAssociatedObjectLoadConfig): PlusMinusNudge[];

package/src/Api/Implementation/PredicateApiImpl.js

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
-import { SystemPredicateDefs } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { SystemPredicateDefs } from '../../AdaptableState/Common/AdaptablePredicate';
 export class PredicateApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);

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

@@ -1,7 +1,7 @@
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 import { ApiBase } from './ApiBase';
 import { QuickSearchApi } from '../QuickSearchApi';
-import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
+import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
 export declare class QuickSearchApiImpl extends ApiBase implements QuickSearchApi {
     getQuickSearchState(): QuickSearchState;
     runQuickSearch(quickSearchText: string): void;