@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.1

package/src/Api/Internal/ExportInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { createGrid, } from 'ag-grid-enterprise';
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import { ALL_DATA_REPORT, CURRENT_LAYOUT_REPORT, SELECTED_DATA_REPORT, SYSTEM_EXPORT_DESTINATIONS, SYSTEM_REPORT_NAMES, } from '../../Utilities/Constants/GeneralConstants';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import FormatHelper, { DateFormatter } from '../../Utilities/Helpers/FormatHelper';
@@ -21,10 +21,6 @@ export class ExportInternalApi extends ApiBase {
         if (report.Name == 'All Data') {
             return true;
         }
-        // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.getExportApi().isExternalReport(report)) {
-            return false;
-        }
         // Start with the DataChanged Column and go through all possibilities
         switch (report.ReportColumnScope) {
             case 'AllColumns':
@@ -168,9 +164,6 @@ export class ExportInternalApi extends ApiBase {
         return true;
     }
     getReportColumnScopeShortDescription(report) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return ['[Custom Columns]'];
-        }
         switch (report.ReportColumnScope) {
             case 'AllColumns':
                 return ['[All Columns]'];
@@ -186,9 +179,6 @@ export class ExportInternalApi extends ApiBase {
         }
     }
     getReportColumnScopeLongDescription(report) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return '[Custom Columns]';
-        }
         switch (report.ReportColumnScope) {
             case 'AllColumns':
                 return '[All Columns]';
@@ -201,9 +191,6 @@ export class ExportInternalApi extends ApiBase {
         }
     }
     getReportExpressionDescription(report, cols) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return '[Custom Data]';
-        }
         if (this.isSystemReport(report.Name)) {
             return `[${report.Name}]`;
         }
@@ -244,7 +231,7 @@ export class ExportInternalApi extends ApiBase {
         }
         const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
         const columnDataType = column.dataType;
-        // 1. if it is a Visual Data report then we always ONLY send the formatted value and ignore all other properties
+        // 1. if it is a VisualExcel report format, we always ONLY send the formatted value and ignore all other properties
         if (isVisualReport) {
             return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 'formattedValue');
         }
@@ -352,8 +339,10 @@ export class ExportInternalApi extends ApiBase {
         }
     }
     buildBaseExportContext(reportName, reportFormat, exportDestination) {
+        const report = this.getExportApi().getReportByName(reportName);
         return {
             ...this.getAdaptableInternalApi().buildBaseContext(),
+            report,
             reportName,
             reportFormat,
             exportDestination,
@@ -382,36 +371,34 @@ export class ExportInternalApi extends ApiBase {
             },
         };
     }
