@adaptabletools/adaptable 13.0.0-canary.2 → 13.0.0-canary.20

package/src/Api/ConditionalStyleApi.d.ts

@@ -2,107 +2,85 @@ import { ConditionalStyleState, ConditionalStyle } from '../PredefinedConfig/Con
 import { AdaptableColumn, AdaptableScope } from '../types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
- * Provides run-time access to Conditional Style Module and state
+ *  Deprecated API section - use `FormatColumnAPI` instead
  */
 export interface ConditionalStyleApi {
     /**
-     * Retrieves Conditional Style section from Adaptable State
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStyleState(): ConditionalStyleState;
     /**
-     * Gets all Conditional Styles in Adaptable State
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllConditionalStyle(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): ConditionalStyle[];
     /**
-     * Get conditional style by id
-     * @param id conditional style id
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStyleById(id: ConditionalStyle['Uuid']): ConditionalStyle;
     /**
-     * Gets all Conditional Styles that are active (not-suspended) in Adaptable State
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllActiveConditionalStyle(): ConditionalStyle[];
     /**
-     * Gets all Conditional Styles that are suspended in Adaptable State
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllSuspendedConditionalStyle(): ConditionalStyle[];
     /**
-     * Opens Settings Panel with Conditional Style section selected and visible
+     * @deprecated use `FormatColumnָAPI` instead
      */
     showConditionalStylePopup(): void;
     /**
-     * Retrieves all Conditional Styles that style whole row
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getRowConditionalStyles(): ConditionalStyle[] | undefined;
     /**
-     * Retrieves all Conditional Styles which have an Expression
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylesWithExpression(): ConditionalStyle[] | undefined;
     /**
-     * Gets all Conditional Styles that style a given Column
-     * @param column Column to check
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylesForColumn(column: AdaptableColumn): ConditionalStyle[] | undefined;
     /**
-     * Returns all Predicates usable in Conditional Styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylePredicateDefs(): AdaptablePredicateDef[];
     /**
-     * Returns all Predicates appropriate for the given Scope
-     * @param scope Scope to check
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getCondStylePredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
-     * Retrieves all Conditional Styles ordered by Column then Row
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getOrderedConditionalStyles(): ConditionalStyle[] | undefined;
     /**
-     * Replaces Conditional Style in State with given one
-     * @param conditionalStyle Conditional Style to edit
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     editConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Replaces Conditional Styles in State with given ones
-     * @param conditionalStyles Conditional Styles to edit
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     editConditionalStyles(conditionalStyles: ConditionalStyle[]): ConditionalStyle[];
     /**
-     * Deletes a Conditional Style
-     * @param conditionalStyle Conditional Style to delete
+     * @deprecated use `FormatColumnָAPI` instead
      */
     deleteConditionalStyle(conditionalStyle: ConditionalStyle): void;
     /**
-     * Deletes Conditional Styles
-     * @param conditionalStyles Conditional Styles to delete
+     * @deprecated use `FormatColumnָAPI` instead
      */
     deleteConditionalStyles(conditionalStyles: ConditionalStyle[]): void;
     /**
-     * Adds new Conditional Style to State
-     * @param conditionalStyle Conditional Style to add
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     addConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Suspends conditional style, a readonly object cannot be suspended
-     * @param conditionalStyle Conditional Style to suspend
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     suspendConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Un-suspends or activates a suspended conditional style
-     * @param conditionalStyle Conditional Style to suspend
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     unSuspendConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
 }

package/src/Api/ConfigApi.d.ts

@@ -116,8 +116,7 @@ export interface ConfigApi {
      */
     getCalculatedColumnState(returnJson: boolean): CalculatedColumnState;
     /**
-     * Returns Conditional Style section of Adaptable State
-     * @param returnJson return as JSON rather than object
+     * @deprecated use `getFormatColumnState` instead
      */
     getConditionalStyleState(returnJson: boolean): ConditionalStyleState;
     /**

package/src/Api/ExportApi.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../PredefinedConfig/ExportState';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, CustomReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
+import { CustomDestination, ServerReport, ExportFormContext } from '../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 /**
  * Provides run-time access to the Export Module and Report state
@@ -50,7 +50,7 @@ export interface ExportApi {
     /**
      * Returns any Custom Reports that have been provided to Export Options
      */
-    getAllCustomReports(): CustomReport[] | undefined;
+    getAllServerReports(): ServerReport[] | undefined;
     /**
      * Retrieves System Reports section of Export State
      */
@@ -139,14 +139,14 @@ export interface ExportApi {
     exportVisualDataToExcel(): void;
     /**
      * Whether a Report is a Custom Report
-     * @param customReportName Report to Check
+     * @param report Report to Check
      */
-    isCustomReport(report: Report): boolean;
+    isServerReport(report: Report): boolean;
     /**
-     * Runs the report function of the CustomReport with the given reportName
+     * Runs the report function of the ServerReport with the given reportName
      * @param reportName custom report name
      */
-    runCustomReport(reportName: string): ReportData | undefined;
+    runServerReport(reportName: string): ReportData | undefined;
     /**
      * Returns the ReportData for the Report with the given name
      * @param reportName - the name of the report

package/src/Api/FinsembleApi.d.ts

@@ -0,0 +1,10 @@
+import { FinsemblePluginOptions } from '../AdaptableOptions/FinsemblePluginOptions';
+/**
+ * Provides run-time access to the Finsemble Plugin
+ */
+export interface FinsembleApi {
+    /**
+     * Retrieves the FinsemblePlugOptions provided in Finsemble Plugin
+     */
+    getPluginOptions(): FinsemblePluginOptions;
+}

package/src/Api/FinsembleApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/FormatColumnApi.d.ts

@@ -1,5 +1,5 @@
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn, AdaptableFormat } from '../types';
+import { FormatColumnState, FormatColumn } from '../PredefinedConfig/FormatColumnState';
+import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope } from '../types';
 import { RowNode } from '@ag-grid-community/core';
 /**
  * Provides run-time access to the Format Column Module and associated state
@@ -38,15 +38,10 @@ export interface FormatColumnApi {
      */
     getAllFormatColumnWithStyle(): FormatColumn[];
     /**
-     * Retrieves the ColumnComparison property, if there, from a Format Column (Column Style)
-     * @param formatColumn Format Column to Add
-     */
-    getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    /**
-     * Returns any ColumnIds referenced in a Column Comparison
-     * @param columnComparision Column Comparison to check
+     * Retrieves all Format Columns in Adaptable State with the `Style` or the `CellAlignment` property set
+     * @returns format columns
      */
