@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.0

package/src/Api/Implementation/ContextMenuApiImpl.js

@@ -2,9 +2,60 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextMenuApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class ContextMenuApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+    }
     hideContextMenu() {
         this.getAgGridApi().hidePopupMenu();
     }
+    getContextMenuItemsByCategory(category, context) {
+        return context.defaultAdaptableMenuItems.filter((item) => item.category === category);
+    }
+    getContextMenuItemsByCategories(categories, context) {
+        return context.defaultAdaptableMenuItems.filter((item) => categories.includes(item.category));
+    }
+    createDefaultMenuStructure(context) {
+        const test = [
+            ...context.defaultAgGridMenuStructure,
+            GeneralConstants_1.MENU_SEPARATOR,
+            ...context.defaultAdaptableMenuStructure,
+        ];
+        return test;
+    }
+    getContextMenuItemByName(menuItemName, context) {
+        const openSettingsPanelMenuItem = context.defaultAdaptableMenuItems.find((item) => item.name === menuItemName);
+        return openSettingsPanelMenuItem;
+    }
+    getContextMenuItemsByNames(menuItemNames, context) {
+        const menuItems = context.defaultAdaptableMenuItems.filter((item) => menuItemNames.includes(item.name));
+        return menuItems;
+    }
+    getContextMenuItemByLabel(label, context) {
+        const menuItem = context.defaultAdaptableMenuItems.find((item) => item.label === label);
+        return menuItem;
+    }
+    getContextMenuItemsByLabels(labels, context) {
+        const menuItems = context.defaultAdaptableMenuItems.filter((item) => labels.includes(item.label));
+        return menuItems;
+    }
+    removeAdaptableContextMenuItemByName(menuItemName, context) {
+        const filteredMenuItems = context.defaultAdaptableMenuStructure.filter((item) => item !== '-' && item.name !== menuItemName);
+        return filteredMenuItems;
+    }
+    removeAdaptableContextMenuItemsByNames(menuItemNames, context) {
+        const filteredMenuItems = context.defaultAdaptableMenuStructure.filter((item) => item !== '-' && !menuItemNames.includes(item.name));
+        return filteredMenuItems;
+    }
+    createGroupMenu(label, subMenuItems, disabled, icon) {
+        return {
+            menuType: 'Group',
+            label: label,
+            subMenuItems: subMenuItems,
+            disabled: disabled,
+            icon: icon,
+        };
+    }
 }
 exports.ContextMenuApiImpl = ContextMenuApiImpl;

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -15,8 +15,7 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().CustomSort;
     }
     getCustomSorts(config) {
-        var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getCustomSortState().CustomSorts, 'CustomSort', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(this.getCustomSortState().CustomSorts, 'CustomSort', config) ?? []);
     }
     getCustomSortById(id) {
         return this.getCustomSorts().find((customSort) => customSort.Uuid === id);
@@ -48,7 +47,10 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
             this.logWarn(`No custom sort defined for ${columnId}`);
             return;
         }
-        const newCustomSort = Object.assign(Object.assign({}, previousCustomSort), { SortedValues: values });
+        const newCustomSort = {
+            ...previousCustomSort,
+            SortedValues: values,
+        };
         this.dispatchAction(CustomSortRedux.CustomSortEdit(newCustomSort));
         return this.getCustomSortByColumn(columnId);
     }

package/src/Api/Implementation/DashboardApiImpl.js

@@ -6,7 +6,7 @@ const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const React = tslib_1.__importStar(require("react"));
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const DashboardInternalApi_1 = require("../Internal/DashboardInternalApi");
 class DashboardApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
