@adaptabletools/adaptable 15.2.0-canary.1 → 15.2.0-canary.3

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1680766462195;
+declare const _default: 1680872029172;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef, Column, GridOptions, ModuleNames, IRowNode, StatusPanelDef } from '@ag-grid-community/core';
+import { ChartModel, ChartRef, Column, IRowNode, ModuleNames, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -196,8 +196,14 @@ export interface IAdaptable {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): void;
-    forAllVisibleRowNodesDo(func: (rowNode: IRowNode) => void): void;
-    getVisibleRowNodes(): IRowNode[];
+    forAllVisibleRowNodesDo(func: (rowNode: IRowNode, rowIndex: number) => void, config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): void;
+    getVisibleRowNodes(config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): IRowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
@@ -229,7 +235,7 @@ export interface IAdaptable {
     showChart(chart: ChartDefinition, container?: HTMLElement): ChartRef;
     getChartRef(chardId: string): ChartRef;
     getChartModels(): ChartModel[];
-    getRowModel(): GridOptions['rowModelType'];
+    getRowModelType(): RowModelType;
     getCurrentIPPStyle(): IPPStyle;
     getDefaultIPPStyle(): IPPStyle;
     getRowCount(): number;

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { FormContext } from '../PredefinedConfig/Common/FormContext';
 import { Report, ReportData, SystemReportNames } from '../PredefinedConfig/ExportState';
-import { AdaptableColumnBase, BaseContext } from '../types';
+import { AdaptableColumnDataType, BaseContext } from '../types';
 /**
  * Options regarding Exporting data from AdapTable
  */
@@ -29,6 +29,8 @@ export interface ExportOptions {
     customDestinations?: CustomDestination[];
     /**
      * Reports generated entirely by users (and not AdapTable)
+     *
+     * @deprecated It will be renamed to `externalReports` in version 16
      */
     serverReports?: ServerReport[];
     /**
@@ -57,6 +59,54 @@ export interface ExportOptions {
      * @defaultValue true
      */
     isColumnExportable?: (exportableColumnContext: ExportableColumnContext) => boolean;
+    /**
+     * Function invoked when a Report is run, enabling you to preload the data before it is exported.
+     * If the function returns a `ReportData` object, that will be used as the data for the Report;
+     * if it returns `TRUE`, the Report will be run as normal, using the data from the grid;
+     * if it returns `FALSE`, the Report will be cancelled.
+     */
+    preProcessExport?: (context: PreProcessExportContext) => boolean | Promise<ReportData | boolean>;
+}
+/**
+ * Context provided to `ExportOptions.processExport()` callback
+ */
+export interface PreProcessExportContext extends BaseContext {
+    /**
+     * The report to be exported
+     */
+    report: Report;
+    /**
+     * Returns the columns which would be included in the report based on the `Report.ReportColumnScope`
+     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
+     */
+    getReportColumns: (includePrimaryKey?: boolean) => AdaptableReportColumn[];
+    /**
+     * Returns the row data which would be included in the report based on the `Report.ReportRowScope`
+     * @param reportColumns - the columns to include in the report
+     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
+     */
+    getReportRowData: (reportColumns: AdaptableReportColumn[], includePrimaryKey?: boolean) => Record<string, any>[];
+}
+/**
+ * Column which is included in a Report
+ */
+export interface AdaptableReportColumn {
+    /**
+     * ColumnID
+     */
+    columnId: string;
+    /**
+     * Column Header
+     */
+    friendlyName: string;
+    /**
+     * Field name to get the value from the row data (defaults to `columnId`)
+     */
+    field?: string;
+    /**
+     * DataType of the Column
+     */
+    dataType: AdaptableColumnDataType;
 }
 /**
  * Format of exported Data - 'rawValue' or 'formattedValue'
@@ -137,5 +187,5 @@ export interface ExportableColumnContext extends BaseContext {
     /**
      * Column to be exported
      */
-    adaptableColumn: AdaptableColumnBase;
+    adaptableColumn: AdaptableReportColumn;
 }

package/src/Api/GridApi.d.ts

@@ -9,7 +9,7 @@ import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo'
 import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { GridOptions, IRowNode } from '@ag-grid-community/core';
+import { GridOptions, IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
 import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
 /**
@@ -211,8 +211,12 @@ export interface GridApi {
     getFirstDisplayedRowNode(): IRowNode | undefined;
     /**
      * Retrieves all filtered Row Nodes currently in the Grid (i.e. after applying the current filter)
+     * @param config - configuration
      */
-    getVisibleRowNodes(): IRowNode[];
+    getVisibleRowNodes(config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): IRowNode[];
     /**
      * Retrieves all Row Nodes currently in the Grid (by default excluding the group rows)
      * @param config - configuration
@@ -481,6 +485,10 @@ export interface GridApi {
      * Opens Settings Panel with Grid Info section selected and visible
      */
     openGridInfoSettingsPanel(): void;
+    /**
+     * Returns the current AG Grid Row Model Type
+     */
+    getRowModelType(): RowModelType;
     /**
      * TO BE REMOVED
      */

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

@@ -101,4 +101,6 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     logSuccess(message: string, ...optionalParams: any[]): void;
     logWarn(message: string, ...optionalParams: any[]): void;
     logError(message: string, ...optionalParams: any[]): void;
+    consoleError(message: string, ...optionalParams: any[]): void;
+    consoleWarn(message: string, ...optionalParams: any[]): void;
 }

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -161,5 +161,11 @@ class AdaptableApiImpl {
     logError(message, ...optionalParams) {
         this.adaptable.logger.error(message, optionalParams);
     }
+    consoleError(message, ...optionalParams) {
+        this.adaptable.logger.consoleError(message, optionalParams);
+    }
+    consoleWarn(message, ...optionalParams) {
+        this.adaptable.logger.consoleWarn(message, optionalParams);
+    }
 }
 exports.AdaptableApiImpl = AdaptableApiImpl;

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

@@ -3,11 +3,10 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, ExportFormContext, ServerReport } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableReportColumn, CustomDestination, ExportFormContext, ServerReport } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
-import { AdaptableColumnBase } from '../../types';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     internalApi: ExportInternalApi;
     constructor(adaptable: IAdaptable);
