Renames customEmail to serviceDeskEmail in Service Desk settings page

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

@@ -7,7 +7,7 @@ import { __, sprintf } from '~/locale';
 import ServiceDeskSetting from './service_desk_setting.vue';
 
 export default {
-  customEmailHelpPath: helpPagePath('/user/project/service_desk.html', {
+  serviceDeskEmailHelpPath: helpPagePath('/user/project/service_desk.html', {
     anchor: 'use-a-custom-email-address',
   }),
   components: {
@@ -32,10 +32,10 @@ export default {
     initialIncomingEmail: {
       default: '',
     },
-    customEmail: {
+    serviceDeskEmail: {
       default: '',
     },
-    customEmailEnabled: {
+    serviceDeskEmailEnabled: {
       default: false,
     },
     selectedTemplate: {
@@ -65,7 +65,7 @@ export default {
       alertVariant: 'danger',
       alertMessage: '',
       incomingEmail: this.initialIncomingEmail,
-      updatedCustomEmail: this.customEmail,
+      updatedServiceDeskEmail: this.serviceDeskEmail,
     };
   },
   methods: {
@@ -110,7 +110,7 @@ export default {
       return axios
         .put(this.endpoint, body)
         .then(({ data }) => {
-          this.updatedCustomEmail = data?.service_desk_address;
+          this.updatedServiceDeskEmail = data?.service_desk_address;
           this.showAlert(__('Changes saved.'), 'success');
         })
         .catch((err) => {
@@ -155,7 +155,7 @@ export default {
         "
       >
         <template #link="{ content }">
-          <gl-link :href="$options.customEmailHelpPath" target="_blank">
+          <gl-link :href="$options.serviceDeskEmailHelpPath" target="_blank">
             {{ content }}
           </gl-link>
         </template>
@@ -168,8 +168,8 @@ export default {
       :is-enabled="isEnabled"
       :is-issue-tracker-enabled="isIssueTrackerEnabled"
       :incoming-email="incomingEmail"
-      :custom-email="updatedCustomEmail"
-      :custom-email-enabled="customEmailEnabled"
+      :service-desk-email="updatedServiceDeskEmail"
+      :service-desk-email-enabled="serviceDeskEmailEnabled"
       :initial-selected-template="selectedTemplate"
       :initial-selected-file-template-project-id="selectedFileTemplateProjectId"
       :initial-outgoing-name="outgoingName"

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

@@ -49,12 +49,12 @@ export default {
       required: false,
       default: '',
     },
-    customEmail: {
+    serviceDeskEmail: {
       type: String,
       required: false,
       default: '',
     },
-    customEmailEnabled: {
+    serviceDeskEmailEnabled: {
       type: Boolean,
       required: false,
     },
@@ -101,20 +101,20 @@ export default {
   },
   computed: {
     hasProjectKeySupport() {
-      return Boolean(this.customEmailEnabled);
+      return Boolean(this.serviceDeskEmailEnabled);
     },
     email() {
-      return this.customEmail || this.incomingEmail;
+      return this.serviceDeskEmail || this.incomingEmail;
     },
-    hasCustomEmail() {
-      return this.customEmail && this.customEmail !== this.incomingEmail;
+    hasServiceDeskEmail() {
+      return this.serviceDeskEmail && this.serviceDeskEmail !== this.incomingEmail;
     },
     emailSuffixHelpUrl() {
       return helpPagePath('user/project/service_desk.html', {
         anchor: 'configure-a-custom-email-address-suffix',
       });
     },
-    customEmailAddressHelpUrl() {
+    serviceDeskEmailAddressHelpUrl() {
       return helpPagePath('user/project/service_desk.html', {
         anchor: 'use-a-custom-email-address',
       });
@@ -204,7 +204,7 @@ export default {
               <clipboard-button :title="__('Copy')" :text="email" css-class="input-group-text" />
             </template>
           </gl-form-input-group>
-          <template v-if="email && hasCustomEmail" #description>
+          <template v-if="email && hasServiceDeskEmail" #description>
             <span class="gl-mt-2 gl-display-inline-block">
               <gl-sprintf :message="__('Emails sent to %{email} are also supported.')">
                 <template #email>
@@ -260,7 +260,7 @@ export default {
               >
                 <template #link="{ content }">
                   <gl-link
-                    :href="customEmailAddressHelpUrl"
+                    :href="serviceDeskEmailAddressHelpUrl"
                     target="_blank"
                     class="gl-text-blue-600 font-size-inherit"
                     >{{ content }}

app/assets/javascripts/projects/settings_service_desk/index.js

@@ -10,8 +10,8 @@ export default () => {
   }
 
   const {
-    customEmail,
-    customEmailEnabled,
+    serviceDeskEmail,
+    serviceDeskEmailEnabled,
     enabled,
     issueTrackerEnabled,
     endpoint,
@@ -27,8 +27,8 @@ export default () => {
   return new Vue({
     el,
     provide: {
-      customEmail,
-      customEmailEnabled: parseBoolean(customEmailEnabled),
+      serviceDeskEmail,
+      serviceDeskEmailEnabled: parseBoolean(serviceDeskEmailEnabled),
       endpoint,
       initialIncomingEmail: incomingEmail,
       initialIsEnabled: parseBoolean(enabled),

app/views/projects/_service_desk_settings.html.haml

@@ -12,8 +12,8 @@
         enabled: "#{@project.service_desk_enabled}",
         issue_tracker_enabled: "#{@project.project_feature.issues_enabled?}",
         incoming_email: (@project.service_desk_incoming_address if @project.service_desk_enabled),
-        custom_email: (@project.service_desk_custom_address if @project.service_desk_enabled),
-        custom_email_enabled: "#{Gitlab::Email::ServiceDeskEmail.enabled?}",
+        service_desk_email: (@project.service_desk_custom_address if @project.service_desk_enabled),
+        service_desk_email_enabled: "#{Gitlab::Email::ServiceDeskEmail.enabled?}",
         selected_template: "#{@project.service_desk_setting&.issue_template_key}",
         selected_file_template_project_id: "#{@project.service_desk_setting&.file_template_project_id}",
         outgoing_name: "#{@project.service_desk_setting&.outgoing_name}",

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

@@ -13,8 +13,8 @@ describe('ServiceDeskRoot', () => {
   let spy;
 
   const provideData = {
-    customEmail: 'custom.email@example.com',
-    customEmailEnabled: true,
+    serviceDeskEmail: 'custom.email@example.com',
+    serviceDeskEmailEnabled: true,
     endpoint: '/gitlab-org/gitlab-test/service_desk',
     initialIncomingEmail: 'servicedeskaddress@example.com',
     initialIsEnabled: true,
@@ -52,8 +52,8 @@ describe('ServiceDeskRoot', () => {
       wrapper = createComponent();
 
       expect(wrapper.findComponent(ServiceDeskSetting).props()).toEqual({
-        customEmail: provideData.customEmail,
-        customEmailEnabled: provideData.customEmailEnabled,
+        serviceDeskEmail: provideData.serviceDeskEmail,
+        serviceDeskEmailEnabled: provideData.serviceDeskEmailEnabled,
         incomingEmail: provideData.initialIncomingEmail,
         initialOutgoingName: provideData.outgoingName,
         initialProjectKey: provideData.projectKey,

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

@@ -134,26 +134,26 @@ describe('ServiceDeskSetting', () => {
       });
     });
 
-    describe('with customEmail', () => {
-      describe('customEmail is different than incomingEmail', () => {
+    describe('with serviceDeskEmail', () => {
+      describe('serviceDeskEmail is different than incomingEmail', () => {
         const incomingEmail = 'foo@bar.com';
-        const customEmail = 'custom@bar.com';
+        const serviceDeskEmail = 'servicedesk@bar.com';
 
         beforeEach(() => {
           wrapper = createComponent({
-            props: { incomingEmail, customEmail },
+            props: { incomingEmail, serviceDeskEmail },
           });
         });
 
-        it('should see custom email', () => {
-          expect(findIncomingEmail().element.value).toEqual(customEmail);
+        it('should see service desk email', () => {
+          expect(findIncomingEmail().element.value).toEqual(serviceDeskEmail);
         });
       });
 
       describe('project suffix', () => {
         it('input is hidden', () => {
           wrapper = createComponent({
-            props: { customEmailEnabled: false },
+            props: { serviceDeskEmailEnabled: false },
           });
 
           const input = wrapper.findByTestId('project-suffix');
@@ -163,7 +163,7 @@ describe('ServiceDeskSetting', () => {
 
         it('input is enabled', () => {
           wrapper = createComponent({
-            props: { customEmailEnabled: true },
+            props: { serviceDeskEmailEnabled: true },
           });
 
           const input = wrapper.findByTestId('project-suffix');
@@ -174,7 +174,7 @@ describe('ServiceDeskSetting', () => {
 
         it('shows error when value contains uppercase or special chars', async () => {
           wrapper = createComponent({
-            props: { email: 'foo@bar.com', customEmailEnabled: true },
+            props: { email: 'foo@bar.com', serviceDeskEmailEnabled: true },
           });
 
           const input = wrapper.findByTestId('project-suffix');
@@ -189,16 +189,16 @@ describe('ServiceDeskSetting', () => {
         });
       });
 
-      describe('customEmail is the same as incomingEmail', () => {
+      describe('serviceDeskEmail is the same as incomingEmail', () => {
         const email = 'foo@bar.com';
 
         beforeEach(() => {
           wrapper = createComponent({
-            props: { incomingEmail: email, customEmail: email },
+            props: { incomingEmail: email, serviceDeskEmail: email },
           });
         });
 
-        it('should see custom email', () => {
+        it('should see service desk email', () => {
           expect(findIncomingEmail().element.value).toEqual(email);
         });
       });