From 89bcafda3c89c1605ba019b3a2c585fec7522ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 7 Oct 2018 10:29:11 +0100 Subject: [PATCH] fix(ui): reset silenceID to null when creating silence from group --- ui/src/Stores/SilenceFormStore.js | 3 +++ ui/src/Stores/SilenceFormStore.test.js | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/ui/src/Stores/SilenceFormStore.js b/ui/src/Stores/SilenceFormStore.js index 5f16b0903..76ca3a5ed 100644 --- a/ui/src/Stores/SilenceFormStore.js +++ b/ui/src/Stores/SilenceFormStore.js @@ -148,6 +148,9 @@ class SilenceFormStore { } this.matchers = matchers; + // ensure that silenceID is nulled, since it's used to edit silences + // and this is used to silence groups + this.silenceID = null; }, fillFormFromSilence(alertmanager, silence) { diff --git a/ui/src/Stores/SilenceFormStore.test.js b/ui/src/Stores/SilenceFormStore.test.js index b25a288ea..b8994373f 100644 --- a/ui/src/Stores/SilenceFormStore.test.js +++ b/ui/src/Stores/SilenceFormStore.test.js @@ -187,6 +187,13 @@ describe("SilenceFormStore.data", () => { ); }); + it("fillMatchersFromGroup() resets silenceID if set", () => { + store.data.silenceID = "12345"; + const group = MockGroup(); + store.data.fillMatchersFromGroup(group, [group.alerts[0]]); + expect(store.data.silenceID).toBeNull(); + }); + it("fillFormFromSilence() sets silenceID", () => { const alertmanager = MockAlertmanager(); const silence = MockSilence();