-
+
-
+
diff --git a/ui/src/Components/SilenceModal/SilenceMatch.test.js b/ui/src/Components/SilenceModal/SilenceMatch.test.js
index 5a8ebb9c9..958a80adc 100644
--- a/ui/src/Components/SilenceModal/SilenceMatch.test.js
+++ b/ui/src/Components/SilenceModal/SilenceMatch.test.js
@@ -2,17 +2,25 @@ import React from "react";
import { shallow } from "enzyme";
-import { NewEmptyMatcher, MatcherValueToObject } from "Stores/SilenceFormStore";
+import {
+ SilenceFormStore,
+ NewEmptyMatcher,
+ MatcherValueToObject
+} from "Stores/SilenceFormStore";
import { SilenceMatch } from "./SilenceMatch";
+let silenceFormStore;
let matcher;
beforeEach(() => {
+ silenceFormStore = new SilenceFormStore();
matcher = NewEmptyMatcher();
});
const ShallowLabelValueInput = () => {
- return shallow();
+ return shallow(
+
+ );
};
describe("", () => {
diff --git a/ui/src/Stores/SilenceFormStore.js b/ui/src/Stores/SilenceFormStore.js
index 8ef4d3a31..600d0bce1 100644
--- a/ui/src/Stores/SilenceFormStore.js
+++ b/ui/src/Stores/SilenceFormStore.js
@@ -44,6 +44,7 @@ class SilenceFormStore {
data = observable(
{
inProgress: false,
+ wasValidated: false,
alertmanagers: [],
matchers: [],
startsAt: moment(),
@@ -51,8 +52,26 @@ class SilenceFormStore {
comment: "",
author: "",
+ get isValid() {
+ if (this.alertmanagers.length === 0) return false;
+ if (this.matchers.length === 0) return false;
+ if (
+ this.matchers.filter(
+ m =>
+ m.name === "" ||
+ m.values.length === 0 ||
+ m.values.filter(v => v === "").length > 0
+ ).length > 0
+ )
+ return false;
+ if (this.comment === "") return false;
+ if (this.author === "") return false;
+ return true;
+ },
+
resetProgress() {
this.inProgress = false;
+ this.wasValidated = false;
},
// append a new empty matcher to the list
@@ -181,6 +200,7 @@ class SilenceFormStore {
decStart: action.bound,
incEnd: action.bound,
decEnd: action.bound,
+ isValid: computed,
toAlertmanagerPayload: computed,
toDuration: computed
},
diff --git a/ui/src/Stores/SilenceFormStore.test.js b/ui/src/Stores/SilenceFormStore.test.js
index 8568e3389..6d8e13c32 100644
--- a/ui/src/Stores/SilenceFormStore.test.js
+++ b/ui/src/Stores/SilenceFormStore.test.js
@@ -1,7 +1,7 @@
import moment from "moment";
import { MockAlert, MockAlertGroup } from "__mocks__/Alerts.js";
-import { SilenceFormStore } from "./SilenceFormStore";
+import { SilenceFormStore, NewEmptyMatcher } from "./SilenceFormStore";
let store;
beforeEach(() => {
@@ -52,6 +52,13 @@ describe("SilenceFormStore.data", () => {
expect(store.data.inProgress).toBe(false);
});
+ it("resetProgress() sets 'wasValidated' to false", () => {
+ store.data.wasValidated = true;
+ expect(store.data.wasValidated).toBe(true);
+ store.data.resetProgress();
+ expect(store.data.wasValidated).toBe(false);
+ });
+
it("addEmptyMatcher() appends a matcher", () => {
expect(store.data.matchers).toHaveLength(0);
store.data.addEmptyMatcher();
@@ -129,6 +136,83 @@ describe("SilenceFormStore.data", () => {
});
});
+const MockAlertmanager = () => ({
+ label: "default",
+ value: "http://localhost"
+});
+
+const MockMatcher = (name, values) => {
+ const matcher = NewEmptyMatcher();
+ matcher.name = name;
+ matcher.values = values;
+ return matcher;
+};
+
+describe("SilenceFormStore.data.isValid", () => {
+ it("isValid returns 'false' if alertmanagers list is empty", () => {
+ store.data.matchers = [MockMatcher("foo", ["bar"])];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if matchers list is empty", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if matchers list is pupulated when a matcher without any name", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("", ["bar"])];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if matchers list is pupulated when a matcher without any value ([])", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("foo", [])];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if matchers list is pupulated when a matcher with empty value ([''])", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("foo", [])];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if author is empty", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("foo", ["bar"])];
+ store.data.author = "";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'false' if comment is empty", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("foo", ["bar"])];
+ store.data.author = "me@example.com";
+ store.data.comment = "";
+ expect(store.data.isValid).toBe(false);
+ });
+
+ it("isValid returns 'true' if all fileds are set", () => {
+ store.data.alertmanagers = [MockAlertmanager];
+ store.data.matchers = [MockMatcher("foo", ["bar"])];
+ store.data.author = "me@example.com";
+ store.data.comment = "fake silence";
+ expect(store.data.isValid).toBe(true);
+ });
+});
+
describe("SilenceFormStore.data startsAt & endsAt validation", () => {
it("toDuration returns correct duration for 5d 0h 1m", () => {
store.data.startsAt = moment([2000, 1, 1, 0, 0, 0]);