@adaptabletools/adaptable 14.0.0-canary.2 → 14.0.0-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "14.0.0-canary.2",
+  "version": "14.0.0-canary.3",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1671469051327;
+declare const _default: 1671805663015;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1671469051327;
+exports.default = 1671805663015;

package/src/Api/AdaptableApi.d.ts

@@ -47,10 +47,6 @@ import { OptionsApi } from './OptionsApi';
  * Has a huge number of classes each dedicated to a specific AdapTable Module or functionality
  */
 export interface AdaptableApi {
-    /**
-     * Provides access to the Adaptable Options
-     */
-    optionsApi: OptionsApi;
     /**
      * Provides access to Action Rows and Columns
      */
@@ -79,6 +75,10 @@ export interface AdaptableApi {
      * Provides access to the Cell Summary Module
      */
     cellSummaryApi: CellSummaryApi;
+    /**
+     * Provides run-time access to Charting Module and state
+     */
+    chartingApi: ChartingApi;
     /**
      * Provides a number of column-related methods
      */
@@ -139,6 +139,10 @@ export interface AdaptableApi {
      * Provides access to the Layout Module
      */
     layoutApi: LayoutApi;
+    /**
+     * Provides access to Adaptable Options
+     */
+    optionsApi: OptionsApi;
     /**
      * Provides access to the Plus Minus Module
      */
@@ -183,6 +187,10 @@ export interface AdaptableApi {
      * Provides access to the Smart Edit Module
      */
     smartEditApi: SmartEditApi;
+    /**
+     * Provides run-time access to the AdapTable Status Bar
+     */
+    statusBarApi: StatusBarApi;
     /**
      * Provides access to the Styled Column Module
      */
@@ -207,14 +215,6 @@ export interface AdaptableApi {
      * Manages User Interface Options where colours, styles and permitted values are configured
      */
     userInterfaceApi: UserInterfaceApi;
-    /**
-     * Provides run-time access to Charting Module and state
-     */
-    chartingApi: ChartingApi;
-    /**
-     * Provides run-time access to the AdapTable Status Bar
-     */
-    statusBarApi: StatusBarApi;
     /**
      * Cleanup method - should be called only when using the vanilla javascript component, as framework components cleanup is performed when the component is destroyed/unmounted.
      * This destroys the Adaptable instance.

package/src/Api/ColumnApi.d.ts

@@ -6,11 +6,11 @@ import { AdaptableColumn, AdaptableColumnDataType, GridCell } from '../../types'
 export interface ColumnApi {
     /**
      * Returns all Columns
-     * */
+     */
     getColumns(): AdaptableColumn[];
     /**
      * Returns all visible Columns
-     * */
+     */
     getVisibleColumns(): AdaptableColumn[];
     /**
      * Returns all numeric Columns
@@ -241,14 +241,6 @@ export interface ColumnApi {
      * @deprecated internal method, will be removed in next major release
      */
     getAgGridColumnType(columnId: string): string | string[];
-    /**
-     * @deprecated use `getFilterableColumns()` instead
-     */
-    getFiltrableColumns(): AdaptableColumn[];
-    /**
-     * @deprecated us `getAggregatableColumns` instead
-     */
-    getAggregetableColumns(): AdaptableColumn[];
     /**
      * @deprecated use `StyledColumnApi.hasPercentBarStyle()` or `StyledColumnApi.hasGradientStyle()` instead
      */

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

@@ -68,11 +68,9 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getArrayColumns(): AdaptableColumn[];
     getSortableColumns(): AdaptableColumn[];
     getFilterableColumns(): AdaptableColumn[];
-    getFiltrableColumns(): AdaptableColumn[];
     getGroupableColumns(): AdaptableColumn[];
     getPivotableColumns(): AdaptableColumn[];
     getAggregatableColumns(): AdaptableColumn[];
-    getAggregetableColumns(): AdaptableColumn[];
     getQueryableColumns(): AdaptableColumn[];
     private logMissingColumnWarning;
     getDistinctDisplayValuesForColumn(columnId: string): any[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -355,10 +355,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getFilterableColumns() {
         return this.getColumns().filter((c) => c.filterable);
     }
-    getFiltrableColumns() {
-        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getFiltrableColumns', 'getFilterableColumns');
-        return this.getFilterableColumns();
-    }
     getGroupableColumns() {
         return this.getColumns().filter((c) => c.groupable);
     }
@@ -368,10 +364,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getAggregatableColumns() {
         return this.getColumns().filter((c) => c.aggregatable && c.dataType == 'Number');
     }
-    getAggregetableColumns() {
-        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getAggregetableColumns', 'getAggregatableColumns');
-        return this.getAggregatableColumns();
-    }
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
     }

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

@@ -86,7 +86,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
-    executeWithProgressIndicator(label: string, executeFn: () => void): void;
+    executeWithProgressIndicator(label: string, executeFn: () => void, errorHandlingFn?: () => void): void;
     hideProgressIndicator(): void;
     getCorrectEnglishVariant(wordToSpell: string): string;
     shouldDisplayTagSections(): boolean;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -267,7 +267,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     isTextComparisonCaseSensitive() {
         return this.adaptable.adaptableOptions.adaptableQLOptions.caseSensitiveTextComparisons;
     }
-    executeWithProgressIndicator(label, executeFn) {
+    executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
         this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(label));
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
@@ -275,6 +275,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
                 executeFn();
             }
             catch (error) {
+                errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
                 this.hideProgressIndicator();
                 (0, LoggingHelper_1.LogAdaptableError)('Unexpected error while executing a function with a progress indicator', error);
             }

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

@@ -1,6 +1,10 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { Report } from '../../PredefinedConfig/ExportState';
+import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
+import { ExcelDataType } from '@ag-grid-community/core';
+import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { DataFormatType } from '../../AdaptableOptions/ExportOptions';
 export declare class ExportInternalApi extends ApiBase {
     /**
      * Whether given data change affects given report
@@ -8,4 +12,8 @@ export declare class ExportInternalApi extends ApiBase {
      * @param report report to check
      */
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
+    getExcelDataType(adaptableColumnType: string | string[] | AdaptableColumnType | AdaptableColumnType[]): ExcelDataType;
+    isVisualDataExportInProgress(): boolean;
+    isDateCellExportedAsFormattedValue(): boolean;
+    getCellExportFormatType(columnDataType: AdaptableColumnDataType): DataFormatType;
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -69,5 +69,56 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
                 return this.adaptable.isRowNodeVisible(cellDataChangedInfo.rowNode);
         }
     }
+    getExcelDataType(adaptableColumnType) {
+        const mapColumnTypeToExcelType = (columnType) => {
+            switch (columnType) {
+                case 'abColDefNumber':
+                    return 'Number';
+                case 'abColDefBoolean':
+                    return 'Boolean';
+                case 'abColDefDate':
+                    return 'DateTime';
+                case 'abColDefString':
+                default:
+                    return 'String';
+            }
+        };
+        if (Array.isArray(adaptableColumnType)) {
+            const validColumnType = adaptableColumnType.find((colType) => colType.startsWith('abColDef'));
+            if (!validColumnType) {
+                return 'String';
+            }
+            return mapColumnTypeToExcelType(validColumnType);
+        }
+        else {
+            return mapColumnTypeToExcelType(adaptableColumnType);
+        }
+    }
+    isVisualDataExportInProgress() {
+        return this.getAdaptableState().System.Export.inProgressVisualData;
+    }
+    isDateCellExportedAsFormattedValue() {
+        return (!!this.getExportOptions().exportDateFormat ||
+            this.getCellExportFormatType('Date') === 'formattedValue');
+    }
+    getCellExportFormatType(columnDataType) {
+        const exportOptions = this.getExportOptions();
+        if (exportOptions.exportFormatType === 'rawValue' ||
+            exportOptions.exportFormatType === 'formattedValue') {
+            return exportOptions.exportFormatType;
+        }
+        // format is customized based on column data type
+        switch (columnDataType) {
+            case 'String':
+                return exportOptions.exportFormatType.string;
+            case 'Number':
+                return exportOptions.exportFormatType.number;
+            case 'Date':
+                return exportOptions.exportFormatType.date;
+            default:
+                // default to rawValue for all other column types
+                return 'rawValue';
+        }
+    }
 }
 exports.ExportInternalApi = ExportInternalApi;

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

@@ -101,6 +101,17 @@ export declare class FormatColumnInternalApi extends ApiBase {
         node: RowNode;
         value: any;
     }): FormatColumn[];
+    /**
+     * Extract from the given FormatColumns the one which is the most relevant  for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumns
+     * @param column
+     * @param params
+     */
+    getMostRelevantFormatColumnForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): FormatColumn | undefined;
     /**
      * Retrieves all Format Columns which have an Expression
      * @returns Format Columns with Expression

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -212,6 +212,16 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     getFormatColumnsRelevantForColumn(formatColumns, column, params) {
         return formatColumns.filter((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));
     }
+    /**
+     * Extract from the given FormatColumns the one which is the most relevant  for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumns
+     * @param column
+     * @param params
+     */
+    getMostRelevantFormatColumnForColumn(formatColumns, column, params) {
+        return formatColumns.find((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));
+    }
     /**
      * Retrieves all Format Columns which have an Expression
      * @returns Format Columns with Expression

package/src/Api/OptionsApi.d.ts

@@ -1,7 +1,7 @@
 import { GridOptions } from '@ag-grid-community/core';
 import { ActionOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, GeneralOptions, LayoutOptions, MenuOptions, NotificationsOptions, SearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 /**
- * Range of functions to access AdaptableOptions
+ * Range of functions to access Adaptable Options
  */
 export interface OptionsApi {
     /**

package/src/PredefinedConfig/Common/FDC3Context.d.ts

@@ -25,6 +25,10 @@ export interface FDC3Context {
     id?: {
         [key: string]: string | undefined;
     };
+    /**
+     * Custom properties and metadata. This can be extended in specific context object.
+     */
+    [key: string]: unknown;
 }
 /**
  * FDC3 Context to define a financial Instrument

package/src/PredefinedConfig/SystemState.d.ts

@@ -92,6 +92,9 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
      * It will suppress the deletion confirmation dialog in the current session.
      */
     DisableDeleteConfirmation: boolean;
