@adaptabletools/adaptable 11.1.1-canary.0 → 11.1.1

package/index.css

@@ -3728,14 +3728,12 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   width: 100%; }
 
 .ab-ActionColumn {
-  position: relative;
-  height: 100%; }
+  height: 100%;
+  display: flex;
+  column-gap: var(--ab-space-1); }
 
 .ab-ActionColumn > button.ab-SimpleButton {
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0; }
+    height: 100%; }
 
 .Toastify__toast-container {
   border-style: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1",
   "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",
@@ -17,7 +17,7 @@
     "blotter"
   ],
   "homepage": "http://www.adaptabletools.com/",
-  "license": "SEE LICENSE IN LICENSE.md",
+  "license": "contact sales@adaptabletools.com for details",
   "author": {
     "name": "Jonny Wolfson",
     "email": "jonny.wolfson@adaptabletools.com"

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1648213605950;
+declare const _default: 1648553646478;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -2,7 +2,7 @@ import { Column, RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
 import { ReportData } from '../PredefinedConfig/ExportState';
 import { Layout } from '../PredefinedConfig/LayoutState';
@@ -164,7 +164,7 @@ export interface IAdaptable {
     lookupPlugins(propertyName: string, ...args: any): any;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;
     getPlugin(pluginId: string): AdaptablePlugin;
-    setValue(dataChangedInfo: DataChangedInfo): void;
+    setValue(cellDataChangedInfo: CellDataChangedInfo): void;
     cancelEdit(): any;
     isCellEditable(rowNode: RowNode, column: Column): boolean;
     getFirstRowNode(): RowNode;

package/src/AdaptableOptions/AlertOptions.d.ts

@@ -2,7 +2,7 @@ import { AlertButton, AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { ButtonContext } from '../PredefinedConfig/Common/AdaptableButton';
 import { AdaptableForm, AdaptableFormData } from '../PredefinedConfig/Common/AdaptableForm';
-import { DataChangedInfo } from '../types';
+import { CellDataChangedInfo } from '../types';
 /**
  * Options related to Alerts in Adaptable.
  */
@@ -39,7 +39,7 @@ export interface AlertOptions {
     /**
      * Function providing Message to display in Alert; if empty, AdapTable provides dynamically
      */
-    alertMessageText?: (alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo) => string | undefined;
+    alertMessageText?: (alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo) => string | undefined;
 }
 /**
  * Handles a Form Button Action

package/src/AdaptableOptions/DataChangeHistoryOptions.d.ts

@@ -1,4 +1,4 @@
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 /**
  * Options to manage the 'Data Change History Module', which provides an overview of all previous changes, giving the possibility to undo specific changes
  */
@@ -16,5 +16,5 @@ export interface DataChangeHistoryOptions {
      * @defaultValue undefined (all data changes are logged)
      * @gridInfoItem
      */
-    showDataChange?: (dataChangeInfo: DataChangedInfo) => boolean;
+    showDataChange?: (cellDataChangedInfo: CellDataChangedInfo) => boolean;
 }

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,4 +1,4 @@
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
  * Options related to Editing in Adaptable.
@@ -9,7 +9,7 @@ export interface EditOptions {
     /**
      * Function to validate on Server Adaptable data edits
      */
-    validateOnServer?: (dataChangedInfo: DataChangedInfo) => Promise<ValidationResult>;
+    validateOnServer?: (cellDataChangedInfo: CellDataChangedInfo) => Promise<ValidationResult>;
     /**
      * Displays message after Server Validation
      *

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -33,29 +33,25 @@ export interface UserInterfaceOptions {
      */
     permittedValues?: PermittedValues[];
     /**
-     * Dropdown values displayed when column is being edited.
-     * When not defined it defaults to permittedValues.
+     * Dropdown values displayed when column is being edited; when not defined defaults to permittedValues
      */
     editLookUpItems?: EditLookUpPermittedValues[];
     /**
-     * Dropdown values for filter options inside floating and header filter.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for 'IN' filter; when not defined defaults to permittedValues
      */
     filterPermittedValues?: FilterPermittedValues[];
     /**
-     * Custom column values for defining custom sort.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for defining Custom Sort; when not defined defaults to permittedValues
      */
     customSortPermittedValues?: CustomSortPermittedValues[];
     /**
-     * Custom column values for editing via bulk-update.
-     * When not defined it defaults to permittedValues.
+     * Custom column values for editing via bulk-update; when not defined defaults to permittedValues
      */
     bulkUpdatePermittedValues?: BulkUpdatePermittedValues[];
     /**
-     * Colours to display in Colour Picker (in place of AdapTable's default set)
+     * Colours to display in Colour Picker (in place of AdapTable's default set); can be hardcoded list or function
      */
-    colorPalette?: string[] | (() => string[]);
+    colorPalette?: string[] | ((currentTheme: string) => string[]);
     /**
      * Columns which contain an AdapTable Button - used for performing Actions
      */
@@ -155,9 +151,9 @@ export interface ActionColumn extends AdaptableObject {
      */
     friendlyName?: string;
     /**
-     * Button to display in the Column
+     * Button (or list of buttons) to display in the Column
      */
-    actionColumnButton: AdaptableButton<ActionColumnButtonContext>;
+    actionColumnButton: AdaptableButton<ActionColumnButtonContext> | AdaptableButton<ActionColumnButtonContext>[];
     /**
      * Shows Action Column also in grouped rows
      */

package/src/Api/AlertApi.d.ts

@@ -1,5 +1,5 @@
 import { AlertState, AlertDefinition, AdaptableAlertAction, AlertButton } from '../PredefinedConfig/AlertState';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
@@ -95,7 +95,7 @@ export interface AlertApi {
      */
     executeAlertAction(actionName: AdaptableAlertAction | string, details: {
         alertDefinition: AlertDefinition;
-        dataChangedInfo?: DataChangedInfo;
+        cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
         formData?: AdaptableFormData;
     }): void;
@@ -103,8 +103,6 @@ export interface AlertApi {
      * Creates Alert formed from inputted values and displays it.
      * @param alertHeader Header of the Alert (if shown in a popup its the Title of the Window)
      * @param alertMessage Main message of the alert
-     * @param alertDefinition The Alert Definition which defines when the Alert is triggered
-     * @param dataChangedInfo The (optional) DataChangedInfo object that might have triggered the Alert
      */
     showAlert(alertHeader: string, alertMessage: string, messageType: AdaptableMessageType, alertProperties?: AlertProperties): void;
     /**
@@ -166,7 +164,7 @@ export interface AlertApi {
      * Returns a description of an Alert Definition
      * @param alertDefinition Alert Definition to use
      */
-    getAlertDescription(alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): string;
+    getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     /**
      * Returns a description of an Alert Definition's Rule
      * @param alertDefinition Alert Definition to use

package/src/Api/DataChangeHistoryApi.d.ts

@@ -1,4 +1,4 @@
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 /**
  * Provides run-time access to the Data Change History Module
  **/
@@ -24,13 +24,13 @@ export interface DataChangeHistoryApi {
     /**
      * Retrieves all data changes which are currently available
      */
-    getDataChangeHistoryLog(): DataChangedInfo[];
+    getDataChangeHistoryLog(): CellDataChangedInfo[];
     /**
      * Reverts the provided data change to its previous value
      *
      * @param dataChangeInfo the change to be undone
      */
-    undoDataChangeHistoryEntry(dataChangeInfo: DataChangedInfo): void;
+    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     /**
      * Opens Data Change History screen
      */

package/src/Api/Events/CellChanged.d.ts

@@ -1,4 +1,4 @@
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { BaseEventInfo } from './BaseEventInfo';
 /**
  * EventInfo returned by CellChanged event
@@ -7,5 +7,5 @@ export interface CellChangedInfo extends BaseEventInfo {
     /**
      * Object providing full information of the cell (and column and row) that changed
      */
-    cellChange: DataChangedInfo;
+    cellChange: CellDataChangedInfo;
 }

package/src/Api/ExportApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../PredefinedConfig/ExportState';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { CustomDestination, ExportButtonContext } from '../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 /**
@@ -109,10 +109,10 @@ export interface ExportApi {
     getExportDestinationForm(destinationName: string): AdaptableForm<ExportButtonContext> | undefined;
     /**
      * Whether given data change affects given report
-     * @param dataChangedInfo data change to check
+     * @param cellDataChangedInfo data change to check
      * @param report report to check
      */
-    isDataChangeInReport(dataChangedInfo: DataChangedInfo, report: Report): boolean;
+    isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     /**
      * Exports data currently in grid to Excel as What-You-See-Is-What-You-Get
      */

package/src/Api/FreeTextColumnApi.d.ts

@@ -1,5 +1,5 @@
 import { FreeTextColumnState, FreeTextColumn, FreeTextStoredValue } from '../PredefinedConfig/FreeTextColumnState';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Provides run-time access to FreeTextColumn Module and associated state
@@ -61,9 +61,9 @@ export interface FreeTextColumnApi {
     getFreeTextColumnValueFromRowNode(freeTextColumn: FreeTextColumn, rowNode: RowNode): any;
     /**
      * Checks if a User Edit was in a Free Text Column
-     * @param dataChangedInfo change to check
+     * @param cellDataChangedInfo change to check
      */
-    checkFreeTextColumnForDataChange(dataChangedInfo: DataChangedInfo): void;
+    checkFreeTextColumnForDataChange(cellDataChangedInfo: CellDataChangedInfo): void;
     /**
      * Opens Settings Panel with Free Text Column section selected and visible
      */

package/src/Api/GridApi.d.ts

@@ -4,7 +4,7 @@ import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
@@ -75,9 +75,9 @@ export interface GridApi {
     }[]): void;
     /**
      * Reverses a data change (if triggered by cell edit)
-     * @param dataChangedInfo data change to undo
+     * @param cellDataChangedInfo data change to undo
      */
-    undoCellEdit(dataChangedInfo: DataChangedInfo): boolean;
+    undoCellEdit(cellDataChangedInfo: CellDataChangedInfo): boolean;
     /**
      * Returns all current Selected Cells in AdapTable
      */
@@ -330,7 +330,7 @@ export interface GridApi {
     /**
      * Fires Cell Changed Changed Event - when any data in AG Grid's dataset has changed
      */
-    fireCellChangedEvent(cellChangedInfo: DataChangedInfo): void;
+    fireCellChangedEvent(cellChangedInfo: CellDataChangedInfo): void;
     /**
      * Fires Grid Data Changed Event - when a row has changed in AG Grid
      */

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { AlertApi } from '../AlertApi';
 import { AlertState, AlertDefinition, AlertProperties, AdaptableAlertAction, AlertButton } from '../../PredefinedConfig/AlertState';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
@@ -24,7 +24,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     executeAlertButton(button: AlertButton<AlertButtonContext>, context: AlertButtonContext): void;
     executeAlertAction(actionName: AdaptableAlertAction, details: {
         alertDefinition: AlertDefinition;
-        dataChangedInfo?: DataChangedInfo;
+        cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
         formData?: AdaptableFormData;
     }): void;
@@ -42,6 +42,6 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     editAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     suspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     unSuspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
-    getAlertDescription(alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): string;
+    getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     getAlertRuleDescription(alert: AlertDefinition): string;
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -62,8 +62,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 buttonOnClick === null || buttonOnClick === void 0 ? void 0 : buttonOnClick.handler(button, context);
                 this.adaptable.api.alertApi.executeAlertAction(action, {
                     alertDefinition: context.alert.alertDefinition,
-                    dataChangedInfo: AdaptableAlert_1.isAdaptableCellChangedAlert(context.alert)
-                        ? context.alert.dataChangedInfo
+                    cellDataChangedInfo: AdaptableAlert_1.isAdaptableCellChangedAlert(context.alert)
+                        ? context.alert.cellDataChangedInfo
                         : null,
                     gridDataChangedInfo: AdaptableAlert_1.isAdaptableRowChangedAlert(context.alert)
                         ? context.alert.gridDataChangedInfo
@@ -74,7 +74,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
     }
     executeAlertAction(actionName, details) {
-        const { alertDefinition, dataChangedInfo, gridDataChangedInfo } = details;
+        const { alertDefinition, cellDataChangedInfo: cellDataChangedInfo, gridDataChangedInfo, } = details;
         const getBackgroundColor = (alertDefinition) => {
             var _a;
             const highlightType = (_a = alertDefinition.MessageType) !== null && _a !== void 0 ? _a : 'Info';
@@ -94,11 +94,11 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             return backgroundColor;
         };
-        if (actionName === 'highlight-cell' && dataChangedInfo) {
+        if (actionName === 'highlight-cell' && cellDataChangedInfo) {
             const backgroundColor = getBackgroundColor(alertDefinition);
             this.adaptable.api.gridApi.highlightCell({
-                columnId: dataChangedInfo.column.columnId,
-                primaryKeyValue: dataChangedInfo.primaryKeyValue,
+                columnId: cellDataChangedInfo.column.columnId,
+                primaryKeyValue: cellDataChangedInfo.primaryKeyValue,
                 highlightStyle: {
                     BackColor: backgroundColor,
                 },
@@ -120,8 +120,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             };
             this.adaptable.api.gridApi.highlightRows(rowsHighlightInfo);
         }
-        if (actionName === 'jump-to-cell' && dataChangedInfo) {
-            this.adaptable.api.gridApi.jumpToCell(dataChangedInfo.primaryKeyValue, dataChangedInfo.column.columnId);
+        if (actionName === 'jump-to-cell' && cellDataChangedInfo) {
+            this.adaptable.api.gridApi.jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId);
         }
         if (actionName === 'jump-to-row' &&
             gridDataChangedInfo &&
@@ -133,14 +133,14 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 this.adaptable.api.gridApi.jumpToRow(targetRowNodePrimaryKeyValue);
             }
         }
-        if (actionName === 'jump-to-column' && dataChangedInfo) {
-            this.adaptable.api.gridApi.jumpToColumn(dataChangedInfo.column.columnId);
+        if (actionName === 'jump-to-column' && cellDataChangedInfo) {
+            this.adaptable.api.gridApi.jumpToColumn(cellDataChangedInfo.column.columnId);
         }
         if (actionName === 'suspend') {
             this.adaptable.api.alertApi.suspendAlertDefinition(alertDefinition);
         }
-        if (actionName === 'undo' && dataChangedInfo) {
-            this.adaptable.api.gridApi.undoCellEdit(dataChangedInfo);
+        if (actionName === 'undo' && cellDataChangedInfo) {
+            this.adaptable.api.gridApi.undoCellEdit(cellDataChangedInfo);
         }
     }
     async displayAlert(alertToShow) {
@@ -188,8 +188,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             // 4: Jump to the Cell
             if (alertProperties.JumpToCell &&
                 AdaptableAlert_1.isAdaptableCellChangedAlert(alertToShow) &&
-                alertToShow.dataChangedInfo) {
-                this.adaptable.jumpToCell(alertToShow.dataChangedInfo.column.columnId, alertToShow.dataChangedInfo.rowNode);
+                alertToShow.cellDataChangedInfo) {
+                this.adaptable.jumpToCell(alertToShow.cellDataChangedInfo.column.columnId, alertToShow.cellDataChangedInfo.rowNode);
             }
             // 5: Jump to the Row
             else if (alertProperties.JumpToRow &&
@@ -204,13 +204,13 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             // 6: Highlight the cell - we just refresh the cells to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
             if (alertProperties.HighlightCell &&
                 AdaptableAlert_1.isAdaptableCellChangedAlert(alertToShow) &&
-                alertToShow.dataChangedInfo) {
-                let alertNode = alertToShow.dataChangedInfo.rowNode;
+                alertToShow.cellDataChangedInfo) {
+                let alertNode = alertToShow.cellDataChangedInfo.rowNode;
                 if (!alertNode) {
-                    alertNode = this.adaptable.getRowNodeForPrimaryKey(alertToShow.dataChangedInfo.primaryKeyValue);
+                    alertNode = this.adaptable.getRowNodeForPrimaryKey(alertToShow.cellDataChangedInfo.primaryKeyValue);
                 }
                 if (alertNode) {
-                    this.adaptable.api.gridApi.refreshCells([alertNode], [alertToShow.dataChangedInfo.column.columnId]);
+                    this.adaptable.api.gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
                     setTimeout(() => {
                         this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
                     }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
@@ -275,11 +275,11 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(AlertRedux.AlertDefinitionUnSuspend(alertDefinition));
         return this.getAlertDefinitionById(alertDefinition.Uuid);
     }
-    getAlertDescription(alertDefinition, dataChangedInfo) {
+    getAlertDescription(alertDefinition, cellDataChangedInfo) {
         var _a;
         const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;
         if (alertMessageFunction) {
-            const returnText = alertMessageFunction(alertDefinition, dataChangedInfo);
+            const returnText = alertMessageFunction(alertDefinition, cellDataChangedInfo);
             if (returnText) {
                 return returnText;
             }

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

@@ -1,12 +1,12 @@
 import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { ApiBase } from './ApiBase';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 export declare class DataChangeHistoryApiImpl extends ApiBase implements DataChangeHistoryApi {
     getDataChangeHistoryMode(): 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';
     activateDataChangeHistory(forceReset?: boolean): void;
     deactivateDataChangeHistory(): void;
     suspendDataChangeHistory(): void;
-    getDataChangeHistoryLog(): DataChangedInfo[];
-    undoDataChangeHistoryEntry(dataChangeInfo: DataChangedInfo): void;
+    getDataChangeHistoryLog(): CellDataChangedInfo[];
+    undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
     showDataChangeHistoryPopup(): void;
 }

package/src/Api/Implementation/EventApiImpl.js

@@ -10,7 +10,8 @@ class EventApiImpl extends ApiBase_1.ApiBase {
         this.on = (eventName, callback) => {
             let result;
             if (eventName === 'AdaptableReady') {
-                result = this.emitter.onIncludeFiredOnce(eventName, callback);
+                this.emitter.onIncludeFiredOnce(eventName).then(callback);
+                return () => { };
             }
             else {
                 result = this.emitter.on(eventName, callback);

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

@@ -2,7 +2,7 @@ import { ExportApi } from '../ExportApi';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../../PredefinedConfig/ExportState';
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { CustomDestination, ExportButtonContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
@@ -25,7 +25,7 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     showExportPopup(): void;
     editReport(report: Report): Report;
     editReports(reports: Report[]): Report[];
-    isDataChangeInReport(dataChangedInfo: DataChangedInfo, report: Report): boolean;
+    isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
     runCustomReport(customReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;

package/src/Api/Implementation/ExportApiImpl.js

@@ -95,7 +95,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         });
         return reports === null || reports === void 0 ? void 0 : reports.map((report) => this.getReportById(report.Uuid));
     }
-    isDataChangeInReport(dataChangedInfo, report) {
+    isDataChangeInReport(cellDataChangedInfo, report) {
         // for All Data Report any data change is true so get out asap
         if (report.Name == 'All Data') {
             return true;
@@ -111,22 +111,21 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
                 break;
             case 'ScopeColumns':
                 // use the Scope object which will tell us if the Column is relevant
-                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(dataChangedInfo.column, report.Scope)) {
+                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
                     return false;
                 }
                 break;
             case 'SelectedColumns':
                 let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
                 if (selectedCellInfo) {
-                    if (selectedCellInfo.columns.find((c) => c.columnId == dataChangedInfo.column.columnId) ==
-                        null) {
+                    if (selectedCellInfo.columns.find((c) => c.columnId == cellDataChangedInfo.column.columnId) == null) {
                         return false;
                     }
                 }
                 break;
             case 'VisibleColumns':
                 //  hope that visibile column property is updated whenever the layout changes... (need to check!)
-                if (!dataChangedInfo.column.visible) {
+                if (!cellDataChangedInfo.column.visible) {
                     return false;
                 }
                 break;
@@ -140,7 +139,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             case 'SelectedCellRows':
                 let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
                 if (selectedCellInfo && selectedCellInfo.gridCells) {
-                    if (selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == dataChangedInfo.primaryKeyValue)) {
+                    if (selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
                     }
                 }
@@ -148,13 +147,13 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             case 'SelectedRows':
                 let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
                 if (selectedRowInfo && selectedRowInfo.gridRows) {
-                    if (selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == dataChangedInfo.primaryKeyValue)) {
+                    if (selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
                     }
                 }
                 return false;
             case 'VisibleRows':
-                return this.adaptable.isRowNodeVisible(dataChangedInfo.rowNode);
+                return this.adaptable.isRowNodeVisible(cellDataChangedInfo.rowNode);
         }
     }
     exportVisualDataToExcel() {

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { FreeTextColumnApi } from '../FreeTextColumnApi';
 import { FreeTextColumnState, FreeTextColumn, FreeTextStoredValue } from '../../PredefinedConfig/FreeTextColumnState';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowNode } from '@ag-grid-community/all-modules';
 export declare class FreeTextColumnApiImpl extends ApiBase implements FreeTextColumnApi {
     getFreeTextColumnState(): FreeTextColumnState;
@@ -16,6 +16,6 @@ export declare class FreeTextColumnApiImpl extends ApiBase implements FreeTextCo
     deleteFreeTextColumn(columnId: string): void;
     showFreeTextColumnPopup(): void;
     getFreeTextColumnValueFromRowNode(freeTextColumn: FreeTextColumn, rowNode: RowNode): any;
-    checkFreeTextColumnForDataChange(dataChangedInfo: DataChangedInfo): void;
+    checkFreeTextColumnForDataChange(cellDataChangedInfo: CellDataChangedInfo): void;
     getFreeTextColumnModuleReferences(freeTextColumn: FreeTextColumn): string[];
 }

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -94,20 +94,20 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
             return null;
         }
     }
-    checkFreeTextColumnForDataChange(dataChangedInfo) {
-        let freeTextColumn = this.getAllFreeTextColumn().find((fc) => fc.ColumnId == dataChangedInfo.column.columnId);
+    checkFreeTextColumnForDataChange(cellDataChangedInfo) {
+        let freeTextColumn = this.getAllFreeTextColumn().find((fc) => fc.ColumnId == cellDataChangedInfo.column.columnId);
         if (freeTextColumn) {
             let freeTextStoredValue = {
-                PrimaryKey: dataChangedInfo.primaryKeyValue,
-                FreeText: dataChangedInfo.newValue,
+                PrimaryKey: cellDataChangedInfo.primaryKeyValue,
+                FreeText: cellDataChangedInfo.newValue,
             };
             this.addEditFreeTextColumnStoredValue(freeTextColumn, freeTextStoredValue);
-            var colsToRefresh = [dataChangedInfo.column.columnId];
-            const refencedCalcColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumnsReferencingColumnId(dataChangedInfo.column.columnId);
+            var colsToRefresh = [cellDataChangedInfo.column.columnId];
+            const refencedCalcColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumnsReferencingColumnId(cellDataChangedInfo.column.columnId);
             refencedCalcColumns.forEach((calculatedColumn) => {
                 colsToRefresh.push(calculatedColumn.ColumnId);
             });
-            this.adaptable.refreshCells([dataChangedInfo.rowNode], colsToRefresh, false);
+            this.adaptable.refreshCells([cellDataChangedInfo.rowNode], colsToRefresh, false);
         }
     }
     getFreeTextColumnModuleReferences(freeTextColumn) {

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

@@ -10,7 +10,7 @@ import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightIn
 import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
@@ -22,7 +22,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     loadGridData(dataSource: any): void;
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
-    undoCellEdit(dataChangedInfo: DataChangedInfo): boolean;
+    undoCellEdit(cellDataChangedInfo: CellDataChangedInfo): boolean;
     deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     setCellValue(columnId: string, newValue: any, primaryKeyValue: any): void;
     setCellsValue(gridCells: {
@@ -82,7 +82,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;
     fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
-    fireCellChangedEvent(dataChangedInfo: DataChangedInfo): void;
+    fireCellChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
     fireGridDataChangedEvent(dataRows: any[], rowNodes: RowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;
     jumpToRow(primaryKeyValue: any): void;
     jumpToColumn(columnId: string): void;