Merge branch '30299-transform-notes-from-polling-response' into 'master'

Handle transformed notes from polling response

See merge request gitlab-org/gitlab-ce!25792

app/assets/javascripts/notes/stores/mutations.js

@@ -193,6 +193,10 @@ export default {
     const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
 
     if (noteObj.individual_note) {
+      if (note.type === constants.DISCUSSION_NOTE) {
+        noteObj.individual_note = false;
+      }
+
       noteObj.notes.splice(0, 1, note);
     } else {
       const comment = utils.findNoteObjectById(noteObj.notes, note.id);

spec/javascripts/notes/stores/mutation_spec.js

 import Vue from 'vue';
 import mutations from '~/notes/stores/mutations';
+import { DISCUSSION_NOTE } from '~/notes/constants';
 import {
   note,
   discussionMock,
@@ -326,6 +327,18 @@ describe('Notes Store mutations', () => {
 
       expect(state.discussions[0].notes[0].note).toEqual('Foo');
     });
+
+    it('transforms an individual note to discussion', () => {
+      const state = {
+        discussions: [individualNote],
+      };
+
+      const transformedNote = { ...individualNote.notes[0], type: DISCUSSION_NOTE };
+
+      mutations.UPDATE_NOTE(state, transformedNote);
+
+      expect(state.discussions[0].individual_note).toEqual(false);
+    });
   });
 
   describe('CLOSE_ISSUE', () => {