@@ -43,5 +42,5 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     isServerReport(report: Report): boolean;
     runServerReport(serverReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
-    isColumnExportable(adaptableColumn: AdaptableColumnBase): boolean;
+    isColumnExportable(adaptableColumn: AdaptableReportColumn): boolean;
 }

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

@@ -8,7 +8,7 @@ import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
-import { GridOptions, IRowNode } from '@ag-grid-community/core';
+import { GridOptions, IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
@@ -70,7 +70,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     selectColumns(columnIds: string[]): void;
     getFirstRowNode(): IRowNode;
     getFirstDisplayedRowNode(): IRowNode;
-    getVisibleRowNodes(): IRowNode[];
+    getVisibleRowNodes(config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): IRowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
@@ -136,4 +139,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridContainerElement(): HTMLElement | null;
     showGridInfoPopup(): void;
     openGridInfoSettingsPanel(): void;
+    getRowModelType(): RowModelType;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -262,7 +262,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getFirstDisplayedRowNode() {
         return this.adaptable.getFirstDisplayedRowNode();
     }
-    getVisibleRowNodes() {
+    getVisibleRowNodes(config) {
         return this.adaptable.getVisibleRowNodes();
     }
     getAllRowNodes(config) {
@@ -515,5 +515,8 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     openGridInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.GridInfoModuleId);
     }
+    getRowModelType() {
+        return this.adaptable.getRowModelType();
+    }
 }
 exports.GridApiImpl = GridApiImpl;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -258,7 +258,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             ColumnFilters: true,
             ColumnSorts: true,
         };
