@adaptabletools/adaptable 12.1.5 → 12.1.8-canary.0

package/index.css

@@ -2598,66 +2598,6 @@ template {
   --ab-cmp-toolpanelpanel_body__background: var(--ab-cmp-dashboardpanel_body__background);
   --ab-cmp-toolpanelpanel_body__padding: var(--ab-cmp-dashboardpanel_body__padding); }
 
-.ab-LayoutEditor {
-  overflow: auto;
-  display: grid;
-  padding: var(--ab-space-2);
-  flex: 1 1 0;
-  min-height: 0;
-  grid-template-columns: 28rem 1fr;
-  grid-template-rows: repeat(3, 1fr);
-  grid-column-gap: 0px;
-  grid-row-gap: 0px;
-  row-gap: var(--ab-space-2);
-  column-gap: var(--ab-space-2);
-  grid-gap: var(--ab-space-2); }
-
-.ab-LayoutEditor,
-  .ab-LayoutEditor * {
-    box-sizing: border-box; }
-
-.ab-LayoutEditor__ColumnList {
-  overflow: auto; }
-
-.ab-LayoutEditor__ColumnListPanel {
-  grid-area: 1 / 1 / 4 / 2; }
-
-.ab-LayoutEditor__ColumnSortListPanel {
-  grid-area: 1 / 2 / 2 / 3; }
-
-.ab-LayoutEditor__RowGroupsListPanel {
-  grid-area: 2 / 2 / 3 / 3; }
-
-.ab-LayoutEditor__PivotListPanel {
-  grid-area: 3 / 2 / 4 / 3; }
-
-.ab-LayoutEditor__PivotList--empty,
-.ab-LayoutEditor__RowGroupsList--empty,
-.ab-LayoutEditor__ColumnSortList--empty {
-  display: flex;
-  flex-flow: column;
-  align-items: center;
-  justify-content: center; }
-
-.ab-LayoutEditor__PivotList,
-.ab-LayoutEditor__RowGroupsList,
-.ab-LayoutEditor__ColumnSortList {
-  padding-top: var(--ab-space-2); }
-
-.ab-LayoutEditor__PivotList__column,
-.ab-LayoutEditor__RowGroupsList__column,
-.ab-LayoutEditor__ColumnSortList__column,
-.ab-LayoutEditor__ColumnList__column {
-  background: var(--ab-color-primary);
-  color: var(--ab-color-text-on-primary);
-  margin: 0 0 var(--ab-space-2) 0; }
-
-.ab-LayoutEditor__PivotList__column,
-.ab-LayoutEditor__RowGroupsList__column,
-.ab-LayoutEditor__ColumnSortList__column {
-  padding-top: var(--ab-space-2);
-  padding-bottom: var(--ab-space-2); }
-
 :root {
   --ab-cmp-popover__border-radius: var(--ab__border-radius);
   --ab-cmp-popover__background: var(--ab-color-defaultbackground);
@@ -2798,6 +2738,13 @@ template {
   --ab-cmp-adaptable-layout-wizard-column-input__max-width: 200px;
   --ab-cmp-adaptable-layout-wizard-column-input__width: 100%; }
 
+.ab-PermitedValuesSelector__PopupContent {
+  z-index: 1000;
+  font-size: var(--ab-cmp-adaptable-permitted-values-selector__font-size);
+  border: 1px solid var(--ab-cmp-adaptable-permitted-values-selector__border);
+  background-color: var(--ab-cmp-adaptable-permitted-values-selector__background-color);
+  padding: var(--ab-cmp-adaptable-permitted-values-selector__padding); }
+
 .ab-Radio-input:focus + svg rect {
   stroke: var(--ab-color-accent);
   stroke-width: 2; }
@@ -4258,6 +4205,12 @@ button.ab-StatusBar__SubPanel:hover {
   max-width: var(--ab-cmp-adaptable-layout-wizard-column-input__max-width);
   width: var(--ab-cmp-adaptable-layout-wizard-column-input__width); }
 
+:root {
+  --ab-cmp-adaptable-permitted-values-selector__font-size: var(--ab-font-size-2);
+  --ab-cmp-adaptable-permitted-values-selector__border: 1px solid var(--ab-color-primarydark);
+  --ab-cmp-adaptable-permitted-values-selector__background-color: var(--ab-color-defaultbackground);
+  --ab-cmp-adaptable-permitted-values-selector__padding: var(--ab-space-1); }
+
 .ab-alert--error {
   background: var(--ab-color-error); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.5",
+  "version": "12.1.8-canary.0",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1659522068928;
+declare const _default: 1661370166897;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -49,14 +49,20 @@ export interface IAdaptable {
      * Avoid unnecessary store calls and rendering
      */
     isInitialised: boolean;
-    /**
-     * TRUE if the Adaptable custom tool panel (side-bar) is displayed
-     */
-    hasAdaptableToolPanel: boolean;
     /**
      * Set to true when adaptable is destroyed.
      */
     isDestroyed: boolean;
+    /**
+     * TRUE iff:
+     *  1. isInitialised = TRUE
+     *  2. isDestroyed = FALSE
+     */
+    isLive: boolean;
+    /**
+     * TRUE if the Adaptable custom tool panel (side-bar) is displayed
+     */
+    hasAdaptableToolPanel: boolean;
     /**
      * Adaptable contains a number of 'Services' which are created at Startup
      *
@@ -113,6 +119,7 @@ export interface IAdaptable {
     _emitSync(eventName: 'CreateAdaptableContextMenuItems', data?: any): Promise<any>;
     prepareGrid(): void;
     redrawBody(): void;
+    redrawRenderedRows(): void;
     redrawHeader(): void;
     redrawRow(rowNode: RowNode): void;
     redrawRows(rowNodes: RowNode[]): void;
@@ -181,6 +188,7 @@ export interface IAdaptable {
     getVisibleRowNodes(): RowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     getRowsInViewport(): RowNode[];
     isGroupRowNode(rowNode: RowNode): boolean;

package/src/AdaptableOptions/ColumnOptions.d.ts

@@ -5,14 +5,12 @@ import { Column } from '@ag-grid-community/all-modules';
 export interface ColumnOptions {
     /**
      * Provide an alternative Friendly Name for a Column
-     *
      * @defaultValue  undefined
      */
     columnFriendlyName?: (columnFriendlyNameContext: ColumnFriendlyNameContext) => string | undefined;
     /**
-     * Optional list of Column Types - used primarily for Special Columns
-     *
-     * @defaultValue  []
+     * Optional list of Column Types - used primarily for Calculated and FreeText Columns
+     * @defaultValue undefined
      */
     columnTypes?: string[];
     /**

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -150,4 +150,23 @@ export interface FilterOptions {
      * @defaultValue  true
      */
     showQuickFilter?: boolean;
+    /**
+     * Display only currently filtered distinct values in Filter controls
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     */
+    showDistinctFilteredValuesOnly?: boolean;
+    /**
+     * Display Clear Filter button in Toolbar and Toolpanel
+     * @defaultValue  false
+     * @gridInfoItem
+     */
+    showClearFilterButton?: boolean;
+    /**
+     * Display Suspend / Unsuspend Button in Toolbar and Toolpanel
+     * @defaultValue  false
+     * @gridInfoItem
+     */
+    showSuspendFilterButton?: boolean;
 }

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableIcon, ContextMenuContext, GridCell } from '../../types';
+import { AdaptableApi, AdaptableIcon, ContextMenuContext, FDC3Context, GridCell } from '../../types';
 import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context';
 /**
  * Options required for when using the Finance plugin
@@ -41,6 +41,18 @@ export interface FinancePluginOptions {
      * Columns to use a Weighted Average aggregation
      */
     weightedAverageColumns?: WeightedAverageColumn[];
+    /**
+     * Intents to which to subscribe.
+     */
+    availableFDC3Intents?: (FDC3Intent | CustomFDC3Intent)[];
+    /**
+     * Called when an intent from `availableIntents` is raised.
+     */
+    onFDC3Intent?: (intent: FDC3Intent | CustomFDC3Intent, context: FDC3Context, adaptableApi: AdaptableApi) => void;
+    /**
+     * Called when a context changes.
+     */
+    onFDC3Context?: (context: FDC3Context, adaptableApi: AdaptableApi) => void;
 }
 /**
  * An Column which contains a Weighted Average aggregation
@@ -265,3 +277,12 @@ export interface RaiseFDC3IntentContext extends ContextMenuContext {
      */
     intent: FDC3Intent | CustomFDC3Intent;
 }
