diff --git a/ui/src/Components/MainModal/Help.js b/ui/src/Components/MainModal/Help.js
index 5f71d5dba..9c5ac33c6 100644
--- a/ui/src/Components/MainModal/Help.js
+++ b/ui/src/Components/MainModal/Help.js
@@ -237,21 +237,21 @@ const Help = () => (
PROJECT-123.
PROJECT-123.
+ PROJECT-123.
/.*PROJECT.*/.
PROJECT-123
@@ -723,11 +723,11 @@ exports[`
PROJECT-123
@@ -737,11 +737,11 @@ exports[`
/.*PROJECT.*/
diff --git a/ui/src/Components/ManagedSilence/SilenceComment.js b/ui/src/Components/ManagedSilence/SilenceComment.js
index 8789dbe4f..c4a59986d 100644
--- a/ui/src/Components/ManagedSilence/SilenceComment.js
+++ b/ui/src/Components/ManagedSilence/SilenceComment.js
@@ -22,9 +22,9 @@ const SilenceComment = ({
afterUpdate,
alertStore
}) => {
- const comment = silence.jiraURL ? (
+ const comment = silence.ticketURL ? (
", () => {
});
it("Renders a JIRA link if present", () => {
- silence.jiraURL = "http://localhost/1234";
- silence.jiraID = "1234";
+ silence.ticketURL = "http://localhost/1234";
+ silence.ticketID = "1234";
const tree = MountedSilenceComment(true);
expect(tree.find("a[href='http://localhost/1234']")).toHaveLength(1);
});
it("Renders a JIRA link if present and comment is expanded", () => {
- silence.jiraURL = "http://localhost/1234";
- silence.jiraID = "1234";
+ silence.ticketURL = "http://localhost/1234";
+ silence.ticketID = "1234";
const tree = MountedSilenceComment(false);
expect(tree.find("a[href='http://localhost/1234']")).toHaveLength(1);
});
diff --git a/ui/src/Models/API.js b/ui/src/Models/API.js
index 61710615f..e6e7e9c44 100644
--- a/ui/src/Models/API.js
+++ b/ui/src/Models/API.js
@@ -61,8 +61,8 @@ const APISilence = PropTypes.exact({
createdAt: PropTypes.string.isRequired,
createdBy: PropTypes.string.isRequired,
comment: PropTypes.string.isRequired,
- jiraID: PropTypes.string.isRequired,
- jiraURL: PropTypes.string.isRequired
+ ticketID: PropTypes.string.isRequired,
+ ticketURL: PropTypes.string.isRequired
});
const APIAlertmanagerUpstream = PropTypes.exact({
diff --git a/ui/src/__mocks__/Alerts.js b/ui/src/__mocks__/Alerts.js
index edaf24c93..afec1d72a 100644
--- a/ui/src/__mocks__/Alerts.js
+++ b/ui/src/__mocks__/Alerts.js
@@ -58,8 +58,8 @@ const MockSilence = () => ({
startsAt: "2000-01-01T00:00:00Z",
endsAt: "2000-01-01T01:00:00Z",
id: "04d37636-2350-4878-b382-e0b50353230f",
- jiraID: "",
- jiraURL: "",
+ ticketID: "",
+ ticketURL: "",
matchers: [
{ name: "foo", value: "bar", isRegex: false },
{ name: "baz", value: "regex", isRegex: true }