-    getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
+    getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
     /**
      * Retrieves all Format Columns in Adaptable State with `DisplayFormat` property set
      * @returns format columns
@@ -105,23 +100,21 @@ export interface FormatColumnApi {
      */
     showFormatColumnPopup(): void;
     /**
-     * Gets an active Format Column, if any, for given Column
-     * @param column The Column for which to retrieve the Format Column
-     * @returns format column
-     */
-    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    /**
-     * Gets Format Column, if any, for given Column
+     * Gets all FormatColumns which are defined for the given column
      * @param column The Column for which to retrieve the Format Column
      * @returns format column
      */
-    getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
-     * Gets Format Column, if any, for given ColumnId
+     * Gets all FormatColumns which are defined for the column with the given columnId
      * @param columnId ColumnId for which to retrieve the Format Column
      * @returns format column
      */
-    getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
+    getFormatColumnsForColumnId(columnId: string, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Get Format Column which has Scope of Single Column, if any, for given ColumnId
      * @param columnId  ColumnId for which to retrieve the Format Column
@@ -129,57 +122,35 @@ export interface FormatColumnApi {
      */
     getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
     /**
-     * Gets Format Column if any for given Column which includes Style element
-     * @param column The Column for which to retrieve the Format Column
-     * @returns format column
+     * Get all FormatColumns which are defined for this column and have a custom AdaptableStyle
+     * @param column
+     * @param config
+     * @returns list of FormatColumn
      */
-    getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Gets Format Column if any for given Column which includes Style element with ClassName
      * @param column The Column for which to retrieve the Format Column
-     * @returns format column
+     * @returns format columns
      */
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
-     * Will get the most appropriate one i.e. first named Column, then DataType, then All
+     * Get all FormatColumns which are defined for this column and have a custom DisplayFormat
      * @param column
-     * @returns format column
+     * @param config
+     * @returns list of FormatColumn
      */
-    getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Returns true if Format State includes Format Columns with a Style property
      */
     hasStyleFormatColumns(): boolean;
-    /**
-     * Gets the Minimum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
-     * @param rowNode current Row Node
-     * @param cellValue current Cell Value
-     */
-    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    /**
-     * Gets the Maximum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
-     * @param rowNode current Row Node
-     * @param cellValue current Cell Value
-     */
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    /**
-     * Returns first Format Column that contains checkbox style
-     * @param columnId column to check
-     */
-    getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
-    /**
-     * Whether given column is a (boolean) checkbox column
-     * @param columnId column to check
-     */
-    isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
-    /**
-     * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
-     */
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     /**
      * Format value according to format options.
      *
@@ -206,4 +177,50 @@ export interface FormatColumnApi {
      * @param formatColumn Format Column
      */
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
+    /**
+     * Returns all Predicates usable in Format Columns
+     */
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Returns all Predicates appropriate for the given Scope
+     * @param scope Scope to check
+     */
+    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumn
+     * @param column
+     * @param params
+     */
+    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): boolean;
+    /**
+     * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumns
+     * @param column
+     * @param params
+     */
+    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): FormatColumn[];
+    /**
+     * Retrieves all Format Columns which have an Expression
+     * @returns Format Columns with Expression
+     */
+    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
+    /**
+     * Increment the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
+    /**
+     * Decrement the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
 }

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

@@ -39,6 +39,7 @@ import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
 import { StatusBarApi } from '../StatusBarApi';
 import { ActionApi } from '../../../types';
+import { StyledColumnApi } from '../StyledColumnApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     actionApi: ActionApi;
@@ -75,6 +76,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     queryApi: QueryApi;
     queryLanguageApi: QueryLanguageApi;
     settingsPanelApi: SettingsPanelApi;
+    styledColumnApi: StyledColumnApi;
     toolPanelApi: ToolPanelApi;
     teamSharingApi: TeamSharingApi;
     scopeApi: ScopeApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -41,6 +41,7 @@ const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
 const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
 const ActionApiImpl_1 = require("./ActionApiImpl");
+const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -79,6 +80,7 @@ class AdaptableApiImpl {
         this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
         this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);
         this.queryLanguageApi = new QueryLanguageApiImpl_1.QueryLanguageApiImpl(adaptable);
+        this.styledColumnApi = new StyledColumnApiImpl_1.StyledColumnApiImpl(adaptable);
         this.toolPanelApi = new ToolPanelApiImpl_1.ToolPanelApiImpl(adaptable);
         this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
         this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);

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

@@ -22,7 +22,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
     isActionColumn(columnId: string): boolean;
-    isFormatNumericStyleColumn(column: AdaptableColumn): boolean;
+    isStyledNumericColumn(column: AdaptableColumn): boolean;
     isNumericColumn(column: AdaptableColumn): boolean;
     isBooleanColumn(column: AdaptableColumn): boolean;
     isDateColumn(column: AdaptableColumn): boolean;
@@ -61,6 +61,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
     getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
     getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
+    getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
     getDistinctVisibleRawValuesForColumn(columnId: string): any[];
     private sortDistinctValues;
     getPrimaryKeyColumn(): AdaptableColumn;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -79,23 +79,23 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
             null);
     }
-    isFormatNumericStyleColumn(column) {
+    isStyledNumericColumn(column) {
         if (column) {
-            return this.adaptable.api.formatColumnApi
-                .getAllFormatColumn()
-                .filter((fc) => { var _a, _b; return ((_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) || ((_b = fc.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle); })
-                .some((formatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, formatColumn.Scope));
+            const styledColmn = this.adaptable.api.styledColumnApi
+                .getAllActiveStyledColumn()
+                .find((sc) => !sc.CheckBoxStyle && sc.ColumnId == column.columnId);
+            return styledColmn != null;
         }
         return false;
     }
     isNumericColumn(column) {
-        return column.dataType == 'Number';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
     }
     isBooleanColumn(column) {
-        return column.dataType == 'Boolean';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Boolean';
     }
     isDateColumn(column) {
-        return column.dataType == 'Date';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
@@ -343,11 +343,17 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
+        return this.sortDistinctValues(this.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode), abColumn).map((cv) => {
             return cv.rawValue;
         });
     }
+    getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return [];
+        }
+        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+    }
     getDistinctVisibleRawValuesForColumn(columnId) {
         const abColumn = this.getColumnFromId(columnId);
         if (abColumn == undefined) {
@@ -424,15 +430,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     getTypesForColumn(columnId) {
         var _a;

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

@@ -3,7 +3,7 @@ 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, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ServerReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -30,8 +30,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     editReports(reports: Report[]): Report[];
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
-    getAllCustomReports(): CustomReport[] | undefined;
-    isCustomReport(report: Report): boolean;
-    runCustomReport(customReportName: string): ReportData | undefined;
+    getAllServerReports(): ServerReport[] | undefined;
+    isServerReport(report: Report): boolean;
+    runServerReport(serverReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -61,10 +61,10 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const customReports = this.getAllCustomReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
-            reports.push(...customReports.map((c) => {
-                return ObjectFactory_1.default.CreateCustomReport(c.name);
+        const serverReports = this.getAllServerReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
+            reports.push(...serverReports.map((c) => {
+                return ObjectFactory_1.default.CreateServerReport(c.name);
             }));
         }
         return reports;
@@ -120,7 +120,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.isCustomReport(report)) {
+        if (this.isServerReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities
@@ -178,21 +178,21 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
-    getAllCustomReports() {
-        return this.getExportOptions().customReports;
+    getAllServerReports() {
+        return this.getExportOptions().serverReports;
     }
-    isCustomReport(report) {
+    isServerReport(report) {
         var _a;
-        return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return ((_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
     }
-    runCustomReport(customReportName) {
+    runServerReport(serverReportName) {
         var _a;
-        const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
-        if (!customReport) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Custom Report '${customReportName}' not found!`);
+        const serverReport = (_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
+        if (!serverReport) {
+            (0, LoggingHelper_1.LogAdaptableWarning)(`Server Report '${serverReportName}' not found!`);
             return undefined;
         }
-        return customReport.onRunReport();
+        return serverReport.onRunReport();
     }
     getReportDataForReport(reportName) {
         const report = this.getReportByName(reportName);