Initial partial loading.fast-issue-comments

3 files changed, 32 insertions, 20 deletions

diff --git a/app/assets/javascripts/notes/components/issue_notes_app.vue b/app/assets/javascripts/notes/components/issue_notes_app.vue
index 1163b2f545e..74f0eb5bc19 100644
--- a/app/assets/javascripts/notes/components/issue_notes_app.vue
+++ b/app/assets/javascripts/notes/components/issue_notes_app.vue
@@ -76,6 +76,7 @@
       getComponentData(note) {
         return note.individual_note ? note.notes[0] : note;
       },
+
       fetchNotes() {
         const options = {
           path: this.getNotesDataByProp('discussionsPath'),
@@ -104,15 +105,6 @@
 
         this.poll();
       },
-      checkLocationHash() {
-        const hash = gl.utils.getLocationHash();
-        const element = document.getElementById(hash);
-
-        if (hash && element) {
-          this.setTargetNoteHash(hash);
-          this.scrollToNoteIfNeeded($(element));
-        }
-      },
     },
     created() {
       this.setNotesData(this.notesData);
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 34966ad63f0..f29db235615 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -18,8 +18,14 @@ export const setInitialNotes = ({ commit }, data) => commit(types.SET_INITIAL_NO
 export const setTargetNoteHash = ({ commit }, data) => commit(types.SET_TARGET_NOTE_HASH, data);
 export const toggleDiscussion = ({ commit }, data) => commit(types.TOGGLE_DISCUSSION, data);
 
+const getNoteIdFromHash = () => {
+  const hash = gl.utils.getLocationHash();
+  return hash ? parseInt(hash.split('_')[1]) : false;
+}
+
 export const fetchNotes = ({ commit, dispatch }, data) => {
   let { path, params } = data;
+  const noteID = getNoteIdFromHash()
   params = params || {};
 
   function innerFetchNotes(path, params) {
@@ -29,15 +35,20 @@ export const fetchNotes = ({ commit, dispatch }, data) => {
       .then((res) => {
         if (res.length > 0) {
           const newParams = params;
+          delete params.note_id;
           const lastNotes = res[res.length-1].notes;
           const lastNoteLength = lastNotes.length;
 
           newParams.after = lastNotes[lastNoteLength-1].id;
           commit(types.SET_INITIAL_NOTES, res);
+
           return innerFetchNotes(path, newParams);
         }
       });
   }
+  if(noteID) {
+    params = { note_id: noteID };
+  }
   return innerFetchNotes(path, params);
 }
 
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 18728d0a1d0..c59de77b0e2 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -97,22 +97,31 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def discussions
     limit = params.has_key?('limit') ? params[:limit] : 3
-    notes = @issue.notes
-      .limit(limit)
-      .inc_relations_for_view
 
-    notes = notes.after_id(params[:after]) if params.has_key?('after')
-    notes = notes.before_id(params[:before]) if params.has_key?('before')
+    if params.has_key?('note_id')
+      note = @issue.notes.includes(:noteable).find(params[:note_id])
+      notes = [note]
+      prepare_notes_for_rendering(notes)
+      discussions = Discussion.build_collection(notes, @issue)
+      render json: DiscussionSerializer.new(project: @project, noteable: @issue, current_user: current_user).represent(discussions)
+    else    
+      notes = @issue.notes
+        .limit(limit)
+        .inc_relations_for_view
 
-    notes = notes.includes(:noteable)
-      .fresh
-      .reject { |n| n.cross_reference_not_visible_for?(current_user) }
+      notes = notes.after_id(params[:after]) if params.has_key?('after')
+      notes = notes.before_id(params[:before]) if params.has_key?('before')
 
-    prepare_notes_for_rendering(notes)
+      notes = notes.includes(:noteable)
+        .fresh
+        .reject { |n| n.cross_reference_not_visible_for?(current_user) }
 
-    discussions = Discussion.build_collection(notes, @issue)
+      prepare_notes_for_rendering(notes)
 
-    render json: DiscussionSerializer.new(project: @project, noteable: @issue, current_user: current_user).represent(discussions)
+      discussions = Discussion.build_collection(notes, @issue)
+
+      render json: DiscussionSerializer.new(project: @project, noteable: @issue, current_user: current_user).represent(discussions)
+    end
   end
 
   def create