Create Web IDE MR and branch picker

5 files changed, 22 insertions, 53 deletions

diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
index 6ef938b0ae2..baa2497ec5b 100644
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
@@ -1,12 +1,10 @@
 import { __ } from '../../../../locale';
 import Api from '../../../../api';
-import router from '../../../ide_router';
 import { scopes } from './constants';
 import * as types from './mutation_types';
-import * as rootTypes from '../../mutation_types';
 
-export const requestMergeRequests = ({ commit }, type) =>
-  commit(types.REQUEST_MERGE_REQUESTS, type);
+export const requestMergeRequests = ({ commit }) =>
+  commit(types.REQUEST_MERGE_REQUESTS);
 export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }) => {
   dispatch(
     'setErrorMessage',
@@ -21,39 +19,22 @@ export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }
     },
     { root: true },
   );
-  commit(types.RECEIVE_MERGE_REQUESTS_ERROR, type);
+  commit(types.RECEIVE_MERGE_REQUESTS_ERROR);
 };
-export const receiveMergeRequestsSuccess = ({ commit }, { type, data }) =>
-  commit(types.RECEIVE_MERGE_REQUESTS_SUCCESS, { type, data });
+export const receiveMergeRequestsSuccess = ({ commit }, data) =>
+  commit(types.RECEIVE_MERGE_REQUESTS_SUCCESS, data);
 
 export const fetchMergeRequests = ({ dispatch, state: { state } }, { type, search = '' }) => {
-  const scope = scopes[type];
-  dispatch('requestMergeRequests', type);
-  dispatch('resetMergeRequests', type);
+  dispatch('requestMergeRequests');
+  dispatch('resetMergeRequests');
+
+  const scope = type ? scopes[type] : 'all';
 
   return Api.mergeRequests({ scope, state, search })
-    .then(({ data }) => dispatch('receiveMergeRequestsSuccess', { type, data }))
+    .then(({ data }) => dispatch('receiveMergeRequestsSuccess', data))
     .catch(() => dispatch('receiveMergeRequestsError', { type, search }));
 };
 
-export const resetMergeRequests = ({ commit }, type) => commit(types.RESET_MERGE_REQUESTS, type);
-
-export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
-  commit(rootTypes.CLEAR_PROJECTS, null, { root: true });
-  commit(rootTypes.SET_CURRENT_MERGE_REQUEST, `${id}`, { root: true });
-  commit(rootTypes.RESET_OPEN_FILES, null, { root: true });
-  dispatch('setCurrentBranchId', '', { root: true });
-  dispatch('pipelines/stopPipelinePolling', null, { root: true })
-    .then(() => {
-      dispatch('pipelines/resetLatestPipeline', null, { root: true });
-      dispatch('pipelines/clearEtagPoll', null, { root: true });
-    })
-    .catch(e => {
-      throw e;
-    });
-  dispatch('setRightPane', null, { root: true });
-
-  router.push(`/project/${projectPath}/merge_requests/${id}`);
-};
+export const resetMergeRequests = ({ commit }) => commit(types.RESET_MERGE_REQUESTS);
 
 export default () => {};
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/getters.js b/app/assets/javascripts/ide/stores/modules/merge_requests/getters.js
deleted file mode 100644
index 8e2b234be8d..00000000000
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/getters.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const getData = state => type => state[type];
-
-export const assignedData = state => state.assigned;
-export const createdData = state => state.created;
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/index.js b/app/assets/javascripts/ide/stores/modules/merge_requests/index.js
index 2e6dfb420f4..04e7e0f08f1 100644
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/index.js
+++ b/app/assets/javascripts/ide/stores/modules/merge_requests/index.js
@@ -1,6 +1,5 @@
 import state from './state';
 import * as actions from './actions';
-import * as getters from './getters';
 import mutations from './mutations';
 
 export default {
@@ -8,5 +7,4 @@ export default {
   state: state(),
   actions,
   mutations,
-  getters,
 };
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js b/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js
index 971da0806bd..98102a68e08 100644
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js
+++ b/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js
@@ -2,15 +2,15 @@
 import * as types from './mutation_types';
 
 export default {
-  [types.REQUEST_MERGE_REQUESTS](state, type) {
-    state[type].isLoading = true;
+  [types.REQUEST_MERGE_REQUESTS](state) {
+    state.isLoading = true;
   },
-  [types.RECEIVE_MERGE_REQUESTS_ERROR](state, type) {
-    state[type].isLoading = false;
+  [types.RECEIVE_MERGE_REQUESTS_ERROR](state) {
+    state.isLoading = false;
   },
-  [types.RECEIVE_MERGE_REQUESTS_SUCCESS](state, { type, data }) {
-    state[type].isLoading = false;
-    state[type].mergeRequests = data.map(mergeRequest => ({
+  [types.RECEIVE_MERGE_REQUESTS_SUCCESS](state, data) {
+    state.isLoading = false;
+    state.mergeRequests = data.map(mergeRequest => ({
       id: mergeRequest.id,
       iid: mergeRequest.iid,
       title: mergeRequest.title,
@@ -20,7 +20,7 @@ export default {
         .replace(`/merge_requests/${mergeRequest.iid}`, ''),
     }));
   },
-  [types.RESET_MERGE_REQUESTS](state, type) {
-    state[type].mergeRequests = [];
+  [types.RESET_MERGE_REQUESTS](state) {
+    state.mergeRequests = [];
   },
 };
diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/state.js b/app/assets/javascripts/ide/stores/modules/merge_requests/state.js
index 57eb6b04283..4748ccfa2e6 100644
--- a/app/assets/javascripts/ide/stores/modules/merge_requests/state.js
+++ b/app/assets/javascripts/ide/stores/modules/merge_requests/state.js
@@ -1,13 +1,7 @@
 import { states } from './constants';
 
 export default () => ({
-  created: {
-    isLoading: false,
-    mergeRequests: [],
-  },
-  assigned: {
-    isLoading: false,
-    mergeRequests: [],
-  },
+  isLoading: false,
+  mergeRequests: [],
   state: states.opened,
 });