@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -1,12 +1,17 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableModuleView, IModule } from './Interface/IModule';
+import { AdaptableModuleView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-export declare class DataChangeHistoryModule extends AdaptableModuleBase implements IModule {
+import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+export declare class DataChangeHistoryModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
+    isListeningToCellDataChanges: boolean;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    shouldListenToDataChanges(): boolean;
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
     isModuleAvailable(): boolean;
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;
-    private shouldLogDataChange;
+    private isDataChangeLoggable;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/DataChangeHistoryModule.js

@@ -1,19 +1,32 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { DataChangeHistoryStatusBarContent } from '../View/DataChangeHistory/DataChangeHistoryStatusBarContent';
-import { ModuleNames } from '@ag-grid-community/core';
 export class DataChangeHistoryModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'target', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
+        this.isListeningToCellDataChanges = false;
     }
     onAdaptableReady() {
+        this.api.internalApi.initializeDataChangeHistory();
+        this.checkListenToCellDataChanged();
+    }
+    shouldListenToDataChanges() {
+        return this.api.dataChangeHistoryApi.getDataChangeHistoryMode() === 'ACTIVE';
+    }
+    checkListenToCellDataChanged() {
+        if (!this.isListeningToCellDataChanges) {
+            if (this.shouldListenToDataChanges()) {
+                this.setupCellDataChangeListener();
+                this.isListeningToCellDataChanges = true;
+            }
+        }
+    }
+    setupCellDataChangeListener() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
-            if (cellDataChangedInfo.trigger !== 'undo' && cellDataChangedInfo.trigger !== 'aggChange') {
-                if (this.shouldLogDataChange(cellDataChangedInfo)) {
-                    this.api.dataChangeHistoryApi.addDataChangeHistoryEntry(cellDataChangedInfo);
-                }
+            if (this.isListeningToCellDataChanges && this.isDataChangeLoggable(cellDataChangedInfo)) {
+                this.api.dataChangeHistoryApi.addDataChangeHistoryEntry(cellDataChangedInfo);
             }
         });
     }
@@ -21,9 +34,9 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
         const isAdaptableModuleAvailable = super.isModuleAvailable();
         const isAgGridModuleAvailable = this.api.internalApi
             .getAdaptableInstance()
-            .agGridAdapter.isModulePresent(ModuleNames.ClientSideRowModelModule);
+            .agGridAdapter.isAgGridModuleRegistered('ClientSideRowModel');
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
-            this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${ModuleNames.ClientSideRowModelModule}`);
+            this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ClientSideRowModel`);
         }
         return isAdaptableModuleAvailable && isAgGridModuleAvailable;
     }