-    getExternalReportData(externalReportName, reportFormat, exportDestination) {
-        const externalReport = this.getExportApi()
-            .getExternalReports()
-            ?.find((cr) => cr.name == externalReportName);
-        if (!externalReport) {
-            this.logWarn(`External Report '${externalReportName}' not found!`);
-            return undefined;
-        }
-        return externalReport.onExport({
-            ...this.buildBaseExportContext(externalReportName, reportFormat, exportDestination),
-            convertToExcel: this.buildExcelConverter(externalReportName, reportFormat, exportDestination),
-            convertToCsv: this.buildCsvConverter(externalReportName, reportFormat, exportDestination),
-            getGridReportColumns: this.buildGridReportColumns(),
+    buildProcessExportContext(report, format, destination) {
+        const { exportContext } = this._adaptable.agGridExportAdapter.buildExportProcessData({
+            report,
+            format,
+            destination,
+            showProgressIndicator: false,
         });
+        return {
+            ...this.buildBaseExportContext(report.Name, format, destination),
+            convertToExcel: this.buildExcelConverter(report.Name, format, destination),
+            convertToCsv: this.buildCsvConverter(report.Name, format, destination),
+            getReportColumns: () => exportContext.exportedColumnIds
+                .map((colId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(colId, false))
+                .filter(Boolean),
+        };
     }
-    buildGridReportColumns() {
-        return () => this.getAdaptableApi().columnApi.getColumns();
-    }
-    buildExcelConverter(externalReportName, reportFormat, exportDestination) {
+    buildExcelConverter(reportName, reportFormat, exportDestination) {
         return (reportData) => {
-            return this.executeGridExport(reportData, externalReportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsExcel({ ...exportParams }));
+            return this.executeGridExport(reportData, reportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsExcel({ ...exportParams }));
         };
     }
-    buildCsvConverter(externalReportName, reportFormat, exportDestination) {
+    buildCsvConverter(reportName, reportFormat, exportDestination) {
         return (reportData) => {
-            const csvParams = this.buildCsvExportParams(externalReportName, reportFormat, exportDestination);
-            return this.executeGridExport(reportData, externalReportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsCsv({ ...exportParams, ...csvParams }));
+            const csvParams = this.buildCsvExportParams(reportName, reportFormat, exportDestination);
+            return this.executeGridExport(reportData, reportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsCsv({ ...exportParams, ...csvParams }));
         };
     }
-    executeGridExport(reportData, externalReportName, reportFormat, exportDestination, exportFn) {
+    executeGridExport(reportData, reportName, reportFormat, exportDestination, exportFn) {
         const htmlDivElement = document.createElement('div');
         let ephemeralGridApi = null;
         try {
@@ -419,9 +406,14 @@ export class ExportInternalApi extends ApiBase {
                 colId: col.columnId,
                 field: col.field ?? col.columnId,
                 headerName: col.friendlyName ?? col.columnId,
-                type: col.dataType ?? 'text',
+                cellDataType: col.dataType ?? 'text',
             }));
-            const gridOptions = { columnDefs, rowData: reportData.rows };
+            const gridOptions = {
+                columnDefs,
+                rowData: reportData.rows,
+                theme: this.getAgGridApi().getGridOption('theme'),
+                dataTypeDefinitions: this.getAgGridApi().getGridOption('dataTypeDefinitions'),
+            };
             const gridParams = {
                 modules: this.getAdaptableApi()
                     .internalApi.getAdaptableInstance()
@@ -431,7 +423,7 @@ export class ExportInternalApi extends ApiBase {
             document.body.appendChild(htmlDivElement);
             ephemeralGridApi = createGrid(htmlDivElement, gridOptions, gridParams);
             const exportParams = {
-                fileName: this.getReportFileName(externalReportName, reportFormat, exportDestination),
+                fileName: this.getReportFileName(reportName, reportFormat, exportDestination),
                 allColumns: true,
                 exportedRows: 'all',
             };
@@ -450,10 +442,10 @@ export class ExportInternalApi extends ApiBase {
             }
         }
     }
-    buildCsvExportParams(externalReportName, reportFormat, exportDestination) {
+    buildCsvExportParams(reportName, reportFormat, exportDestination) {
         const exportOptions = this.getAdaptableApi().optionsApi.getExportOptions();
         const csvSeparator = typeof exportOptions.csvSeparator === 'function'
-            ? exportOptions.csvSeparator(this.buildBaseExportContext(externalReportName, reportFormat, exportDestination))
+            ? exportOptions.csvSeparator(this.buildBaseExportContext(reportName, reportFormat, exportDestination))
             : exportOptions.csvSeparator;
         return {
             columnSeparator: csvSeparator,

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

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableQLModule } from '../../AdaptableState/Common/Types';
 import { AdaptableField, AdaptableObject, AdaptablePredicate } from '../../types';
 export declare class ExpressionInternalApi extends ApiBase {
     /**

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

@@ -2,9 +2,9 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { ColDef, IRowNode } from 'ag-grid-enterprise';
 import { AppIdentifier, Context, ContextType, Intent, IntentResolution, StandardContextType, StandardIntent } from '@finos/fdc3';
 import { BroadcastConfig, RaiseIntentConfig } from '../../AdaptableOptions/Fdc3Options';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
-import { AdaptableIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableIcon } from '../../AdaptableState/Common/AdaptableIcon';
 export type WithContext<K> = K & {
     contextType: ContextType;
 };

package/src/Api/Internal/Fdc3InternalApi.js

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { isStandardContextType, isStandardIntent, } from '@finos/fdc3';
 import { ColumnRefTypePrefix, FieldRefTypePrefix, } from '../../AdaptableOptions/Fdc3Options';
 import { ActionColumnRenderer, ReactActionColumnRenderer, } from '../../agGrid/cellRenderers/ActionColumnRenderer';
-import { FDC3_COLUMN_TYPE } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { FDC3_COLUMN_TYPE } from '../../AdaptableState/Common/AdaptableColumn';
 export class Fdc3InternalApi extends ApiBase {
     mapRowToContextData(contextType, rowNode) {
         if (contextType === 'fdc3.nothing') {

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

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { FlashingCellDefinition } from '../../PredefinedConfig/FlashingCellState';
-import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
+import { FlashingCellDefinition } from '../../AdaptableState/FlashingCellState';
+import { AdaptableFlashingCell } from '../../AdaptableState/Common/AdaptableFlashingCell';
 export declare class FlashingCellInternalApi extends ApiBase {
     /**
      * Merges a Flashing Cell Definition with default values

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

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { FreeTextColumn } from '../../PredefinedConfig/FreeTextColumnState';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
+import { FreeTextColumn } from '../../AdaptableState/FreeTextColumnState';
 import { ColDef } from 'ag-grid-enterprise';
 export declare class FreeTextColumnInternalApi extends ApiBase {
     /**

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -3,7 +3,7 @@ import ObjectFactory, { CreateEmptyFreeTextColumn } from '../../Utilities/Object
 import { AdaptableNumberEditor } from '../../agGrid/editors/AdaptableNumberEditor';
 import { AdaptableDateEditor } from '../../agGrid/editors/AdaptableDateEditor';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
-import { FREE_TEXT_COLUMN_TYPE, } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { FREE_TEXT_COLUMN_TYPE, } from '../../AdaptableState/Common/AdaptableColumn';
 export class FreeTextColumnInternalApi extends ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column

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

@@ -1,10 +1,10 @@
 import { RowClassParams } from 'ag-grid-enterprise';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
-import { SpecialColumnSettings } from '../../PredefinedConfig/Common/SpecialColumnSettings';
-import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { AdaptableMenuItem } from '../../AdaptableState/Common/Menu';
+import { SpecialColumnSettings } from '../../AdaptableState/Common/SpecialColumnSettings';
+import { GridCell } from '../../AdaptableState/Selection/GridCell';
+import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class GridInternalApi extends ApiBase {
     /**

package/src/Api/Internal/GridInternalApi.js

@@ -1,4 +1,4 @@
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { convertAdaptableStyleToCSS } from '../../Utilities/Helpers/StyleHelper';

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

@@ -1,6 +1,6 @@
 import { LayoutAssociatedObject } from '../../AdaptableOptions/LayoutOptions';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { Layout, PivotLayout, TableLayout } from '../../PredefinedConfig/LayoutState';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { Layout, PivotLayout, TableLayout } from '../../AdaptableState/LayoutState';
 import { ApiBase } from '../Implementation/ApiBase';
 import { ColDef, ColGroupDef } from 'ag-grid-enterprise';
 export declare class LayoutInternalApi extends ApiBase {

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -12,7 +12,7 @@ export class NamedQueryInternalApi extends ApiBase {
                 .getNamedQueryNamesFromExpression(expression);
         }
         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.getReferencedNamedQueryNames received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];

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

@@ -1,7 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptablePredicate, AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { SystemFilterPredicateId } from '../../PredefinedConfig/Common/ColumnFilter';
-import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptablePredicate, AdaptablePredicateDef } from '../../AdaptableState/Common/AdaptablePredicate';
+import { SystemFilterPredicateId } from '../../AdaptableState/Common/ColumnFilter';
+import { AdaptableColumnDataType } from '../../AdaptableState/Common/AdaptableColumn';
 import { ColumnScope } from '../../types';
 export declare class PredicateInternalApi extends ApiBase {
     /**

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

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../AdaptableState/StyledColumnState';
 import { IRowNode } from 'ag-grid-enterprise';
 import { PredicateDefHandlerContext } from '../../types';
 export declare class StyledColumnInternalApi extends ApiBase {

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

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 export declare class SystemStatusInternalApi extends ApiBase {
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];

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

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableSharedEntity } from '../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntity } from '../../AdaptableState/TeamSharingState';
 export declare class TeamSharingInternalApi extends ApiBase {
     /**
      * Retrieves shared entry dependencies.

package/src/Api/LayoutApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableColumn, ColumnSort, PivotLayout, TableLayout } from '../../types';
-import { ExtendedLayoutInfo } from '../PredefinedConfig/Common/ExtendedLayoutInfo';
-import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
+import { ExtendedLayoutInfo } from '../AdaptableState/Common/ExtendedLayoutInfo';
+import { LayoutState, Layout } from '../AdaptableState/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
  */
@@ -176,7 +176,7 @@ export interface LayoutApi {
      */
     addColumnToTableLayout(columnId: string, layoutName: string): void;
     /**
-     * Adds a Column to Current Layout
+     * Adds a Column to Current (Table) Layout
      * @param columnId Column to add
      */
     addColumnToCurrentTableLayout(columnId: string): void;

package/src/Api/NoteApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableNote, AdaptableNotes, NoteState } from '../PredefinedConfig/NoteState';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../AdaptableState/NoteState';
 import { CellAddress } from '../../types';
 /**
  * Provides run-time access to Notes Module and related State

package/src/Api/OpenFinApi.d.ts

@@ -1,5 +1,5 @@
-import { OpenFinReport, OpenFinSchedule, OpenFinState } from '../PredefinedConfig/OpenFinState';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { OpenFinReport, OpenFinSchedule, OpenFinState } from '../AdaptableState/OpenFinState';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
 import { OpenFinPluginOptions } from '../AdaptableOptions/OpenFinPluginOptions';
 /**
  * Provides run-time access to the OpenFin Plugin

package/src/Api/PlusMinusApi.d.ts

@@ -1,5 +1,5 @@
-import { PlusMinusState, PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
-import { CellUpdateRequest, GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { PlusMinusState, PlusMinusNudge } from '../AdaptableState/PlusMinusState';
+import { CellUpdateRequest, GridCell } from '../AdaptableState/Selection/GridCell';
 /**
  * Provides run-time access to the Plus / Minus Module and associated state
  */

package/src/Api/PredicateApi.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableColumnPredicate } from '../../types';
-import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerContext, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerContext, PredicateModuleScope } from '../AdaptableState/Common/AdaptablePredicate';
 /**
  * Functions which manage the Predicate object in AdapTable
  */

package/src/Api/QuickSearchApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { QuickSearchState } from '../PredefinedConfig/QuickSearchState';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { QuickSearchState } from '../AdaptableState/QuickSearchState';
 /**
  * Provides run-time access to Quick Search Module
  */

package/src/Api/ScheduleApi.d.ts

@@ -1,8 +1,8 @@
-import { BaseSchedule } from '../PredefinedConfig/Common/Schedule';
-import { ReportSchedule } from '../PredefinedConfig/ExportState';
-import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
-import { OpenFinSchedule } from '../PredefinedConfig/OpenFinState';
-import { ReminderSchedule, ScheduleState } from '../PredefinedConfig/ScheduleState';
+import { BaseSchedule } from '../AdaptableState/Common/Schedule';
+import { ReportSchedule } from '../AdaptableState/ExportState';
+import { IPushPullSchedule } from '../AdaptableState/IPushPullState';
+import { OpenFinSchedule } from '../AdaptableState/OpenFinState';
+import { ReminderSchedule, ScheduleState } from '../AdaptableState/ScheduleState';
 /**
  * Provides run-time access to the Schedule Module and associated state
  */

package/src/Api/ShortcutApi.d.ts

@@ -1,4 +1,4 @@
-import { ShortcutState, Shortcut } from '../PredefinedConfig/ShortcutState';
+import { ShortcutState, Shortcut } from '../AdaptableState/ShortcutState';
 /**
  * Provides run-time access to Shortcut Module and associated state
  */

package/src/Api/SmartEditApi.d.ts

@@ -1,5 +1,5 @@
 import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
-import { MathOperation } from '../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../AdaptableState/Common/Enums';
 import { SmartEditCustomOperation } from '../types';
 /**
  * Provides run-time access to the Smart Edit Module

package/src/Api/{ConfigApi.d.ts → StateApi.d.ts}

@@ -1,47 +1,55 @@
-import { ThemeState } from '../PredefinedConfig/ThemeState';
-import { ShortcutState } from '../PredefinedConfig/ShortcutState';
-import { QuickSearchState } from '../PredefinedConfig/QuickSearchState';
-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 { PlusMinusState } from '../PredefinedConfig/PlusMinusState';
-import { ApplicationState } from '../PredefinedConfig/ApplicationState';
-import { AdaptablePersistentState, AdaptableState } from '../PredefinedConfig/AdaptableState';
-import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
-import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
-import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState, NoteState, ChartingState, FlashingCellState, StatusBarState, StyledColumnState } from '../types';
+import { ThemeState } from '../AdaptableState/ThemeState';
+import { ShortcutState } from '../AdaptableState/ShortcutState';
+import { QuickSearchState } from '../AdaptableState/QuickSearchState';
+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 { PlusMinusState } from '../AdaptableState/PlusMinusState';
+import { ApplicationState } from '../AdaptableState/ApplicationState';
+import { AdaptablePersistentState, AdaptableState } from '../AdaptableState/AdaptableState';
+import { FreeTextColumnState } from '../AdaptableState/FreeTextColumnState';
+import { ToolPanelState } from '../AdaptableState/ToolPanelState';
+import { AdaptableModule, AdaptableStateKey } from '../AdaptableState/Common/Types';
+import { AdaptableSearchState, AdaptableSortState, ChartingState, FlashingCellState, InitialState, NamedQueryState, NoteState, PredefinedConfig, ScheduleState, StatusBarState, StyledColumnState } from '../types';
 /**
- * Range of functions to access Predefined Config and Adaptable State
+ * Range of functions to access Initial and Full Adaptable State
  */
-export interface ConfigApi {
+export interface StateApi {
     /**
-     * Changes the key used for persisting the AdaptableState into localStorage. Optionally provides a predefinedConfig to load.
+     * Changes key used for persisting AdaptableState into localStorage; optionally provides an initialState to load
      * @param adaptableStateKey - key for persisting the AdaptableState into localStorage
-     * @param config.predefinedConfig - new predefinedConfig to load
-     * @param config.flushCurrentState - whether to flush(persist) the current state before loading the new predefinedConfig
+     * @param config.initialState - new initialState to load
+     * @param config.flushCurrentState - whether to flush(persist) the current state before loading the new initialState
      * @param config.progressIndicatorLabel - label for the progress indicator
      *
      */
     setAdaptableStateKey(adaptableStateKey: string, config?: {
-        predefinedConfig?: PredefinedConfig;
+        initialState?: InitialState;
         flushCurrentState?: boolean;
         progressIndicatorLabel?: string;
     }): Promise<void>;
     /**
-     * Returns current Predefined Config
+     * @deprecated use `getInitialState()` instead
      */
     getPredefinedConfig(): PredefinedConfig | any;
     /**
-     * Reloads existing or supplied Predefined Config; clears persistent state by calling `StateOptions.clearState` function for remote storage removal
-     * @param newPredefinedConfig optional Config to load
+     * Returns the Initial Adaptable State
+     */
+    getInitialState(): InitialState | any;
+    /**
+     * @deprecated use `reloadInitialState()` instead
      */
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
+    /**
+     * Reloads existing (or supplied) Initial State; clears persistent state by calling `StateOptions.clearState`
+     * @param newInitialState optional new InitialState to load
+     */
+    reloadInitialState(newInitialState?: InitialState): void;
     /**
      * Copies all Adaptable state to clipboard
      */
@@ -54,7 +62,7 @@ export interface ConfigApi {
      * Loads supplied user state, replacing (NOT merging) existing User(persisted) State.
      * @param state
      */
-    loadUserState(config: PredefinedConfig): void;
+    loadUserState(state: InitialState): void;
     /**
      * Retrieves ALL state which is currently stored by Adaptable (both persistent and transient/internal)
      */
@@ -86,7 +94,7 @@ export interface ConfigApi {
      * @param stateKey section of State to return
      * @param returnJson whether to return section as JSON or object
      */
-    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;
+    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;
     /**
      * Adds '1' to current revision number of State element
      * @param stateKey Adaptable State Key to update

package/src/Api/StatusBarApi.d.ts

@@ -1,5 +1,5 @@
 import { StatusPanelDef } from 'ag-grid-enterprise';
-import { AdaptableStatusBar } from '../PredefinedConfig/StatusBarState';
+import { AdaptableStatusBar } from '../AdaptableState/StatusBarState';
 /**
  * Methods for managing the AdapTable Status Bar
  */

package/src/Api/StyledColumnApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { StyledColumn, StyledColumnState } from '../PredefinedConfig/StyledColumnState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { StyledColumn, StyledColumnState } from '../AdaptableState/StyledColumnState';
 /**
  * Provides run-time access to Styled Column Module and associated state
  */
@@ -58,8 +58,8 @@ export interface StyledColumnApi {
      */
     unSuspendStyledColumn(styledColumn: StyledColumn): void;
     /**
-    * Suspends all Styled Columns
-    */
+     * Suspends all Styled Columns
+     */
     suspendAllStyledColumn(): void;
     /**
      * Activates all suspended Styled Column

package/src/Api/SystemStatusApi.d.ts

@@ -1,4 +1,4 @@
-import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../AdaptableState/Common/SystemStatusMessageInfo';
 /**
  * Provides access to System Status Module and associated state
  */

package/src/Api/TeamSharingApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig, SharedEntity } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
+import { AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig, SharedEntity } from '../AdaptableState/TeamSharingState';
 import { AdaptableModule, AdaptableSharedEntityConfig } from '../types';
 /**
  * Provides run-time access to Team Sharing Module and associated state

package/src/Api/ThemeApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableTheme, ThemeState } from '../PredefinedConfig/ThemeState';
+import { AdaptableTheme, ThemeState } from '../AdaptableState/ThemeState';
 /**
  * Provides run-time access to the Theme Module and associated state
  */

package/src/Api/ToolPanelApi.d.ts

@@ -1,7 +1,7 @@
-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';
 /**
  * Functions for managing the AdapTable ToolPanel Component (at side of grid)
  */

package/src/Api/UserInterfaceApi.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableObject, AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { AdaptableObject, AdaptableObjectTag } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableIcon, AdaptableModule } from '../types';
-import { CustomWindowConfig } from '../PredefinedConfig/Common/CustomWindowConfig';
-import { ProgressIndicatorConfig } from '../PredefinedConfig/Common/ProgressIndicatorConfig';
+import { CustomWindowConfig } from '../AdaptableState/Common/CustomWindowConfig';
+import { ProgressIndicatorConfig } from '../AdaptableState/Common/ProgressIndicatorConfig';
 /**
  * Functions relating to User Interface section of Adaptable State
  */

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

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

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

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

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

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