Add latest changes from gitlab-org/gitlab@master

11 files changed, 124 insertions, 12 deletions

diff --git a/app/assets/javascripts/error_tracking/store/details/actions.js b/app/assets/javascripts/error_tracking/store/details/actions.js
new file mode 100644
index 00000000000..0390bca7175
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/details/actions.js
@@ -0,0 +1,63 @@
+import service from '../../services';
+import * as types from './mutation_types';
+import createFlash from '~/flash';
+import Poll from '~/lib/utils/poll';
+import { __ } from '~/locale';
+
+let stackTracePoll;
+let detailPoll;
+
+const stopPolling = poll => {
+  if (poll) poll.stop();
+};
+
+export function startPollingDetails({ commit }, endpoint) {
+  detailPoll = new Poll({
+    resource: service,
+    method: 'getSentryData',
+    data: { endpoint },
+    successCallback: ({ data }) => {
+      if (!data) {
+        detailPoll.restart();
+        return;
+      }
+
+      commit(types.SET_ERROR, data.error);
+      commit(types.SET_LOADING, false);
+
+      stopPolling(detailPoll);
+    },
+    errorCallback: () => {
+      commit(types.SET_LOADING, false);
+      createFlash(__('Failed to load error details from Sentry.'));
+    },
+  });
+
+  detailPoll.makeRequest();
+}
+
+export function startPollingStacktrace({ commit }, endpoint) {
+  stackTracePoll = new Poll({
+    resource: service,
+    method: 'getSentryData',
+    data: { endpoint },
+    successCallback: ({ data }) => {
+      if (!data) {
+        stackTracePoll.restart();
+        return;
+      }
+      commit(types.SET_STACKTRACE_DATA, data.error);
+      commit(types.SET_LOADING_STACKTRACE, false);
+
+      stopPolling(stackTracePoll);
+    },
+    errorCallback: () => {
+      commit(types.SET_LOADING_STACKTRACE, false);
+      createFlash(__('Failed to load stacktrace.'));
+    },
+  });
+
+  stackTracePoll.makeRequest();
+}
+
+export default () => {};
diff --git a/app/assets/javascripts/error_tracking/store/details/getters.js b/app/assets/javascripts/error_tracking/store/details/getters.js
new file mode 100644
index 00000000000..7d13439d721
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/details/getters.js
@@ -0,0 +1,3 @@
+export const stacktrace = state => state.stacktraceData.stack_trace_entries.reverse();
+
+export default () => {};
diff --git a/app/assets/javascripts/error_tracking/store/details/mutation_types.js b/app/assets/javascripts/error_tracking/store/details/mutation_types.js
new file mode 100644
index 00000000000..a2592253a2d
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/details/mutation_types.js
@@ -0,0 +1,4 @@
+export const SET_ERROR = 'SET_ERRORS';
+export const SET_LOADING = 'SET_LOADING';
+export const SET_LOADING_STACKTRACE = 'SET_LOADING_STACKTRACE';
+export const SET_STACKTRACE_DATA = 'SET_STACKTRACE_DATA';
diff --git a/app/assets/javascripts/error_tracking/store/details/mutations.js b/app/assets/javascripts/error_tracking/store/details/mutations.js
new file mode 100644
index 00000000000..6f4720444e0
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/details/mutations.js
@@ -0,0 +1,16 @@
+import * as types from './mutation_types';
+
+export default {
+  [types.SET_ERROR](state, data) {
+    state.error = data;
+  },
+  [types.SET_LOADING](state, loading) {
+    state.loading = loading;
+  },
+  [types.SET_LOADING_STACKTRACE](state, data) {
+    state.loadingStacktrace = data;
+  },
+  [types.SET_STACKTRACE_DATA](state, data) {
+    state.stacktraceData = data;
+  },
+};
diff --git a/app/assets/javascripts/error_tracking/store/details/state.js b/app/assets/javascripts/error_tracking/store/details/state.js
new file mode 100644
index 00000000000..95fb0ba0558
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/details/state.js
@@ -0,0 +1,6 @@
+export default () => ({
+  error: {},
+  stacktraceData: {},
+  loading: true,
+  loadingStacktrace: true,
+});
diff --git a/app/assets/javascripts/error_tracking/store/index.js b/app/assets/javascripts/error_tracking/store/index.js
index 3ba05e22727..941c752e96a 100644
--- a/app/assets/javascripts/error_tracking/store/index.js
+++ b/app/assets/javascripts/error_tracking/store/index.js
@@ -1,21 +1,36 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import * as actions from './actions';
-import * as getters from './getters';
-import mutations from './mutations';
+
+import * as listActions from './list/actions';
+import listMutations from './list/mutations';
+import listState from './list/state';
+import * as listGetters from './list/getters';
+
+import * as detailsActions from './details/actions';
+import detailsMutations from './details/mutations';
+import detailsState from './details/state';
+import * as detailsGetters from './details/getters';
 
 Vue.use(Vuex);
 
 export const createStore = () =>
   new Vuex.Store({
-    state: {
-      errors: [],
-      externalUrl: '',
-      loading: true,
+    modules: {
+      list: {
+        namespaced: true,
+        state: listState(),
+        actions: listActions,
+        mutations: listMutations,
+        getters: listGetters,
+      },
+      details: {
+        namespaced: true,
+        state: detailsState(),
+        actions: detailsActions,
+        mutations: detailsMutations,
+        getters: detailsGetters,
+      },
     },
-    actions,
-    mutations,
-    getters,
   });
 
 export default createStore();
diff --git a/app/assets/javascripts/error_tracking/store/actions.js b/app/assets/javascripts/error_tracking/store/list/actions.js
index 1e754a4f54f..18c6e5e9695 100644
--- a/app/assets/javascripts/error_tracking/store/actions.js
+++ b/app/assets/javascripts/error_tracking/store/list/actions.js
@@ -1,4 +1,4 @@
-import Service from '../services';
+import Service from '../../services';
 import * as types from './mutation_types';
 import createFlash from '~/flash';
 import Poll from '~/lib/utils/poll';
@@ -9,7 +9,7 @@ let eTagPoll;
 export function startPolling({ commit, dispatch }, endpoint) {
   eTagPoll = new Poll({
     resource: Service,
-    method: 'getErrorList',
+    method: 'getSentryData',
     data: { endpoint },
     successCallback: ({ data }) => {
       if (!data) {
diff --git a/app/assets/javascripts/error_tracking/store/getters.js b/app/assets/javascripts/error_tracking/store/list/getters.js
index 1a2ec62f79f..1a2ec62f79f 100644
--- a/app/assets/javascripts/error_tracking/store/getters.js
+++ b/app/assets/javascripts/error_tracking/store/list/getters.js
diff --git a/app/assets/javascripts/error_tracking/store/mutation_types.js b/app/assets/javascripts/error_tracking/store/list/mutation_types.js
index f9d77a6b08e..f9d77a6b08e 100644
--- a/app/assets/javascripts/error_tracking/store/mutation_types.js
+++ b/app/assets/javascripts/error_tracking/store/list/mutation_types.js
diff --git a/app/assets/javascripts/error_tracking/store/mutations.js b/app/assets/javascripts/error_tracking/store/list/mutations.js
index e4bd81db9c9..e4bd81db9c9 100644
--- a/app/assets/javascripts/error_tracking/store/mutations.js
+++ b/app/assets/javascripts/error_tracking/store/list/mutations.js
diff --git a/app/assets/javascripts/error_tracking/store/list/state.js b/app/assets/javascripts/error_tracking/store/list/state.js
new file mode 100644
index 00000000000..d371350ef0e
--- /dev/null
+++ b/app/assets/javascripts/error_tracking/store/list/state.js
@@ -0,0 +1,5 @@
+export default () => ({
+  errors: [],
+  externalUrl: '',
+  loading: true,
+});