From 0421fbcdada7bdc746979c420706f99836fafb46 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Wed, 9 May 2018 21:21:06 +0000
Subject: refactor 'cycle_analytics' to use axios

---
 .../cycle_analytics/cycle_analytics_bundle.js      |  2 --
 .../cycle_analytics/cycle_analytics_service.js     | 30 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
index 87f8854f940..1c43fc3cdc7 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
@@ -82,7 +82,6 @@ export default () => {
 
         this.service
           .fetchCycleAnalyticsData(fetchOptions)
-          .then(resp => resp.json())
           .then((response) => {
             this.store.setCycleAnalyticsData(response);
             this.selectDefaultStage();
@@ -116,7 +115,6 @@ export default () => {
             stage,
             startDate: this.startDate,
           })
-          .then(resp => resp.json())
           .then((response) => {
             this.isEmptyStage = !response.events.length;
             this.store.setStageEvents(response.events, stage);
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
index f496c38208d..4cf416c50e5 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
@@ -1,16 +1,20 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+import axios from '~/lib/utils/axios_utils';
 
 export default class CycleAnalyticsService {
   constructor(options) {
-    this.requestPath = options.requestPath;
-    this.cycleAnalytics = Vue.resource(this.requestPath);
+    this.axios = axios.create({
+      baseURL: options.requestPath,
+    });
   }
 
   fetchCycleAnalyticsData(options = { startDate: 30 }) {
-    return this.cycleAnalytics.get({ cycle_analytics: { start_date: options.startDate } });
+    return this.axios
+      .get('', {
+        params: {
+          'cycle_analytics[start_date]': options.startDate,
+        },
+      })
+      .then(x => x.data);
   }
 
   fetchStageData(options) {
@@ -19,12 +23,12 @@ export default class CycleAnalyticsService {
       startDate,
     } = options;
 
-    return Vue.http.get(`${this.requestPath}/events/${stage.name}.json`, {
-      params: {
-        cycle_analytics: {
-          start_date: startDate,
+    return this.axios
+      .get(`events/${stage.name}.json`, {
+        params: {
+          'cycle_analytics[start_date]': startDate,
         },
-      },
-    });
+      })
+      .then(x => x.data);
   }
 }
-- 
cgit v1.2.3