@adaptabletools/adaptable-cjs 20.0.0-canary.21 → 20.0.0-canary.22

package/package.json

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

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -98,7 +98,7 @@ const DefaultAdaptableOptions = {
         exportDataFormat: 'rawValue',
         exportDateFormat: undefined,
         customDestinations: undefined,
-        externalReports: undefined,
+        processExport: undefined,
         appendFileTimestamp: false,
         systemReportNames: GeneralConstants_1.SYSTEM_REPORT_NAMES,
         systemReportFormats: GeneralConstants_1.SYSTEM_REPORT_FORMATS,

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -25,10 +25,6 @@ export interface ExportOptions<TData = any> {
      * User-provided Report Destinations (in addition to those shipped in AdapTable)
      */
     customDestinations?: CustomDestination[];
-    /**
-     * Reports generated entirely by users (and not evaluated AdapTable)
-     */
-    externalReports?: ExternalReport[];
     /**
      * System Reports to use; leave blank for all, empty array for none
      *
@@ -67,10 +63,6 @@ export interface ExportOptions<TData = any> {
      * @defaultValue true
      */
     isColumnExportable?: (context: AdaptableColumnContext) => boolean;
-    /**
-     * Function invoked before a Report is run, enabling users to preload the data before it is exported
-     */
-    preProcessExport?: (preProcessExportContext: PreProcessExportContext) => boolean | Promise<ReportData | boolean>;
     /**
      * Separator for CSV exports
      *
@@ -87,6 +79,15 @@ export interface ExportOptions<TData = any> {
      * Function to provide the Detail Rows when exporting in Master-Detail grids. This function will be invoked for each master row node.
      */
     getDetailRows?: (context: GetDetailRowsContext<TData>) => CsvDetailRow[] | ExcelDetailRow[] | undefined;
+    /**
+     * Provides custom handling of the Export process before the default export is executed.
+     *
+     * @returns A Promise resolving to one of:
+     *   - `true` - Continue with the default export process
+     *   - `false` - Cancel the export process
+     *   - `ExportResultData` - Custom export data (useful for server-side data)
+     */
+    processExport?: (processExportContext: ProcessExportContext) => Promise<ExportResultData | boolean>;
 }
 /**
  * Detail Row Data in a CSV format; technically an array of AG Grid {@link https://www.ag-grid.com/javascript-data-grid/csv-export/#csvcell | CsvCell}s
@@ -129,43 +130,10 @@ export interface GetDetailRowsContext<TData = any> extends BaseExportContext {
      */
     createCellExcel: (cellContent: any, cellType: ExcelDataType) => ExcelCell;
 }
-/**
- * Context provided to `ExportOptions.processExport()` callback used when pre-processing Export
- */
-export interface PreProcessExportContext extends BaseContext {
-    /**
-     * Report being exported
-     */
-    report: Report;
-    /**
-     * Returns Columns to export based on Report's `ReportColumnScope`
-     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
-     */
-    getReportColumns: (includePrimaryKey?: boolean) => AdaptableColumn[];
-    /**
-     * Returns row data which would typically be exported based on the Report's `ReportRowScope`
-     * @param reportColumns - the columns to include in the report
-     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
-     */
-    getReportRowData: (reportColumns: AdaptableColumn[], includePrimaryKey?: boolean) => Record<string, any>[];
-}
 /**
  * Format of exported Data - 'rawValue' or 'formattedValue'
  */
 export type DataFormatType = 'rawValue' | 'formattedValue';
-/**
- * Defines a Report where all the data is provided entirely by the user
- */
-export interface ExternalReport {
-    /**
-     * Name of the Report
-     */
-    name: string;
-    /**
-     * Function invoked to return the data (in the form of a `ExportResultData` object)
-     */
-    onExport: (context: ExternalReportContext) => Promise<ExportResultData>;
-}
 /**
  * Defines a custom Export destination
  */
@@ -226,7 +194,6 @@ export type SystemExportDestination =
  */
  | 'Clipboard';
 export type ExportDestinationType = TypeHint<string, SystemExportDestination>;
-export type ExportDestination = SystemExportDestination | CustomDestination;
 /**
  * Context information available in all Export-related functions
  */
