Commit d0500d6a authored by Tom Quirk's avatar Tom Quirk

Address reviewer feedback

- simplify jira connect alert display logic
- add namespacing to success translation
parent 5ec6487d
......@@ -41,17 +41,8 @@ export default {
return this.usersPath;
},
alertLinkUrl() {
return this.alert?.linkUrl;
},
alertTitle() {
return this.alert?.title;
},
alertMessage() {
return this.alert?.message;
},
alertVariant() {
return this.alert?.variant;
shouldShowAlert() {
return Boolean(this.alert?.message);
},
},
modal: {
......@@ -81,20 +72,20 @@ export default {
<template>
<div>
<gl-alert
v-if="alertMessage"
v-if="shouldShowAlert"
class="gl-mb-7"
:variant="alertVariant"
:title="alertTitle"
:variant="alert.variant"
:title="alert.title"
@dismiss="setAlert"
>
<gl-sprintf v-if="alertLinkUrl" :message="alertMessage">
<gl-sprintf v-if="alert.linkUrl" :message="alert.message">
<template #link="{ content }">
<gl-link :href="alertLinkUrl" target="_blank">{{ content }}</gl-link>
<gl-link :href="alert.linkUrl" target="_blank">{{ content }}</gl-link>
</template>
</gl-sprintf>
<template v-else>
{{ alertMessage }}
{{ alert.message }}
</template>
</gl-alert>
......
......@@ -36,7 +36,7 @@ export default {
persistAlert({
title: s__('Integrations|Namespace successfully linked'),
message: s__(
'You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}',
'Integrations|You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}',
),
linkUrl: helpPagePath('integration/jira_development_panel.html', { anchor: 'usage' }),
variant: 'success',
......
......@@ -16435,6 +16435,9 @@ msgstr ""
msgid "Integrations|You must have owner or maintainer permissions to link namespaces."
msgstr ""
msgid "Integrations|You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}"
msgstr ""
msgid "Interactive mode"
msgstr ""
......@@ -34513,9 +34516,6 @@ msgstr ""
msgid "You need to upload a GitLab project export archive (ending in .gz)."
msgstr ""
msgid "You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}"
msgstr ""
msgid "You successfully declined the invitation"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment