Merge branch 'custom-suffix-label' into 'master'

Show validation error for setting project suffix

See merge request gitlab-org/gitlab!73458

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue

@@ -75,6 +75,7 @@ export default {
       outgoingName: this.initialOutgoingName || __('GitLab Support Bot'),
       projectKey: this.initialProjectKey,
       searchTerm: '',
+      projectKeyError: null,
     };
   },
   computed: {
@@ -104,6 +105,14 @@ export default {
       this.selectedFileTemplateProjectId = selectedFileTemplateProjectId;
       this.selectedTemplate = selectedTemplate;
     },
+    validateProjectKey() {
+      if (this.projectKey && !new RegExp(/^[a-z0-9_]+$/).test(this.projectKey)) {
+        this.projectKeyError = __('Only use lowercase letters, numbers, and underscores.');
+        return;
+      }
+
+      this.projectKeyError = null;
+    },
   },
 };
 </script>
@@ -169,8 +178,17 @@ export default {
           v-model.trim="projectKey"
           data-testid="project-suffix"
           class="form-control"
+          :state="!projectKeyError"
+          @blur="validateProjectKey"
         />
-        <span v-if="hasProjectKeySupport" class="form-text text-muted">
+        <span v-if="hasProjectKeySupport && projectKeyError" class="form-text text-danger">
+          {{ projectKeyError }}
+        </span>
+        <span
+          v-if="hasProjectKeySupport"
+          class="form-text text-muted"
+          :class="{ 'gl-mt-2!': hasProjectKeySupport && projectKeyError }"
+        >
           {{ __('A string appended to the project path to form the Service Desk email address.') }}
         </span>
         <span v-else class="form-text text-muted">

locale/gitlab.pot

@@ -24184,6 +24184,9 @@ msgstr ""
 msgid "Only reCAPTCHA v2 is supported:"
 msgstr ""
 
+msgid "Only use lowercase letters, numbers, and underscores."
+msgstr ""
+
 msgid "Only users from the specified IP address ranges are able to reach this group, including all subgroups, projects, and Git repositories."
 msgstr ""
 

spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js

 import { GlButton, GlDropdown, GlLoadingIcon, GlToggle } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, mount } from '@vue/test-utils';
 import { nextTick } from 'vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import ServiceDeskSetting from '~/projects/settings_service_desk/components/service_desk_setting.vue';
@@ -16,9 +16,9 @@ describe('ServiceDeskSetting', () => {
   const findTemplateDropdown = () => wrapper.find(GlDropdown);
   const findToggle = () => wrapper.find(GlToggle);
 
-  const createComponent = ({ props = {} } = {}) =>
+  const createComponent = ({ props = {}, mountFunction = shallowMount } = {}) =>
     extendedWrapper(
-      shallowMount(ServiceDeskSetting, {
+      mountFunction(ServiceDeskSetting, {
         propsData: {
           isEnabled: true,
           ...props,
@@ -128,6 +128,23 @@ describe('ServiceDeskSetting', () => {
           expect(input.exists()).toBe(true);
           expect(input.attributes('disabled')).toBeUndefined();
         });
+
+        it('shows error when value contains uppercase or special chars', async () => {
+          wrapper = createComponent({
+            props: { customEmailEnabled: true },
+            mountFunction: mount,
+          });
+
+          const input = wrapper.findByTestId('project-suffix');
+
+          input.setValue('abc_A.');
+          input.trigger('blur');
+
+          await wrapper.vm.$nextTick();
+
+          const errorText = wrapper.find('.text-danger');
+          expect(errorText.exists()).toBe(true);
+        });
       });
 
       describe('customEmail is the same as incomingEmail', () => {