+    Export: {
+        inProgressVisualData: boolean;
+    };
 }
 export interface ProgressIndicator {
     active: boolean;

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

@@ -70,6 +70,8 @@ export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
 export declare const SYSTEM_DATA_SET_SELECT = "SYSTEM_DATA_SET_SELECT";
 export declare const SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = "SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS";
 export declare const SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = "SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX";
+export declare const SYSTEM_VISUAL_EXPORT_BEGIN = "SYSTEM_VISUAL_EXPORT_BEGIN";
+export declare const SYSTEM_VISUAL_EXPORT_END = "SYSTEM_VISUAL_EXPORT_END";
 export interface SystemHighlightCellAddAction extends Redux.Action {
     cellHighlightInfo: CellHighlightInfo;
 }
@@ -239,6 +241,10 @@ export interface SystemSetPreviousGroupedColumnIndexAction extends Redux.Action
     columnId: string;
     columnIndex: number;
 }
+export interface SystemVisualExportBegin extends Redux.Action {
+}
+export interface SystemVisualExportEnd extends Redux.Action {
+}
 export declare const SystemHighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => SystemHighlightCellAddAction;
 export declare const SystemHighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => SystemHighlightCellDeleteAction;
 export declare const SystemHighlightCellDeleteAll: () => SystemHighlightCellDeleteAllAction;
