summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-09-06 18:53:56 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-09-06 18:53:56 +0200
commit0bab2377acc685ea3ccb6297dc4094d5353c7e4a (patch)
tree5de3f71907c7ea1063198f685b3f1b355c286950
parent6def5bd66b04f887dd0d24ae4030ec86195ff7cb (diff)
downloadgitlab-ce-winh-kill-mutation-types.tar.gz
No more mutation_types.jswinh-kill-mutation-types
-rw-r--r--app/assets/javascripts/notes/stores/actions.js3
-rw-r--r--app/assets/javascripts/notes/stores/mutations.js10
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 411bd585672..50dc0d8b6de 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -6,6 +6,7 @@ import TaskList from '../../task_list';
import Flash from '../../flash';
import Poll from '../../lib/utils/poll';
import * as types from './mutation_types';
+import { EXPAND_DISCUSSION } from './mutations';
import * as utils from './utils';
import * as constants from '../constants';
import service from '../services/notes_service';
@@ -23,7 +24,7 @@ export const expandDiscussion = ({ commit, dispatch }, data) => {
dispatch('diffs/renderFileForDiscussionId', data.discussionId, { root: true });
}
- commit(types.EXPAND_DISCUSSION, data);
+ commit(EXPAND_DISCUSSION.name, data);
};
export const collapseDiscussion = ({ commit }, data) => commit(types.COLLAPSE_DISCUSSION, data);
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index fa44ef2d057..0c6d7701536 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -3,6 +3,11 @@ import * as types from './mutation_types';
import * as constants from '../constants';
import { isInMRPage } from '../../lib/utils/common_utils';
+export const EXPAND_DISCUSSION = (state, { discussionId }) => {
+ const discussion = utils.findNoteObjectById(state.discussions, discussionId);
+ Object.assign(discussion, { expanded: true });
+};
+
export default {
[types.ADD_NEW_NOTE](state, data) {
const note = data.discussion ? data.discussion.notes[0] : data;
@@ -55,10 +60,7 @@ export default {
}
},
- [types.EXPAND_DISCUSSION](state, { discussionId }) {
- const discussion = utils.findNoteObjectById(state.discussions, discussionId);
- Object.assign(discussion, { expanded: true });
- },
+ EXPAND_DISCUSSION,
[types.COLLAPSE_DISCUSSION](state, { discussionId }) {
const discussion = utils.findNoteObjectById(state.discussions, discussionId);