From f62359c23b86bb8c8dc241ff4e09bab24e74ccbd Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Fri, 23 Mar 2018 11:45:43 +0100 Subject: Basic Setup for MR Showing --- .../ide/stores/mutations/merge_request.js | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 app/assets/javascripts/ide/stores/mutations/merge_request.js (limited to 'app/assets/javascripts/ide/stores/mutations/merge_request.js') diff --git a/app/assets/javascripts/ide/stores/mutations/merge_request.js b/app/assets/javascripts/ide/stores/mutations/merge_request.js new file mode 100644 index 00000000000..69abe010372 --- /dev/null +++ b/app/assets/javascripts/ide/stores/mutations/merge_request.js @@ -0,0 +1,40 @@ +import * as types from '../mutation_types'; + +export default { + [types.SET_CURRENT_MERGE_REQUEST](state, currentMergeRequestId) { + Object.assign(state, { + currentMergeRequestId, + }); + }, + [types.SET_MERGE_REQUEST]( + state, + { projectPath, mergeRequestId, mergeRequest }, + ) { + // Add client side properties + Object.assign(mergeRequest, { + active: true, + }); + + Object.assign(state.projects[projectPath], { + mergeRequests: { + [mergeRequestId]: mergeRequest, + }, + }); + }, + [types.SET_MERGE_REQUEST_CHANGES]( + state, + { projectPath, mergeRequestId, changes }, + ) { + Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { + changes, + }); + }, + [types.SET_MERGE_REQUEST_NOTES]( + state, + { projectPath, mergeRequestId, notes }, + ) { + Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { + notes, + }); + }, +}; -- cgit v1.2.1 From b452bdead4f217b7488f13db9b608a9ddce1830e Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Sun, 25 Mar 2018 14:02:09 +0200 Subject: Actual MR diff displayed --- .../ide/stores/mutations/merge_request.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'app/assets/javascripts/ide/stores/mutations/merge_request.js') diff --git a/app/assets/javascripts/ide/stores/mutations/merge_request.js b/app/assets/javascripts/ide/stores/mutations/merge_request.js index 69abe010372..921b2fa8cf7 100644 --- a/app/assets/javascripts/ide/stores/mutations/merge_request.js +++ b/app/assets/javascripts/ide/stores/mutations/merge_request.js @@ -13,6 +13,9 @@ export default { // Add client side properties Object.assign(mergeRequest, { active: true, + changes: [], + versions: [], + baseCommitSha: null, }); Object.assign(state.projects[projectPath], { @@ -29,6 +32,23 @@ export default { changes, }); }, + [types.SET_MERGE_REQUEST_VERSIONS]( + state, + { projectPath, mergeRequestId, versions }, + ) { + Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { + versions, + baseCommitSha: versions.length ? versions[0].base_commit_sha : null, + }); + }, + [types.SET_MERGE_REQUEST_VERSION]( + state, + { projectPath, mergeRequestId, changes }, + ) { + Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { + changes, + }); + }, [types.SET_MERGE_REQUEST_NOTES]( state, { projectPath, mergeRequestId, notes }, -- cgit v1.2.1 From 0ea359d2cfd97f4271f812ba9f216bcf4ae42c20 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Sun, 25 Mar 2018 20:16:20 +0200 Subject: Fixes to Formatting to all Files --- .../ide/stores/mutations/merge_request.js | 31 +++------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'app/assets/javascripts/ide/stores/mutations/merge_request.js') diff --git a/app/assets/javascripts/ide/stores/mutations/merge_request.js b/app/assets/javascripts/ide/stores/mutations/merge_request.js index 921b2fa8cf7..6ccb74136d9 100644 --- a/app/assets/javascripts/ide/stores/mutations/merge_request.js +++ b/app/assets/javascripts/ide/stores/mutations/merge_request.js @@ -6,10 +6,7 @@ export default { currentMergeRequestId, }); }, - [types.SET_MERGE_REQUEST]( - state, - { projectPath, mergeRequestId, mergeRequest }, - ) { + [types.SET_MERGE_REQUEST](state, { projectPath, mergeRequestId, mergeRequest }) { // Add client side properties Object.assign(mergeRequest, { active: true, @@ -24,37 +21,15 @@ export default { }, }); }, - [types.SET_MERGE_REQUEST_CHANGES]( - state, - { projectPath, mergeRequestId, changes }, - ) { + [types.SET_MERGE_REQUEST_CHANGES](state, { projectPath, mergeRequestId, changes }) { Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { changes, }); }, - [types.SET_MERGE_REQUEST_VERSIONS]( - state, - { projectPath, mergeRequestId, versions }, - ) { + [types.SET_MERGE_REQUEST_VERSIONS](state, { projectPath, mergeRequestId, versions }) { Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { versions, baseCommitSha: versions.length ? versions[0].base_commit_sha : null, }); }, - [types.SET_MERGE_REQUEST_VERSION]( - state, - { projectPath, mergeRequestId, changes }, - ) { - Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { - changes, - }); - }, - [types.SET_MERGE_REQUEST_NOTES]( - state, - { projectPath, mergeRequestId, notes }, - ) { - Object.assign(state.projects[projectPath].mergeRequests[mergeRequestId], { - notes, - }); - }, }; -- cgit v1.2.1 From 8f7cf2ede5ef37d8c333aef7962de0191492f7c1 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 28 Mar 2018 10:40:48 +0200 Subject: Fixed Code review Comments --- .../javascripts/ide/stores/mutations/merge_request.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'app/assets/javascripts/ide/stores/mutations/merge_request.js') diff --git a/app/assets/javascripts/ide/stores/mutations/merge_request.js b/app/assets/javascripts/ide/stores/mutations/merge_request.js index 6ccb74136d9..334819fe702 100644 --- a/app/assets/javascripts/ide/stores/mutations/merge_request.js +++ b/app/assets/javascripts/ide/stores/mutations/merge_request.js @@ -7,17 +7,15 @@ export default { }); }, [types.SET_MERGE_REQUEST](state, { projectPath, mergeRequestId, mergeRequest }) { - // Add client side properties - Object.assign(mergeRequest, { - active: true, - changes: [], - versions: [], - baseCommitSha: null, - }); - Object.assign(state.projects[projectPath], { mergeRequests: { - [mergeRequestId]: mergeRequest, + [mergeRequestId]: { + ...mergeRequest, + active: true, + changes: [], + versions: [], + baseCommitSha: null, + }, }, }); }, -- cgit v1.2.1