-        if (this.adaptable.getRowModel() === 'viewport') {
+        if (this.getGridApi().getRowModelType() === 'viewport') {
             layoutSupportedFeatures.RowGroupedColumns = false;
             layoutSupportedFeatures.AggregationColumns = false;
             layoutSupportedFeatures.PivotColumns = false;

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

@@ -77,8 +77,14 @@ export declare class AdaptableInternalApi extends ApiBase {
     getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
-    forAllRowNodesDo(func: (rowNode: IRowNode) => void): void;
-    forAllVisibleRowNodesDo(func: (rowNode: IRowNode) => void): void;
+    forAllRowNodesDo(func: (rowNode: IRowNode) => void, config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): void;
+    forAllVisibleRowNodesDo(func: (rowNode: IRowNode) => void, config?: {
+        includeGroupRows?: boolean;
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): void;
     getLabelForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getTooltipForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getStyleForButton(button: AdaptableButton<BaseContext>, context: BaseContext): ButtonStyle | undefined;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -143,11 +143,11 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         var _a, _b;
         return ((_b = (_a = this.adaptable.ModuleService.getModuleInfoByModule(adaptableModule)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : adaptableModule);
     }
-    forAllRowNodesDo(func) {
-        this.adaptable.forAllRowNodesDo(func);
+    forAllRowNodesDo(func, config) {
+        this.adaptable.forAllRowNodesDo(func, config);
     }
-    forAllVisibleRowNodesDo(func) {
-        this.adaptable.forAllVisibleRowNodesDo(func);
+    forAllVisibleRowNodesDo(func, config) {
+        this.adaptable.forAllVisibleRowNodesDo(func, config);
     }
     getLabelForButton(button, context) {
         if (!button.label) {

package/src/Api/Internal/LayoutInternalApi.js

@@ -117,7 +117,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             ColumnFilters: true,
             ColumnSorts: true,
         };
-        if (this.adaptable.getRowModel() === 'viewport') {
+        if (this.getGridApi().getRowModelType() === 'viewport') {
             layoutSupportedFeatures.RowGroupedColumns = false;
             layoutSupportedFeatures.AggregationColumns = false;
             layoutSupportedFeatures.PivotColumns = false;

package/src/PredefinedConfig/ExportState.d.ts

@@ -74,7 +74,7 @@ export interface ReportData {
      */
     columns: AdaptableColumnBase[];
     /**
-     * Rows in the Report
+     * Row Data in the Report
      */
     rows: Record<string, any>[];
 }

package/src/Strategy/ExportModule.d.ts

@@ -13,7 +13,8 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    export(report: Report, exportDestination: ExportDestination | string): void;
+    export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
+    private preProcessExport;
     private isCustomDestination;
     private convertReportToJSON;
     private openReportInTablePopup;

package/src/Strategy/ExportModule.js

@@ -21,6 +21,7 @@ const ExportSelector_1 = require("../View/Export/ExportSelector");
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
+const waitForTimeout_1 = require("../Utilities/waitForTimeout");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -70,12 +71,46 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             },
         ];
     }
-    export(report, exportDestination) {
+    async export(report, exportDestination) {
+        var _a;
+        const cleanupExportProcess = () => {
+            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
+            this.api.internalApi.hideProgressIndicator();
+        };
         if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
             this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportBegin)());
         }
-        this.api.internalApi.executeWithProgressIndicator(`${report.Name} Export in progress...`, () => {
-            var _a;
+        this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(`${report.Name} Export in progress...`));
+        try {
+            // waitForTimeout required to give the ProgressIndicator rendering a head-start (see rAF in ProgressIndicator implementation)
+            await (0, waitForTimeout_1.waitForTimeout)(16);
+            if (report.Name === GeneralConstants_1.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.internalApi.getReportService().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.internalApi.getReportService().getReportData(report);
+            }
+            else {
+                this.api.logInfo(`Export ${report.Name} (${exportDestination}) using data from preProcessExport()`);
+                reportData = preProcessedExport;
+            }
             if (this.isCustomDestination(exportDestination)) {
                 const customDestination = (_a = this.api.optionsApi
                     .getAdaptableOptions()
@@ -90,7 +125,8 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             return new Promise((resolve) => {
                                 setTimeout(() => {
                                     const preparedContext = Object.assign(Object.assign({}, context), { report,
-                                        customDestination, reportData: this.api.internalApi.getReportService().getReportData(report) });
+                                        customDestination,
+                                        reportData });
                                     resolve(preparedContext);
                                 }, 20);
                             });
@@ -100,7 +136,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 else if (customDestination) {
                     const reportContext = {
                         report: report,
-                        reportData: this.api.internalApi.getReportService().getReportData(report),
+                        reportData,
                         adaptableApi: this.api,
                     };
                     customDestination.onExport(reportContext);
@@ -109,33 +145,49 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             else {
                 switch (exportDestination) {
                     case Enums_1.ExportDestination.Excel:
-                        if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
-                            // WYSIWYG is fully delegated to the AG Grid excel export
-                            this.api.exportApi.exportVisualDataToExcel();
-                        }
-                        else {
-                            this.convertReportToExcel(report);
-                        }
+                        this.convertReportToExcel(report, reportData);
                         break;
                     case Enums_1.ExportDestination.Clipboard:
-                        this.copyToClipboard(report);
+                        this.copyToClipboard(report, reportData);
                         break;
                     case Enums_1.ExportDestination.CSV:
-                        this.convertReportToCsv(report);
+                        this.convertReportToCsv(report, reportData);
                         break;
                     case Enums_1.ExportDestination.JSON:
-                        this.convertReportToJSON(report);
+                        this.convertReportToJSON(report, reportData);
                         break;
                     case Enums_1.ExportDestination.Table:
-                        this.openReportInTablePopup(report);
+                        this.openReportInTablePopup(report, reportData);
                         break;
                 }
             }
-            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
-            this.api.internalApi.hideProgressIndicator();
-        }, () => {
-            this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
-        });
+            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({
+                report,
+                adaptableApi: this.api,
+                getReportColumns: (includePrimaryKey) => {
+                    return this.api.internalApi
+                        .getReportService()
+                        .getReportDataColumns(report, includePrimaryKey);
+                },
+                getReportRowData: (reportColumns, includePrimaryKey) => {
+                    return this.api.internalApi
+                        .getReportService()
+                        .getReportDataRows(report, reportColumns, includePrimaryKey);
+                },
+            });
+        }
+        return true;
     }
     isCustomDestination(exportDestination) {
         if (Object.values(Enums_1.ExportDestination).some((val) => val === exportDestination)) {
@@ -143,8 +195,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.exportApi.isExportDestinationCustom(exportDestination);
     }
-    convertReportToJSON(report) {
-        const reportData = this.api.internalApi.getReportService().getReportData(report);
+    convertReportToJSON(report, reportData) {
         if (this.isEmptyReportData(reportData)) {
             this.showEmptyExportWarning();
             return;
@@ -153,8 +204,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const jsonFileName = this.api.internalApi.getReportService().getReportFileName(report.Name) + '.json';
         Helper_1.Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
     }
-    openReportInTablePopup(report) {
-        const reportData = this.api.internalApi.getReportService().getReportData(report, true);
+    openReportInTablePopup(report, reportData) {
         if (this.isEmptyReportData(reportData)) {
             this.showEmptyExportWarning();
             return;
@@ -191,7 +241,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             popupProps,
         });
     }
-    convertReportToCsv(report) {
+    convertReportToCsv(report, reportData) {
         const csvContent = this.createCSVContent(report);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {
             this.showEmptyExportWarning();
@@ -200,15 +250,14 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const csvFileName = this.api.internalApi.getReportService().getReportFileName(report.Name) + '.csv';
         Helper_1.Helper.createDownloadedFile(csvContent, csvFileName, 'text/csv;encoding:utf-8');
     }
-    convertReportToExcel(report) {
-        const reportData = this.api.internalApi.getReportService().getReportData(report);
+    convertReportToExcel(report, reportData) {
         if (this.isEmptyReportData(reportData)) {
             this.showEmptyExportWarning();
             return;
         }
         this.api.exportApi.exportDataToExcel(reportData, this.api.internalApi.getReportService().getReportFileName(report.Name));
     }
-    copyToClipboard(report) {
+    copyToClipboard(report, reportData) {
         const csvContent = this.createTabularContent(report);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {
             this.showEmptyExportWarning();

package/src/Strategy/LayoutModule.js

@@ -65,7 +65,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * logic where layout is applied, it is easier and
          * less error prone to just remove it.
          */
-        if (this.api.internalApi.getAdaptableInstance().getRowModel() === 'viewport') {
+        if (this.api.gridApi.getRowModelType() === 'viewport') {
             this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
         }
     }

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -1,5 +1,5 @@
 import { Report, ReportData, SystemReportName } from '../../../PredefinedConfig/ExportState';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnBase } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptableService } from './IAdaptableService';
 import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
 import { SystemExportDestination } from '../../../types';
@@ -17,10 +17,12 @@ export interface IReportService extends IAdaptableService {
     GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(Report: Report, cols: AdaptableColumn[]): string;
-    GetReportColumnsForReport(report: Report): AdaptableColumn[];
     PublishLiveLiveDataChangedEvent(reportDestination: 'OpenFin' | 'ipushpull' | 'Glue42', liveDataChangedTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
+    getReportDataColumns(report: Report, includePrimaryKey?: boolean): AdaptableColumnBase[];
+    getReportDataRows(report: Report, columns: AdaptableColumnBase[], includePrimaryKey?: boolean): Record<string, any>[];
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
+    getReportDataColumns(report: Report, includePrimaryKey?: boolean): AdaptableColumnBase[];
     convertReportDataToArray(reportData: ReportData): any[][];
     getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
     getCellExportValueFromRawValue(rowNode: IRowNode, rawValue: any, columnId: string): any;

package/src/Utilities/Services/ReportService.d.ts

@@ -2,7 +2,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { Report, ReportData, SystemReportName } from '../../PredefinedConfig/ExportState';
 import { IReportService } from './Interface/IReportService';
 import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
-import { SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableReportColumn, SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
 import { AdaptableApi } from '../../../types';
 export declare class ReportService implements IReportService {
     private adaptableApi;
@@ -23,7 +23,8 @@ export declare class ReportService implements IReportService {
     GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(report: Report, cols: AdaptableColumn[]): string;
-    GetReportColumnsForReport(report: Report, includePrimaryKey?: boolean): AdaptableColumn[];
+    getReportDataColumns(report: Report, includePrimaryKey?: boolean): AdaptableReportColumn[];
+    getReportDataRows(report: Report, columns: AdaptableReportColumn[], includePrimaryKey?: boolean): Record<string, any>[];
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];