@@ -292,6 +298,8 @@ export declare const SystemChartingSetCurrentChartModels: (chartModels: ChartMod
 export declare const SystemChartingCurrentChartModelsSelector: (state: SystemState) => ChartModel[];
 export declare const SystemSetPreviousGroupedColumnsIndex: (layoutId: string, columnId: string, columnIndex: number) => SystemSetPreviousGroupedColumnIndexAction;
 export declare const SystemDisableDeleteConfirmation: () => SystemDisableDeleteConfirmation;
+export declare const SystemVisualExportBegin: () => SystemVisualExportBegin;
+export declare const SystemVisualExportEnd: () => SystemVisualExportEnd;
 export declare const SystemDisableDeleteConfirmationSelector: (state: SystemState) => boolean;
 export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState) => Record<string, Record<string, number>>;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.SYSTEM_DISABLE_DELETE_CONFIRMATION = exports.SYSTEM_FILTER_FORM_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_SHOW = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
-exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = void 0;
-exports.SystemReducer = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = void 0;
+exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_VISUAL_EXPORT_END = exports.SYSTEM_VISUAL_EXPORT_BEGIN = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = void 0;
+exports.SystemReducer = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemVisualExportEnd = exports.SystemVisualExportBegin = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -85,6 +85,9 @@ exports.SYSTEM_DATA_SET_SELECT = 'SYSTEM_DATA_SET_SELECT';
 exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = 'SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS';
 // Layout
 exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = 'SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX';
+// Data Export (Report)
+exports.SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
+exports.SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -338,6 +341,14 @@ const SystemDisableDeleteConfirmation = () => ({
     type: exports.SYSTEM_DISABLE_DELETE_CONFIRMATION,
 });
 exports.SystemDisableDeleteConfirmation = SystemDisableDeleteConfirmation;
+const SystemVisualExportBegin = () => ({
+    type: exports.SYSTEM_VISUAL_EXPORT_BEGIN,
+});
+exports.SystemVisualExportBegin = SystemVisualExportBegin;
+const SystemVisualExportEnd = () => ({
+    type: exports.SYSTEM_VISUAL_EXPORT_END,
+});
+exports.SystemVisualExportEnd = SystemVisualExportEnd;
 const SystemDisableDeleteConfirmationSelector = (state) => {
     return state.DisableDeleteConfirmation;
 };
