Remove vue resource from group service

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/66750

2 files changed, 12 insertions, 16 deletions

diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index aa50fd8ff62..8d2dac47ff2 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -95,10 +95,8 @@ export default {
           if (updatePagination) {
             this.updatePagination(res.headers);
           }
-
-          return res;
+          return res.data;
         })
-        .then(res => res.json())
         .catch(() => {
           this.isLoading = false;
           $.scrollTo(0);
@@ -190,11 +188,10 @@ export default {
       this.targetGroup.isBeingRemoved = true;
       this.service
         .leaveGroup(this.targetGroup.leavePath)
-        .then(res => res.json())
         .then(res => {
           $.scrollTo(0);
           this.store.removeGroup(this.targetGroup, this.targetParentGroup);
-          Flash(res.notice, 'notice');
+          Flash(res.data.notice, 'notice');
         })
         .catch(err => {
           let message = COMMON_STR.FAILURE;
diff --git a/app/assets/javascripts/groups/service/groups_service.js b/app/assets/javascripts/groups/service/groups_service.js
index b79ba291463..790b581a7c0 100644
--- a/app/assets/javascripts/groups/service/groups_service.js
+++ b/app/assets/javascripts/groups/service/groups_service.js
@@ -1,40 +1,39 @@
-import Vue from 'vue';
-import '../../vue_shared/vue_resource_interceptor';
+import axios from '~/lib/utils/axios_utils';
 
 export default class GroupsService {
   constructor(endpoint) {
-    this.groups = Vue.resource(endpoint);
+    this.endpoint = endpoint;
   }
 
   getGroups(parentId, page, filterGroups, sort, archived) {
-    const data = {};
+    const params = {};
 
     if (parentId) {
-      data.parent_id = parentId;
+      params.parent_id = parentId;
     } else {
       // Do not send the following param for sub groups
       if (page) {
-        data.page = page;
+        params.page = page;
       }
 
       if (filterGroups) {
-        data.filter = filterGroups;
+        params.filter = filterGroups;
       }
 
       if (sort) {
-        data.sort = sort;
+        params.sort = sort;
       }
 
       if (archived) {
-        data.archived = archived;
+        params.archived = archived;
       }
     }
 
-    return this.groups.get(data);
+    return axios.get(this.endpoint, { params });
   }
 
   // eslint-disable-next-line class-methods-use-this
   leaveGroup(endpoint) {
-    return Vue.http.delete(endpoint);
+    return axios.delete(endpoint);
   }
 }