Merge branch 'remove-vue-resource-from-service-desk' into 'master'

Remove vue-resource from service desk

See merge request gitlab-org/gitlab-ee!16041

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

@@ -62,8 +62,7 @@ export default {
 
       this.service
         .fetchIncomingEmail()
-        .then(res => res.json())
-        .then(data => {
+        .then(({ data }) => {
           const email = data.service_desk_address;
           if (!email) {
             throw new Error(__("Response didn't include `service_desk_address`"));
@@ -90,8 +89,7 @@ export default {
 
       this.service
         .toggleServiceDesk(isChecked)
-        .then(res => res.json())
-        .then(data => {
+        .then(({ data }) => {
           const email = data.service_desk_address;
           if (isChecked && !email) {
             throw new Error(__("Response didn't include `service_desk_address`"));

ee/app/assets/javascripts/projects/settings_service_desk/services/service_desk_service.js

-import Vue from 'vue';
-import vueResource from 'vue-resource';
-
-Vue.use(vueResource);
+import axios from '~/lib/utils/axios_utils';
 
 class ServiceDeskService {
   constructor(endpoint) {
-    this.serviceDeskResource = Vue.resource(`${endpoint}`);
+    this.endpoint = endpoint;
   }
 
   fetchIncomingEmail() {
-    return this.serviceDeskResource.get();
+    return axios.get(this.endpoint);
   }
 
   toggleServiceDesk(enable) {
-    return this.serviceDeskResource.update({
-      service_desk_enabled: enable,
-    });
+    return axios.put(this.endpoint, { service_desk_enabled: enable });
   }
 }
 

ee/changelogs/unreleased/remove-vue-resource-from-service-desk.yml

+---
+title: Remove vue-resource from service_desk_service.js
+merge_request: 16041
+author: Lee Tickett
+type: other