@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.0

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

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

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

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

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

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

package/src/Api/Internal/ActionColumnInternalApi.js

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

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

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

package/src/Api/Internal/AdaptableInternalApi.js

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

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

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

package/src/Api/Internal/AlertInternalApi.js

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

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

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

package/src/Api/Internal/CalculatedColumnInternalApi.js

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

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

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

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

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

package/src/Api/Internal/ColumnFilterInternalApi.js

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

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

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

package/src/Api/Internal/ColumnInternalApi.js

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

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

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

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

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

package/src/Api/Internal/DashboardInternalApi.js

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

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

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

package/src/Api/Internal/EventInternalApi.js

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

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

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

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 {
     /**