diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue')
-rw-r--r-- | app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue index 4bfed6d489d..df7d9b56aed 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue @@ -20,7 +20,12 @@ export default { type: String, required: true, }, - initialIncomingEmail: { + incomingEmail: { + type: String, + required: false, + default: '', + }, + customEmail: { type: String, required: false, default: '', @@ -50,23 +55,18 @@ export default { data() { return { isEnabled: this.initialIsEnabled, - incomingEmail: this.initialIncomingEmail, isTemplateSaving: false, isAlertShowing: false, alertVariant: 'danger', alertMessage: '', + updatedCustomEmail: this.customEmail, }; }, created() { eventHub.$on('serviceDeskEnabledCheckboxToggled', this.onEnableToggled); eventHub.$on('serviceDeskTemplateSave', this.onSaveTemplate); - this.service = new ServiceDeskService(this.endpoint); - - if (this.isEnabled && !this.incomingEmail) { - this.fetchIncomingEmail(); - } }, beforeDestroy() { @@ -75,22 +75,6 @@ export default { }, methods: { - fetchIncomingEmail() { - this.service - .fetchIncomingEmail() - .then(({ data }) => { - const email = data.service_desk_address; - if (!email) { - throw new Error(__("Response didn't include `service_desk_address`")); - } - - this.incomingEmail = email; - }) - .catch(() => - this.showAlert(__('An error occurred while fetching the Service Desk address.')), - ); - }, - onEnableToggled(isChecked) { this.isEnabled = isChecked; this.incomingEmail = ''; @@ -119,7 +103,7 @@ export default { this.service .updateTemplate({ selectedTemplate, outgoingName, projectKey }, this.isEnabled) .then(({ data }) => { - this.incomingEmail = data?.service_desk_address; + this.updatedCustomEmail = data?.service_desk_address; this.showAlert(__('Changes were successfully made.'), 'success'); }) .catch(err => { @@ -155,6 +139,7 @@ export default { <service-desk-setting :is-enabled="isEnabled" :incoming-email="incomingEmail" + :custom-email="updatedCustomEmail" :initial-selected-template="selectedTemplate" :initial-outgoing-name="outgoingName" :initial-project-key="projectKey" |