1 files changed, 54 insertions, 46 deletions

diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index c8edc06349f..e5e40ce07fa 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -6,8 +6,8 @@ import { isInMRPage } from '../../lib/utils/common_utils';
 export default {
   [types.ADD_NEW_NOTE](state, note) {
     const { discussion_id, type } = note;
-    const [exists] = state.notes.filter(n => n.id === note.discussion_id);
-    const isDiscussion = type === constants.DISCUSSION_NOTE;
+    const [exists] = state.discussions.filter(n => n.id === note.discussion_id);
+    const isDiscussion = type === constants.DISCUSSION_NOTE || type === constants.DIFF_NOTE;
 
     if (!exists) {
       const noteData = {
@@ -25,42 +25,44 @@ export default {
         noteData.resolve_with_issue_path = note.resolve_with_issue_path;
       }
 
-      state.notes.push(noteData);
-      document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
+      state.discussions.push(noteData);
     }
   },
 
   [types.ADD_NEW_REPLY_TO_DISCUSSION](state, note) {
-    const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
+    const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
 
     if (noteObj) {
       noteObj.notes.push(note);
-      document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
     }
   },
 
   [types.DELETE_NOTE](state, note) {
-    const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
+    const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
 
     if (noteObj.individual_note) {
-      state.notes.splice(state.notes.indexOf(noteObj), 1);
+      state.discussions.splice(state.discussions.indexOf(noteObj), 1);
     } else {
       const comment = utils.findNoteObjectById(noteObj.notes, note.id);
       noteObj.notes.splice(noteObj.notes.indexOf(comment), 1);
 
       if (!noteObj.notes.length) {
-        state.notes.splice(state.notes.indexOf(noteObj), 1);
+        state.discussions.splice(state.discussions.indexOf(noteObj), 1);
       }
     }
+  },
+
+  [types.EXPAND_DISCUSSION](state, { discussionId }) {
+    const discussion = utils.findNoteObjectById(state.discussions, discussionId);
 
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
+    discussion.expanded = true;
   },
 
   [types.REMOVE_PLACEHOLDER_NOTES](state) {
-    const { notes } = state;
+    const { discussions } = state;
 
-    for (let i = notes.length - 1; i >= 0; i -= 1) {
-      const note = notes[i];
+    for (let i = discussions.length - 1; i >= 0; i -= 1) {
+      const note = discussions[i];
       const children = note.notes;
 
       if (children.length && !note.individual_note) {
@@ -72,7 +74,7 @@ export default {
         }
       } else if (note.isPlaceholderNote) {
         // remove placeholders from state root
-        notes.splice(i, 1);
+        discussions.splice(i, 1);
       }
     }
   },
@@ -88,29 +90,29 @@ export default {
   [types.SET_USER_DATA](state, data) {
     Object.assign(state, { userData: data });
   },
-  [types.SET_INITIAL_NOTES](state, notesData) {
-    const notes = [];
+  [types.SET_INITIAL_DISCUSSIONS](state, discussionsData) {
+    const discussions = [];
 
-    notesData.forEach(note => {
+    discussionsData.forEach(discussion => {
       // To support legacy notes, should be very rare case.
-      if (note.individual_note && note.notes.length > 1) {
-        note.notes.forEach(n => {
-          notes.push({
-            ...note,
+      if (discussion.individual_note && discussion.notes.length > 1) {
+        discussion.notes.forEach(n => {
+          discussions.push({
+            ...discussion,
             notes: [n], // override notes array to only have one item to mimick individual_note
           });
         });
       } else {
-        const oldNote = utils.findNoteObjectById(state.notes, note.id);
+        const oldNote = utils.findNoteObjectById(state.discussions, discussion.id);
 
-        notes.push({
-          ...note,
-          expanded: oldNote ? oldNote.expanded : note.expanded,
+        discussions.push({
+          ...discussion,
+          expanded: oldNote ? oldNote.expanded : discussion.expanded,
         });
       }
     });
 
-    Object.assign(state, { notes });
+    Object.assign(state, { discussions });
   },
 
   [types.SET_LAST_FETCHED_AT](state, fetchedAt) {
@@ -122,17 +124,17 @@ export default {
   },
 
   [types.SHOW_PLACEHOLDER_NOTE](state, data) {
-    let notesArr = state.notes;
-    if (data.replyId) {
-      notesArr = utils.findNoteObjectById(notesArr, data.replyId).notes;
+    let notesArr = state.discussions;
+
+    const existingDiscussion = utils.findNoteObjectById(notesArr, data.replyId);
+    if (existingDiscussion) {
+      notesArr = existingDiscussion.notes;
     }
 
     notesArr.push({
       individual_note: true,
       isPlaceholderNote: true,
-      placeholderType: data.isSystemNote
-        ? constants.SYSTEM_NOTE
-        : constants.NOTE,
+      placeholderType: data.isSystemNote ? constants.SYSTEM_NOTE : constants.NOTE,
       notes: [
         {
           body: data.noteBody,
@@ -151,28 +153,23 @@ export default {
 
     if (hasEmojiAwardedByCurrentUser.length) {
       // If current user has awarded this emoji, remove it.
-      note.award_emoji.splice(
-        note.award_emoji.indexOf(hasEmojiAwardedByCurrentUser[0]),
-        1,
-      );
+      note.award_emoji.splice(note.award_emoji.indexOf(hasEmojiAwardedByCurrentUser[0]), 1);
     } else {
       note.award_emoji.push({
         name: awardName,
         user: { id, name, username },
       });
     }
-
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.TOGGLE_DISCUSSION](state, { discussionId }) {
-    const discussion = utils.findNoteObjectById(state.notes, discussionId);
+    const discussion = utils.findNoteObjectById(state.discussions, discussionId);
 
     discussion.expanded = !discussion.expanded;
   },
 
   [types.UPDATE_NOTE](state, note) {
-    const noteObj = utils.findNoteObjectById(state.notes, note.discussion_id);
+    const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
 
     if (noteObj.individual_note) {
       noteObj.notes.splice(0, 1, note);
@@ -180,24 +177,20 @@ export default {
       const comment = utils.findNoteObjectById(noteObj.notes, note.id);
       noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
     }
-
-    // document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
   },
 
   [types.UPDATE_DISCUSSION](state, noteData) {
     const note = noteData;
     let index = 0;
 
-    state.notes.forEach((n, i) => {
+    state.discussions.forEach((n, i) => {
       if (n.id === note.id) {
         index = i;
       }
     });
 
     note.expanded = true; // override expand flag to prevent collapse
-    state.notes.splice(index, 1, note);
-
-    document.dispatchEvent(new CustomEvent('refreshLegacyNotes'));
+    state.discussions.splice(index, 1, note);
   },
 
   [types.CLOSE_ISSUE](state) {
@@ -211,4 +204,19 @@ export default {
   [types.TOGGLE_STATE_BUTTON_LOADING](state, value) {
     Object.assign(state, { isToggleStateButtonLoading: value });
   },
+
+  [types.SET_NOTES_FETCHED_STATE](state, value) {
+    Object.assign(state, { isNotesFetched: value });
+  },
+
+  [types.SET_DISCUSSION_DIFF_LINES](state, { discussionId, diffLines }) {
+    const discussion = utils.findNoteObjectById(state.discussions, discussionId);
+    const index = state.discussions.indexOf(discussion);
+
+    const discussionWithDiffLines = Object.assign({}, discussion, {
+      truncated_diff_lines: diffLines,
+    });
+
+    state.discussions.splice(index, 1, discussionWithDiffLines);
+  },
 };