@@ -23,10 +23,12 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         return this.getDashboardOptions().customDashboardButtons || [];
     }
     getCustomDashboardButtonByLabel(buttonLabel) {
-        const api = this.getAdaptableApi();
-        const dashboardContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { dashboardState: api.dashboardApi.getDashboardState() });
+        const dashboardContext = {
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+            dashboardState: this.getDashboardApi().getDashboardState(),
+        };
         return this.getDashboardOptions().customDashboardButtons.find((cb) => {
-            api.internalApi.getLabelForButton(cb, dashboardContext) == buttonLabel;
+            this.getAdaptableInternalApi().getLabelForButton(cb, dashboardContext) == buttonLabel;
         });
     }
     setModuleButtons(moduleButtons) {
@@ -72,7 +74,7 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(DashboardRedux.DashboardSetIsCollapsed(false));
     }
     refreshDashboard() {
-        this.dispatchAction((0, SystemRedux_1.SystemDashboardRefresh)());
+        this.dispatchAction((0, InternalRedux_1.DashboardRefresh)());
     }
     floatDashboard() {
         this.dispatchAction(DashboardRedux.DashboardSetIsFloating(true));
@@ -114,10 +116,9 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(DashboardRedux.DashboardSetActiveTabIndex(tabIndex));
     }
     setActiveTab(tabName) {
-        var _a;
         const tab = this.getTabByName(tabName);
         if (tab) {
-            let tabIndex = (_a = this.getDashboardState().Tabs) === null || _a === void 0 ? void 0 : _a.findIndex((t) => t);
+            let tabIndex = this.getDashboardState().Tabs?.findIndex((t) => t);
             this.setActiveTabIndex(tabIndex);
         }
     }

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataChangeHistoryApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     constructor() {
@@ -22,7 +22,7 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
         };
     }
     getDataChangeHistoryMode() {
-        return this.getAdaptableState().System.DataChangeHistory.currentMode;
+        return this.getAdaptableState().Internal.DataChangeHistory.currentMode;
     }
     activateDataChangeHistory(forceReset) {
         const currentMode = this.getDataChangeHistoryMode();
@@ -30,26 +30,25 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
             return;
         }
         if (forceReset || currentMode === 'INACTIVE') {
-            this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryEnable)());
+            this.dispatchAction((0, InternalRedux_1.DataChangeHistoryEnable)());
         }
         else if (currentMode === 'SUSPENDED') {
-            this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryResume)());
+            this.dispatchAction((0, InternalRedux_1.DataChangeHistoryResume)());
         }
     }
     deactivateDataChangeHistory() {
         if (this.getDataChangeHistoryMode() === 'ACTIVE' ||
             this.getDataChangeHistoryMode() === 'SUSPENDED') {
-            this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryDisable)());
+            this.dispatchAction((0, InternalRedux_1.DataChangeHistoryDisable)());
         }
     }
     suspendDataChangeHistory() {
         if (this.getDataChangeHistoryMode() === 'ACTIVE') {
-            this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistorySuspend)());
+            this.dispatchAction((0, InternalRedux_1.DataChangeHistorySuspend)());
         }
     }
     getDataChangeHistoryLog() {
-        var _a;
-        const changeLog = (_a = this.getAdaptableState().System.DataChangeHistory.logs) !== null && _a !== void 0 ? _a : {};
+        const changeLog = this.getAdaptableState().Internal.DataChangeHistory.logs ?? {};
         return Object.values(changeLog);
     }
     getDataChangeForGridCell(gridCell) {
@@ -59,15 +58,15 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     }
     addDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
-        this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryAdd)(dataChangeInfo, uniqueKey));
+        this.dispatchAction((0, InternalRedux_1.DataChangeHistoryAdd)(dataChangeInfo, uniqueKey));
     }
     undoDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
