@adaptabletools/adaptable-cjs 20.0.0-canary.3 → 20.0.0-canary.5

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -31,6 +31,7 @@ import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
 import { RowFormService } from '../Utilities/Services/RowFormService';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from '../agGrid/AgGridExportAdapter';
+import { AgGridThemeAdapter } from '../agGrid/AgGridThemeAdapter';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -66,6 +67,7 @@ export interface IAdaptable {
     agGridMenuAdapter: AgGridMenuAdapter;
     agGridColumnAdapter: AgGridColumnAdapter;
     agGridExportAdapter: AgGridExportAdapter;
+    agGridThemeAdapter: AgGridThemeAdapter;
     hasAdaptableToolPanel: boolean;
     renderReactRoot: RenderReactRootFn;
     /**
@@ -244,7 +246,6 @@ export interface IAdaptable {
     isGridRangeSelectable(): boolean;
     isGridRowSelectable(): boolean;
     isGridGroupingActive(): boolean;
-    getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAllGridColumns(): Column<any>[];

package/src/AdaptableOptions/CellSummaryOptions.d.ts

@@ -9,7 +9,7 @@ export interface CellSummaryOptions<TData = any> {
      */
     customCellSummaryOperations?: CustomCellSummaryOperation<TData>[];
     /**
-     * Numeric format to use for summary value; note relevant Format Columns with a DisplayFormat take precedence over this
+     * Numeric format to use for summary value; a Format Column DisplayFormat will take precedence
      */
     numericDisplayFormat?: NumberFormatterOptions | ((columnContext: AdaptableColumnContext) => NumberFormatterOptions);
 }

package/src/AdaptableOptions/ContainerOptions.d.ts

