@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.0

package/src/Api/Internal/AlertInternalApi.js

@@ -6,6 +6,10 @@ import { AlertModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { isCellDataChangedInfo } from '../../Utilities/Services/Interface/IAlertService';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import Helper from '../../Utilities/Helpers/Helper';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import { OBSERVABLE_EXPRESSION_ROW_ADDED, OBSERVABLE_EXPRESSION_ROW_REMOVED, } from '../../Utilities/Constants/GeneralConstants';
+import { errorOnce } from '../../agGrid/AdaptableLogger';
 export class AlertInternalApi extends ApiBase {
     getExpressionForAlertRule(alertRule) {
         var expression;
@@ -23,9 +27,8 @@ export class AlertInternalApi extends ApiBase {
      * @param name name of the Form
      */
     getAdaptableFormByName(name) {
-        var _a;
         const alertForms = this.getAlertOptions().alertForms || [];
-        return (_a = alertForms.find((f) => f.name === name)) === null || _a === void 0 ? void 0 : _a.form;
+        return alertForms.find((f) => f.name === name)?.form;
     }
     /**
      * Retrieves all Alert Definitions in Alert State which are NOT Reactive (BooleanQuery)
@@ -75,38 +78,29 @@ export class AlertInternalApi extends ApiBase {
     getAlertDefinitionsWithAllowEdit() {
         return this.getActiveNonReactiveAlertDefinitions().filter((a) => a.AlertProperties == null || a.AlertProperties.PreventEdit !== true);
     }
-    /**
-     * Publishes an event when an Alert is triggered
-     * @param alertToFire Alerts which has just triggered
-     */
-    publishAlertFiredEvent(alertToFire) {
-        const alertFiredInfo = Object.assign({ alert: alertToFire }, this.getAdaptableInternalApi().buildBaseContext());
-        this.getEventApi().emit('AlertFired', alertFiredInfo);
-    }
     /**
      * Runs after a button in an Alert Form is clicked
      */
     executeAlertButton(button, context) {
-        if (button.Action) {
-            let actions = button.Action;
-            if (typeof actions === 'function') {
-                actions(context);
+        if (button.Command) {
+            let commands = button.Command;
+            if (typeof commands === 'function') {
+                commands(context);
                 return;
             }
-            if (!Array.isArray(actions)) {
-                actions = [actions];
+            if (!Array.isArray(commands)) {
+                commands = [commands];
             }
-            actions.forEach((action) => {
-                var _a;
-                const buttonOnClick = (_a = this.getAlertOptions().actionHandlers) === null || _a === void 0 ? void 0 : _a.find((x) => x.name === action);
-                buttonOnClick === null || buttonOnClick === void 0 ? void 0 : buttonOnClick.handler(button, context);
-                this.executeAlertAction(action, {
+            commands.forEach((command) => {
+                const buttonOnClick = this.getAlertOptions().commandHandlers?.find((x) => x.name === command);
+                buttonOnClick?.handler(button, context);
+                this.executeAlertCommand(command, {
                     alertDefinition: context.alert.alertDefinition,
                     cellDataChangedInfo: isAdaptableCellChangedAlert(context.alert)
                         ? context.alert.cellDataChangedInfo
                         : null,
-                    gridDataChangedInfo: isAdaptableRowChangedAlert(context.alert)
-                        ? context.alert.gridDataChangedInfo
+                    rowDataChangedInfo: isAdaptableRowChangedAlert(context.alert)
+                        ? context.alert.rowDataChangedInfo
                         : null,
                     formData: context.formData,
                 });
@@ -114,15 +108,14 @@ export class AlertInternalApi extends ApiBase {
         }
     }
     /**
-     * Runs after an Alert Action is invoked
-     * @param actionName Action which has been invoked
+     * Runs after an Alert Command is invoked
+     * @param command Action which has been invoked
      * @param details Info about the Alert and Form
      */
-    executeAlertAction(actionName, details) {
-        const { alertDefinition, cellDataChangedInfo: cellDataChangedInfo, gridDataChangedInfo, } = details;
+    executeAlertCommand(command, details) {
+        const { alertDefinition, cellDataChangedInfo: cellDataChangedInfo, rowDataChangedInfo: rowDataChangedInfo, } = details;
         const getBackgroundColor = (alertDefinition) => {
-            var _a;
-            const highlightType = (_a = alertDefinition.MessageType) !== null && _a !== void 0 ? _a : 'Info';
+            const highlightType = alertDefinition.MessageType ?? 'Info';
             let backgroundColor = '';
             switch (highlightType) {
                 case 'Error':
@@ -139,7 +132,7 @@ export class AlertInternalApi extends ApiBase {
             }
             return backgroundColor;
         };
-        if (actionName === 'highlight-cell' && cellDataChangedInfo) {
+        if (command === 'highlight-cell' && cellDataChangedInfo) {
             const backgroundColor = getBackgroundColor(alertDefinition);
             this.getGridApi().highlightCell({
                 columnId: cellDataChangedInfo.column.columnId,
@@ -150,7 +143,7 @@ export class AlertInternalApi extends ApiBase {
                 timeout: this.getAlertOptions().cellHighlightDuration,
             });
         }
-        if (actionName === 'highlight-row' && cellDataChangedInfo) {
+        if (command === 'highlight-row' && cellDataChangedInfo) {
             const rowsHighlightInfo = {
                 primaryKeyValues: [cellDataChangedInfo.primaryKeyValue],
                 highlightStyle: {
@@ -160,11 +153,11 @@ export class AlertInternalApi extends ApiBase {
             };
             this.getGridApi().highlightRows(rowsHighlightInfo);
         }
-        if (actionName === 'highlight-row' &&
-            gridDataChangedInfo &&
+        if (command === 'highlight-row' &&
+            rowDataChangedInfo &&
             // no sense to highlight a deleted(non-existing) row
-            (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete') {
-            const primaryKeyValues = this.getGridApi().getPrimaryKeyValuesForRowNodes(gridDataChangedInfo.rowNodes);
+            rowDataChangedInfo?.rowTrigger !== 'Delete') {
+            const primaryKeyValues = this.getGridApi().getPrimaryKeyValuesForRowNodes(rowDataChangedInfo.rowNodes);
             const rowsHighlightInfo = {
                 primaryKeyValues,
                 highlightStyle: {
@@ -174,31 +167,31 @@ export class AlertInternalApi extends ApiBase {
             };
             this.getGridApi().highlightRows(rowsHighlightInfo);
         }
-        if (actionName === 'jump-to-cell' && cellDataChangedInfo) {
-            this.getGridApi().jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId);
+        if (command === 'jump-to-cell' && cellDataChangedInfo) {
+            this.getGridApi().jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId, cellDataChangedInfo.rowNode);
         }
-        if (actionName === 'jump-to-row' &&
+        if (command === 'jump-to-row' &&
             // either a cell change
             (cellDataChangedInfo ||
                 // or a grid change, but NOT row deletion
-                (gridDataChangedInfo &&
+                (rowDataChangedInfo &&
                     // no sense to jump to a deleted(non-existing) row
-                    (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete'))) {
+                    rowDataChangedInfo?.rowTrigger !== 'Delete'))) {
             const [firstRowNode] = cellDataChangedInfo
                 ? [cellDataChangedInfo.rowNode]
-                : gridDataChangedInfo.rowNodes;
+                : rowDataChangedInfo.rowNodes;
             const targetRowNodePrimaryKeyValue = this.getGridApi().getPrimaryKeyValueForRowNode(firstRowNode);
             if (targetRowNodePrimaryKeyValue) {
                 this.getGridApi().jumpToRow(targetRowNodePrimaryKeyValue);
             }
         }
-        if (actionName === 'jump-to-column' && cellDataChangedInfo) {
+        if (command === 'jump-to-column' && cellDataChangedInfo) {
             this.getGridApi().jumpToColumn(cellDataChangedInfo.column.columnId);
         }
-        if (actionName === 'suspend') {
+        if (command === 'suspend') {
             this.getAlertApi().suspendAlertDefinition(alertDefinition);
         }
-        if (actionName === 'undo' && cellDataChangedInfo) {
+        if (command === 'undo' && cellDataChangedInfo) {
             this.getGridApi().undoCellEdit(cellDataChangedInfo);
         }
     }
@@ -255,7 +248,6 @@ export class AlertInternalApi extends ApiBase {
      * @param alertDefinition Alert Definition to use
      */
     getAlertMessageHeaderForDataChange(alertDefinition, cellDataChangedInfo) {
-        var _a, _b;
         const anotationContext = cellDataChangedInfo
             ? {
                 column: cellDataChangedInfo.column,
@@ -267,9 +259,9 @@ export class AlertInternalApi extends ApiBase {
                 trigger: cellDataChangedInfo.trigger,
             }
             : {};
-        let message = (_a = this.getCustomAlertMessageHeader(alertDefinition, {
+        let message = this.getCustomAlertMessageHeader(alertDefinition, {
             cellDataChangedInfo,
-        })) !== null && _a !== void 0 ? _a : (_b = cellDataChangedInfo === null || cellDataChangedInfo === void 0 ? void 0 : cellDataChangedInfo.column) === null || _b === void 0 ? void 0 : _b.friendlyName;
+        }) ?? cellDataChangedInfo?.column?.friendlyName;
         try {
             message = cellDataChangedInfo ? this.annotateAlertText(message, anotationContext) : message;
         }
@@ -278,49 +270,49 @@ export class AlertInternalApi extends ApiBase {
         }
         return message;
     }
-    getAlertMessageForGridDataChange(alertDefinition, gridDataChangedInfo) {
-        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
-        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+    getAlertMessageForRowDataChange(alertDefinition, rowDataChangedInfo) {
+        const rowAdded = rowDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = rowDataChangedInfo.rowNodes.length;
         const actionName = rowAdded ? 'Added' : 'Removed';
         const defaultMessage = numberOfChangedRows > 1
             ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
             : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
         const customMessage = this.getCustomAlertDescription(alertDefinition, {
-            gridDataChangedInfo,
+            rowDataChangedInfo: rowDataChangedInfo,
         });
         let alertMessage = alertDefinition.MessageText
             ? alertDefinition.MessageText
-            : customMessage !== null && customMessage !== void 0 ? customMessage : defaultMessage;
+            : customMessage ?? defaultMessage;
         try {
             alertMessage = this.annotateAlertText(alertMessage, {
                 numberOfRows: numberOfChangedRows,
-                timestamp: gridDataChangedInfo.changedAt,
-                trigger: gridDataChangedInfo.rowTrigger,
+                timestamp: rowDataChangedInfo.changedAt,
+                trigger: rowDataChangedInfo.rowTrigger,
             });
         }
         catch (e) {
-            this.logError('Error in getAlertMessageForGridDataChange', e);
+            this.logError('Error in getAlertMessageForRowDataChange', e);
         }
         return alertMessage;
     }
-    getAlertHeaderForGridDataChange(alertDefinition, gridDataChangedInfo) {
-        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
-        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+    getAlertHeaderForRowDataChange(alertDefinition, rowDataChangedInfo) {
+        const rowAdded = rowDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = rowDataChangedInfo.rowNodes.length;
         const actionName = rowAdded ? 'Added' : 'Removed';
         const customHeader = this.getCustomAlertMessageHeader(alertDefinition, {
-            gridDataChangedInfo,
+            rowDataChangedInfo: rowDataChangedInfo,
         });
         const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
-        let header = customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader;
+        let header = customHeader ?? alertHeader;
         try {
             header = this.annotateAlertText(header, {
                 numberOfRows: numberOfChangedRows,
-                timestamp: gridDataChangedInfo.changedAt,
-                trigger: gridDataChangedInfo.rowTrigger,
+                timestamp: rowDataChangedInfo.changedAt,
+                trigger: rowDataChangedInfo.rowTrigger,
             });
         }
         catch (e) {
-            this.logError('Error in getAlertHeaderForGridDataChange', e);
+            this.logError('Error in getAlertHeaderForRowDataChange', e);
         }
         return header;
     }
@@ -331,13 +323,12 @@ export class AlertInternalApi extends ApiBase {
      * @param dataChangedInfo data change info, it can be eighter grid or cell data chantged info
      */
     getCustomAlertDescription(alertDefinition, dataChangedInfo) {
-        var _a;
-        const alertMessageFunction = (_a = this.getAlertOptions()) === null || _a === void 0 ? void 0 : _a.alertMessageText;
+        const alertMessageFunction = this.getAlertOptions()?.alertMessageText;
         if (alertMessageFunction) {
             const alertMessageContext = {
                 alertDefinition: alertDefinition,
                 cellDataChangedInfo: dataChangedInfo.cellDataChangedInfo,
-                gridDataChangedInfo: dataChangedInfo.gridDataChangedInfo,
+                rowDataChangedInfo: dataChangedInfo.rowDataChangedInfo,
             };
             const returnText = alertMessageFunction(alertMessageContext);
             if (returnText) {
@@ -352,13 +343,12 @@ export class AlertInternalApi extends ApiBase {
      * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
      */
     getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
-        var _a;
-        const alertMessageFunction = (_a = this.getAlertOptions()) === null || _a === void 0 ? void 0 : _a.alertMessageHeader;
+        const alertMessageFunction = this.getAlertOptions()?.alertMessageHeader;
         if (alertMessageFunction) {
             const returnText = alertMessageFunction({
                 alertDefinition,
-                cellDataChangedInfo: dataChangedInfo === null || dataChangedInfo === void 0 ? void 0 : dataChangedInfo.cellDataChangedInfo,
-                gridDataChangedInfo: dataChangedInfo === null || dataChangedInfo === void 0 ? void 0 : dataChangedInfo.gridDataChangedInfo,
+                cellDataChangedInfo: dataChangedInfo?.cellDataChangedInfo,
+                rowDataChangedInfo: dataChangedInfo?.rowDataChangedInfo,
             });
             if (returnText) {
                 return returnText;
@@ -374,9 +364,8 @@ export class AlertInternalApi extends ApiBase {
      * @param alertDefinition Alert Definition to use
      */
     getAlertRuleDescription(alertDefinition) {
-        var _a, _b, _c, _d;
-        let ruleDescription = ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)
-            ? (_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.map((predicate) => this.getPredicateApi().predicateToString(predicate)).join(' AND ')
+        let ruleDescription = alertDefinition.Rule?.Predicates?.length
+            ? alertDefinition.Rule?.Predicates?.map((predicate) => this.getPredicateApi().predicateToString(predicate)).join(' AND ')
             : this.getAdaptableInternalApi().getAdaptableQueryExpressionText(alertDefinition.Rule);
         return ruleDescription;
     }
@@ -409,19 +398,24 @@ export class AlertInternalApi extends ApiBase {
         return alert.alertType;
     }
     getAdaptableFormFromAlertForm(alertForm, context, defaultMessageType) {
-        var _a, _b;
         let adaptableAlertForm;
         let isActionForm = false;
         if (typeof alertForm === 'string') {
             const alertForms = this.getAlertOptions().alertForms || [];
-            adaptableAlertForm = (_a = alertForms.find((f) => f.name === alertForm)) === null || _a === void 0 ? void 0 : _a.form;
+            adaptableAlertForm = alertForms.find((f) => f.name === alertForm)?.form;
         }
         else {
-            adaptableAlertForm = Object.assign(Object.assign({}, alertForm), { buttons: (alertForm.Buttons || []).map((alertButton) => {
-                    return Object.assign(Object.assign({}, alertButton), { onClick: () => {
+            adaptableAlertForm = {
+                ...alertForm,
+                buttons: (alertForm.Buttons || []).map((alertButton) => {
+                    return {
+                        ...alertButton,
+                        onClick: () => {
                             this.executeAlertButton(alertButton, context);
-                        } });
-                }) });
+                        },
+                    };
+                }),
+            };
             isActionForm = true;
         }
         if (!adaptableAlertForm) {
@@ -429,27 +423,35 @@ export class AlertInternalApi extends ApiBase {
         }
         if (adaptableAlertForm && adaptableAlertForm.buttons) {
             // dont mutate the form, but clone it
-            adaptableAlertForm = Object.assign({}, adaptableAlertForm);
-            adaptableAlertForm.buttons = (_b = adaptableAlertForm.buttons) === null || _b === void 0 ? void 0 : _b.map((button) => {
+            adaptableAlertForm = { ...adaptableAlertForm };
+            adaptableAlertForm.buttons = adaptableAlertForm.buttons?.map((button) => {
                 let buttonStyle = isActionForm
                     ? button.ButtonStyle
                     : this.getAdaptableInternalApi().getStyleForButton(button, context);
-                if (defaultMessageType && !(buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone)) {
+                if (defaultMessageType && !buttonStyle?.tone) {
                     // force the button tone to be the alert tone, if the tone is missing from button style (or button style non-existent)
-                    buttonStyle = Object.assign(Object.assign({}, buttonStyle), { tone: defaultMessageType.toLowerCase() });
+                    buttonStyle = {
+                        ...buttonStyle,
+                        tone: defaultMessageType.toLowerCase(),
+                    };
                 }
                 let label = isActionForm
                     ? button.Label
                     : this.getAdaptableInternalApi().getLabelForButton(button, context);
-                return Object.assign(Object.assign({}, button), { buttonStyle,
-                    label });
+                return {
+                    ...button,
+                    buttonStyle,
+                    label,
+                };
             });
         }
         return adaptableAlertForm;
     }
+    clearAdaptableAlerts() {
+        this.dispatchAction(InternalRedux.AdaptableAlertDeleteAll([]));
+    }
     getAdaptableAlerts() {
-        var _a;
-        return (_a = this.getAdaptableState().System.AdaptableAlerts) !== null && _a !== void 0 ? _a : [];
+        return this.getAdaptableState().Internal.AdaptableAlerts ?? [];
     }
     getAdaptableCellChangedAlerts() {
         return this.getAdaptableAlerts().filter(isAdaptableCellChangedAlert);
@@ -459,19 +461,15 @@ export class AlertInternalApi extends ApiBase {
     }
     getAdaptableAlertWithHighlightCell(columnId, rowNode) {
         // only alerts triggered by cell changes are relevant for HighlightCell actions
-        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.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;
-        });
+        return this.getAdaptableCellChangedAlerts().find((alert) => alert.alertDefinition.AlertProperties?.HighlightCell &&
+            alert.cellDataChangedInfo?.column?.columnId === columnId &&
+            alert.cellDataChangedInfo?.rowNode === rowNode);
     }
     getAdaptableAlertWithHighlightRow(rowNode) {
         let alertWithRowHighlight;
         alertWithRowHighlight = this.getAdaptableRowChangedAlerts().find((alert) => {
-            var _a, _b;
-            if ((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightRow) {
-                if ((_b = alert.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowNodes.map((rowNode) => rowNode.id).includes(rowNode.id)) {
+            if (alert.alertDefinition.AlertProperties?.HighlightRow) {
+                if (alert.rowDataChangedInfo?.rowNodes.map((rowNode) => rowNode.id).includes(rowNode.id)) {
                     return alert;
                 }
             }
@@ -480,9 +478,8 @@ export class AlertInternalApi extends ApiBase {
             return alertWithRowHighlight;
         }
         alertWithRowHighlight = this.getAdaptableCellChangedAlerts().find((alert) => {
-            var _a, _b;
-            if ((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightRow) {
-                if (((_b = alert.cellDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowNode.id) == rowNode.id) {
+            if (alert.alertDefinition.AlertProperties?.HighlightRow) {
+                if (alert.cellDataChangedInfo?.rowNode.id == rowNode.id) {
                     return alert;
                 }
             }
@@ -490,14 +487,22 @@ export class AlertInternalApi extends ApiBase {
         return alertWithRowHighlight;
     }
     isAlertDefinitionForAddedRowChangeEvent(alertDefinition) {
-        var _a, _b, _c;
-        const addedRowPredicate = 'AddedRow';
-        return (_c = (_b = (_a = alertDefinition === null || alertDefinition === void 0 ? void 0 : alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (predicate) => predicate.PredicateId === addedRowPredicate);
+        const observableExpression = alertDefinition?.Rule?.ObservableExpression;
+        if (StringExtensions.IsNotNullOrEmpty(observableExpression)) {
+            return observableExpression.includes(OBSERVABLE_EXPRESSION_ROW_ADDED);
+        }
+        return false;
     }
     isAlertDefinitionForRemovedRowChangeEvent(alertDefinition) {
-        var _a, _b, _c;
-        const removedRowPredicate = 'RemovedRow';
-        return (_c = (_b = (_a = alertDefinition === null || alertDefinition === void 0 ? void 0 : alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (predicate) => predicate.PredicateId === removedRowPredicate);
+        const observableExpression = alertDefinition?.Rule?.ObservableExpression;
+        if (StringExtensions.IsNotNullOrEmpty(observableExpression)) {
+            return observableExpression.includes(OBSERVABLE_EXPRESSION_ROW_REMOVED);
+        }
+        return false;
+    }
+    setUpReactiveAlerts() {
+        const reactiveAlertDefinitions = this.getActiveReactiveAlertDefinitions();
+        reactiveAlertDefinitions.forEach((reactiveAlertDefinition) => this.getAdaptableInternalApi().getAlertService().createReactiveAlert(reactiveAlertDefinition));
     }
     getAlertDefinitionsForCellDataChange(dataChangedEvent) {
         const allActiveNonReactiveDefinitions = this.getActiveNonReactiveAlertDefinitions();
@@ -513,17 +518,25 @@ export class AlertInternalApi extends ApiBase {
                     if (!rowNode) {
                         rowNode = this.getGridApi().getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
                     }
-                    const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(expression, 'Alert', `Invalid Alert boolean expression '${expression}'`);
-                    const isSatisfiedExpression = isValidExpression &&
-                        this.getAdaptableApi()
-                            .internalApi.getQueryLanguageService()
-                            .evaluateBooleanExpression(expression, 'Alert', rowNode);
+                    const isValidExpression = this.getExpressionApi().isValidBooleanExpression(expression, 'Alert', `Invalid Alert boolean expression '${expression}'`);
+                    let isSatisfiedExpression = false;
+                    try {
+                        isSatisfiedExpression =
+                            isValidExpression &&
+                                this.getAdaptableApi()
+                                    .internalApi.getQueryLanguageService()
+                                    .evaluateBooleanExpression(expression, 'Alert', rowNode, dataChangedEvent);
+                    }
+                    catch (error) {
+                        isSatisfiedExpression = false;
+                        errorOnce(error.message);
+                    }
                     if (isSatisfiedExpression) {
                         triggeredAlerts.push(alertDefinition);
                     }
                 }
                 else if (alertDefinition.Rule.AggregatedBooleanExpression) {
-                    const isValidExpression = this.getAdaptableApi().expressionApi.isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, 'Alert', `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
+                    const isValidExpression = this.getExpressionApi().isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, 'Alert', `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
                     const isSatisfiedExpression = isValidExpression &&
                         this.isAggregationAlertTriggered(alertDefinition, dataChangedEvent);
                     if (isSatisfiedExpression) {
@@ -543,21 +556,26 @@ export class AlertInternalApi extends ApiBase {
     }
     isAggregationAlertTriggered(alertDefinition, dataChangedEvent) {
         const changedColumn = dataChangedEvent.column.columnId;
-        const aggregationColumns = this.getAdaptableApi().expressionApi.getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
-        if (!aggregationColumns.includes(changedColumn)) {
+        const expressionAggregationColumns = this.getExpressionApi().getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
+        if (!expressionAggregationColumns.includes(changedColumn)) {
             return false;
         }
-        const aggregatedBooleanValue = this.getAdaptableApi()
-            .internalApi.getQueryLanguageService()
+        const aggregatedBooleanValue = this.getAdaptableInternalApi()
+            .getQueryLanguageService()
             .computeAggregatedBooleanValue(alertDefinition.Rule.AggregatedBooleanExpression, AlertModuleId);
         return aggregatedBooleanValue;
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
-        var _a;
-        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
+        const predicateDefHandlerContext = {
+            value: dataChangedEvent.newValue,
+            oldValue: dataChangedEvent.oldValue,
             // TODO send real display value
-            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableInternalApi().buildBaseContext());
-        return this.getPredicateApi().handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
+            displayValue: null,
+            node: dataChangedEvent.rowNode,
+            column: dataChangedEvent.column,
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+        };
+        return this.getPredicateApi().handleColumnPredicates(alert.Rule?.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     isAlertDefinitionForRowChangeEvent(alertDefinition) {
         return (this.isAlertDefinitionForAddedRowChangeEvent(alertDefinition) ||
@@ -568,19 +586,19 @@ export class AlertInternalApi extends ApiBase {
             alertDefinitions.forEach((alertDefinition) => {
                 if (this.shouldFireAlertOnClient(alertDefinition)) {
                     const alert = ObjectFactory.CreateCellChangedAlert(this.getAlertMessageHeaderForDataChange(alertDefinition, dataChangedInfo), this.getAlertDescriptionForDataChange(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
-                    this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
+                    this.getAlertApi().displayAdaptableAlert(alert);
                 }
             });
         }
         else {
-            this.showAlertsForGridDataChanges(dataChangedInfo, alertDefinitions);
+            this.showAlertsForRowDataChanges(dataChangedInfo, alertDefinitions);
         }
     }
-    showAlertsForGridDataChanges(gridDataChangedInfo, alertDefinitions) {
-        alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
+    showAlertsForRowDataChanges(rowDataChangedInfo, alertDefinitions) {
+        alertDefinitions?.forEach((alertDefinition) => {
             if (this.shouldFireAlertOnClient(alertDefinition)) {
-                const alert = ObjectFactory.CreateRowChangedAlert(this.getAlertHeaderForGridDataChange(alertDefinition, gridDataChangedInfo), this.getAlertMessageForGridDataChange(alertDefinition, gridDataChangedInfo), alertDefinition, gridDataChangedInfo);
-                this.getAlertApi().showAdaptableAlert(alert);
+                const alert = ObjectFactory.CreateRowChangedAlert(this.getAlertHeaderForRowDataChange(alertDefinition, rowDataChangedInfo), this.getAlertMessageForRowDataChange(alertDefinition, rowDataChangedInfo), alertDefinition, rowDataChangedInfo);
+                this.getAlertApi().displayAdaptableAlert(alert);
             }
         });
     }
@@ -588,11 +606,11 @@ export class AlertInternalApi extends ApiBase {
         const rule = alertDefinition.Rule;
         if (rule) {
             if (rule.Predicates) {
-                return this.getAdaptableApi().expressionApi.internalApi.evaluatePredicatesInAdaptableQL('Alert', alertDefinition, alertDefinition.Rule.Predicates);
+                return this.getExpressionApi().internalApi.evaluatePredicatesInAdaptableQL('Alert', alertDefinition, alertDefinition.Rule.Predicates);
             }
             else {
                 var expression = this.getExpressionForAlertRule(rule);
-                return this.getAdaptableApi().expressionApi.internalApi.evaluateExpressionInAdaptableQL('Alert', alertDefinition, expression);
+                return this.getExpressionApi().internalApi.evaluateExpressionInAdaptableQL('Alert', alertDefinition, expression);
             }
         }
         return true;
@@ -623,29 +641,28 @@ export class AlertInternalApi extends ApiBase {
      * - trigger -> [trigger]
      */
     annotateAlertText(text, context) {
-        var _a, _b, _c;
         if (!text) {
             return text;
         }
         if (!context) {
             return text;
         }
-        if (context === null || context === void 0 ? void 0 : context.newValue) {
+        if (context?.newValue) {
             text = Helper.replaceAll(text, '[newValue]', context.newValue);
         }
-        if (context === null || context === void 0 ? void 0 : context.oldValue) {
+        if (context?.oldValue) {
             text = Helper.replaceAll(text, '[oldValue]', context.oldValue);
         }
-        if (context === null || context === void 0 ? void 0 : context.primaryKeyValue) {
+        if (context?.primaryKeyValue) {
             text = Helper.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
         }
-        if (context === null || context === void 0 ? void 0 : context.timestamp) {
+        if (context?.timestamp) {
             text = Helper.replaceAll(text, '[timestamp]', context.timestamp + '');
         }
-        if (context === null || context === void 0 ? void 0 : context.numberOfRows) {
+        if (context?.numberOfRows) {
             text = Helper.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
         }
-        if (context === null || context === void 0 ? void 0 : context.trigger) {
+        if (context?.trigger) {
             const dataChangeTriggerMap = {
                 edit: 'Edit',
                 tick: 'Tick',
@@ -660,13 +677,14 @@ export class AlertInternalApi extends ApiBase {
             };
             const mappedTrigger = 
             // @ts-ignore
-            (_a = (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger])) !== null && _a !== void 0 ? _a : context.trigger;
+            (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger]) ??
+                context.trigger;
             text = Helper.replaceAll(text, '[trigger]', mappedTrigger);
         }
-        if (context === null || context === void 0 ? void 0 : context.column) {
+        if (context?.column) {
             text = Helper.replaceAll(text, '[column]', this.getColumnApi().getFriendlyNameForColumnId(context.column.columnId));
         }
-        if (context === null || context === void 0 ? void 0 : context.rowNode) {
+        if (context?.rowNode) {
             const columns = Helper.extractColsFromText(text);
             for (const column of columns) {
                 if (this.getColumnApi().getColumnWithColumnId(column)) {
@@ -675,8 +693,9 @@ export class AlertInternalApi extends ApiBase {
             }
         }
         if (text.indexOf('[context') !== -1) {
-            const agGridContext = (_c = (_b = this.getAdaptableInternalApi()
-                .getAgGridAdapter()).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
+            const agGridContext = this.getAdaptableInternalApi()
+                .getAgGridAdapter()
+                .getGridOption?.('context');
             const agGridContextKeys = Helper.extractContextKeysFromText(text);
             for (const key of agGridContextKeys) {
                 if (agGridContext[key]) {

package/src/Api/Internal/CalculatedColumnInternalApi.d.ts

@@ -1,7 +1,7 @@
+import { ColDef } from 'ag-grid-enterprise';
 import { ApiBase } from '../Implementation/ApiBase';
 import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
 import { AdaptableColumn } from '../../types';
-import { ColDef } from '@ag-grid-community/core';
 export declare class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
@@ -27,6 +27,6 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
     isCumulativeAggregatedExpression(input: string): boolean;
     isQuantileAggregatedExpression(input: string): boolean;
     getExpressionFromCalculatedColumn(calculatedColumn: CalculatedColumn): string;
-    fireCalculatedColumnChangedEvent(trigger: string, calculatedColumn: CalculatedColumn): void;
     getColDefsForCalculatedColumns(): ColDef[];
+    validateDeletedCalculatedColumn(calculatedColumn: CalculatedColumn): boolean;
 }