IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fixes so notification channels are properly deleted (#31040)

Browse Source
This commit is contained in:
Hugo Häggmark 2021-02-09 15:29:50 +01:00 committed by GitHub
parent c69c8bd47c
commit f43d834a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
public/app/features/alerting/AlertTabCtrl.test.ts Normal file
View File

@ -0,0 +1,81 @@
import { AlertTabCtrl } from './AlertTabCtrl';
interface Args {
notifications?: Array<{ uid?: string; id?: number; isDefault: boolean }>;
}
function setupTestContext({ notifications = [] }: Args = {}) {
const panel = {
alert: { notifications },
options: [],
title: 'Testing Alerts',
};
const $scope = {
ctrl: {
panel,
render: jest.fn(),
},
};
const dashboardSrv: any = {};
const uiSegmentSrv: any = {};
const datasourceSrv: any = {};
const controller = new AlertTabCtrl($scope, dashboardSrv, uiSegmentSrv, datasourceSrv);
controller.notifications = notifications;
controller.alertNotifications = [];
controller.initModel();
return { controller };
}
describe('AlertTabCtrl', () => {
describe('when removeNotification is called with an uid', () => {
it('then the correct notifier should be removed', () => {
const { controller } = setupTestContext({
notifications: [
{ id: 1, uid: 'one', isDefault: true },
{ id: 2, uid: 'two', isDefault: false },
],
});
expect(controller.alert.notifications).toEqual([
{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
]);
expect(controller.alertNotifications).toEqual([
{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
]);
controller.removeNotification({ uid: 'one' });
expect(controller.alert.notifications).toEqual([{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' }]);
expect(controller.alertNotifications).toEqual([{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' }]);
});
});
describe('when removeNotification is called with an id', () => {
it('then the correct notifier should be removed', () => {
const { controller } = setupTestContext({
notifications: [
{ id: 1, uid: 'one', isDefault: true },
{ id: 2, uid: 'two', isDefault: false },
],
});
expect(controller.alert.notifications).toEqual([
{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
]);
expect(controller.alertNotifications).toEqual([
{ id: 2, uid: 'two', isDefault: false, iconClass: 'bell' },
{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' },
]);
controller.removeNotification({ id: 2 });
expect(controller.alert.notifications).toEqual([{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' }]);
expect(controller.alertNotifications).toEqual([{ id: 1, uid: 'one', isDefault: true, iconClass: 'bell' }]);
});
});
});

6
public/app/features/alerting/AlertTabCtrl.ts
View File

@ -165,10 +165,10 @@ export class AlertTabCtrl {
}
removeNotification(an: any) {
// remove notifiers refeered to by id and uid to support notifiers added
// remove notifiers referred to by id and uid to support notifiers added
// before and after we added support for uid
_.remove(this.alert.notifications, (n: any) => n.uid === an.uid);
_.remove(this.alertNotifications, (n: any) => n.uid === an.uid);
_.remove(this.alert.notifications, (n: any) => n.uid === an.uid || n.id === an.id);
_.remove(this.alertNotifications, (n: any) => n.uid === an.uid || n.id === an.id);
}
addAlertRuleTag() {