diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/dot_com_alert.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/dot_com_alert.vue new file mode 100644 index 0000000000000000000000000000000000000000..4bb3c8b58e57b4840e0a0d6ed58c473a8e6cef9d --- /dev/null +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/dot_com_alert.vue @@ -0,0 +1,34 @@ +<script> +import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; +import { s__ } from '~/locale'; +import { JIRA_USER_REQUIREMENTS_DOC_LINK } from '~/jira_connect/subscriptions/constants'; + +export default { + components: { + GlAlert, + GlLink, + GlSprintf, + }, + i18n: { + title: s__('JiraConnect|Are you a Jira administrator?'), + body: s__( + 'JiraConnect|To complete the setup, you must meet %{linkStart}certain user requirements%{linkEnd} in Jira.', + ), + }, + JIRA_USER_REQUIREMENTS_DOC_LINK, +}; +</script> + +<template> + <gl-alert variant="warning" :title="$options.i18n.title" :dismissible="false"> + <div> + <gl-sprintf :message="$options.i18n.body"> + <template #link="{ content }"> + <gl-link :href="$options.JIRA_USER_REQUIREMENTS_DOC_LINK" target="_blank"> + {{ content }} + </gl-link> + </template> + </gl-sprintf> + </div> + </gl-alert> +</template> diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue index a0c9c67838e39626af7b1e8e60e818f078a893b4..75f3ff936bd68b03a33a2a42933bfca21c122add 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue @@ -52,11 +52,7 @@ export default { <div class="gl-mt-5"> <h3>{{ s__('JiraConnect|Continue setup in GitLab') }}</h3> <p> - {{ - s__( - 'JiraConnect|In order to complete the set up, you’ll need to complete a few steps in GitLab:', - ) - }} + {{ s__('JiraConnect|To complete the setup, you must follow a few steps in GitLab:') }} </p> <div class="gl-mb-5"> <div v-for="step in requiredSteps" :key="step.name" class="gl-mb-2"> diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue index d3770cc310a6dbef39f96d018109bcb480df5e72..28bf974b8f128725bb4c251aa64209444808557b 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue @@ -11,6 +11,7 @@ import { __, s__ } from '~/locale'; import { GITLAB_COM_BASE_PATH } from '~/jira_connect/subscriptions/constants'; import SelfManagedAlert from './self_managed_alert.vue'; +import DotComAlert from './dot_com_alert.vue'; import SetupInstructions from './setup_instructions.vue'; const RADIO_OPTIONS = { @@ -30,6 +31,7 @@ export default { GlFormRadio, GlButton, SelfManagedAlert, + DotComAlert, SetupInstructions, }, props: { @@ -113,6 +115,7 @@ export default { </gl-form-radio> </gl-form-radio-group> <self-managed-alert v-if="isSelfManagedSelected" /> + <dot-com-alert v-else /> <div class="gl-display-flex gl-justify-content-end gl-mt-5"> <gl-button variant="confirm" type="submit" :loading="loading" data-testid="submit-button">{{ diff --git a/locale/gitlab.pot b/locale/gitlab.pot index db0d726c8c69923244a3aa6fb25e51802153b880..30a4f5c758d341607e161693f7bd336af36d080c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -26974,6 +26974,9 @@ msgstr "" msgid "JiraConnect|Are you a GitLab administrator?" msgstr "" +msgid "JiraConnect|Are you a Jira administrator?" +msgstr "" + msgid "JiraConnect|Cannot find namespace. Make sure you have sufficient permissions." msgstr "" @@ -27043,9 +27046,6 @@ msgstr "" msgid "JiraConnect|Groups are the GitLab groups and subgroups you link to this Jira instance." msgstr "" -msgid "JiraConnect|In order to complete the set up, you’ll need to complete a few steps in GitLab:" -msgstr "" - msgid "JiraConnect|Jira Connect Application ID" msgstr "" @@ -27106,6 +27106,12 @@ msgstr "" msgid "JiraConnect|The Jira user is not a site or organization administrator. Check the permissions in Jira and try again." msgstr "" +msgid "JiraConnect|To complete the setup, you must follow a few steps in GitLab:" +msgstr "" + +msgid "JiraConnect|To complete the setup, you must meet %{linkStart}certain user requirements%{linkEnd} in Jira." +msgstr "" + msgid "JiraConnect|We would love to learn more about your experience with the GitLab for Jira Cloud App." msgstr ""