+export declare type FDC3ContextHandler = (context: FDC3Context) => void;
+export interface FDC3DesktopAgent {
+    raiseIntent: (intent: FDC3Intent, context: FDC3Context) => void;
+    broadcast: (context: FDC3Context) => void;
+    addIntentListener: (intent: FDC3Intent | CustomFDC3Intent, listener: (context: FDC3Context) => void) => void;
+    addContextListener: (contextType: string | null, handler: FDC3ContextHandler) => {
+        unsubscribe: () => void;
+    };
+}

package/src/AdaptableOptions/StateOptions.d.ts

@@ -4,7 +4,7 @@ import { AdaptableState } from '../PredefinedConfig/AdaptableState';
  */
 export interface StateOptions {
     /**
-     * Allows the customization of Adaptable State loading
+     * Allows customization of Adaptable State loading
      */
     loadState?: AdaptableLoadStateFunction;
     /**
@@ -12,11 +12,11 @@ export interface StateOptions {
      */
     applyState?: (state: any) => any;
     /**
-     * Allows the customization of the Adaptable State that is going to be persisted
+     * Allows customization of Adaptable State about to be persisted
      */
     saveState?: AdaptableSaveStateFunction;
     /**
-     * Allows the customization of Adaptable State persistence
+     * Allows customization of Adaptable State persistence
      */
     persistState?: AdaptablePersistStateFunction;
     /**
@@ -34,39 +34,52 @@ export interface StateOptions {
      */
     debounceStateDelay?: number;
 }