@@ -235,6 +202,10 @@ export interface BaseExportContext extends BaseContext {
      * Name of the Report being run
      */
     reportName: ReportNameType;
+    /**
+     * The Report Configuration being run
+     */
+    report: Report;
     /**
      * Format of the Report being run
      */
@@ -248,18 +219,23 @@ export interface BaseExportContext extends BaseContext {
  * Report Context sent when using Custom Export Destinations
  */
 export interface ReportContext extends BaseExportContext {
-    /**
-     * Definition of Report being Run
-     */
-    report: Report;
     /**
      * Export Data for the Report
      */
     reportData: ExportResultData;
 }
-export interface ExternalReportContext extends BaseExportContext {
-    getGridReportColumns: () => ReportColumn[];
+export interface ProcessExportContext extends BaseExportContext {
+    /**
+     * Returns Columns to export based on Report's `ReportColumnScope`
+     */
+    getReportColumns: () => ReportColumn[];
+    /**
+     * Converts the Report Data to Excel format
+     */
     convertToExcel: (reportData: ReportData) => Blob;
+    /**
+     * Converts the Report Data to CSV format
+     */
     convertToCsv: (reportData: ReportData) => string;
 }
 /**

package/src/Api/ExportApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../PredefinedConfig/ExportState';
-import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, ExternalReport, SystemExportDestination } from '../AdaptableOptions/ExportOptions';
+import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, SystemExportDestination } from '../AdaptableOptions/ExportOptions';
 import { AdaptableColumn } from '../types';
 /**
  * Provides run-time access to the Export Module and Report state
@@ -44,7 +44,7 @@ export interface ExportApi {
      */
     getReportById(id: Report['Uuid']): Report;
     /**
-     * Retrieves all available Reports - System, External and User-created Reports
+     * Retrieves all available Reports - System and User-created Reports
      * @returns reports
      */
     getAllReports(): Report[];
@@ -52,10 +52,6 @@ export interface ExportApi {
      * Retrieves all Custom Reports that have been created by the User
      */
     getCustomReports(): Report[];
-    /**
-     * Returns all External Reports that have been provided to Export Options
-     */
-    getExternalReports(): ExternalReport[];
     /**
      * Retrieves all Report Formats that are available
      */
@@ -134,11 +130,6 @@ export interface ExportApi {
      * @param destination Custom Destination for which to get Form Def
      */
     getExportDestinationForm(destinationName: ExportDestinationType): AdaptableForm<ExportFormContext> | undefined;
-    /**
-     * Is given Report user-generated
-     * @param report Report to Check
-     */
-    isExternalReport(report: Report): boolean;
     /**
      * Returns whether the given column is exportable
      */
@@ -149,7 +140,7 @@ export interface ExportApi {
      * @param format - format of the report
      * @param destination - destination to export to
      */
-    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): void;
+    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): Promise<void>;
     /**
      * Gets the data for the Report with the given Name in the given Format
      * @param reportName - name of the report

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

@@ -2,7 +2,7 @@ import { ExportApi } from '../ExportApi';
 import { ExportState, Report, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../../PredefinedConfig/ExportState';
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, ExternalReport, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ExportDestinationType, ExportFormContext, ExportResultData, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
 import { AdaptableColumn } from '../../types';
@@ -34,10 +34,9 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     updateReport(report: Report): Report;
     updateReports(reports: Report[]): Report[];
     getCustomReports(): Report[];
-    getExternalReports(): ExternalReport[];
-    isExternalReport(report: Report): boolean;
     isColumnExportable(adaptableColumn: AdaptableColumn): boolean;
     getSupportedExportDestinations(reportFormat: ReportFormatType): ExportDestinationType[];
-    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): void;
+    exportReport(reportName: ReportNameType, format: ReportFormatType, destination?: ExportDestinationType): Promise<void>;
     getReportData(reportName: ReportNameType, format: ReportFormatType): Promise<ExportResultData>;
+    private processExport;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -5,8 +5,6 @@ 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 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 {
@@ -33,10 +31,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         if (customReport) {
             return customReport;
         }
-        const externalReport = this.getExternalReports()?.find((r) => r.name == reportName);
-        if (externalReport) {
-            return ObjectFactory_1.default.CreateExternalReport(externalReport.name);
-        }
     }
     getReportById(id) {
         return this.getAllReports()?.find((report) => report.Uuid === id);
@@ -78,12 +72,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const externalReports = this.getExternalReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(externalReports)) {
-            reports.push(...externalReports.map((c) => {
-                return ObjectFactory_1.default.CreateExternalReport(c.name);
-            }));
-        }
         return reports;
     }
     selectReport(reportName) {
@@ -130,12 +118,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     getCustomReports() {
         return this.getExportState().Reports ?? [];
     }
-    getExternalReports() {
-        return this.getExportOptions().externalReports ?? [];
-    }
-    isExternalReport(report) {
-        return this.getExternalReports()?.find((cr) => cr.name == report.Name) != null;
-    }
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;
         if (typeof isExportableFn === 'function') {
@@ -161,52 +143,74 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             return true;
         });
     }
-    exportReport(reportName, format, destination = 'Download') {
+    async exportReport(reportName, format, destination = 'Download') {
         let report = this.getReportByName(reportName);
-        if (this.checkItemExists(report, reportName, 'Report')) {
-            if (this.isExternalReport(report)) {
-                // Handle external report
-                this.internalApi
-                    .getExternalReportData(reportName, format, destination)
-                    .then((reportData) => {
-                    if (reportData) {
-                        this.internalApi.sendReportToDestination(reportData, report, format, destination);
-                    }
-                })
-                    .catch((error) => {
-                    this.logWarn(`Failed to get external report data for '${reportName}': ${error}`);
-                });
-                return;
-            }
-            this._adaptable.agGridExportAdapter
-                .exportData({
+        if (!this.checkItemExists(report, reportName, 'Report')) {
+            return;
+        }
+        this.logInfo(`Start Export of ${reportName} in format ${format} to ${destination}`);
+        const processExportResult = await this.processExport(report, format, destination);
+        // if FALSE, cancel export
+        if (!processExportResult) {
+            this.logInfo(`Cancel Export of ${reportName}`);
+            return;
+        }
+        // if TRUE, continue with standard export
+        if (processExportResult === true) {
+            const exportedReport = await 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);
             });
+            if (destination === 'Download' &&
+                (format === 'Excel' || format === 'VisualExcel' || format === 'Csv')) {
+                return;
+            }
+            this.internalApi.sendReportToDestination(exportedReport, report, format, destination);
         }
+        else {
+            // in this case the user has returned a custom ExportResultData object
+            const userProcessedExportResult = processExportResult;
+            if (!userProcessedExportResult) {
+                this.logWarn(`Processing of Export ${reportName} to ${destination} returned null or undefined`);
+                return;
+            }
+            this.internalApi.sendReportToDestination(userProcessedExportResult, report, format, destination);
+        }
+        this.logInfo(`Finished Export of ${reportName} in format ${format} to ${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({
+        if (!this.checkItemExists(report, reportName, 'Report')) {
+            return;
+        }
+        this.logInfo(`Start getting Report Data for ${reportName} in format ${format}`);
+        const processExportResult = await this.processExport(report, format, 'Clipboard');
+        let reportData;
+        // handle Export processing
+        if (typeof processExportResult?.type === 'string') {
+            reportData = processExportResult;
+        }
+        else {
+            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;
         }
+        this.logInfo(`Finished getting Report Data for ${reportName} in format ${format}`);
+        return reportData;
+    }
+    async processExport(report, format, destination) {
+        const processExportFn = this.getExportOptions().processExport;
+        if (!processExportFn) {
+            return true;
+        }
+        this.logInfo(`Process Export of ${report.Name} in format ${format} to ${destination}`);
+        const processExportContext = this.internalApi.buildProcessExportContext(report, format, destination);
+        return processExportFn(processExportContext);
     }
 }
 exports.ExportApiImpl = ExportApiImpl;

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

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

package/src/Api/Internal/ExportInternalApi.js

@@ -25,10 +25,6 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         if (report.Name == 'All Data') {
             return true;
         }
-        // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.getExportApi().isExternalReport(report)) {
-            return false;
-        }
         // Start with the DataChanged Column and go through all possibilities
         switch (report.ReportColumnScope) {
             case 'AllColumns':
@@ -172,9 +168,6 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         return true;
     }
     getReportColumnScopeShortDescription(report) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return ['[Custom Columns]'];
-        }
         switch (report.ReportColumnScope) {
             case 'AllColumns':
                 return ['[All Columns]'];
@@ -190,9 +183,6 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
     }
     getReportColumnScopeLongDescription(report) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return '[Custom Columns]';
-        }
         switch (report.ReportColumnScope) {
             case 'AllColumns':
                 return '[All Columns]';
@@ -205,9 +195,6 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
     }
     getReportExpressionDescription(report, cols) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return '[Custom Data]';
-        }
         if (this.isSystemReport(report.Name)) {
             return `[${report.Name}]`;
         }
@@ -356,8 +343,10 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
     }
     buildBaseExportContext(reportName, reportFormat, exportDestination) {
+        const report = this.getExportApi().getReportByName(reportName);
         return {
             ...this.getAdaptableInternalApi().buildBaseContext(),
+            report,
             reportName,
             reportFormat,
             exportDestination,
@@ -386,23 +375,21 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             },
         };
     }
-    getExternalReportData(externalReportName, reportFormat, exportDestination) {
-        const externalReport = this.getExportApi()
-            .getExternalReports()
-            ?.find((cr) => cr.name == externalReportName);
-        if (!externalReport) {
-            this.logWarn(`External Report '${externalReportName}' not found!`);
-            return undefined;
-        }
-        return externalReport.onExport({
-            ...this.buildBaseExportContext(externalReportName, reportFormat, exportDestination),
-            convertToExcel: this.buildExcelConverter(externalReportName, reportFormat, exportDestination),
-            convertToCsv: this.buildCsvConverter(externalReportName, reportFormat, exportDestination),
-            getGridReportColumns: this.buildGridReportColumns(),
+    buildProcessExportContext(report, format, destination) {
+        const { exportContext } = this._adaptable.agGridExportAdapter.buildExportProcessData({
+            report,
+            format,
+            destination,
+            showProgressIndicator: false,
         });
-    }
-    buildGridReportColumns() {
-        return () => this.getAdaptableApi().columnApi.getColumns();
+        return {
+            ...this.buildBaseExportContext(report.Name, format, destination),
+            convertToExcel: this.buildExcelConverter(report.Name, format, destination),
+            convertToCsv: this.buildCsvConverter(report.Name, format, destination),
+            getReportColumns: () => exportContext.exportedColumnIds
+                .map((colId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(colId, false))
+                .filter(Boolean),
+        };
     }
     buildExcelConverter(externalReportName, reportFormat, exportDestination) {
         return (reportData) => {
@@ -423,9 +410,14 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
                 colId: col.columnId,
                 field: col.field ?? col.columnId,
                 headerName: col.friendlyName ?? col.columnId,
-                type: col.dataType ?? 'text',
+                cellDataType: col.dataType ?? 'text',
             }));
-            const gridOptions = { columnDefs, rowData: reportData.rows };
+            const gridOptions = {
+                columnDefs,
+                rowData: reportData.rows,
+                theme: this.getAgGridApi().getGridOption('theme'),
+                dataTypeDefinitions: this.getAgGridApi().getGridOption('dataTypeDefinitions'),
+            };
             const gridParams = {
                 modules: this.getAdaptableApi()
                     .internalApi.getAdaptableInstance()

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -22,6 +22,7 @@ export declare const HALF_SECOND: number;
 export declare const QUARTER_SECOND: number;
 export declare const GROUP_PATH_SEPARATOR: string;
 export declare const AG_GRID_GROUPED_COLUMN: string;
+export declare const AG_GRID_SELECTION_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAYOUT_NEW_TABLE_OR_PIVOT_TOOLTIP = exports.LAYOUT_NEW_PIVOT_TOOLTIP = exports.LAYOUT_NEW_TABLE_TOOLTIP = exports.THEME_STYLE = exports.SYSTEM_EXPORT_DESTINATIONS = exports.CLIPBOARD_EXPORT_DESTINATION = exports.DOWNLOAD_EXPORT_DESTINATION = exports.SELECT_REPORT_FORMAT_STRING = exports.SELECT_REPORT_STRING = exports.SYSTEM_REPORT_FORMATS = exports.JSON_FORMAT_REPORT = exports.CSV_FORMAT_REPORT = exports.VISUAL_EXCEL_FORMAT_REPORT = exports.EXCEL_FORMAT_REPORT = exports.SYSTEM_REPORT_NAMES = exports.SELECTED_DATA_REPORT = exports.CURRENT_LAYOUT_REPORT = exports.ALL_DATA_REPORT = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.MENU_SEPARATOR = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.QUARTER_SECOND = exports.HALF_SECOND = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.READ_ONLY_STYLE = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE_ID = exports.ADAPTABLE = exports.ERROR_LAYOUT = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.OBSERVABLE_EXPRESSION_ROW_REMOVED = exports.OBSERVABLE_EXPRESSION_ROW_ADDED = exports.STANDALONE_MODULE_POPUPS = exports.LAYOUT_DELETE_TOOLTIP = exports.LAYOUT_CLONE_TOOLTIP = exports.LAYOUT_EDIT_TOOLTIP = exports.LAYOUT_SAVE_TOOLTIP = void 0;
+exports.LAYOUT_NEW_PIVOT_TOOLTIP = exports.LAYOUT_NEW_TABLE_TOOLTIP = exports.THEME_STYLE = exports.SYSTEM_EXPORT_DESTINATIONS = exports.CLIPBOARD_EXPORT_DESTINATION = exports.DOWNLOAD_EXPORT_DESTINATION = exports.SELECT_REPORT_FORMAT_STRING = exports.SELECT_REPORT_STRING = exports.SYSTEM_REPORT_FORMATS = exports.JSON_FORMAT_REPORT = exports.CSV_FORMAT_REPORT = exports.VISUAL_EXCEL_FORMAT_REPORT = exports.EXCEL_FORMAT_REPORT = exports.SYSTEM_REPORT_NAMES = exports.SELECTED_DATA_REPORT = exports.CURRENT_LAYOUT_REPORT = exports.ALL_DATA_REPORT = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.MENU_SEPARATOR = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_SELECTION_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.QUARTER_SECOND = exports.HALF_SECOND = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.READ_ONLY_STYLE = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE_ID = exports.ADAPTABLE = exports.ERROR_LAYOUT = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.OBSERVABLE_EXPRESSION_ROW_REMOVED = exports.OBSERVABLE_EXPRESSION_ROW_ADDED = exports.STANDALONE_MODULE_POPUPS = exports.LAYOUT_DELETE_TOOLTIP = exports.LAYOUT_CLONE_TOOLTIP = exports.LAYOUT_EDIT_TOOLTIP = exports.LAYOUT_SAVE_TOOLTIP = exports.LAYOUT_NEW_TABLE_OR_PIVOT_TOOLTIP = void 0;
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
 exports.MISSING_COLUMN = ' [MISSING]';
 exports.LIGHT_THEME = 'light';
@@ -25,6 +25,7 @@ exports.HALF_SECOND = 500;
 exports.QUARTER_SECOND = 250;
 exports.GROUP_PATH_SEPARATOR = '/';
 exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
+exports.AG_GRID_SELECTION_COLUMN = 'ag-Grid-SelectionColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.AG_GRID_CHART_WINDOW = 'AG Grid Window';
 exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';

package/src/View/Export/ExportViewPanel.js

@@ -39,7 +39,7 @@ const ExportViewPanel = (props) => {
             React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
                     action: 'Edit',
                     source: 'Toolbar',
-                })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || exportApi.isExternalReport(currentReport), accessLevel: accessLevel }),
+                })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null, accessLevel: accessLevel }),
             React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
                     action: 'New',
                     source: 'Toolbar',

package/src/agGrid/AgGridExportAdapter.js

@@ -456,7 +456,9 @@ class AgGridExportAdapter {
             formatColumnsWithDisplayFormatMemo[columnId] = formatColumns;
             return formatColumns;
         };
-        const agGridDisplayedColumns = this.agGridApi.getAllDisplayedColumns();
+        const agGridDisplayedColumns = this.agGridApi
+            .getAllDisplayedColumns()
+            .filter((agCol) => agCol.getId() !== GeneralConstants_1.AG_GRID_SELECTION_COLUMN);
         const colDefs = agGridDisplayedColumns.map((column) => {
             return column.getColDef();
         });

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1742312380937 || Date.now(),
-    VERSION: "20.0.0-canary.21" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1742409311229 || Date.now(),
+    VERSION: "20.0.0-canary.22" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -3206,16 +3206,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
-    ExternalReport: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
     FDC3ActionColumn: {
         name: string;
         kind: string;
@@ -4473,22 +4463,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    PreProcessExportContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            ref: string;
-        })[];
-    };
     PreprocessRowDataContext: {
         name: string;
         kind: string;