Merge branch 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce...

Merge branch 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce into issue-discussions-refactor

* 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce:
  Convert ?full_data=1 -> ?view=full_data

app/assets/javascripts/notes/components/issue_comment_form.vue

@@ -105,7 +105,7 @@
             endpoint: this.endpoint,
             flashContainer: this.$el,
             data: {
-              full_data: true,
+              view: 'full_data',
               note: {
                 noteable_type: 'Issue',
                 noteable_id: this.getIssueData.id,

app/assets/javascripts/notes/components/issue_discussion.vue

@@ -100,7 +100,7 @@
             target_type: 'issue',
             target_id: this.discussion.noteable_id,
             note: { note: noteText },
-            full_data: true,
+            view: 'full_data',
           },
         };
 

app/assets/javascripts/notes/components/issue_note.vue

@@ -78,7 +78,7 @@
         const data = {
           endpoint: this.note.path,
           note: {
-            full_data: true,
+            view: 'full_data',
             target_type: 'issue',
             target_id: this.note.noteable_id,
             note: { note: noteText },

app/controllers/concerns/notes_actions.rb

@@ -18,7 +18,8 @@ module NotesActions
     @notes = prepare_notes_for_rendering(@notes)
 
     notes_json[:notes] =
-      if params[:full_data]
+      case params[:view]
+      when 'full_data'
         note_serializer.represent(@notes)
       else
         @notes.map { |note| note_json(note) }
@@ -87,7 +88,8 @@ module NotesActions
     if note.persisted?
       attrs[:valid] = true
 
-      if params[:full_data]
+      case params[:view]
+      when 'full_data'
         attrs.merge!(note_serializer.represent(note))
       else
         attrs.merge!(

app/helpers/notes_helper.rb

@@ -93,11 +93,13 @@ module NotesHelper
     end
   end
 
-  def notes_url
+  def notes_url(extra_params = {})
     if @snippet.is_a?(PersonalSnippet)
-      snippet_notes_path(@snippet)
+      snippet_notes_path(@snippet, extra_params)
     else
-      project_noteable_notes_path(@project, target_id: @noteable.id, target_type: @noteable.class.name.underscore)
+      params = { target_id: @noteable.id, target_type: @noteable.class.name.underscore }
+
+      project_noteable_notes_path(@project, params.merge(extra_params))
     end
   end
 

app/views/projects/issues/_discussion.html.haml

@@ -9,7 +9,7 @@
   new_session_path: new_session_path(:user, redirect_to_referer: 'yes'),
   markdown_docs: help_page_path('user/markdown'),
   quick_actions_docs: help_page_path('user/project/quick_actions'),
-  notes_path: "#{notes_url}?full_data=1",
+  notes_path: notes_url(view: 'full_data'),
   last_fetched_at: Time.now.to_i,
   issue_data: serialize_issuable(@issue),
   current_user_data: UserSerializer.new.represent(current_user).to_json }}

spec/helpers/notes_helper_spec.rb

@@ -205,6 +205,14 @@ describe NotesHelper do
 
       expect(helper.notes_url).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes")
     end
+
+    it 'adds extra params' do
+      namespace = create(:namespace, path: 'nm')
+      @project = create(:project, path: 'test', namespace: namespace)
+      @noteable = create(:issue, project: @project)
+
+      expect(helper.notes_url(view: 'full_data')).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes?view=full_data")
+    end
   end
 
   describe '#note_url' do

spec/javascripts/notes/mock_data.js

@@ -5,7 +5,7 @@ export const notesDataMock = {
   lastFetchedAt: '1501862675',
   markdownDocs: '/help/user/markdown',
   newSessionPath: '/users/sign_in?redirect_to_referer=yes',
-  notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes?full_data=1',
+  notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes?view=full_data',
   quickActionsDocs: '/help/user/project/quick_actions',
   registerPath: '/users/sign_in?redirect_to_referer=yes#register-pane',
 };
@@ -314,4 +314,4 @@ export const discussionResponse = [{
 		"path": "/gitlab-org/gitlab-ce/notes/1391"
 	}],
 	"individual_note": true
-}];
+}];
\ No newline at end of file