diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue')
-rw-r--r-- | app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue index 34d53e2de0c..fe2d376f1da 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue @@ -1,5 +1,13 @@ <script> -import { GlButton, GlFormSelect, GlToggle, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import { + GlButton, + GlFormSelect, + GlToggle, + GlLoadingIcon, + GlSprintf, + GlFormInput, + GlLink, +} from '@gitlab/ui'; import { __ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; @@ -14,6 +22,8 @@ export default { GlToggle, GlLoadingIcon, GlSprintf, + GlFormInput, + GlLink, }, props: { isEnabled: { @@ -148,17 +158,37 @@ export default { <span class="sr-only">{{ __('Fetching incoming email') }}</span> </template> - <template v-if="hasProjectKeySupport"> - <label for="service-desk-project-suffix" class="mt-3"> - {{ __('Project name suffix') }} - </label> - <input id="service-desk-project-suffix" v-model.trim="projectKey" class="form-control" /> - <span class="form-text text-muted"> - {{ - __('A string appended to the project path to form the Service Desk email address.') - }} - </span> - </template> + <label for="service-desk-project-suffix" class="mt-3"> + {{ __('Project name suffix') }} + </label> + <gl-form-input + v-if="hasProjectKeySupport" + id="service-desk-project-suffix" + v-model.trim="projectKey" + data-testid="project-suffix" + class="form-control" + /> + <span v-if="hasProjectKeySupport" class="form-text text-muted"> + {{ __('A string appended to the project path to form the Service Desk email address.') }} + </span> + <span v-else class="form-text text-muted"> + <gl-sprintf + :message=" + __( + 'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}', + ) + " + > + <template #link="{ content }"> + <gl-link + href="https://docs.gitlab.com/ee/user/project/service_desk.html#using-a-custom-email-address" + target="_blank" + class="gl-text-blue-600 font-size-inherit" + >{{ content }} + </gl-link> + </template> + </gl-sprintf> + </span> <label for="service-desk-template-select" class="mt-3"> {{ __('Template to append to all Service Desk issues') }} |