@adaptabletools/adaptable 11.0.9 → 11.1.1-canary.1

package/src/Redux/Store/AdaptableStore.js

@@ -42,6 +42,7 @@ const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants")
 const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
+const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
 const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
 exports.INIT_STATE = 'INIT_STATE';
@@ -109,6 +110,7 @@ class AdaptableStore {
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
                 this.TheStore.dispatch(PopupRedux.PopupShowAlert({
+                    alertType: 'generic',
                     header: 'Configuration',
                     message: 'Error loading your configuration:' + e,
                     alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -258,7 +260,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -273,6 +275,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
                     if (namedQueryReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Named Query could not be deleted',
                             message: `It is still referenced in the following modules: ${namedQueryReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -294,6 +297,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(previousNamedQueryName);
                         if (namedQueryReferences.length) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Named Query could not be renamed',
                                 message: `It is currently referenced in the following modules: ${namedQueryReferences.join(', ')}`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -319,11 +323,11 @@ 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 { flashingCell: FlashingCell } = action;
+                    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;
                 }
@@ -380,15 +384,17 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_ALERT_DELETE: {
                     const actionTyped = action;
                     let ret = next(action);
-                    if (((_c = actionTyped.alert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
-                        actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
+                    const adaptableAlert = actionTyped.alert;
+                    if (((_c = adaptableAlert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
+                        AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
+                        adaptableAlert.cellDataChangedInfo) {
+                        const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
+                        adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
                     }
-                    if (((_d = actionTyped.alert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
-                        actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.api.gridApi.refreshRowNode(rowNode);
+                    if (((_d = adaptableAlert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
+                        AdaptableAlert_1.isAdaptableRowChangedAlert(adaptableAlert) &&
+                        adaptableAlert.gridDataChangedInfo) {
+                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                     }
                     return ret;
                 }
@@ -402,13 +408,16 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let alerts = actionTyped.alerts;
                     alerts.forEach((alert) => {
                         var _a, _b;
-                        if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) && alert.dataChangedInfo) {
-                            let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
+                        if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
+                            AdaptableAlert_1.isAdaptableCellChangedAlert(alert) &&
+                            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) && alert.dataChangedInfo) {
-                            let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.api.gridApi.refreshRowNode(rowNode);
+                        if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) &&
+                            AdaptableAlert_1.isAdaptableRowChangedAlert(alert) &&
+                            alert.gridDataChangedInfo) {
+                            adaptable.api.gridApi.refreshRowNodes(alert.gridDataChangedInfo.rowNodes);
                         }
                     });
                     return ret;
@@ -420,14 +429,17 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_ALERT_REMOVE_HIGHLIGHT: {
                     let ret = next(action);
                     const actionTyped = action;
-                    if (actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        if (actionTyped.alert.alertDefinition.AlertProperties.HighlightCell) {
-                            adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
-                        }
-                        if (actionTyped.alert.alertDefinition.AlertProperties.HighlightRow) {
-                            adaptable.api.gridApi.refreshRowNode(rowNode);
-                        }
+                    const adaptableAlert = actionTyped.alert;
+                    if (((_e = adaptableAlert.alertDefinition.AlertProperties) === null || _e === void 0 ? void 0 : _e.HighlightCell) &&
+                        AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
+                        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) &&
+                        adaptableAlert.gridDataChangedInfo) {
+                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                     }
                     return ret;
                 }
@@ -481,6 +493,25 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     return ret;
                 }
+                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_ADD: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    const rowsHighlightInfo = actionTyped.rowsHighlightInfo;
+                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(rowsHighlightInfo.primaryKeyValues);
+                    if (rowNodes.length) {
+                        adaptable.api.gridApi.refreshRowNodes(rowNodes);
+                    }
+                    return ret;
+                }
+                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_DELETE: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(actionTyped.primaryKeyValues);
+                    if (rowNodes.length) {
+                        adaptable.api.gridApi.refreshRowNodes(rowNodes);
+                    }
+                    return ret;
+                }
                 case SystemRedux.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL: {
                     const rowHighlightInfos = middlewareAPI.getState().System.HighlightedRows;
                     const ret = next(action);
@@ -540,6 +571,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const calculatedColumnReferences = adaptable.api.calculatedColumnApi.getCalculatedColumnModuleReferences(actionTyped.calculatedColumn);
                     if (calculatedColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'CalculatedColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${calculatedColumnReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -563,6 +595,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const freeTextColumnReferences = adaptable.api.freeTextColumnApi.getFreeTextColumnModuleReferences(actionTyped.freeTextColumn);
                     if (freeTextColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'FreeTextColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -762,7 +795,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_e = adaptable.adaptableOptions.layoutOptions) === null || _e === void 0 ? void 0 : _e.autoSaveLayouts)) {
+                        if (!((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts)) {
                             middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -770,7 +803,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_f = adaptable.adaptableOptions.layoutOptions) === null || _f === void 0 ? void 0 : _f.autoSaveLayouts)) {
+                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
                                 middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
@@ -1001,6 +1034,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing get error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't get shared items: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1027,6 +1061,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[Entity.Uuid];
                         if (existingActiveSharedEntity) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Team Sharing',
                                 message: `Couldn't share ${adaptable.api.internalApi.getModuleFriendlyName(existingActiveSharedEntity.Module)}, there is already an existing active share for it: ${existingActiveSharedEntity.Description}`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1049,6 +1084,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .then(() => {
                         if (shareSuccessful) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Team Sharing',
                                 message: `${adaptable.api.internalApi.getModuleFriendlyName(Module)} Shared Successfully`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
@@ -1058,6 +1094,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing share error : ' + error.message, actionTyped.Entity);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't share item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1081,6 +1118,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             .getSharedEntityDependants(actionTyped.Uuid, sharedEntities);
                         if (sharedEntityDependants.length) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: `Cannot remove the shared item as it is referenced in:`,
                                 message: sharedEntityDependants
                                     .map((sharedEntity) => `${adaptable.api.internalApi.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
@@ -1098,6 +1136,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing remove error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't remove item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1112,7 +1151,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case TeamSharingRedux.TEAMSHARING_IMPORT_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    const [importStepActions, needsOverwriteConfirmation,] = adaptable.api.internalApi
+                    const [importStepActions, needsOverwriteConfirmation] = adaptable.api.internalApi
                         .getTeamSharingService()
                         .buildSharedEntityImportActions(actionTyped.SharedEntity);
                     const processImportAction = TeamSharingRedux.TeamSharingProcessImport(importStepActions);
@@ -1164,6 +1203,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .then(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()))
                         .catch(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()));
                     middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        alertType: 'generic',
                         header: 'Team Sharing',
                         message: `Item Successfully Imported`,
                         alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
@@ -1185,14 +1225,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .getSharedEntities(adaptableId)
                         .then((sharedEntities) => {
                         // check if remote server has a newer revision
-                        const [localRevision, remoteRevision,] = adaptable.api.internalApi
+                        const [localRevision, remoteRevision] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .getSharedEntityLocalAndRemoteRevisions(ChangedAdaptableObject.Uuid, sharedEntities);
                         if (remoteRevision > localRevision) {
                             // if remote has a newer version, we will NOT overwrite it
                             return;
                         }
-                        const [updatedSharedEntities, newActiveEntities,] = adaptable.api.internalApi
+                        const [updatedSharedEntities, newActiveEntities] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .updateActiveSharedEntity(ChangedAdaptableObject, UserName, sharedEntities);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...newActiveEntities));
@@ -1202,6 +1242,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing update active item error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't update active item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1222,6 +1263,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing update error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't check for updates: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1234,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.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import * as AlertRedux from '../Redux/ActionsReducers/AlertRedux';
@@ -15,12 +14,15 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
     updateOldConfig(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    protected handleDataSourceChanged(dataChangedInfo: DataChangedInfo): void;
+    private handleCellDataChanged;
+    private handleGridDataChanged;
     private handleReactiveAlertTriggered;
     private showAlertForDefinitions;
-    private getAlertDefinitionsForDataChange;
+    private getAlertDefinitionsForCellDataChange;
+    private getAlertDefinitionsForGridDataChange;
     private getBaseAlertDefinitionsForDataChange;
     private isAlertPredicateTriggered;
+    private isAlertDefinitionForRowChangeEvent;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;
     toView(alert: AlertDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

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,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleDataSourceChanged(dataChangedInfo);
+            this.handleCellDataChanged(cellDataChangedInfo);
+        });
+        this.api.eventApi.on('GridDataChanged', (gridDataChangedInfo) => {
+            if (gridDataChangedInfo.rowTrigger === 'Edit') {
+                // changed row alerts should be handled by standard 'Any' ('AnyChange') Predicate
+                return;
+            }
+            this.handleGridDataChanged(gridDataChangedInfo);
         });
         this.api.internalApi
             .getAlertService()
@@ -87,25 +96,40 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
-                let currentAlerts = this.api.internalApi
-                    .getAdaptableAlerts()
-                    .filter((a) => { var _a; return a.dataChangedInfo && ((_a = a.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell); });
-                if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(currentAlerts)) {
-                    let relevantAlert = currentAlerts.find((a) => this.api.scopeApi.isColumnInScope(menuContext.adaptableColumn, a.alertDefinition.Scope) && a.dataChangedInfo.rowNode == menuContext.rowNode);
-                    if (relevantAlert) {
-                        items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
-                    }
+                let relevantAlert;
+                // find alerts which highlight the current cell
+                relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightCell(menuContext.adaptableColumn.columnId, menuContext.rowNode);
+                if (!relevantAlert) {
+                    // find alerts which highlight the current row
+                    relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
+                }
+                if (relevantAlert) {
+                    items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }
         return items;
     }
-    handleDataSourceChanged(dataChangedInfo) {
-        const alertDefinitions = this.getAlertDefinitionsForDataChange(dataChangedInfo);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(alertDefinitions)) {
-            this.showAlertForDefinitions(dataChangedInfo, alertDefinitions);
+    handleCellDataChanged(cellDataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForCellDataChange(cellDataChangedInfo);
+        if (alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.length) {
+            this.showAlertForDefinitions(cellDataChangedInfo, alertDefinitions);
         }
     }
+    handleGridDataChanged(gridDataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForGridDataChange(gridDataChangedInfo);
+        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+        const actionName = rowAdded ? 'Added' : 'Removed';
+        const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
+        const alertMessage = numberOfChangedRows > 1
+            ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
+            : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
+        alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
+            const alert = ObjectFactory_1.default.CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
+            this.api.alertApi.displayAlert(alert);
+        });
+    }
     handleReactiveAlertTriggered(reactiveAlertInfo) {
         var _a;
         // the row node data is most probably stale because the reactive queries buffer the changed data
@@ -120,15 +144,30 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ]);
         }
     }
-    showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
+    showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateAlert(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);
         });
     }
-    getAlertDefinitionsForDataChange(dataChangedEvent) {
+    getAlertDefinitionsForCellDataChange(dataChangedEvent) {
         return this.getBaseAlertDefinitionsForDataChange(dataChangedEvent, this.api.alertApi.getActiveNonReactiveAlertDefinitions());
     }
+    getAlertDefinitionsForGridDataChange(gridDataChangedInfo) {
+        return this.api.alertApi
+            .getActiveNonReactiveAlertDefinitions()
+            .filter((alertDefinition) => this.isAlertDefinitionForRowChangeEvent(alertDefinition))
+            .filter((alertDefinition) => {
+            var _a, _b, _c, _d;
+            if (gridDataChangedInfo.rowTrigger === 'Add') {
+                return ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'AddedRow';
+            }
+            if (gridDataChangedInfo.rowTrigger === 'Delete') {
+                return ((_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicate) === null || _d === void 0 ? void 0 : _d.PredicateId) === 'RemovedRow';
+            }
+            return false;
+        });
+    }
     getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
         let relatedAlertDefinitions = definitions
             .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
@@ -151,8 +190,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         triggeredAlerts.push(alertDefinition);
                     }
                 }
-                else if (this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
-                    triggeredAlerts.push(alertDefinition);
+                else {
+                    if (!this.isAlertDefinitionForRowChangeEvent(alertDefinition) &&
+                        this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
+                        triggeredAlerts.push(alertDefinition);
+                    }
                 }
             });
         }
@@ -168,6 +210,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             column: dataChangedEvent.column,
         }, defaultNoPredicateReturn);
     }
+    isAlertDefinitionForRowChangeEvent(alertDefinition) {
+        return (this.api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition) ||
+            this.api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition));
+    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.alertApi.getAlertDefinitions(),

package/src/Strategy/BulkUpdateModule.js

@@ -43,6 +43,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Cannot edit while Grid is in Pivot Mode.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -53,6 +54,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'No cells are selected.\nPlease select some cells.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -63,6 +65,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update only supports single column edit.\nPlease adjust cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -74,6 +77,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update is not permitted on readonly columns.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -85,6 +89,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update is not permitted on readonly cells.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -116,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,
@@ -126,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/ExportModule.js

@@ -185,6 +185,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     showEmptyExportWarning() {
         this.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowAlert({
+            alertType: 'generic',
             header: 'Export',
             message: 'No Data To Export',
             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),

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;