@@ -16,13 +16,6 @@ export interface ContainerOptions {
      * @gridInfoItem
      */
     agGridContainer?: string | HTMLElement;
-    /**
-     *  How long to wait for AG Grid before giving up trying to connect
-     *
-     * @defaultValue 60s
-     * @gridInfoItem
-     */
-    agGridContainerWaitTimeout?: number;
     /**
      * Name of div where popups appear
      *

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -58,7 +58,6 @@ const DefaultAdaptableOptions = {
     containerOptions: {
         adaptableContainer: 'adaptable',
         agGridContainer: 'grid',
-        agGridContainerWaitTimeout: 60000,
         modalContainer: undefined,
         systemStatusContainer: undefined,
         alertContainer: undefined,
@@ -299,6 +298,7 @@ const DefaultAdaptableOptions = {
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
         showDocumentationLinks: true,
         showAdapTableVersion: true,
+        showAgGridVersion: true,
     },
 };
 function applyDefaultAdaptableOptions(adaptableOptions) {

package/src/AdaptableOptions/EditOptions.d.ts

@@ -26,7 +26,7 @@ export interface EditOptions<TData = any> {
      */
     smartEditCustomOperations?: SmartEditCustomOperation<TData>[];
     /**
-     * Dropdown values displayed when column is being edited
+     * Columns that will display a Select dropdown when editing
      */
     showSelectCellEditor?: (currentColumContext: AdaptableColumnContext<TData>) => boolean;
     /**
@@ -39,17 +39,28 @@ export interface EditOptions<TData = any> {
  */
 export interface CustomEditColumnValuesContext<TData = any> extends AdaptableColumnContext<TData> {
     /**
-     * Current distinct values in Cell
+     * Current distinct values in Column
      */
     defaultValues: Required<CustomEditColumnValueInfo>[];
+    /**
+     * Search text in Edit - used when fetching values from server
+     */
     currentSearchValue: string;
     /**
      * Currently edited Grid Cell
      */
     gridCell: GridCell;
 }
+/**
+ * Information about items in the Edit Controls
+ */
 export interface CustomEditColumnValueInfo {
-    label?: string;
+    /**
+     * Item's label
+     */ label?: string;
+    /**
+     * Value of Item being shown
+     */
     value: any;
 }
 /**

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -13,7 +13,7 @@ export interface ExportOptions<TData = any> {
      *
      * @defaultValue rawValue
      */
-    exportDataFormat?: DataFormatType | DataFormatDataType | ((dataFormatTypeContext: DataFormatTypeContext<TData>) => DataFormatType);
+    exportDataFormat?: DataFormatType | DataFormatDataType | ((context: AdaptableColumnContext<TData>) => DataFormatType);
     /**
      * Optional custom format for Date columns when exporting
      *
@@ -66,7 +66,7 @@ export interface ExportOptions<TData = any> {
      * Whether a Column is included in System Reports and available in UI for selection
      * @defaultValue true
      */
-    isColumnExportable?: (exportableColumnContext: ExportableColumnContext) => boolean;
+    isColumnExportable?: (context: AdaptableColumnContext) => boolean;
     /**
      * Function invoked before a Report is run, enabling users to preload the data before it is exported
      */
@@ -257,11 +257,6 @@ export interface ReportContext extends BaseExportContext {
      */
     reportData: ExportResultData;
 }
-/**
- * Context used for setting whether a Column is exportable
- */
-export interface ExportableColumnContext extends AdaptableColumnContext {
-}
 /**
  * Context used for providing a custom filename for a Report
  */
@@ -271,23 +266,14 @@ export interface ReportFileNameContext extends BaseExportContext {
      */
     fileName: string;
 }
-/**
- * Context provided when setting a Data Format Type for Export
- */
-export interface DataFormatTypeContext<TData = any> extends BaseContext {
-    /**
-     * Column being exported
-     */
-    column: AdaptableColumn<TData>;
-}
 /**
  * Defines the Format Data Types for all Data Types
  */
 export interface DataFormatDataType {
     /**
-     * Data Format type for String columns
+     * Data Format type for String / Text columns
      */
-    string?: DataFormatType;
+    text?: DataFormatType;
     /**
      * Data Format type for Number columns
      */

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -36,10 +36,10 @@ export interface PredicateOptions {
      */
     caseSensitivePredicates?: boolean;
     /**
-   * Should Values (IN) Predicate evaluate using datetime (rather than date)
-   * @defaultValue  true
-   * @noCodeItem
-   */
+     * Should Values (IN) Predicate evaluate using datetime (rather than date)
+     * @defaultValue  true
+     * @noCodeItem
+     */
     evaluateValuesPredicateUsingTime?: boolean;
 }
 /**

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -68,6 +68,13 @@ export interface UserInterfaceOptions<TData = any> {
      * @gridInfoItem
      */
     showAdapTableVersion?: boolean;
+    /**
+     * Displays the AG Grid version in Grid Info section of Settings Panel
+     *
+     * @defaultValue true
+     * @gridInfoItem
+     */
+    showAgGridVersion?: boolean;
     /**
      * English variant to use in AdapTable UI
      *

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -144,6 +144,7 @@ class AdaptableApiImpl {
         this.formatColumnApi = null;
         this.freeTextColumnApi = null;
         this.gridApi = null;
+        this.rowFormApi = null;
         this.internalApi = null;
         this.layoutApi = null;
         this.pluginsApi = null;

package/src/Api/Implementation/ExportApiImpl.js

@@ -147,10 +147,11 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;
         if (typeof isExportableFn === 'function') {
-            return isExportableFn({
+            const adaptableColumnContext = {
                 ...this.getAdaptableInternalApi().buildBaseContext(),
                 column: adaptableColumn,
-            });
+            };
+            return isExportableFn(adaptableColumnContext);
         }
         return true;
     }

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -163,7 +163,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.getExportApi().exportReport(reportSchedule.ReportName, reportSchedule.ReportFormat, 'Download');
+            this.getExportApi().exportReport(reportSchedule.ReportName, reportSchedule.ReportFormat, reportSchedule.ExportDestination ?? 'Download');
         }
         else if (scheduleType == 'ipushpull') {
             const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -39,7 +39,7 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
         if (!column) {
             return false;
         }
-        return !!this.getStyledColumns().find((styledColumn) => !!styledColumn.SparkLineStyle && styledColumn.ColumnId === column.columnId);
+        return !!this.getStyledColumns().find((styledColumn) => !!styledColumn.SparklineStyle && styledColumn.ColumnId === column.columnId);
     }
     getActiveStyledColumnForColumn(column) {
         const styledColumns = this.getActiveStyledColumns();

package/src/Api/Implementation/ThemeApiImpl.js

@@ -8,6 +8,7 @@ const ApiBase_1 = require("./ApiBase");
 const themes_1 = require("../../themes");
 const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class ThemeApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -74,7 +75,8 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ThemeModuleId);
     }
     getAgGridCurrentThemeName() {
-        return this._adaptable.getAgGridCurrentThemeName();
+        (0, logDeprecation_1.logDeprecation)(this._adaptable.logger, 'ThemeApi', 'getAgGridCurrentThemeName', null, `This is required only for AG Grid's legacy themes. See https://www.ag-grid.com/javascript-data-grid/theming-v32/`);
+        return this._adaptable.agGridThemeAdapter.getAgGridCurrentThemeClassNames();
     }
     editTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));

package/src/Api/Internal/EventInternalApi.js

@@ -63,7 +63,12 @@ class EventInternalApi extends ApiBase_1.ApiBase {
             isToolbarStateChangedToHidden,
         };
         if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.getEventApi().emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => {
+                const eventApi = this.getEventApi();
+                if (eventApi) {
+                    eventApi.emit('DashboardChanged', dashboardChangedInfo);
+                }
+            });
         }
     }
     fireAlertFiredEvent(alertToFire) {

package/src/Api/Internal/ExportInternalApi.js

@@ -117,7 +117,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             // format is customized based on column data type
             switch (columnDataType) {
                 case 'text':
-                    return dataFormatDataType.string;
+                    return dataFormatDataType.text;
                 case 'number':
                     return dataFormatDataType.number;
                 case 'date':

package/src/Api/Internal/RowFormInternalApi.js

@@ -190,7 +190,7 @@ class RowFormInternalApi extends ApiBase_1.ApiBase {
         }
         const returnValues = this.getGridApi().internalApi.getDistinctDisplayValuesForColumnOld(column.columnId);
         // FIXME add support for asynchronous custom select cell editor values
-        // it involves refactoring the AdaptableForm & AdapatableFormComponent
+        // it involves refactoring the AdaptableForm & adaptableFormComponent
         // await this.getSelectCellEditorValuesForColumn(
         //   column,
         //   gridCell

package/src/Api/ThemeApi.d.ts

@@ -81,6 +81,8 @@ export interface ThemeApi {
     openThemeSettingsPanel(): void;
     /**
      * Get the name of the current AG Grid theme
+     *
+     * @deprecated required only for legacy AG Grid themes, see https://www.ag-grid.com/javascript-data-grid/theming-v32/
      */
     getAgGridCurrentThemeName(): string;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -150,4 +150,4 @@ export type SystemAlertPredicateIds = SystemAlertPredicateId[];
 /**
  * List of System Predicates available for Alerts
  */
-export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';
+export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/Common/AdaptableColumnContext.d.ts

@@ -5,7 +5,7 @@ import { BaseContext } from './BaseContext';
  */
 export interface AdaptableColumnContext<TData = any> extends BaseContext {
     /**
-     * Column being filtered
+     * The current Column
      */
     column: AdaptableColumn<TData>;
 }

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -270,22 +270,6 @@ exports.SystemPredicateDefs = [
         toString: ({ inputs }) => `Not Between ${inputs[0] ?? ''}:${inputs[1]}`,
         shortcuts: ['!:'],
     },
-    {
-        id: 'IsNumeric',
-        label: 'Is Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => !isNaN(Number(value)),
-    },
-    {
-        id: 'IsNotNumeric',
-        label: 'Is Not Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => isNaN(Number(value)),
-    },
     // String System Filters
     {
         id: 'Is',

package/src/PredefinedConfig/ExportState.d.ts

@@ -3,9 +3,9 @@ import { BaseSchedule } from './Common/Schedule';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnBase } from './Common/AdaptableColumn';
 import { AdaptableObject } from './Common/AdaptableObject';
-import { AdaptableFormData } from './Common/AdaptableForm';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
+import { ExportDestinationType } from '../AdaptableOptions/ExportOptions';
 /**
  * Predefined Configuration for Export Module
  */
@@ -61,9 +61,9 @@ export interface ReportSchedule extends BaseSchedule {
      */
     ReportFormat: ReportFormatType;
     /**
-     * Additional data for a Custom Destination produced by a Dynamic Form
+     * Destination of Report to run on Schedule
      */
-    ExportDestinationData?: AdaptableFormData;
+    ExportDestination?: ExportDestinationType;
 }
 /**
  * Defines the data in a Report run by AdapTable

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -72,4 +72,4 @@ export type SystemFlashingCellPredicateIds = SystemFlashingCellPredicateId[];
 /**
  * List of System Predicates available for Flashing Cells
  */
-export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';
+export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/LayoutState.d.ts

@@ -51,7 +51,7 @@ export interface LayoutBase extends AdaptableObject {
      */
     ColumnHeaders?: ColumnStringMap;
     /**
-     * Whether to include aggFunc name in the Column header: e.g. 'sum(Price)' will just be 'Price'
+     * Whether to include aggFunc name in Column header: e.g. 'sum(Price)' becomes 'Price'
      */
     SuppressAggFuncInHeader?: boolean;
     /**
@@ -88,7 +88,7 @@ export interface TableLayout extends LayoutBase {
      */
     RowSummaries?: RowSummary[];
     /**
-     * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
+     * Columns showing aggregated values in Grouped Rows; a record of ColumnId and aggfunc (e.g. sum) or 'true' (to use default aggfunc)
      */
     TableAggregationColumns?: TableAggregationColumns;
     /**
@@ -100,19 +100,19 @@ export interface TableLayout extends LayoutBase {
      */
     RowGroupDisplayType?: 'single' | 'multi';
     /**
-     * Pivot Columns - can NOT be provided
+     * Pivot Columns - must NOT be provided
      */
     PivotColumns?: never;
     /**
-     * Pivot Group Columns - can NOT be provided
+     * Pivot Group Columns - must NOT be provided
      */
     PivotGroupedColumns?: never;
     /**
-     * Pivot Expansions - can NOT be provided
+     * Pivot Expansions - must NOT be provided
      */
     PivotExpandLevel?: never;
     /**
-     * Pivot Aggregation Columns - can NOT be provided
+     * Pivot Aggregation Columns - must NOT be provided
      */
     PivotAggregationColumns?: never;
 }
@@ -137,31 +137,31 @@ export interface PivotLayout extends LayoutBase {
      */
     PivotGroupedColumns?: string[];
     /**
-     * Table Columns - can NOT be provided
+     * Table Columns - must NOT be provided
      */
     TableColumns?: never;
     /**
-     * Table Aggregation Columns - can NOT be provided
+     * Table Aggregation Columns - must NOT be provided
      */
     TableAggregationColumns?: never;
     /**
-     * Row Grouped Columns Columns - can NOT be provided
+     * Row Grouped Columns Columns - must NOT be provided
      */
     RowGroupedColumns?: never;
 }
-/**
- * Object used for defining which Row Group Values are Expanded or Collapsed
- */
-export type RowGroupValuesWithExceptionKeys = {
-    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
-    ExceptionGroupKeys?: any[][];
-};
 /**
  * Manages how (and which) Row Group values are stored
  */
 export type RowGroupValues = {
     RowGroupDefaultBehavior: 'always-expanded' | 'always-collapsed';
 } | RowGroupValuesWithExceptionKeys;
+/**
+ * Defines which Row Group Values are expanded or collapsed
+ */
+export type RowGroupValuesWithExceptionKeys = {
+    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
+    ExceptionGroupKeys?: any[][];
+};
 /**
  * Defines a map of Columns with a String value
  */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -32,7 +32,7 @@ export interface StyledColumn extends SuspendableObject {
     /**
      * Displays a Sparkline Chart in an array column
      */
-    SparkLineStyle?: SparklineStyle;
+    SparklineStyle?: SparklineStyle;
     /**
      * Displays cell values in Column as a Badge
      */

package/src/Strategy/StyledColumnModule.js

@@ -39,12 +39,12 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     // because if just one then it was created in AG Grid and we dont want to edit it
                 }
                 else {
-                    const hasSparklineStyle = styledColumn != null && styledColumn.SparkLineStyle != null;
+                    const hasSparklineStyle = styledColumn != null && styledColumn.SparklineStyle != null;
                     if (!hasSparklineStyle) {
                         styledColumn = {
                             ...ObjectFactory_1.default.CreateEmptyStyledColumn(),
                             ColumnId: column.columnId,
-                            SparkLineStyle: {},
+                            SparklineStyle: {},
                         };
                     }
                     let label = hasSparklineStyle ? 'Edit ' : 'Create ';
@@ -52,7 +52,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         ? 'styled-column-sparkline-edit'
                         : 'styled-column-sparkline-add';
                     let popupParam = {
-                        action: sparklineColumnExists ? 'Edit' : 'New',
+                        action: hasSparklineStyle ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
                         config: {
@@ -165,7 +165,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             return 'percent';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             return 'spark-line';
         }
         else if (styledColumn.BadgeStyle) {
@@ -252,7 +252,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             type = 'Spark Line';
         }
         else if (styledColumn.BadgeStyle) {
@@ -268,7 +268,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'styled-column-percent-bar-edit';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             type = 'styled-column-sparkline-edit';
         }
         else if (styledColumn.BadgeStyle) {

package/src/Utilities/ObjectFactory.js

@@ -180,6 +180,7 @@ function CreateEmptyReportSchedule() {
         Schedule: CreateEmptySchedule(),
         ReportName: GeneralConstants_1.EMPTY_STRING,
         ReportFormat: GeneralConstants_1.EMPTY_STRING,
+        ExportDestination: 'Download',
     };
 }
 exports.CreateEmptyReportSchedule = CreateEmptyReportSchedule;

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

@@ -5,10 +5,10 @@ export declare class ThemeService implements IThemeService {
     private unsubscribe;
     private styleSheetObject;
     constructor(api: AdaptableApi);
+    destroy(): void;
     subscribe(): void;
     onThemeChanged: () => void;
     applyNewThemeVariables(theme: AdaptableTheme): void;
-    destroy(): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
     getDOMPrefferedColorScheme(): 'dark' | 'light';
     mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme;

package/src/Utilities/Services/ThemeService.js

@@ -23,6 +23,11 @@ class ThemeService {
             ];
         }
     }
+    destroy() {
+        this.api = null;
+        this.unsubscribe();
+        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
+    }
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
@@ -47,11 +52,6 @@ class ThemeService {
         str += '}';
         this.styleSheetObject.replaceSync(str);
     }
-    destroy() {
-        this.api = null;
-        this.unsubscribe();
-        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
-    }
     showMissingThemeFiles(theme) {
         // run time defined theme
         // because it may be an empty theme

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -58,7 +58,10 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.clearDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
+        const agGridThemeMode = this.props.api.internalApi
+            .getAdaptableInstance()
+            .agGridThemeAdapter.getAgGridThemeMode();
+        const currentAgGridTheme = agGridThemeMode === 'legacy' ? this.props.api.themeApi.getAgGridCurrentThemeName() : '';
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -14,7 +14,9 @@ const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
 const PopupPanel_1 = require("../../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableObjectsSummary_1 = require("./AdaptableObjectsSummary");
 const EnvVars_1 = require("../../../EnvVars");
-const version = EnvVars_1.ADAPTABLE_VERSION;
+const agGridModules_1 = require("../../../agGrid/agGridModules");
+const adaptableVersion = EnvVars_1.ADAPTABLE_VERSION;
+const agGridVersion = agGridModules_1.AG_GRID_VERSION;
 const GridInfoPopup = (props) => {
     const api = props.api;
     const CreateGridSummaries = (colItems) => {
@@ -37,7 +39,10 @@ const GridInfoPopup = (props) => {
             : null;
         const selectedRowInfo = api.gridApi.getSelectedRowInfo();
         if (api.optionsApi.getUserInterfaceOptions()?.showAdapTableVersion) {
-            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version));
+            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', adaptableVersion));
+        }
+        if (api.optionsApi.getUserInterfaceOptions()?.showAgGridVersion) {
+            returnRows.push(createReadOnlyColItem(colItems, 'AG Grid Version', agGridVersion));
         }
         returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
         returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
+import { ExportDestinationType } from '../../../../AdaptableOptions/ExportOptions';
 import { Report, ReportFormatType, ReportSchedule } from '../../../../PredefinedConfig/ExportState';
 interface ReportScheduleProps {
     report: ReportSchedule;
     onChange: (reminder: ReportSchedule) => void;
     allReports: Report[];
     allFormats: ReportFormatType[];
+    allDestinations: ExportDestinationType[];
 }
 export declare const ScheduleSettingsReport: React.FunctionComponent<ReportScheduleProps>;
 export {};