Commit dde11215 by Sofia Papagiannaki Committed by GitHub

Alerting: Fix modal text for deleting obsolete notifier (#31171)

parent 23621357
......@@ -219,16 +219,20 @@ export class AlertTabCtrl {
ThresholdMapper.alertToGraphThresholds(this.panel);
for (const addedNotification of alert.notifications) {
let identifier = addedNotification.uid;
// lookup notifier type by uid
let model: any = _.find(this.notifications, { uid: addedNotification.uid });
let model: any = _.find(this.notifications, { uid: identifier });
// fallback using id if uid is missing
if (!model && addedNotification.id) {
identifier = addedNotification.id;
model = _.find(this.notifications, { id: identifier });
}
// fallback to using id if uid is missing
if (!model) {
model = _.find(this.notifications, { id: addedNotification.id });
if (!model) {
appEvents.emit(CoreEvents.showConfirmModal, {
title: 'Notifier with invalid ID is detected',
text: `Do you want to delete notifier with invalid ID: ${addedNotification.id} from the dashboard JSON?`,
title: 'Notifier with invalid identifier is detected',
text: `Do you want to delete notifier with invalid identifier: ${identifier} from the dashboard JSON?`,
text2: 'After successful deletion, make sure to save the dashboard for storing the update JSON.',
icon: 'trash-alt',
confirmText: 'Delete',
......@@ -238,7 +242,6 @@ export class AlertTabCtrl {
},
});
}
}
if (model && model.isDefault === false) {
model.iconClass = this.getNotificationIcon(model.type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment