Commit fe4a0a98 by Torkel Ödegaard

fix(alerting): added confirm modal in UI, when deleting alert

parent 24a25453
...@@ -144,7 +144,6 @@ func (e *Engine) handleResponse(result *EvalContext) { ...@@ -144,7 +144,6 @@ func (e *Engine) handleResponse(result *EvalContext) {
} }
}() }()
e.log.Info("rule", "nil", result.Rule == nil)
e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing) e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing)
e.resultHandler.Handle(result) e.resultHandler.Handle(result)
} }
...@@ -6,6 +6,7 @@ import {QueryPart} from 'app/core/components/query_part/query_part'; ...@@ -6,6 +6,7 @@ import {QueryPart} from 'app/core/components/query_part/query_part';
import alertDef from './alert_def'; import alertDef from './alert_def';
import config from 'app/core/config'; import config from 'app/core/config';
import moment from 'moment'; import moment from 'moment';
import appEvents from 'app/core/app_events';
export class AlertTabCtrl { export class AlertTabCtrl {
panel: any; panel: any;
...@@ -302,10 +303,20 @@ export class AlertTabCtrl { ...@@ -302,10 +303,20 @@ export class AlertTabCtrl {
} }
delete() { delete() {
this.alert = this.panel.alert = {enabled: false}; appEvents.emit('confirm-modal', {
this.panel.thresholds = []; title: 'Delete Alert',
this.conditionModels = []; text: 'Are you sure you want to delete this alert rule?',
this.panelCtrl.render(); text2: 'You need to save dashboard for the delete to take effect',
icon: 'fa-trash',
yesText: 'Delete',
onConfirm: () => {
this.alert = this.panel.alert = {enabled: false};
this.panel.thresholds = [];
this.conditionModels = [];
this.panelCtrl.render();
}
});
} }
enable() { enable() {
......
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