diff --git a/ui/src/Components/SilenceModal/SilenceForm.test.js b/ui/src/Components/SilenceModal/SilenceForm.test.js index 8dcbdaf23..2b2f17a06 100644 --- a/ui/src/Components/SilenceModal/SilenceForm.test.js +++ b/ui/src/Components/SilenceModal/SilenceForm.test.js @@ -7,11 +7,7 @@ import copy from "copy-to-clipboard"; import { MockThemeContext } from "__mocks__/Theme"; import { AlertStore, NewUnappliedFilter } from "Stores/AlertStore"; import { Settings } from "Stores/Settings"; -import { - SilenceFormStore, - SilenceFormStage, - NewEmptyMatcher, -} from "Stores/SilenceFormStore"; +import { SilenceFormStore, NewEmptyMatcher } from "Stores/SilenceFormStore"; import { QueryOperators, StaticLabels } from "Common/Query"; import { SilenceForm } from "./SilenceForm"; @@ -343,7 +339,7 @@ describe("", () => { it("calling submit doesn't move the form to Preview stage when form is invalid", () => { const tree = MountedSilenceForm(); tree.simulate("submit", { preventDefault: jest.fn() }); - expect(silenceFormStore.data.currentStage).toBe(SilenceFormStage.UserInput); + expect(silenceFormStore.data.currentStage).toBe("form"); }); it("calling submit move form to the 'Preview' stage when form is valid", () => { @@ -357,7 +353,7 @@ describe("", () => { silenceFormStore.data.autofillMatchers = false; const tree = MountedSilenceForm(); tree.simulate("submit", { preventDefault: jest.fn() }); - expect(silenceFormStore.data.currentStage).toBe(SilenceFormStage.Preview); + expect(silenceFormStore.data.currentStage).toBe("preview"); }); it("calling submit saves author value to the Settings store", () => { diff --git a/ui/src/Components/SilenceModal/SilenceForm.tsx b/ui/src/Components/SilenceModal/SilenceForm.tsx index e945ef501..532dd577b 100644 --- a/ui/src/Components/SilenceModal/SilenceForm.tsx +++ b/ui/src/Components/SilenceModal/SilenceForm.tsx @@ -18,7 +18,6 @@ import { faCopy } from "@fortawesome/free-solid-svg-icons/faCopy"; import { AlertStore } from "Stores/AlertStore"; import { SilenceFormStore, - SilenceFormStage, NewEmptyMatcher, NewClusterRequest, ClusterRequestT, @@ -173,7 +172,7 @@ const SilenceForm: FC<{ settingsStore.silenceFormConfig.saveAuthor(silenceFormStore.data.author); if (silenceFormStore.data.isValid) - silenceFormStore.data.currentStage = SilenceFormStage.Preview; + silenceFormStore.data.currentStage = "preview"; silenceFormStore.data.wasValidated = true; }; diff --git a/ui/src/Components/SilenceModal/SilenceModalContent.test.js b/ui/src/Components/SilenceModal/SilenceModalContent.test.js index 4f82ed8d7..4066b7dc1 100644 --- a/ui/src/Components/SilenceModal/SilenceModalContent.test.js +++ b/ui/src/Components/SilenceModal/SilenceModalContent.test.js @@ -7,11 +7,7 @@ import toDiffableHtml from "diffable-html"; import { MockThemeContext } from "__mocks__/Theme"; import { AlertStore } from "Stores/AlertStore"; import { Settings } from "Stores/Settings"; -import { - SilenceFormStore, - SilenceFormStage, - SilenceTabNames, -} from "Stores/SilenceFormStore"; +import { SilenceFormStore } from "Stores/SilenceFormStore"; import { SilenceModalContent } from "./SilenceModalContent"; let alertStore; @@ -40,7 +36,7 @@ beforeEach(() => { clusters: { am: ["am1"] }, }; - silenceFormStore.tab.current = SilenceTabNames.Editor; + silenceFormStore.tab.current = "editor"; }); afterEach(() => { @@ -78,7 +74,7 @@ describe("", () => { }); it("Clicking on the Editor tab changes content", () => { - silenceFormStore.tab.current = SilenceTabNames.Browser; + silenceFormStore.tab.current = "browser"; const tree = MountedSilenceModalContent(); const tabs = tree.find("Tab"); tabs.at(0).simulate("click"); @@ -101,28 +97,28 @@ describe("", () => { describe(" Editor", () => { it("title is 'New silence' when creating new silence", () => { - silenceFormStore.data.currentStage = SilenceFormStage.UserInput; + silenceFormStore.data.currentStage = "form"; silenceFormStore.data.silenceID = null; const tree = MountedSilenceModalContent(); const tab = tree.find("Tab").at(0); expect(tab.props().title).toBe("New silence"); }); it("title is 'Editing silence' when editing exiting silence", () => { - silenceFormStore.data.currentStage = SilenceFormStage.UserInput; + silenceFormStore.data.currentStage = "form"; silenceFormStore.data.silenceID = "1234"; const tree = MountedSilenceModalContent(); const tab = tree.find("Tab").at(0); expect(tab.props().title).toBe("Editing silence"); }); it("title is 'Preview silenced alerts' when previewing silenced alerts", () => { - silenceFormStore.data.currentStage = SilenceFormStage.Preview; + silenceFormStore.data.currentStage = "preview"; silenceFormStore.data.silenceID = "1234"; const tree = MountedSilenceModalContent(); const tab = tree.find("Tab").at(0); expect(tab.props().title).toBe("Preview silenced alerts"); }); it("title is 'Silence submitted' after sending silence to Alertmanager", () => { - silenceFormStore.data.currentStage = SilenceFormStage.Submit; + silenceFormStore.data.currentStage = "submit"; silenceFormStore.data.silenceID = "1234"; const tree = MountedSilenceModalContent(); const tab = tree.find("Tab").at(0); @@ -130,21 +126,21 @@ describe(" Editor", () => { }); it("renders SilenceForm when silenceFormStore.data.currentStage is 'UserInput'", () => { - silenceFormStore.data.currentStage = SilenceFormStage.UserInput; + silenceFormStore.data.currentStage = "form"; const tree = MountedSilenceModalContent(); const form = tree.find("SilenceForm"); expect(form).toHaveLength(1); }); it("renders SilencePreview when silenceFormStore.data.currentStage is 'Preview'", () => { - silenceFormStore.data.currentStage = SilenceFormStage.Preview; + silenceFormStore.data.currentStage = "preview"; const tree = MountedSilenceModalContent(); const ctrl = tree.find("SilencePreview"); expect(ctrl).toHaveLength(1); }); it("renders SilenceSubmitController when silenceFormStore.data.currentStage is 'Submit'", () => { - silenceFormStore.data.currentStage = SilenceFormStage.Submit; + silenceFormStore.data.currentStage = "submit"; const tree = MountedSilenceModalContent(); expect(toDiffableHtml(tree.html())).toMatchSnapshot(); }); @@ -152,7 +148,7 @@ describe(" Editor", () => { describe(" Browser", () => { it("renders silence browser when tab is set to Browser", () => { - silenceFormStore.tab.current = SilenceTabNames.Browser; + silenceFormStore.tab.current = "browser"; const tree = MountedSilenceModalContent(); const form = tree.find("Browser"); expect(form).toHaveLength(1); diff --git a/ui/src/Components/SilenceModal/SilenceModalContent.tsx b/ui/src/Components/SilenceModal/SilenceModalContent.tsx index 5a41867f2..ea5ff8ce2 100644 --- a/ui/src/Components/SilenceModal/SilenceModalContent.tsx +++ b/ui/src/Components/SilenceModal/SilenceModalContent.tsx @@ -7,11 +7,7 @@ import { faSpinner } from "@fortawesome/free-solid-svg-icons/faSpinner"; import { faLock } from "@fortawesome/free-solid-svg-icons/faLock"; import { AlertStore } from "Stores/AlertStore"; -import { - SilenceFormStore, - SilenceFormStage, - SilenceTabNames, -} from "Stores/SilenceFormStore"; +import { SilenceFormStore } from "Stores/SilenceFormStore"; import { Settings } from "Stores/Settings"; import { Tab } from "Components/Modal/Tab"; import { SilenceForm } from "./SilenceForm"; @@ -47,21 +43,20 @@ const SilenceModalContent: FC<{