-export declare type AdaptableStateFunctionConfig = {
+/**
+ * State Function Config object passed into all State Options functions (except 'applyState')
+ */
+export interface AdaptableStateFunctionConfig {
+    /**
+     * Id of current Adaptable instance
+     */
     adaptableId: string;
+    /**
+     * State Key being used
+     */
     adaptableStateKey: string;
+    /**
+     * current Adaptable user
+     */
     userName: string;
+    /**
+     * optional url
+     */
     url?: string;
-};
+}
 /**
  * Allows customization of state persistence - used `persistState` function in StateOptions
  *
  * @example
  * ```
- * persistState = (state, {adaptableId, adaptableStateKey}) => {
- *  localStorage.setItem(adaptableStateKey, JSON.stringify(state))
+ * persistState = (state, stateFunctionConfig) => {
+ *  localStorage.setItem(stateFunctionConfig.adaptableStateKey, JSON.stringify(state))
  * }
  * ```
  */
 export interface AdaptablePersistStateFunction {
-    (state: any, { adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): Promise<any>;
+    (state: any, adaptableStateFunctionConfig: AdaptableStateFunctionConfig): Promise<any>;
 }
 /**
  * Allows clearing state when a custom persistState is used.
  * Only called by configApi.reloadPredefinedConfig
- *
- * @example
  */
 export interface AdaptableClearStateFunction {
-    ({ adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): Promise<any>;
+    (adaptablestatefunctionconfig: AdaptableStateFunctionConfig): Promise<any>;
 }
 /**
  * Allows the customization state persistence - used by `saveState` function in StateOptions
  */
 export interface AdaptableSaveStateFunction {
-    (state: AdaptableState, { adaptableId, adaptableStateKey, userName, url }: AdaptableStateFunctionConfig): any;
+    (state: AdaptableState, adaptablestatefunctionconfig: AdaptableStateFunctionConfig): any;
 }
 /**
  * Allows customization of state loading - used by `loadState` function in StateOptions

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -105,7 +105,7 @@ export interface BasePermittedValues {
  */
 export interface PermittedValues extends BasePermittedValues {
     /**
-     * Values to display: either hardcoded list or a function
+     * Values to display: either hardcoded list or a function that returns a list
      */
     values?: any[] | ((context: PermittedValuesContext) => any[]);
 }
@@ -113,6 +113,9 @@ export interface PermittedValues extends BasePermittedValues {
  * Used to define permitted values for inline column editor
  */
 export interface EditLookUpPermittedValues extends BasePermittedValues {
+    /**
+     * Values to display in Edit Look Up: either hardcoded list or a function that returns a list
+     */
     values?: any[] | ((context: EditLookUpContext) => any[]);
 }
 /**
@@ -124,56 +127,60 @@ export interface FilterPermittedValues extends BasePermittedValues {
      * @defaultValue false
      */
     suppressFilterSearchBar?: boolean;
+    /**
+     * Values to display in 'IN' Filter: either hardcoded list or a function that returns a list
+     */
     values: (context: FilterPermittedValuesContext) => any[] | Promise<any[]>;
 }
 /**
- * Custom column values for custom sort.
+ * Custom column values for Custom Sort
  */
 export interface CustomSortPermittedValues extends BasePermittedValues {
+    /**
+     * Values to display in Custom Sort Wizard: either hardcoded list or a function that returns a list
+     */
     values: (context: PermittedValuesContext) => any[] | Promise<any[]>;
 }
 /**
  * User to define permitted values when updating cells via bulk update
  */
 export interface BulkUpdatePermittedValues extends BasePermittedValues {
+    /**
+     * Values to display in Bulk Update Wizard: either hardcoded list or a function that returns a list
+     */
     values: (context: BulkUpdatePermittedValuesContext) => any[] | Promise<any[]>;
 }
 /**
- * Use PermittedValues instead
- * @deprecated use PermittedValues instead
+ * Context used when getting PermittedValues via a function
  */
-export declare type CellValuesList = PermittedValues;
-export interface EditLookUpContext extends BaseContext {
-    /**
-     * Column displaying the Edit LookUp
-     */
-    column: AdaptableColumn;
-    /**
-     * Cell being edited
-     */
-    gridCell?: GridCell;
-}
 export interface PermittedValuesContext extends BaseContext {
     /**
      * Column whose values are being displayed
      */
     column: AdaptableColumn;
 }
-export interface FilterPermittedValuesContext extends BaseContext {
+/**
+ * Context used when getting EditLookUpPermittedValues via a function
+ */
+export interface EditLookUpContext extends PermittedValuesContext {
     /**
-     * Column hosting the filter form
+     * Cell being edited
      */
-    column: AdaptableColumn;
+    gridCell?: GridCell;
+}
+/**
+ * Context used when getting FilterPermittedValues via a function
+ */
+export interface FilterPermittedValuesContext extends PermittedValuesContext {
     /**
      * A search string
      */
-    filter: string;
+    searchFilter: string;
 }
-export interface BulkUpdatePermittedValuesContext extends BaseContext {
-    /**
-     * Column being edited via Bulk Update
-     */
-    column: AdaptableColumn;
+/**
+ * Context used when getting BulkUpdatePermittedValues via a function
+ */
+export interface BulkUpdatePermittedValuesContext extends PermittedValuesContext {
     /**
      * Cells which will be modified in the Bulk Update
      */

package/src/Api/ColumnApi.d.ts

@@ -229,7 +229,7 @@ export interface ColumnApi {
      * @param columnId Column to check
      * @param columnFilter Current applied filter
      */
-    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
+    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{
         values: {
             value: any;
             label: string;
@@ -308,6 +308,11 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     getDefaultAggFunc(columnId: string): string;
+    /**
+     * Returns the `types` property for a given Column
+     * @param columnId Column to Check
+     */
+    getTypesForColumn(columnId: string): string | string[];
     getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
     getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
 }

package/src/Api/ExportApi.d.ts

@@ -133,6 +133,11 @@ export interface ExportApi {
      * Exports data currently in grid to Excel as What-You-See-Is-What-You-Get
      */
     exportVisualDataToExcel(): void;
+    /**
+     * Whether a Report is a Custom Report
+     * @param customReportName Report to Check
+     */
+    isCustomReport(report: Report): boolean;
     /**
      * Runs the report function of the CustomReport with the given reportName
      * @param reportName custom report name

package/src/Api/FilterApi.d.ts

@@ -48,6 +48,11 @@ export interface FilterApi {
      * @returns column filters
      */
     getColumnFilters(): ColumnFilter[];
+    /**
+     * Retrieves all active/no-suspedned Column Filters in currently applied Layout
+     * @returns column filters
+     */
+    getActiveColumnFilters(): ColumnFilter[];
     /**
      * Retrieves the Column Filter for the specified Column.
      * @param columnId Column ID to lookup
@@ -138,4 +143,28 @@ export interface FilterApi {
      * Fires Filter Applied Event - typically used to enable filtering on the server
      */
     fireFilterAppliedEvent(): void;
+    /**
+     * Compares to sets of Column Filters to see if they are identical
+     * @param filters1
+     * @param filters2
+     */
+    areColumnFiltersDifferent(filters1: ColumnFilter[], filters2: ColumnFilter[]): boolean;
+    /**
+     * Suspends a Column Filter
+     * @param columnFilter Column Filter to Suspend
+     */
+    suspendColumnFilter(columnFilter: ColumnFilter): void;
+    /**
+     * Unsuspends a Column Filter
+     * @param columnFilter Column Filter to UnSuspend
+     */
+    unSuspendColumnFilter(columnFilter: ColumnFilter): void;
+    /**
+     * Suspends all Column Filters
+     */
+    suspendAllColumnFilters(): void;
+    /**
+     * Unsuspends all Column Filters
+     */
+    unSuspendAllColumnFilters(): void;
 }

package/src/Api/FlashingCellApi.d.ts

@@ -60,6 +60,10 @@ export interface FlashingCellApi {
      * @param flashingCellDefinitions Flashing Cell Definitions to Add to State
      */
     setFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): void;
+    /**
+     * Merges a Flashing Cell Definition with default values
+     * @param flashingCellDefinition Flashing Cell Definition to Merge
+     */
     mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     /**
      * Adds provided Flashing cell Definitions
@@ -88,4 +92,8 @@ export interface FlashingCellApi {
      * @param scope the Scope to check
      */
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Clears all Cells and Rows which have been flashed (primarily used if duration is 'Always')
+     */
+    clearGridFlashing(): void;
 }

package/src/Api/GridApi.d.ts

@@ -206,6 +206,7 @@ export interface GridApi {
      */
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     /**
      * Retrieves Row Nodes that contain given Primary Keys

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

@@ -53,7 +53,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getQueryableColumns(): AdaptableColumn[];
     private LogMissingColumnWarning;
     getDistinctDisplayValuesForColumn(columnId: string): any[];
-    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
+    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{
         values: any[];
         suppressClientSideFilter: boolean;
     }>;
@@ -72,4 +72,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDefaultAggFunc(columnId: string): string;
     getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
     getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
+    getTypesForColumn(columnId: string): string | string[] | undefined;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -289,7 +289,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             return cv.normalisedValue;
         });
     }
-    async getDistinctFilterDisplayValuesForColumn(columnId, filter) {
+    async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
         const abColumn = this.getColumnFromId(columnId);
         if (abColumn == undefined) {
             return {
@@ -297,7 +297,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
                 suppressClientSideFilter: false,
             };
         }
-        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
+        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
                 return {
@@ -434,5 +434,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         // can we cache this in some way?
         return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
     }
+    getTypesForColumn(columnId) {
+        var _a;
+        const agGridColumn = this.getAgGridColumnForAdaptableColumn(columnId);
+        return (_a = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef()) === null || _a === void 0 ? void 0 : _a.type;
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

package/src/Api/Implementation/DataSetApiImpl.js

@@ -30,7 +30,7 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.DataSetModuleId);
     }
     fireDataSetSelectedEvent(dataSet) {
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isLive) {
             const dataSetSelectedInfo = {
                 adaptableApi: this.adaptable.api,
                 dataSet,

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, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -30,6 +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;
     getReportDataForReport(reportName: string): ReportData | undefined;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -7,6 +7,8 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class ExportApiImpl extends ApiBase_1.ApiBase {
     getExportState() {
         return this.getAdaptableState().Export;
@@ -56,9 +58,16 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         return systemDestinations;
     }
     getAllReports() {
-        return this.getAvailableSystemReports()
+        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);
+            }));
+        }
+        return reports;
     }
     getReportSchedules() {
         return this.getAdaptableState().Schedule.ReportSchedules;
@@ -111,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 (report.ReportRowScope == 'CustomRows' || report.ReportColumnScope == 'CustomColumns') {
+        if (this.isCustomReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities
@@ -169,9 +178,16 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
+    getAllCustomReports() {
+        return this.getExportOptions().customReports;
+    }
+    isCustomReport(report) {
+        var _a;
+        return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+    }
     runCustomReport(customReportName) {
         var _a;
-        const customReport = (_a = this.getExportOptions().customReports) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
+        const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
         if (!customReport) {
             LoggingHelper_1.LogAdaptableWarning(`Custom Report '${customReportName}' not found!`);
             return undefined;