@adaptabletools/adaptable 11.1.0 → 11.1.1-canary.2

package/src/Api/Implementation/GridApiImpl.js

@@ -32,10 +32,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
         return rowNodes;
     }
-    undoCellEdit(dataChangedInfo) {
+    undoCellEdit(cellDataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
-        this.adaptable.api.internalApi.getDataService().logUndoChange(dataChangedInfo);
-        this.setCellValue(dataChangedInfo.column.columnId, dataChangedInfo.oldValue, dataChangedInfo.primaryKeyValue);
+        this.adaptable.api.internalApi.getDataService().logUndoChange(cellDataChangedInfo);
+        this.setCellValue(cellDataChangedInfo.column.columnId, cellDataChangedInfo.oldValue, cellDataChangedInfo.primaryKeyValue);
         return true;
     }
     async deleteGridData(dataRows, dataUpdateConfig) {
@@ -276,11 +276,11 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('SearchChanged', searchChangedInfo);
         }
     }
-    fireCellChangedEvent(dataChangedInfo) {
+    fireCellChangedEvent(cellDataChangedInfo) {
         if (this.adaptable.isInitialised) {
             const cellChangedInfo = {
                 adaptableApi: this.adaptable.api,
-                cellChange: dataChangedInfo,
+                cellChange: cellDataChangedInfo,
             };
             this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
         }

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

@@ -10,7 +10,7 @@ import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellI
 import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, Layout, SystemStatusMessageInfo } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
@@ -75,7 +75,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     setGridCells(gridCells: GridCell[]): void;
     setToolbarTitle(): string;
     setGridCell(gridCell: GridCell): void;
-    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
+    buildDataChangedInfo(config: Pick<CellDataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): CellDataChangedInfo;
     private createDataChangedInfoFromGridCell;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     updateCurrentDraftLayout(layout: Layout): void;

package/src/Api/Implementation/InternalApiImpl.js

@@ -75,8 +75,8 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableCellChangedAlerts().find((alert) => {
             var _a, _b, _c, _d;
             return ((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
-                ((_c = (_b = alert.dataChangedInfo) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c.columnId) === columnId &&
-                ((_d = alert.dataChangedInfo) === null || _d === void 0 ? void 0 : _d.rowNode) === rowNode;
+                ((_c = (_b = alert.cellDataChangedInfo) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c.columnId) === columnId &&
+                ((_d = alert.cellDataChangedInfo) === null || _d === void 0 ? void 0 : _d.rowNode) === rowNode;
         });
     }
     getAdaptableAlertWithHighlightRow(rowNode) {
@@ -197,8 +197,8 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return toolbarTitle;
     }
     setGridCell(gridCell) {
-        const dataChangedInfo = this.createDataChangedInfoFromGridCell(gridCell);
-        this.adaptable.setValue(dataChangedInfo);
+        const cellDataChangedInfo = this.createDataChangedInfoFromGridCell(gridCell);
+        this.adaptable.setValue(cellDataChangedInfo);
     }
     buildDataChangedInfo(config) {
         var _a;
@@ -207,14 +207,14 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     createDataChangedInfoFromGridCell(gridCell) {
         let currentValue = this.adaptable.getDisplayValue(gridCell.primaryKeyValue, gridCell.column.columnId);
         const currentRowNode = this.adaptable.getRowNodeForPrimaryKey(gridCell.primaryKeyValue);
-        const dataChangedInfo = this.buildDataChangedInfo({
+        const cellDataChangedInfo = this.buildDataChangedInfo({
             oldValue: currentValue,
             newValue: gridCell.rawValue,
             column: gridCell.column,
             primaryKeyValue: gridCell.primaryKeyValue,
             rowNode: currentRowNode,
         });
-        return dataChangedInfo;
+        return cellDataChangedInfo;
     }
     setLastAppliedShortCut(gridCell) {
         this.dispatchAction(SystemRedux.SetLastAppliedShortcut(gridCell));

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -8,7 +8,9 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         let colorPalette = this.getUserInterfaceOptions().colorPalette;
         // first do the function then get hardcoded items
         if (colorPalette != null && typeof colorPalette === 'function') {
-            return colorPalette();
+            const currentTheme = this.adaptable.api.themeApi.getCurrentTheme();
+            const colours = colorPalette(currentTheme);
+            return colours;
         }
         else {
             let arr = colorPalette;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableMessageType, AlertDefinition, DataChangedInfo, SystemStatusMessageInfo } from '../types';
+import { AdaptableMessageType, AlertDefinition, CellDataChangedInfo, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -80,7 +80,7 @@ export interface InternalApi {
     setGridCell(gridCell: GridCell): void;
     setToolbarTitle(): string;
     getQueryPreviewData(): any;
-    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
+    buildDataChangedInfo(config: Pick<CellDataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): CellDataChangedInfo;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     updateCurrentDraftLayout(layout: Layout): void;
     getPrimaryKey(): any;

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

@@ -1,5 +1,5 @@
 import { AdaptableObject } from './AdaptableObject';
-import { DataChangedInfo } from './DataChangedInfo';
+import { CellDataChangedInfo } from './CellDataChangedInfo';
 import { GridDataChangedInfo } from '../../Api/Events/GridDataChanged';
 import { AlertDefinition } from '../AlertState';
 /**
@@ -16,7 +16,7 @@ export interface AdaptableCellChangedAlert extends AdaptableAlertBase<'cellChang
     /**
      * Cell DataChange which triggered Alert
      */
-    dataChangedInfo: DataChangedInfo;
+    cellDataChangedInfo: CellDataChangedInfo;
 }
 /**
  * Defines an Alert fired by AdapTable when a row is changed

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

@@ -1,5 +1,5 @@
 import { AdaptableObject } from './AdaptableObject';
-import { DataChangedInfo } from '../../types';
+import { CellDataChangedInfo } from '../../types';
 import { FlashingCellDefinition } from '../../../types';
 /**
  * Defines an Alert fired by AdapTable
@@ -12,7 +12,7 @@ export interface AdaptableFlashingCell extends AdaptableObject {
     /**
      *  Data change which triggered the FlashingCell
      */
-    dataChangedInfo?: DataChangedInfo;
+    cellDataChangedInfo?: CellDataChangedInfo;
     /**
      * Direction of the change: 'up', 'down' or 'neutral'
      */

package/src/PredefinedConfig/Common/{DataChangedInfo.d.ts → CellDataChangedInfo.d.ts}

@@ -3,7 +3,7 @@ import { AdaptableColumn } from './AdaptableColumn';
 /**
  * Defines a Cell Edit - includes full details of old and new values, the column and the enclosing Row
  */
-export interface DataChangedInfo {
+export interface CellDataChangedInfo {
     /**
      * Timestamp of change occurrence (in milliseconds)
      */
@@ -37,7 +37,3 @@ export interface DataChangedInfo {
      */
     trigger?: 'edit' | 'tick' | 'undo' | 'aggChange';
 }
-export interface DataChangedScope {
-    wholeRow: boolean;
-    columnIds: Set<string>;
-}

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

@@ -0,0 +1,4 @@
+export interface DataChangedScope {
+    wholeRow: boolean;
+    columnIds: Set<string>;
+}

package/src/PredefinedConfig/Common/DataChangedScope.js

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

package/src/PredefinedConfig/SystemState.d.ts

@@ -1,7 +1,7 @@
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
-import { DataChangedInfo, GridCell } from '../types';
+import { CellDataChangedInfo, GridCell } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
 import { Glue42State, Glue42Report } from './Glue42State';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
@@ -54,7 +54,7 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
         disablePersistence: boolean;
     };
     DataChangeHistory: {
-        logs: Record<string, DataChangedInfo>;
+        logs: Record<string, CellDataChangedInfo>;
         currentMode: DataChangeHistoryMode;
         enableTime: Date;
         suspendTime: Date;

package/src/Redux/ActionsReducers/GridRedux.d.ts

@@ -4,7 +4,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
 import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { CellSummmary } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
@@ -81,10 +81,10 @@ export declare const GRID_SET_TREE_MODE_ON = "GRID_SET_TREE_MODE_ON";
  */
 export declare const GRID_SET_TREE_MODE_OFF = "GRID_SET_TREE_MODE_OFF";
 export interface GridDataChangedAction extends Redux.Action {
-    dataChangedInfo: DataChangedInfo;
+    cellDataChangedInfo: CellDataChangedInfo;
 }
 export interface GridDataEditedAction extends Redux.Action {
-    dataChangedInfo: DataChangedInfo;
+    cellDataChangedInfo: CellDataChangedInfo;
 }
 export interface GridSetColumnsAction extends Redux.Action {
     columns: AdaptableColumn[];
@@ -102,10 +102,10 @@ export interface GridEditColumnAction extends Redux.Action {
     column: AdaptableColumn;
 }
 export interface GridSetValueLikeEditAction extends Redux.Action {
-    dataChangedInfo: DataChangedInfo;
+    cellDataChangedInfo: CellDataChangedInfo;
 }
 export interface GridSetValueLikeEditBatchAction extends Redux.Action {
-    dataChangedInfoBatch: DataChangedInfo[];
+    cellDataChangedInfoBatch: CellDataChangedInfo[];
 }
 export interface GridSelectColumnAction extends Redux.Action {
     columnId: string;

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -11,7 +11,7 @@ import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemSta
 import { CachedQuery } from '../../PredefinedConfig/QueryState';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { MathOperation, SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
@@ -191,10 +191,10 @@ export interface SystemLicenseShowWatermarkAction extends Redux.Action {
 export interface SystemLicenseDisablePersistenceAction extends Redux.Action {
 }
 export interface SystemDataChangeHistoryAddAction extends Redux.Action {
-    changeInfo: DataChangedInfo;
+    changeInfo: CellDataChangedInfo;
 }
 export interface SystemDataChangeHistoryUndoAction extends Redux.Action {
-    changeInfo: DataChangedInfo;
+    changeInfo: CellDataChangedInfo;
 }
 export interface SystemDataChangeHistoryEnableAction extends Redux.Action {
 }
@@ -249,8 +249,8 @@ export declare const SystemProgressIndicatorShow: (label: string) => SystemProgr
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;
-export declare const SystemDataChangeHistoryAdd: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryAddAction;
-export declare const SystemDataChangeHistoryUndo: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryUndoAction;
+export declare const SystemDataChangeHistoryAdd: (changeInfo: CellDataChangedInfo) => SystemDataChangeHistoryAddAction;
+export declare const SystemDataChangeHistoryUndo: (changeInfo: CellDataChangedInfo) => SystemDataChangeHistoryUndoAction;
 export declare const SystemDataChangeHistoryEnable: () => SystemDataChangeHistoryEnableAction;
 export declare const SystemDataChangeHistoryDisable: () => SystemDataChangeHistoryDisableAction;
 export declare const SystemDataChangeHistorySuspend: () => SystemDataChangeHistorySuspendAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -530,16 +530,16 @@ exports.SystemReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Export: Object.assign(Object.assign({}, state.Export), { CustomDestinationPopups: (_a = state.Export.CustomDestinationPopups) === null || _a === void 0 ? void 0 : _a.filter((data) => data !== action.data) }) });
         case exports.SYSTEM_DATA_CHANGE_HISTORY_ADD: {
             const actionTypedAdd = action;
-            const dataChangedInfo = actionTypedAdd.changeInfo;
-            const uniqueKey = getDataChangeHistoryKey(dataChangedInfo);
+            const cellDataChangedInfo = actionTypedAdd.changeInfo;
+            const uniqueKey = getDataChangeHistoryKey(cellDataChangedInfo);
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
-            updatedDataChangeHistoryLogs[uniqueKey] = dataChangedInfo;
+            updatedDataChangeHistoryLogs[uniqueKey] = cellDataChangedInfo;
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });
         }
         case exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO: {
             const actionTypedUndo = action;
-            const dataChangedInfo = actionTypedUndo.changeInfo;
-            const uniqueKey = getDataChangeHistoryKey(dataChangedInfo);
+            const cellDataChangedInfo = actionTypedUndo.changeInfo;
+            const uniqueKey = getDataChangeHistoryKey(cellDataChangedInfo);
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
             delete updatedDataChangeHistoryLogs[uniqueKey];
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });

package/src/Redux/Store/AdaptableStore.js

@@ -324,10 +324,10 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
                 case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
                     const { flashingCell: FlashingCell } = action;
-                    const { dataChangedInfo } = FlashingCell;
+                    const { cellDataChangedInfo: cellDataChangedInfo } = FlashingCell;
                     let ret = next(action);
-                    if (dataChangedInfo) {
-                        adaptable.refreshCells([dataChangedInfo.rowNode], Object.keys(FlashingCell.flashColumnIds), true);
+                    if (cellDataChangedInfo) {
+                        adaptable.refreshCells([cellDataChangedInfo.rowNode], Object.keys(FlashingCell.flashColumnIds), true);
                     }
                     return ret;
                 }
@@ -387,9 +387,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const adaptableAlert = actionTyped.alert;
                     if (((_c = adaptableAlert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
                         AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
-                        adaptableAlert.dataChangedInfo) {
-                        const rowNode = adaptableAlert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [adaptableAlert.dataChangedInfo.column.columnId], true);
+                        adaptableAlert.cellDataChangedInfo) {
+                        const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
+                        adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
                     }
                     if (((_d = adaptableAlert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
                         AdaptableAlert_1.isAdaptableRowChangedAlert(adaptableAlert) &&
@@ -410,9 +410,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         var _a, _b;
                         if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
                             AdaptableAlert_1.isAdaptableCellChangedAlert(alert) &&
-                            alert.dataChangedInfo) {
-                            let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
+                            alert.cellDataChangedInfo) {
+                            let rowNode = alert.cellDataChangedInfo.rowNode;
+                            adaptable.refreshCells([rowNode], [alert.cellDataChangedInfo.column.columnId], true);
                         }
                         if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) &&
                             AdaptableAlert_1.isAdaptableRowChangedAlert(alert) &&
@@ -432,9 +432,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const adaptableAlert = actionTyped.alert;
                     if (((_e = adaptableAlert.alertDefinition.AlertProperties) === null || _e === void 0 ? void 0 : _e.HighlightCell) &&
                         AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
-                        adaptableAlert.dataChangedInfo) {
-                        const rowNode = adaptableAlert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [adaptableAlert.dataChangedInfo.column.columnId], true);
+                        adaptableAlert.cellDataChangedInfo) {
+                        const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
+                        adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
                     }
                     if (((_f = adaptableAlert.alertDefinition.AlertProperties) === null || _f === void 0 ? void 0 : _f.HighlightRow) &&
                         AdaptableAlert_1.isAdaptableRowChangedAlert(adaptableAlert) &&
@@ -645,7 +645,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case QuickSearchRedux.QUICK_SEARCH_RUN: {
                     let returnAction = next(action);
                     adaptable.redrawBody();
-                    // if set then reun a query on the text
+                    // if set then return a query on the text
                     if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
@@ -1276,8 +1276,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_DATA_CHANGE_HISTORY_UNDO:
                     const actionTypedUndo = action;
-                    const dataChangedInfo = actionTypedUndo.changeInfo;
-                    adaptable.api.gridApi.undoCellEdit(dataChangedInfo);
+                    const cellDataChangedInfo = actionTypedUndo.changeInfo;
+                    adaptable.api.gridApi.undoCellEdit(cellDataChangedInfo);
                     return next(action);
                 /*******************
                  * SYSTEM (INTERNAL) ACTIONS

package/src/Strategy/AlertModule.js

@@ -18,15 +18,17 @@ const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, 'Alert', 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger === 'undo' || dataChangedInfo.trigger === 'aggChange') {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger === 'undo' || cellDataChangedInfo.trigger === 'aggChange') {
                 // do NOT handle reverted or aggregated changes
                 return;
             }
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = dataChangedInfo;
-                const columnId = dataChangedInfo.column.columnId;
+                const { oldValue, newValue } = cellDataChangedInfo;
+                const columnId = cellDataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -34,7 +36,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleCellDataChanged(dataChangedInfo);
+            this.handleCellDataChanged(cellDataChangedInfo);
         });
         this.api.eventApi.on('GridDataChanged', (gridDataChangedInfo) => {
             if (gridDataChangedInfo.rowTrigger === 'Edit') {
@@ -108,10 +110,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    handleCellDataChanged(dataChangedInfo) {
-        const alertDefinitions = this.getAlertDefinitionsForCellDataChange(dataChangedInfo);
+    handleCellDataChanged(cellDataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForCellDataChange(cellDataChangedInfo);
         if (alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.length) {
-            this.showAlertForDefinitions(dataChangedInfo, alertDefinitions);
+            this.showAlertForDefinitions(cellDataChangedInfo, alertDefinitions);
         }
     }
     handleGridDataChanged(gridDataChangedInfo) {
@@ -142,9 +144,9 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ]);
         }
     }
-    showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
+    showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateCellChangedAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
+            const alert = ObjectFactory_1.default.CreateCellChangedAlert(cellDataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
             this.api.alertApi.displayAlert(alert);
         });
     }

package/src/Strategy/BulkUpdateModule.js

@@ -121,7 +121,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         break;
                 }
                 selectedCellInfo.gridCells.forEach((selectedCell) => {
-                    const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
+                    const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: selectedCell.rawValue,
                         newValue: typedBulkUpdateValue,
                         column: selectedCell.column,
@@ -131,7 +131,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     });
                     const validationRules = this.api.internalApi
                         .getValidationService()
-                        .getValidationRulesForDataChange(dataChangedInfo);
+                        .getValidationRulesForDataChange(cellDataChangedInfo);
                     const previewResult = {
                         id: selectedCell.primaryKeyValue,
                         initialValue: selectedCell.rawValue,

package/src/Strategy/DataChangeHistoryModule.js

@@ -8,10 +8,12 @@ const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, 'Data Changes', 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger !== 'undo' && dataChangedInfo.trigger !== 'aggChange') {
-                if (this.shouldLogDataChange(dataChangedInfo)) {
-                    this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemDataChangeHistoryAdd(dataChangedInfo));
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger !== 'undo' && cellDataChangedInfo.trigger !== 'aggChange') {
+                if (this.shouldLogDataChange(cellDataChangedInfo)) {
+                    this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemDataChangeHistoryAdd(cellDataChangedInfo));
                 }
             }
         });
@@ -22,7 +24,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
     hasNamedQueryReferences() {
         return false;
     }
-    shouldLogDataChange(dataChangedInfo) {
+    shouldLogDataChange(cellDataChangedInfo) {
         // we log changes only if the change tracking is active
         if (this.api.internalApi.getState().System.DataChangeHistory.currentMode !== 'ACTIVE') {
             return false;
@@ -30,7 +32,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         if (this.api.internalApi.getAdaptableOptions().dataChangeHistoryOptions.showDataChange) {
             return this.api.internalApi
                 .getAdaptableOptions()
-                .dataChangeHistoryOptions.showDataChange(dataChangedInfo);
+                .dataChangeHistoryOptions.showDataChange(cellDataChangedInfo);
         }
         return true;
     }

package/src/Strategy/FlashingCellModule.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import * as FlashingCellRedux from '../Redux/ActionsReducers/FlashingCellRedux';
@@ -16,7 +16,7 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    protected handleDataSourceChanged(dataChangedInfo: DataChangedInfo): void;
+    protected handleDataSourceChanged(cellDataChangedInfo: CellDataChangedInfo): void;
     private showFlashingCellsForDefinitions;
     private isFlashingTargetOnlyAggChange;
     private getFlashingCellDefinitionsForDataChange;

package/src/Strategy/FlashingCellModule.js

@@ -17,8 +17,10 @@ const getFlashingTargetViewItems_1 = require("./Utilities/getFlashingTargetViewI
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, 'Flashing Cell', 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger === 'undo') {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger === 'undo') {
                 // do NOT handle reverted changes
                 return;
             }
@@ -26,8 +28,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // - flash for the underlying small data changes, but the visual does not
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = dataChangedInfo;
-                const columnId = dataChangedInfo.column.columnId;
+                const { oldValue, newValue } = cellDataChangedInfo;
+                const columnId = cellDataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -35,7 +37,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleDataSourceChanged(dataChangedInfo);
+            this.handleDataSourceChanged(cellDataChangedInfo);
         });
     }
     getModuleAdaptableObjects() {
@@ -101,23 +103,27 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    handleDataSourceChanged(dataChangedInfo) {
-        const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(dataChangedInfo);
+    handleDataSourceChanged(cellDataChangedInfo) {
+        const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(cellDataChangedInfo);
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingCellDefinitions)) {
-            this.showFlashingCellsForDefinitions(dataChangedInfo, flashingCellDefinitions);
+            this.showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions);
         }
     }
-    showFlashingCellsForDefinitions(dataChangedInfo, flashingCellDefinitions = []) {
+    showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions = []) {
         const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
-        const columnDataType = dataChangedInfo.column.dataType;
+        const columnDataType = cellDataChangedInfo.column.dataType;
         const numeric = columnDataType === 'Number';
         const isComparableType = numeric || columnDataType === 'Date';
         let up = false;
         let down = false;
         let direction = 'neutral';
         if (isComparableType) {
-            const newValue = numeric ? Number(dataChangedInfo.newValue) : dataChangedInfo.newValue;
-            const oldValue = numeric ? Number(dataChangedInfo.oldValue) : dataChangedInfo.oldValue;
+            const newValue = numeric
+                ? Number(cellDataChangedInfo.newValue)
+                : cellDataChangedInfo.newValue;
+            const oldValue = numeric
+                ? Number(cellDataChangedInfo.oldValue)
+                : cellDataChangedInfo.oldValue;
             up = newValue > oldValue;
             down = newValue < oldValue;
             direction = up ? 'up' : down ? 'down' : 'neutral';
@@ -125,7 +131,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         flashingCellDefinitions.forEach((flashingCellDefinition) => {
             var _a;
             let flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
-            const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
+            const flashColumnIds = { [cellDataChangedInfo.column.columnId]: true };
             /**
              * When flashing a row, all columns in that row are marked to flash.
              */
@@ -134,11 +140,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     flashColumnIds[colId] = true;
                 });
             }
-            const rowPrimaryKey = dataChangedInfo.primaryKeyValue;
+            const rowPrimaryKey = cellDataChangedInfo.primaryKeyValue;
             this.api.flashingCellApi.showFlashingCell({
                 rowPrimaryKey,
                 flashingCellDefinition: flashingCellDefinition,
-                dataChangedInfo,
+                cellDataChangedInfo: cellDataChangedInfo,
                 direction,
                 flashTarget,
                 flashColumnIds,

package/src/Strategy/FormatColumnModule.js

@@ -19,7 +19,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * Use Case: Data (cell/row) has changed
          * Action: Any CheckboxFormatColumns need to be updated, as their disabled state may have changed
          */
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
             const activeCheckboxColumnIds = this.api.columnApi
                 .getColumns()
                 .filter((aColumn) => {
@@ -28,7 +30,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             })
                 .map((aColumn) => aColumn.columnId);
             // no need to refresh the CheckboxColumns if the change was triggered by one of them
-            if (!activeCheckboxColumnIds.includes(dataChangedInfo.column.columnId)) {
+            if (!activeCheckboxColumnIds.includes(cellDataChangedInfo.column.columnId)) {
                 this.api.internalApi
                     .getAdaptableInstance()
                     .refreshCells(null, activeCheckboxColumnIds, true, true);

package/src/Utilities/Emitter.d.ts

@@ -7,7 +7,7 @@ declare class Emittery {
     on(eventName: string, listener: EmitterCallback): any;
     off(eventName: string, listener: EmitterCallback): void;
     once(eventName: string): Promise<unknown>;
-    onIncludeFiredOnce(eventName: string): Promise<any>;
+    onIncludeFiredOnce(eventName: string, listener: EmitterCallback): any;
     onIncludeFired(eventName: string, listener: EmitterCallback): any;
     emit(eventName: string, eventData?: any): Promise<any[]>;
     emitSync(eventName: string, eventData?: any): any[];