-        this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryUndo)(dataChangeInfo, uniqueKey));
+        this.dispatchAction((0, InternalRedux_1.DataChangeHistoryUndo)(dataChangeInfo, uniqueKey));
     }
     clearDataChangeHistoryEntry(dataChangeInfo) {
         const uniqueKey = this.getDataChangeHistoryKey(dataChangeInfo);
-        this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryClearRow)(dataChangeInfo, uniqueKey));
+        this.dispatchAction((0, InternalRedux_1.DataChangeHistoryClearRow)(dataChangeInfo, uniqueKey));
     }
     openDataChangeHistorySettingsPanel() {
         this.showModulePopup(ModuleConstants.DataChangeHistoryModuleId);

package/src/Api/Implementation/DataSetApiImpl.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSetApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const ApiBase_1 = require("./ApiBase");
 const DataSetInternalApi_1 = require("../Internal/DataSetInternalApi");
 class DataSetApiImpl extends ApiBase_1.ApiBase {
@@ -12,11 +12,10 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
         this.internalApi = new DataSetInternalApi_1.DataSetInternalApi(_adaptable);
     }
     getDataSets() {
-        var _a, _b;
-        return (_b = (_a = this.getDataSetOptions()) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
+        return this.getDataSetOptions()?.dataSets ?? [];
     }
     getCurrentDataSet() {
-        let currentDataSetName = this.getAdaptableState().System.CurrentDataSet;
+        let currentDataSetName = this.getAdaptableState().Internal.CurrentDataSet;
         return this.getDataSetByName(currentDataSetName);
     }
     getDataSetByName(dataSetName) {
@@ -25,11 +24,11 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
     setDataSet(dataSetName) {
         const dataSet = this.getDataSetByName(dataSetName);
         if (this.checkItemExists(dataSet, dataSetName, 'Data Source')) {
-            this.dispatchAction(SystemRedux.SystemDataSetSelect(dataSet));
+            this.dispatchAction(InternalRedux.DataSetSelect(dataSet));
         }
     }
     clearCurrentDataSet() {
-        this.dispatchAction(SystemRedux.SystemDataSetSelect(null));
+        this.dispatchAction(InternalRedux.DataSetSelect(null));
     }
     openDataSetSettingsPanel() {
         this.showModulePopup(ModuleConstants.DataSetModuleId);

package/src/Api/Implementation/EntitlementApiImpl.js

@@ -18,9 +18,13 @@ class EntitlementApiImpl extends ApiBase_1.ApiBase {
             const moduleEntitlements = entitlementOptions.moduleEntitlements;
             if (moduleEntitlements) {
                 if (typeof moduleEntitlements === 'function') {
-                    const entitlementContext = Object.assign(Object.assign({ adaptableModule }, this.getAdaptableInternalApi().buildBaseContext()), { defaultAccessLevel });
+                    const entitlementContext = {
+                        adaptableModule,
+                        ...this.getAdaptableInternalApi().buildBaseContext(),
+                        defaultAccessLevel,
+                    };
                     const dynamicModuleEntitlement = moduleEntitlements(entitlementContext);
-                    return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;
+                    return dynamicModuleEntitlement ?? defaultAccessLevel;
                 }
                 else {
                     const entitlement = moduleEntitlements.find((f) => f.adaptableModule === adaptableModule);

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

@@ -2,8 +2,10 @@ import { ApiBase } from './ApiBase';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { EventApi } from '../EventApi';
 import { EmitterCallback } from '../../Utilities/Emitter';
+import { EventInternalApi } from '../Internal/EventInternalApi';
 export declare class EventApiImpl extends ApiBase implements EventApi {
     private emitter;
+    internalApi: EventInternalApi;
     constructor(_adaptable: IAdaptable);
     destroy(): void;
     on: (eventName: string, callback: EmitterCallback) => (() => void);

package/src/Api/Implementation/EventApiImpl.js

@@ -4,6 +4,7 @@ exports.EventApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
+const EventInternalApi_1 = require("../Internal/EventInternalApi");
 class EventApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -22,6 +23,7 @@ class EventApiImpl extends ApiBase_1.ApiBase {
         this.emit = (eventName, data) => this.emitter.emit(eventName, data);
         this.emitSync = (eventName, data) => this.emitter.emitSync(eventName, data);
         this.emitter = new Emitter_1.default();
+        this.internalApi = new EventInternalApi_1.EventInternalApi(_adaptable);
     }
     destroy() {
         super.destroy();

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

@@ -1,11 +1,11 @@
 import { ExportApi } from '../ExportApi';
-import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../../PredefinedConfig/ExportState';
+import { ExportState, Report, ReportData, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../PredefinedConfig/ExportState';
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { AdaptableReportColumn, CustomDestination, ExportFormContext, ExternalReport } from '../../AdaptableOptions/ExportOptions';
-import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
+import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, ExternalReport, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
+import { AdaptableColumn } from '../../types';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     internalApi: ExportInternalApi;
     constructor(_adaptable: IAdaptable);
@@ -14,28 +14,31 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getCurrentReport(): Report;
     getReportByName(reportName: string): Report | undefined;
     getReportById(id: Report['Uuid']): Report;
-    getDestinationByName(destinationName: ExportDestination | string): ExportDestination | CustomDestination | undefined;
-    getCurrentDestination(): ExportDestination | CustomDestination;
-    getAvailableSystemReports(): SystemReportNames;
-    getAvailableExportDestinations(): ExportDestination[];
-    getReports(): Report[];
-    getReportSchedules(): ReportSchedule[];
-    runReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
-    runSystemReport(systemReportName: 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows', destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
-    selectReport(reportName: string): void;
-    selectDestination(destinationName: string): void;
+    getDestinationByName(destinationName: ExportDestinationType): SystemExportDestination | CustomDestination | undefined;
+    getAvailableSystemReports(): SystemReportName[];
+    getAvailableSystemFormats(): SystemReportFormat[];
+    getAvailableSystemDestinations(): SystemExportDestination[];
+    getAllExportDestinations(): ExportDestinationType[];
+    getAllFormats(): ReportFormatType[];
+    getAllReports(): Report[];
+    selectReport(reportName: ReportNameType | null): void;
+    clearReport(): void;
+    selectFormat(reportFormat: ReportFormatType | null): void;
+    clearFormat(): void;
     getCustomDestinations(): CustomDestination[];
     isExportDestinationCustom(destinationName: string): boolean;
     getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     canExportToExcel(): boolean;
-    exportDataToExcel(reportData: ReportData, fileName: string): void;
+    canExportToCsv(): boolean;
     openExportSettingsPanel(): void;
-    editReport(report: Report): Report;
-    editReports(reports: Report[]): Report[];
-    exportVisualDataToExcel(): void;
+    updateReport(report: Report): Report;
+    updateReports(reports: Report[]): Report[];
+    getCustomReports(): Report[];
     getExternalReports(): ExternalReport[];
     isExternalReport(report: Report): boolean;
     runExternalReport(externalReportName: string): ReportData | undefined;
-    getReportDataForReport(reportName: string): ReportData | undefined;
-    isColumnExportable(adaptableColumn: AdaptableReportColumn): boolean;
+    isColumnExportable(adaptableColumn: AdaptableColumn): boolean;
+    getSupportedExportDestinations(reportFormat: ReportFormatType): ExportDestinationType[];
+    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): void;
+    getReportData(reportName: ReportNameType, format: ReportFormatType): Promise<ExportResultData>;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ExportInternalApi_1 = require("../Internal/ExportInternalApi");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class ExportApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -29,37 +29,52 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         if (this.internalApi.isSystemReport(reportName)) {
             return this.internalApi.createSystemReport(reportName);
         }
-        else {
-            return this.getReports().find((r) => r.Name == reportName);
+        const customReport = this.getCustomReports().find((r) => r.Name == reportName);
+        if (customReport) {
+            return customReport;
+        }
+        const externalReport = this.getExternalReports()?.find((r) => r.name == reportName);
+        if (externalReport) {
+            return ObjectFactory_1.default.CreateExternalReport(externalReport.name);
         }
     }
     getReportById(id) {
-        var _a;
-        return (_a = this.getReports()) === null || _a === void 0 ? void 0 : _a.find((report) => report.Uuid === id);
+        return this.getAllReports()?.find((report) => report.Uuid === id);
     }
     getDestinationByName(destinationName) {
-        if (Object.values(Enums_1.ExportDestination).some((val) => val === destinationName)) {
+        if (this.internalApi.isSystemDestination(destinationName)) {
             return destinationName;
         }
         return this.getCustomDestinations().find((destination) => destination.name === destinationName);
     }
-    getCurrentDestination() {
-        const currentDestination = this.getExportState().CurrentDestination;
-        return currentDestination && this.getDestinationByName(currentDestination);
-    }
     getAvailableSystemReports() {
         return this.getExportOptions().systemReportNames.filter((s) => this.internalApi.isSystemReportActive(s));
     }
-    getAvailableExportDestinations() {
-        let systemDestinations = [];
-        this.getExportOptions().systemExportDestinations.forEach((exportDestination) => {
-            if (this.internalApi.isSystemExportDestinationActive(exportDestination)) {
-                systemDestinations.push(exportDestination);
+    getAvailableSystemFormats() {
+        const availableReportFormats = this.getExportOptions().systemReportFormats;
+        return availableReportFormats.filter((format) => {
+            // JSON format doesn't support Master Detail Grid
+            if (this.getGridApi().isMasterDetailGrid()) {
+                return format !== 'JSON';
             }
+            return true;
         });
-        return systemDestinations;
     }
-    getReports() {
+    getAvailableSystemDestinations() {
+        return this.getExportOptions().systemExportDestinations;
+    }
+    getAllExportDestinations() {
+        const destinationItems = [
+            ...this.getAvailableSystemDestinations(),
+            ...this.getCustomDestinations().map((destination) => destination.name),
+        ];
+        return destinationItems;
+    }
+    getAllFormats() {
+        // FIXME AFL: add here custom formats when available
+        return this.getAvailableSystemFormats();
+    }
+    getAllReports() {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
@@ -71,88 +86,120 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         }
         return reports;
     }
-    getReportSchedules() {
-        return this.getAdaptableState().Schedule.ReportSchedules;
-    }
-    runReport(reportName, destination) {
-        let report = this.getReportByName(reportName);
-        if (this.checkItemExists(report, reportName, 'Report')) {
-            this.dispatchAction(ExportRedux.ExportApply(report, destination));
-        }
-    }
-    runSystemReport(systemReportName, destination) {
-        this.runReport(systemReportName, destination);
-    }
     selectReport(reportName) {
         this.dispatchAction(ExportRedux.ReportSelect(reportName));
     }
-    selectDestination(destinationName) {
-        this.dispatchAction(ExportRedux.DestinationSelect(destinationName));
+    clearReport() {
+        this.selectReport(GeneralConstants_1.EMPTY_STRING);
+    }
+    selectFormat(reportFormat) {
+        this.dispatchAction(ExportRedux.FormatSelect(reportFormat));
+    }
+    clearFormat() {
+        this.selectFormat(null);
     }
     getCustomDestinations() {
-        var _a;
-        return (_a = this.getExportOptions().customDestinations) !== null && _a !== void 0 ? _a : [];
+        return this.getExportOptions().customDestinations ?? [];
     }
     isExportDestinationCustom(destinationName) {
         return this.getCustomDestinations().some((destination) => destination.name === destinationName);
     }
     getExportDestinationForm(destinationName) {
-        var _a;
-        return (_a = this.getCustomDestinations().find((destination) => destination.name === destinationName)) === null || _a === void 0 ? void 0 : _a.form;
+        return this.getCustomDestinations().find((destination) => destination.name === destinationName)
+            ?.form;
     }
     canExportToExcel() {
         return this._adaptable.canExportToExcel();
     }
-    exportDataToExcel(reportData, fileName) {
-        this._adaptable.exportToExcel(reportData, fileName);
+    canExportToCsv() {
+        return this._adaptable.canExportToCsv();
     }
     openExportSettingsPanel() {
         this.showModulePopup(ModuleConstants.ExportModuleId);
     }
-    editReport(report) {
+    updateReport(report) {
         this.dispatchAction(ExportRedux.ReportEdit(report));
         return this.getReportById(report.Uuid);
     }
-    editReports(reports) {
+    updateReports(reports) {
         reports.forEach((report) => {
-            this.editReport(report);
+            this.updateReport(report);
         });
-        return reports === null || reports === void 0 ? void 0 : reports.map((report) => this.getReportById(report.Uuid));
+        return reports?.map((report) => this.getReportById(report.Uuid));
     }
-    exportVisualDataToExcel() {
-        this._adaptable.exportVisualDataToExcel();
+    getCustomReports() {
+        return this.getExportState().Reports ?? [];
     }
     getExternalReports() {
-        var _a;
-        return (_a = this.getExportOptions().externalReports) !== null && _a !== void 0 ? _a : [];
+        return this.getExportOptions().externalReports ?? [];
     }
     isExternalReport(report) {
-        var _a;
-        return ((_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return this.getExternalReports()?.find((cr) => cr.name == report.Name) != null;
     }
     runExternalReport(externalReportName) {
-        var _a;
-        const externalReport = (_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == externalReportName);
+        const externalReport = this.getExternalReports()?.find((cr) => cr.name == externalReportName);
         if (!externalReport) {
             this.logWarn(`External Report '${externalReportName}' not found!`);
             return undefined;
         }
         return externalReport.onRunReport();
     }
-    getReportDataForReport(reportName) {
-        const report = this.getReportByName(reportName);
-        if (!report) {
-            this.logWarn(`Report '${reportName}' not found!`);
-            return undefined;
-        }
-        return this.internalApi.getReportData(report);
-    }
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;
         if (typeof isExportableFn === 'function') {
-            return isExportableFn(Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { adaptableColumn }));
+            return isExportableFn({
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+                column: adaptableColumn,
+            });
         }
         return true;
     }
+    getSupportedExportDestinations(reportFormat) {
+        if (reportFormat == undefined) {
+            return [];
+        }
+        return this.getExportApi()
+            .getAllExportDestinations()
+            .filter((destination) => {
+            // can NOT export BLOBs to Clipboard
+            if (reportFormat === 'Excel' || reportFormat === 'VisualExcel') {
+                return destination !== 'Clipboard';
+            }
+            return true;
+        });
+    }
+    exportReport(reportName, format, destination = 'Download') {
+        let report = this.getReportByName(reportName);
+        if (this.checkItemExists(report, reportName, 'Report')) {
+            this._adaptable.agGridExportAdapter
+                .exportData({
+                report,
+                format,
+                destination,
+                showProgressIndicator: true,
+            })
+                .then((reportResult) => {
+                if (destination === 'Download' &&
+                    (format === 'Excel' || format === 'VisualExcel' || format === 'Csv')) {
+                    return;
+                }
+                this.internalApi.sendReportToDestination(reportResult, report, format, destination);
+            });
+        }
+    }
+    async getReportData(reportName, format) {
+        let report = this.getReportByName(reportName);
+        if (this.checkItemExists(report, reportName, 'Report')) {
+            this.logInfo(`Start getting Report Data for ${reportName} in format ${format}`);
+            const reportData = await this._adaptable.agGridExportAdapter.exportData({
+                report,
+                format,
+                destination: 'Clipboard',
+                showProgressIndicator: false,
+            });
+            this.logInfo(`Finished getting Report Data for ${reportName} in format ${format}`);
+            return reportData;
+        }
+    }
 }
 exports.ExportApiImpl = ExportApiImpl;

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

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { ExpressionApi } from '../ExpressionApi';
 import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-import { AdaptableColumnBase } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {
@@ -14,7 +14,7 @@ export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi
     isValidAggregatedScalarExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     getASTForExpression(query: string): any;
     getColumnsFromExpression(expression: string): string[];
-    isColumnQueryable(adaptableColumnBase: AdaptableColumnBase): boolean;
+    isColumnQueryable(abColumn: AdaptableColumn): boolean;
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
     getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
     useCaseSensitivity(): boolean;

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -55,7 +55,7 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
                 .internalApi.getQueryLanguageService()
                 .getColumnsFromExpression(expression);
             columnIds.forEach((columnId) => {
-                const calculatedColumn = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+                const calculatedColumn = this.getCalculatedColumnApi().getCalculatedColumnForColumnId(columnId);
                 if (calculatedColumn) {
                     const transitiveColumnIds = this.getColumnsFromExpression(this.getAdaptableQueryExpression(calculatedColumn.Query));
                     columnIds.push(...transitiveColumnIds);
@@ -70,17 +70,23 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
             return [];
         }
     }
-    isColumnQueryable(adaptableColumnBase) {
+    isColumnQueryable(abColumn) {
         let queryableColumnFn = this.getExpressionOptions().isColumnQueryable;
         if (queryableColumnFn) {
-            const queryableColumnContext = Object.assign({ adaptableColumn: adaptableColumnBase }, this.getAdaptableInternalApi().buildBaseContext());
+            const queryableColumnContext = {
+                column: abColumn,
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+            };
             return queryableColumnFn(queryableColumnContext);
         }
         return true;
     }
     getAdaptableQueryExpression(query) {
-        var _a, _b, _c, _d;
-        return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
+        return (query.BooleanExpression ??
+            query.ScalarExpression ??
+            query.ObservableExpression ??
+            query.AggregatedBooleanExpression ??
+            query.AggregatedScalarExpression);
     }
     getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
         return this.getAdaptableApi()