@@ -388,6 +399,9 @@ const initialState = {
         previousGroupedColumns: {},
     },
     DisableDeleteConfirmation: false,
+    Export: {
+        inProgressVisualData: false,
+    },
 };
 const SystemReducer = (state = initialState, action) => {
     let alerts;
@@ -708,6 +722,16 @@ const SystemReducer = (state = initialState, action) => {
         case exports.SYSTEM_DISABLE_DELETE_CONFIRMATION: {
             return Object.assign(Object.assign({}, state), { DisableDeleteConfirmation: true });
         }
+        case exports.SYSTEM_VISUAL_EXPORT_BEGIN: {
+            return Object.assign(Object.assign({}, state), { Export: {
+                    inProgressVisualData: true,
+                } });
+        }
+        case exports.SYSTEM_VISUAL_EXPORT_END: {
+            return Object.assign(Object.assign({}, state), { Export: {
+                    inProgressVisualData: false,
+                } });
+        }
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.js

@@ -1144,6 +1144,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     return next(action);
                 }
+                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_BEGIN:
+                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_END: {
+                    let returnAction = next(action);
+                    adaptable.ReportService.resetExcelStyleMemoization();
+                    return returnAction;
+                }
                 /*******************
                  * TEAM SHARING ACTIONS
                  *******************/

package/src/Strategy/AdaptableModuleBase.js

@@ -244,7 +244,7 @@ class AdaptableModuleBase {
     }
     getFriendlyName(module, friendlyName) {
         let returnValue = friendlyName;
-        let generalOptions = this.api.internalApi.getAdaptableOptions().generalOptions;
+        let generalOptions = this.api.optionsApi.getGeneralOptions();
         if (generalOptions && ArrayExtensions_1.default.IsNotNullOrEmpty(generalOptions.alternativeModuleNames)) {
             generalOptions.alternativeModuleNames.forEach((af) => {
                 if (module == af.adaptableModule) {

package/src/Strategy/AlertModule.js

@@ -29,8 +29,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 // do NOT handle reverted or aggregated changes
                 return;
             }
-            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
-                'formattedValue') {
+            if (this.api.optionsApi.getAlertOptions().dataChangeDetectionPolicy === 'formattedValue') {
                 const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);

package/src/Strategy/DashboardModule.js

@@ -50,7 +50,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (this.api.dashboardApi.getDashboardState().IsFloating) {
                 menuItems.push(this.createColumnMenuItemReduxAction('Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
-            else if (this.api.internalApi.getAdaptableOptions().dashboardOptions.canFloat) {
+            else if (this.api.optionsApi.getDashboardOptions().canFloat) {
                 menuItems.push(this.createColumnMenuItemReduxAction('Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {

package/src/Strategy/DataChangeHistoryModule.js

@@ -42,10 +42,8 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         if (this.api.internalApi.getState().System.DataChangeHistory.currentMode !== 'ACTIVE') {
             return false;
         }
-        if (this.api.internalApi.getAdaptableOptions().dataChangeHistoryOptions.showDataChange) {
-            return this.api.internalApi
-                .getAdaptableOptions()
-                .dataChangeHistoryOptions.showDataChange(cellDataChangedInfo);
+        if (this.api.optionsApi.getDataChangeHistoryOptions().showDataChange) {
+            return this.api.optionsApi.getDataChangeHistoryOptions().showDataChange(cellDataChangedInfo);
         }
         return true;
     }

package/src/Strategy/DataSetModule.js

@@ -21,7 +21,7 @@ class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getModuleAdaptableObjects() {
         var _a, _b;
-        return (_b = (_a = this.api.internalApi.getAdaptableOptions().generalOptions) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.api.optionsApi.getGeneralOptions()) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
     }
     hasNamedQueryReferences() {
         return false;

package/src/Strategy/ExportModule.js

@@ -18,6 +18,7 @@ const getExportRowsViewItems_1 = require("./Utilities/Export/getExportRowsViewIt
 const ReportExportDropdown_1 = require("../View/Export/ReportExportDropdown");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ExportSelector_1 = require("../View/Export/ExportSelector");
+const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -68,10 +69,13 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         ];
     }
     export(report, exportDestination) {
+        if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
+            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportBegin)());
+        }
         this.api.internalApi.executeWithProgressIndicator(`${report.Name} Export in progress...`, () => {
             var _a;
             if (this.isCustomDestination(exportDestination)) {
-                const customDestination = (_a = this.api.internalApi
+                const customDestination = (_a = this.api.optionsApi
                     .getAdaptableOptions()
                     .exportOptions.customDestinations) === null || _a === void 0 ? void 0 : _a.find((cd) => cd.name == exportDestination);
                 if (customDestination === null || customDestination === void 0 ? void 0 : customDestination.form) {
@@ -122,7 +126,10 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         break;
                 }
             }
+            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
             this.api.internalApi.hideProgressIndicator();
+        }, () => {
+            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
         });
     }
     isCustomDestination(exportDestination) {

package/src/Strategy/FilterModule.js

@@ -23,7 +23,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     handleAdaptableReady() {
-        if (this.api.internalApi.getAdaptableOptions().filterOptions.showQuickFilter == false) {
+        if (this.api.optionsApi.getFilterOptions().showQuickFilter == false) {
             this.api.filterApi.hideQuickFilterBar();
         }
         const columnFilters = this.api.filterApi.getColumnFilters();

package/src/Strategy/FlashingCellModule.js

@@ -29,8 +29,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             // TODO: think about flashing row value only
             // - flash for the underlying small data changes, but the visual does not
-            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
-                'formattedValue') {
+            if (this.api.optionsApi.getAlertOptions().dataChangeDetectionPolicy === 'formattedValue') {
                 const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);

package/src/Strategy/FreeTextColumnModule.js

@@ -13,8 +13,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     isModuleAvailable() {
         // FreeTextColumn module doesn't support autogenerated primary keys
-        return (super.isModuleAvailable() &&
-            !this.api.internalApi.getAdaptableOptions().autogeneratePrimaryKey);
+        return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
     }
     getModuleAdaptableObjects() {
         return this.api.freeTextColumnApi.getFreeTextColumns();

package/src/Strategy/LayoutModule.js

@@ -311,8 +311,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.layoutViewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
+        var _a, _b, _c, _d, _e, _f;
+        const maxColumnsToDisplay = (_b = (_a = this.api.optionsApi.getLayoutOptions().layoutViewOptions) === null || _a === void 0 ? void 0 : _a.maxColumnsToDisplay) !== null && _b !== void 0 ? _b : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameForColumnId(columnId);
         };
@@ -348,13 +348,13 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Columns',
                     values: columns,
                 },
-                ((_e = layout.ColumnSorts) === null || _e === void 0 ? void 0 : _e.length) && (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, this.api),
-                ((_f = layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) === null || _f === void 0 ? void 0 : _f.length) && (0, getLayoutFilterViewItems_1.getLayoutFilterViewItems)(layout, this.api),
-                ((_g = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _g === void 0 ? void 0 : _g.length) && {
+                ((_c = layout.ColumnSorts) === null || _c === void 0 ? void 0 : _c.length) && (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, this.api),
+                ((_d = layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) === null || _d === void 0 ? void 0 : _d.length) && (0, getLayoutFilterViewItems_1.getLayoutFilterViewItems)(layout, this.api),
+                ((_e = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _e === void 0 ? void 0 : _e.length) && {
                     name: 'Grouped Columns',
                     values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
-                ((_h = layout === null || layout === void 0 ? void 0 : layout.PivotColumns) === null || _h === void 0 ? void 0 : _h.length) && {
+                ((_f = layout === null || layout === void 0 ? void 0 : layout.PivotColumns) === null || _f === void 0 ? void 0 : _f.length) && {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },

package/src/Strategy/SettingsPanelModule.js

@@ -7,7 +7,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        const friendlyName = api.internalApi.getAdaptableOptions().settingsPanelOptions.title;
+        const friendlyName = api.optionsApi.getSettingsPanelOptions().title;
         super(ModuleConstants.SettingsPanelModuleId, friendlyName, 'settings', null, 'Manage all Adaptable Settings', api);
     }
     addColumnMenuItems(column) {

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -428,8 +428,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-        .maxTimeframeSize;
+    let maxTimeframeSize = context.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions.maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -91,10 +91,8 @@ class CalculatedColumnExpressionService {
             }
         }
         if (calculatedColumnQuery.AggregatedScalarExpression) {
-            const validationResult = this.adaptableApi.internalApi
-                .getQueryLanguageService()
-                .validateAggregatedScalar(calculatedColumnQuery.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
-            return validationResult.isValid;
+            const validationResult = this.adaptableApi.queryLanguageApi.isValidAggregatedScalarExpression(calculatedColumnQuery.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
+            return validationResult;
         }
         // if query has neither a ScalarExpression nor an AggregatedScalarExpression => it can only be false
         return false;