@@ -33,9 +46,8 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    shouldLogDataChange(cellDataChangedInfo) {
-        // we log changes only if the change tracking is active
-        if (this.api.internalApi.getState().System.DataChangeHistory.currentMode !== 'ACTIVE') {
+    isDataChangeLoggable(cellDataChangedInfo) {
+        if (cellDataChangedInfo.trigger === 'undo' || cellDataChangedInfo.trigger === 'aggChange') {
             return false;
         }
         if (this.api.optionsApi.getDataChangeHistoryOptions().showDataChange) {

package/src/Strategy/DataSetModule.js

@@ -1,9 +1,9 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { DataSetStatusPanelPopover } from '../View/DataSet/DataSetStatusPanelPopover';
 import { createUuid } from '../PredefinedConfig/Uuid';
 import { DataSetSelector } from '../View/DataSet/DataSetSelector';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 export class DataSetModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataSetModuleId, ModuleConstants.DataSetFriendlyName, 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
@@ -16,14 +16,12 @@ export class DataSetModule extends AdaptableModuleBase {
         });
     }
     getModuleAdaptableObjects() {
-        var _a, _b;
-        return (_b = (_a = this.api.optionsApi.getDataSetOptions()) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
+        return this.api.optionsApi.getDataSetOptions()?.dataSets ?? [];
     }
     hasNamedQueryReferences() {
         return false;
     }
     toView(dataSet) {
-        var _a;
         return {
             items: [
                 {
@@ -34,7 +32,7 @@ export class DataSetModule extends AdaptableModuleBase {
                 {
                     name: 'Settings',
                     label: 'Description',
-                    values: [(_a = dataSet.description) !== null && _a !== void 0 ? _a : 'Not Specified'],
+                    values: [dataSet.description ?? 'Not Specified'],
                 },
                 getObjectTagsViewItems(dataSet, this.api),
             ],
@@ -49,8 +47,7 @@ export class DataSetModule extends AdaptableModuleBase {
             actions: [DataSetSelector],
             emptyView: 'No DataSets are provided',
             getStatusBarPanelProps: () => {
-                var _a, _b;
-                const content = (_b = (_a = this.api.dataSetApi.getCurrentDataSet()) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.moduleInfo.FriendlyName;
+                const content = this.api.dataSetApi.getCurrentDataSet()?.name ?? this.moduleInfo.FriendlyName;
                 return {
                     content: content,
                     popover: DataSetStatusPanelPopover,

package/src/Strategy/ExportModule.d.ts

@@ -1,32 +1,20 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IExportModule } from './Interface/IExportModule';
-import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Report } from '../PredefinedConfig/ExportState';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
-export declare class ExportModule extends AdaptableModuleBase implements IExportModule {
+export declare class ExportModule extends AdaptableModuleBase {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
-    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
-    private buildReportMenuItems;
-    export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
-    private preProcessExport;
-    private isCustomDestination;
-    private convertReportToJSON;
-    private openReportInTablePopup;
-    private convertReportToCsv;
-    private convertReportToExcel;
-    private copyToClipboard;
-    private createCSVContent;
-    private createTabularContent;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    private getMenuItemName;
+    private getDestinationMenuItemIcon;
+    private getFormatMenuItemIcon;
     getTeamSharingAction(): TeamSharingImportInfo<Report>;
-    private isEmptyReportData;
-    private showEmptyExportWarning;
     toView(report: Report): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;

package/src/Strategy/ExportModule.js

@@ -1,35 +1,24 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { ExportDestination } from '../PredefinedConfig/Common/Enums';
-import { Helper } from '../Utilities/Helpers/Helper';
 import * as ExportRedux from '../Redux/ActionsReducers/ExportRedux';
-import { ALL_DATA_REPORT, CURRENT_DATA_REPORT, SELECTED_CELLS_REPORT, SELECTED_ROWS_REPORT, VISUAL_DATA_REPORT, } from '../Utilities/Constants/GeneralConstants';
-import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
-import StringExtensions from '../Utilities/Extensions/StringExtensions';
-import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
-import { ObjectFactory } from '../Utilities/ObjectFactory';
 import { NewReportWizard } from '../View/Export/Wizard/NewReportWizard';
 import { getExportColumnsViewItems } from './Utilities/Export/getExportColumnsViewItems';
 import { getExportRowsViewItems } from './Utilities/Export/getExportRowsViewItems';
-import { ReportExportDropdown } from '../View/Export/ReportExportDropdown';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
-import { ExportSelector } from '../View/Export/ExportSelector';
-import { SystemVisualExportBegin, SystemVisualExportEnd, } from '../Redux/ActionsReducers/SystemRedux';
-import { SHOW_EXPORT_TABLE } from '../View/Components/Popups/WindowPopups/windowFactory';
-import { createUuid } from '../PredefinedConfig/Uuid';
-import { waitForTimeout } from '../Utilities/waitForTimeout';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
+import { ExportStatusBar } from '../View/Export/ExportStatusBar';
+import { ReportListItem } from '../View/Export/ReportListItem';
 export class ExportModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.exportApi.getReports();
+        return this.api.exportApi.getAllReports();
     }
     getExplicitlyReferencedColumnIds(report) {
         if (report.ReportColumnScope === 'ScopeColumns' &&
             this.api.columnScopeApi.scopeHasColumns(report.Scope)) {
             return this.api.columnScopeApi
-                .getColumnsForScope(report.Scope)
+                .getColumnsInScope(report.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
@@ -46,285 +35,84 @@ export class ExportModule extends AdaptableModuleBase {
             return;
         }
         let returnMenuItems = [];
-        const availableSystemReports = this.api.exportApi.getAvailableSystemReports();
-        if (availableSystemReports.includes(VISUAL_DATA_REPORT)) {
-            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', 'excel', () => this.export(this.api.exportApi.getReportByName(VISUAL_DATA_REPORT), ExportDestination.Excel)));
-        }
-        if (availableSystemReports.includes(ALL_DATA_REPORT)) {
-            const allDataReport = this.api.exportApi.getReportByName(ALL_DATA_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(allDataReport));
-        }
-        if (availableSystemReports.includes(CURRENT_DATA_REPORT)) {
-            const currentDataReport = this.api.exportApi.getReportByName(CURRENT_DATA_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(currentDataReport));
-        }
-        const canExportCells = availableSystemReports.includes(SELECTED_CELLS_REPORT) &&
-            menuContext.selectedCellInfo &&
-            ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
-            ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
-        if (canExportCells) {
-            const selectedCellReport = this.api.exportApi.getReportByName(SELECTED_CELLS_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport));
-        }
-        const canExportRows = availableSystemReports.includes(SELECTED_ROWS_REPORT) &&
-            menuContext.selectedRowInfo &&
-            ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows) &&
-            menuContext.gridCell &&
-            menuContext.gridCell.primaryKeyValue &&
-            menuContext.isSelectedRow;
-        if (canExportRows) {
-            const selectedRowReport = this.api.exportApi.getReportByName(SELECTED_ROWS_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(selectedRowReport));
-        }
+        const allReportNames = this.api.exportApi.internalApi.getAllAvailableReportNames();
+        const allReportFormats = this.api.exportApi.getAvailableSystemFormats();
+        allReportNames.forEach((reportName) => {
+            const formatItems = allReportFormats.map((reportFormat) => {
+                const supportedDestinations = this.api.exportApi.getSupportedExportDestinations(reportFormat);
+                const exportDestinationItems = supportedDestinations.map((exportDestination) => this.createMenuItemClickFunction(this.getMenuItemName(reportName, reportFormat, exportDestination), exportDestination, this.getDestinationMenuItemIcon(exportDestination), () => this.api.exportApi.exportReport(reportName, reportFormat, exportDestination)));
+                const formatMenuItemGroup = {
+                    name: this.getMenuItemName(reportName, reportFormat),
+                    label: reportFormat,
+                    isVisible: true,
+                    category: 'Export',
+                    icon: {
+                        name: this.getFormatMenuItemIcon(reportFormat),
+                    },
+                    subItems: exportDestinationItems,
+                };
+                return formatMenuItemGroup;
+            });
+            const reportMenuItemGroup = {
+                name: this.getMenuItemName(reportName),
+                label: reportName,
+                isVisible: true,
+                category: 'Export',
+                icon: {
+                    name: 'export-data',
+                },
+                subItems: formatItems,
+            };
+            returnMenuItems.push(reportMenuItemGroup);
+        });
         return returnMenuItems;
     }
-    buildReportMenuItems(report) {
-        // a bit convoluted, but ce la vie, that's what happens when you use enums instead of union types
+    getMenuItemName(reportName, reportFormat, exportDestination) {
         // convert to lowercase and replace empty spaces with hyphens
         const adjustName = (name = '') => {
             const result = name.replace(/ /g, '-');
             return result.toLowerCase();
         };
-        const getMenuItemName = (reportName, destination) => {
-            return `export-${adjustName(reportName)}-${adjustName(destination)}`;
-        };
-        const getMenuItemIcon = (exportDestination) => {
-            // once we have icons for csv, clipboard etc then i would like to add them here one by one and use moduleinfo for custom
-            switch (exportDestination) {
-                case ExportDestination.Excel:
-                    return 'excel';
-                case ExportDestination.Clipboard:
-                    return 'clipboard';
-                case ExportDestination.CSV:
-                    return 'csv';
-                case ExportDestination.JSON:
-                    return 'json';
-                case ExportDestination.Table:
-                    return 'grid';
-            }
-            return this.moduleInfo.Glyph;
-        };
-        const menuItems = [];
-        for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, destination), destination, getMenuItemIcon(destination), //  'filter', //  this.moduleInfo.Glyph,
-            () => this.export(report, destination)));
+        let name = `export-${adjustName(reportName)}`;
+        if (reportFormat) {
+            name += `-${adjustName(reportFormat)}`;
+        }
+        if (exportDestination) {
+            name += `-${adjustName(exportDestination)}`;
+        }
+        return name;
+    }
+    getDestinationMenuItemIcon(exportDestination) {
+        switch (exportDestination) {
+            case 'Download':
+                return 'downloaded';
+            case 'Clipboard':
+                return 'clipboard';
+            default:
+                return 'export-data';
+        }
+    }
+    getFormatMenuItemIcon(reportFormat) {
+        switch (reportFormat) {
+            case 'Excel':
+                return 'excel';
+            case 'VisualExcel':
+                return 'color-palette';
+            case 'CSV':
+                return 'csv';
+            case 'JSON':
+                return 'json';
+            default:
+                return 'export';
         }
-        for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, customDestination.name), customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
-        }
-        return menuItems;
-    }
-    async export(report, exportDestination) {
-        var _a;
-        const cleanupExportProcess = () => {
-            this.api.internalApi.dispatchReduxAction(SystemVisualExportEnd());
-            this.api.userInterfaceApi.hideProgressIndicator();
-        };
-        if (report.Name === VISUAL_DATA_REPORT) {
-            this.api.internalApi.dispatchReduxAction(SystemVisualExportBegin());
-        }
-        this.api.userInterfaceApi.showProgressIndicator({
-            text: `${report.Name} Export in progress...`,
-        });
-        try {
-            // waitForTimeout required to give the ProgressIndicator rendering a head-start (see rAF in ProgressIndicator implementation)
-            await waitForTimeout(16);
-            if (report.Name === VISUAL_DATA_REPORT) {
-                this.api.logInfo(`Export ${report.Name} (${exportDestination})`);
-                this.api.exportApi.exportVisualDataToExcel();
-                // WYSIWYG is fully delegated to the AG Grid excel export, so we don't need to do anything else
-                cleanupExportProcess();
-                return;
-            }
-            const preProcessedExport = await this.preProcessExport(report);
-            let reportData;
-            if (preProcessedExport === false) {
-                this.api.logInfo(`Export ${report.Name} (${exportDestination}) cancelled by preProcessExport()`);
-                cleanupExportProcess();
-                return;
-            }
-            else if (preProcessedExport === true) {
-                this.api.logInfo(`Export ${report.Name} (${exportDestination}) using data from the grid`);
-                reportData = this.api.exportApi.internalApi.getReportData(report);
-            }
-            else if ((preProcessedExport === null || preProcessedExport === void 0 ? void 0 : preProcessedExport.rows) == undefined ||
-                (preProcessedExport === null || preProcessedExport === void 0 ? void 0 : preProcessedExport.columns) == undefined) {
-                this.api.logWarn(`Export ${report.Name} (${exportDestination}) : preProcessExport() returned an invalid ReportData object, fallback to data from the grid`);
-                reportData = this.api.exportApi.internalApi.getReportData(report);
-            }
-            else {
-                this.api.logInfo(`Export ${report.Name} (${exportDestination}) using data from preProcessExport()`);
-                reportData = preProcessedExport;
-                if (!reportData.columns.length) {
-                    // an empty column array means that all columns have been exported
-                    // we have to update the report to reflect this
-                    reportData.columns = this.api.exportApi.internalApi.getReportDataColumns(report);
-                }
-            }
-            if (this.isCustomDestination(exportDestination)) {
-                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) {
-                    this.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowForm({
-                        Id: 'export-destination-form',
-                        Form: customDestination === null || customDestination === void 0 ? void 0 : customDestination.form,
-                        prepareContext: (context) => {
-                            // we want to give the current popup time to close
-                            // and we reopen with a delay in case this button action causes another popup
-                            return new Promise((resolve) => {
-                                setTimeout(() => {
-                                    const preparedContext = Object.assign(Object.assign({}, context), { report,
-                                        customDestination,
-                                        reportData });
-                                    resolve(preparedContext);
-                                }, 20);
-                            });
-                        },
-                    }));
-                }
-                else if (customDestination) {
-                    const reportContext = Object.assign({ report: report, reportData }, this.api.internalApi.buildBaseContext());
-                    customDestination.onExport(reportContext);
-                }
-            }
-            else {
-                switch (exportDestination) {
-                    case ExportDestination.Excel:
-                        this.convertReportToExcel(report, reportData);
-                        break;
-                    case ExportDestination.Clipboard:
-                        this.copyToClipboard(reportData);
-                        break;
-                    case ExportDestination.CSV:
-                        this.convertReportToCsv(report, reportData);
-                        break;
-                    case ExportDestination.JSON:
-                        this.convertReportToJSON(report, reportData);
-                        break;
-                    case ExportDestination.Table:
-                        this.openReportInTablePopup(report, reportData);
-                        break;
-                }
-            }
-            cleanupExportProcess();
-        }
-        catch (e) {
-            this.api.consoleError(`Error while exporting ${report.Name}}`, e);
-            cleanupExportProcess();
-        }
-    }
-    async preProcessExport(report) {
-        const preProcessExportFn = this.api.optionsApi.getAdaptableOptions().exportOptions.preProcessExport;
-        if (preProcessExportFn) {
-            this.api.logInfo(`Export ${report.Name} : preProcessExport()`);
-            return preProcessExportFn(Object.assign(Object.assign({ report }, this.api.internalApi.buildBaseContext()), { getReportColumns: (includePrimaryKey) => {
-                    return this.api.exportApi.internalApi.getReportDataColumns(report, includePrimaryKey);
-                }, getReportRowData: (reportColumns, includePrimaryKey) => {
-                    return this.api.exportApi.internalApi.getReportDataRows(report, reportColumns, includePrimaryKey);
-                } }));
-        }
-        return true;
-    }
-    isCustomDestination(exportDestination) {
-        if (Object.values(ExportDestination).some((val) => val === exportDestination)) {
-            return false;
-        }
-        return this.api.exportApi.isExportDestinationCustom(exportDestination);
-    }
-    convertReportToJSON(report, reportData) {
-        if (this.isEmptyReportData(reportData)) {
-            this.showEmptyExportWarning();
-            return;
-        }
-        const jsonContent = JSON.stringify(reportData);
-        const jsonFileName = this.api.exportApi.internalApi.getReportFileName(report.Name, 'JSON') + '.json';
-        Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
-    }
-    openReportInTablePopup(report, reportData) {
-        if (this.isEmptyReportData(reportData)) {
-            this.showEmptyExportWarning();
-            return;
-        }
-        const popupProps = {
-            reportData,
-        };
-        let title = 'Export Table';
-        if (report.Name) {
-            title = `${title} [${report.Name}]`;
-        }
-        if (report.Scope) {
-            const scopeText = this.api.exportApi.internalApi.getReportColumnScopeShortDescription(report);
-            if (scopeText === null || scopeText === void 0 ? void 0 : scopeText.length) {
-                title = `${title} ${scopeText.join(',')}`;
-            }
-        }
-        if (report.Query) {
-            const queryText = this.api.exportApi.internalApi.getReportExpressionDescription(report, this.api.columnApi.getColumns());
-            if (queryText === null || queryText === void 0 ? void 0 : queryText.length) {
-                title = `${title} ${queryText}`;
-            }
-        }
-        this.api.internalApi.showPopupWindow({
-            // allow to open multiple tables
-            id: 'report-table-' + createUuid(),
-            title: title,
-            icon: 'export-data',
-            factoryId: SHOW_EXPORT_TABLE,
-            popupProps,
-        });
-    }
-    convertReportToCsv(report, reportData) {
-        const csvContent = this.createCSVContent(reportData);
-        if (StringExtensions.IsNullOrEmpty(csvContent)) {
-            this.showEmptyExportWarning();
-            return;
-        }
-        const csvFileName = this.api.exportApi.internalApi.getReportFileName(report.Name, 'CSV') + '.csv';
-        Helper.createDownloadedFile(csvContent, csvFileName, 'text/csv;encoding:utf-8');
-    }
-    convertReportToExcel(report, reportData) {
-        if (this.isEmptyReportData(reportData)) {
-            this.showEmptyExportWarning();
-            return;
-        }
-        this.api.exportApi.exportDataToExcel(reportData, this.api.exportApi.internalApi.getReportFileName(report.Name, 'Excel'));
-    }
-    copyToClipboard(reportData) {
-        const csvContent = this.createTabularContent(reportData);
-        if (StringExtensions.IsNullOrEmpty(csvContent)) {
-            this.showEmptyExportWarning();
-            return;
-        }
-        Helper.copyToClipboard(csvContent);
-    }
-    createCSVContent(reportData) {
-        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
-        return Helper.convertArrayToCsv(reportDataAsArray, ',');
-    }
-    createTabularContent(reportData) {
-        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
-        return Helper.convertArrayToCsv(reportDataAsArray, '\t');
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.exportApi.getReports(),
+            ModuleEntities: this.api.exportApi.getAllReports(),
             AddAction: ExportRedux.ReportAdd,
             EditAction: ExportRedux.ReportEdit,
         };
     }
-    isEmptyReportData(reportData) {
-        var _a, _b;
-        return !((_a = reportData === null || reportData === void 0 ? void 0 : reportData.rows) === null || _a === void 0 ? void 0 : _a.length) && !((_b = reportData === null || reportData === void 0 ? void 0 : reportData.columns) === null || _b === void 0 ? void 0 : _b.length);
-    }
-    showEmptyExportWarning() {
-        this.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowAlert({
-            alertType: 'generic',
-            header: 'Export',
-            message: 'No Data To Export',
-            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-        }));
-    }
     toView(report) {
         const isSystemReport = this.api.exportApi.internalApi.isSystemReport(report.Name);
         if (isSystemReport) {
@@ -358,14 +146,14 @@ export class ExportModule extends AdaptableModuleBase {
     getViewProperties() {
         return {
             newTooltipText: 'Create New Report',
-            actions: [ReportExportDropdown],
+            actions: [ReportListItem],
             getDeleteAction: ExportRedux.ReportDelete,
             getEditWizard() {
                 return NewReportWizard;
             },
             getStatusBarPanelProps: () => {
                 return {
-                    content: ExportSelector,
+                    content: ExportStatusBar,
                     triggerActionOnWrapperClick: false,
                 };
             },

package/src/Strategy/Fdc3Module.d.ts

@@ -4,7 +4,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     private buildRaiseIntentMenuItem;
     private buildBroadcastMenuItem;
     private getFdc3Api;