diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-30 10:59:29 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-30 10:59:29 +0100 |
| commit | 8f646faf3dc2ded677a9a5fbca16b5da9b146d19 (patch) | |
| tree | b09fd1baea4271c0012f48fff2495f79d67accff /app | |
| parent | c760965079fce0f020980987794ea61c86eb09ff (diff) | |
| download | gitlab-ce-8f646faf3dc2ded677a9a5fbca16b5da9b146d19.tar.gz | |
improved stored data
created reset action to reset stored merge requests
Diffstat (limited to 'app')
3 files changed, 14 insertions, 2 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 5afecb2af0d..35b1492f1cf 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js @@ -14,11 +14,13 @@ export const receiveMergeRequestsSuccess = ({ commit }, data) => export const fetchMergeRequests = ({ dispatch, state }) => { dispatch('requestMergeRequests'); - Api.mergeRequests({ scope: state.scope, view: 'simple' }) + Api.mergeRequests({ scope: state.scope, state: 'opened' }) .then(({ data }) => { dispatch('receiveMergeRequestsSuccess', data); }) .catch(() => dispatch('receiveMergeRequestsError')); }; +export const resetMergeRequests = ({ commit }) => commit(types.RESET_MERGE_REQUESTS); + export default () => {}; diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js b/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js index 83acc0ed33d..0badddcbae7 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js @@ -1,3 +1,5 @@ export const REQUEST_MERGE_REQUESTS = 'REQUEST_MERGE_REQUESTS'; export const RECEIVE_MERGE_REQUESTS_ERROR = 'RECEIVE_MERGE_REQUESTS_ERROR'; export const RECEIVE_MERGE_REQUESTS_SUCCESS = 'RECEIVE_MERGE_REQUESTS_SUCCESS'; + +export const RESET_MERGE_REQUESTS = 'RESET_MERGE_REQUESTS'; 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 82fb5c1346d..f02dbed6563 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js @@ -10,8 +10,16 @@ export default { }, [types.RECEIVE_MERGE_REQUESTS_SUCCESS](state, data) { state.mergeRequests = data.map(mergeRequest => ({ - id: mergeRequest.iid, + id: mergeRequest.id, + iid: mergeRequest.iid, title: mergeRequest.title, + projectId: mergeRequest.project_id, + projectPathWithNamespace: mergeRequest.web_url + .replace(`${gon.gitlab_url}/`, '') + .replace(`/merge_requests/${mergeRequest.iid}`, ''), })); }, + [types.RESET_MERGE_REQUESTS](state) { + state.mergeRequests = []; + }, }; |