diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 06:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 06:08:49 +0000 |
commit | 6305f1dc00870f6e0635e2e850538a00bbd00bda (patch) | |
tree | 8a518cae3805b8d7269bfacc8ae60aa441fadb22 /app/assets/javascripts/notes/stores | |
parent | 1d388ed855838a2d50588c131f9f23815f148344 (diff) | |
download | gitlab-ce-6305f1dc00870f6e0635e2e850538a00bbd00bda.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/stores')
5 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index 9bd245c094d..f3dc6187c3f 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -506,5 +506,8 @@ export const fetchDescriptionVersion = (_, { endpoint, startingVersion }) => { }); }; +export const setCurrentDiscussionId = ({ commit }, discussionId) => + commit(types.SET_CURRENT_DISCUSSION_ID, discussionId); + // prevent babel-plugin-rewire from generating an invalid default during karma tests export default () => {}; diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 3d0ec8cd3a7..35398999abc 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -59,7 +59,6 @@ export const getDiscussionLastNote = state => discussion => export const unresolvedDiscussionsCount = state => state.unresolvedDiscussionsCount; export const resolvableDiscussionsCount = state => state.resolvableDiscussionsCount; -export const hasUnresolvedDiscussions = state => state.hasUnresolvedDiscussions; export const showJumpToNextDiscussion = (state, getters) => (mode = 'discussion') => { const orderedDiffs = diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js index 6168aeae35d..771b80108b8 100644 --- a/app/assets/javascripts/notes/stores/modules/index.js +++ b/app/assets/javascripts/notes/stores/modules/index.js @@ -8,6 +8,7 @@ export default () => ({ convertedDisscussionIds: [], targetNoteHash: null, lastFetchedAt: null, + currentDiscussionId: null, // View layer isToggleStateButtonLoading: false, @@ -26,7 +27,6 @@ export default () => ({ commentsDisabled: false, resolvableDiscussionsCount: 0, unresolvedDiscussionsCount: 0, - hasUnresolvedDiscussions: false, }, actions, getters, diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/notes/stores/mutation_types.js index 796370920bb..8eb426d3f9b 100644 --- a/app/assets/javascripts/notes/stores/mutation_types.js +++ b/app/assets/javascripts/notes/stores/mutation_types.js @@ -25,6 +25,7 @@ export const COLLAPSE_DISCUSSION = 'COLLAPSE_DISCUSSION'; export const EXPAND_DISCUSSION = 'EXPAND_DISCUSSION'; export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION'; export const UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS = 'UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS'; +export const SET_CURRENT_DISCUSSION_ID = 'SET_CURRENT_DISCUSSION_ID'; // Issue export const CLOSE_ISSUE = 'CLOSE_ISSUE'; diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index e70f0238316..71091d26b85 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -267,7 +267,6 @@ export default { discussion.resolvable && discussion.notes.some(note => note.resolvable && !note.resolved), ).length; - state.hasUnresolvedDiscussions = state.unresolvedDiscussionsCount > 1; }, [types.CONVERT_TO_DISCUSSION](state, discussionId) { @@ -281,4 +280,8 @@ export default { convertedDisscussionIds.splice(convertedDisscussionIds.indexOf(discussionId), 1); Object.assign(state, { convertedDisscussionIds }); }, + + [types.SET_CURRENT_DISCUSSION_ID](state, discussionId) { + state.currentDiscussionId = discussionId; + }, }; |