Changes tab VUE refactoring

9 files changed, 327 insertions, 27 deletions

diff --git a/app/serializers/blob_entity.rb b/app/serializers/blob_entity.rb
index ad039a2623d..b501fd5e964 100644
--- a/app/serializers/blob_entity.rb
+++ b/app/serializers/blob_entity.rb
@@ -3,11 +3,13 @@ class BlobEntity < Grape::Entity
 
   expose :id, :path, :name, :mode
 
+  expose :readable_text?, as: :readable_text
+
   expose :icon do |blob|
     IconsHelper.file_type_icon_class('file', blob.mode, blob.name)
   end
 
-  expose :url do |blob|
+  expose :url, if: -> (*) { request.respond_to?(:ref) } do |blob|
     project_blob_path(request.project, File.join(request.ref, blob.path))
   end
 end
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb
index 6e68d275047..aa289a96975 100644
--- a/app/serializers/diff_file_entity.rb
+++ b/app/serializers/diff_file_entity.rb
@@ -1,25 +1,46 @@
 class DiffFileEntity < Grape::Entity
+  include RequestAwareEntity
+  include BlobHelper
+  include CommitsHelper
   include DiffHelper
   include SubmoduleHelper
   include BlobHelper
   include IconsHelper
-  include ActionView::Helpers::TagHelper
+  include TreeHelper
+  include ChecksCollaboration
+  include Gitlab::Utils::StrongMemoize
 
   expose :submodule?, as: :submodule
 
   expose :submodule_link do |diff_file|
-    submodule_links(diff_file.blob, diff_file.content_sha, diff_file.repository).first
+    memoized_submodule_links(diff_file).first
+  end
+
+  expose :submodule_tree_url do |diff_file|
+    memoized_submodule_links(diff_file).last
   end
 
-  expose :blob_path do |diff_file|
-    diff_file.blob.path
+  expose :blob, using: BlobEntity
+
+  expose :can_modify_blob do |diff_file|
+    merge_request = options[:merge_request]
+
+    if merge_request&.source_project && current_user
+      can_modify_blob?(diff_file.blob, merge_request.source_project, merge_request.source_branch)
+    else
+      false
+    end
   end
 
-  expose :blob_icon do |diff_file|
-    blob_icon(diff_file.b_mode, diff_file.file_path)
+  expose :file_hash do |diff_file|
+    Digest::SHA1.hexdigest(diff_file.file_path)
   end
 
   expose :file_path
+  expose :too_large?, as: :too_large
+  expose :collapsed?, as: :collapsed
+  expose :new_file?, as: :new_file
+
   expose :deleted_file?, as: :deleted_file
   expose :renamed_file?, as: :renamed_file
   expose :old_path
@@ -28,6 +49,36 @@ class DiffFileEntity < Grape::Entity
   expose :a_mode
   expose :b_mode
   expose :text?, as: :text
+  expose :added_lines
+  expose :removed_lines
+  expose :diff_refs
+  expose :content_sha
+  expose :stored_externally?, as: :stored_externally
+  expose :external_storage
+
+  expose :load_collapsed_diff_url, if: -> (diff_file, options) { diff_file.text? && options[:merge_request] } do |diff_file|
+    merge_request = options[:merge_request]
+    project = merge_request.target_project
+
+    next unless project
+
+    diff_for_path_namespace_project_merge_request_path(
+      namespace_id: project.namespace.to_param,
+      project_id: project.to_param,
+      id: merge_request.iid,
+      old_path: diff_file.old_path,
+      new_path: diff_file.new_path,
+      file_identifier: diff_file.file_identifier
+    )
+  end
+
+  expose :formatted_external_url, if: -> (_, options) { options[:environment] } do |diff_file|
+    options[:environment].formatted_external_url
+  end
+
+  expose :external_url, if: -> (_, options) { options[:environment] } do |diff_file|
+    options[:environment].external_url_for(diff_file.new_path, diff_file.content_sha)
+  end
 
   expose :old_path_html do |diff_file|
     old_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path)
@@ -38,4 +89,64 @@ class DiffFileEntity < Grape::Entity
     _, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path)
     new_path
   end
+
+  expose :edit_path, if: -> (_, options) { options[:merge_request] } do |diff_file|
+    merge_request = options[:merge_request]
+
+    options = merge_request.persisted? ? { from_merge_request_iid: merge_request.iid } : {}
+
+    next unless merge_request.source_project
+
+    project_edit_blob_path(merge_request.source_project,
+      tree_join(merge_request.source_branch, diff_file.new_path),
+      options)
+  end
+
+  expose :view_path, if: -> (_, options) { options[:merge_request] } do |diff_file|
+    merge_request = options[:merge_request]
+
+    project = merge_request.target_project
+
+    next unless project
+
+    project_blob_path(project, tree_join(diff_file.content_sha, diff_file.new_path))
+  end
+
+  expose :replaced_view_path, if: -> (_, options) { options[:merge_request] } do |diff_file|
+    image_diff = diff_file.rich_viewer && diff_file.rich_viewer.partial_name == 'image'
+    image_replaced = diff_file.old_content_sha && diff_file.old_content_sha != diff_file.content_sha
+
+    merge_request = options[:merge_request]
+    project = merge_request.target_project
+
+    next unless project
+
+    project_blob_path(project, tree_join(diff_file.old_content_sha, diff_file.old_path)) if image_diff && image_replaced
+  end
+
+  expose :context_lines_path, if: -> (diff_file, _) { diff_file.text? } do |diff_file|
+    project_blob_diff_path(diff_file.repository.project, tree_join(diff_file.content_sha, diff_file.file_path))
+  end
+
+  # Used for inline diffs
+  expose :highlighted_diff_lines, if: -> (diff_file, _) { diff_file.text? } do |diff_file|
+    diff_file.diff_lines_for_serializer
+  end
+
+  # Used for parallel diffs
+  expose :parallel_diff_lines, if: -> (diff_file, _) { diff_file.text? }
+
+  def current_user
+    request.current_user
+  end
+
+  def memoized_submodule_links(diff_file)
+    strong_memoize(:submodule_links) do
+      if diff_file.submodule?
+        submodule_links(diff_file.blob, diff_file.content_sha, diff_file.repository)
+      else
+        []
+      end
+    end
+  end
 end
diff --git a/app/serializers/diffs_entity.rb b/app/serializers/diffs_entity.rb
new file mode 100644
index 00000000000..bb804e5347a
--- /dev/null
+++ b/app/serializers/diffs_entity.rb
@@ -0,0 +1,65 @@
+class DiffsEntity < Grape::Entity
+  include DiffHelper
+  include RequestAwareEntity
+
+  expose :real_size
+  expose :size
+
+  expose :branch_name do |diffs|
+    merge_request&.source_branch
+  end
+
+  expose :target_branch_name do |diffs|
+    merge_request&.target_branch
+  end
+
+  expose :commit do |diffs|
+    options[:commit]
+  end
+
+  expose :merge_request_diff, using: MergeRequestDiffEntity do |diffs|
+    options[:merge_request_diff]
+  end
+
+  expose :start_version, using: MergeRequestDiffEntity do |diffs|
+    options[:start_version]
+  end
+
+  expose :latest_diff do |diffs|
+    options[:latest_diff]
+  end
+
+  expose :latest_version_path, if: -> (*) { merge_request } do |diffs|
+    diffs_project_merge_request_path(merge_request&.project, merge_request)
+  end
+
+  expose :added_lines do |diffs|
+    diffs.diff_files.sum(&:added_lines)
+  end
+
+  expose :removed_lines do |diffs|
+    diffs.diff_files.sum(&:removed_lines)
+  end
+
+  expose :render_overflow_warning do |diffs|
+    render_overflow_warning?(diffs.diff_files)
+  end
+
+  expose :email_patch_path, if: -> (*) { merge_request } do |diffs|
+    merge_request_path(merge_request, format: :patch)
+  end
+
+  expose :plain_diff_path, if: -> (*) { merge_request } do |diffs|
+    merge_request_path(merge_request, format: :diff)
+  end
+
+  expose :diff_files, using: DiffFileEntity
+
+  expose :merge_request_diffs, using: MergeRequestDiffEntity, if: -> (_, options) { options[:merge_request_diffs]&.any? } do |diffs|
+    options[:merge_request_diffs]
+  end
+
+  def merge_request
+    options[:merge_request]
+  end
+end
diff --git a/app/serializers/diffs_serializer.rb b/app/serializers/diffs_serializer.rb
new file mode 100644
index 00000000000..6771e10c5ac
--- /dev/null
+++ b/app/serializers/diffs_serializer.rb
@@ -0,0 +1,3 @@
+class DiffsSerializer < BaseSerializer
+  entity DiffsEntity
+end
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb
index 718fb35e62d..63f28133a64 100644
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -1,16 +1,31 @@
 class DiscussionEntity < Grape::Entity
   include RequestAwareEntity
+  include NotesHelper
 
   expose :id, :reply_id
+  expose :position, if: -> (d, _) { d.diff_discussion? }
+  expose :line_code, if: -> (d, _) { d.diff_discussion? }
   expose :expanded?, as: :expanded
+  expose :active?, as: :active, if: -> (d, _) { d.diff_discussion? }
+  expose :project_id
 
   expose :notes do |discussion, opts|
     request.note_entity.represent(discussion.notes, opts)
   end
 
+  expose :discussion_path do |discussion|
+    discussion_path(discussion)
+  end
+
   expose :individual_note?, as: :individual_note
-  expose :resolvable?, as: :resolvable
+  expose :resolvable do |discussion|
+    discussion.resolvable?
+  end
+
   expose :resolved?, as: :resolved
+  expose :resolved_by_push?, as: :resolved_by_push
+  expose :resolved_by
+  expose :resolved_at
   expose :resolve_path, if: -> (d, _) { d.resolvable? } do |discussion|
     resolve_project_merge_request_discussion_path(discussion.project, discussion.noteable, discussion.id)
   end
@@ -18,24 +33,17 @@ class DiscussionEntity < Grape::Entity
     new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id)
   end
 
-  expose :diff_file, using: DiffFileEntity, if: -> (d, _) { defined? d.diff_file }
+  expose :diff_file, using: DiffFileEntity, if: -> (d, _) { d.diff_discussion? }
 
   expose :diff_discussion?, as: :diff_discussion
 
-  expose :truncated_diff_lines, if: -> (d, _) { (defined? d.diff_file) && d.diff_file.text? } do |discussion|
-    options[:context].render_to_string(
-      partial: "projects/diffs/line",
-      collection: discussion.truncated_diff_lines,
-      as: :line,
-      locals: { diff_file: discussion.diff_file,
-                discussion_expanded: true,
-                plain: true },
-      layout: false,
-      formats: [:html]
-    )
+  expose :truncated_diff_lines_path, if: -> (d, _) { !d.expanded? && !render_truncated_diff_lines? } do |discussion|
+    project_merge_request_discussion_path(discussion.project, discussion.noteable, discussion)
   end
 
-  expose :image_diff_html, if: -> (d, _) { defined? d.diff_file } do |discussion|
+  expose :truncated_diff_lines, if: -> (d, _) { d.diff_discussion? && d.on_text? && (d.expanded? || render_truncated_diff_lines?) }
+
+  expose :image_diff_html, if: -> (d, _) { d.diff_discussion? && d.on_image? } do |discussion|
     diff_file = discussion.diff_file
     partial = diff_file.new_file? || diff_file.deleted_file? ? 'single_image_diff' : 'replaced_image_diff'
     options[:context].render_to_string(
@@ -47,4 +55,17 @@ class DiscussionEntity < Grape::Entity
       formats: [:html]
     )
   end
+
+  expose :for_commit?, as: :for_commit
+  expose :commit_id
+
+  private
+
+  def render_truncated_diff_lines?
+    options[:render_truncated_diff_lines]
+  end
+
+  def current_user
+    request.current_user
+  end
 end
diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb
new file mode 100644
index 00000000000..32c761b45ac
--- /dev/null
+++ b/app/serializers/merge_request_diff_entity.rb
@@ -0,0 +1,46 @@
+class MergeRequestDiffEntity < Grape::Entity
+  include Gitlab::Routing
+  include GitHelper
+  include MergeRequestsHelper
+
+  expose :version_index do |merge_request_diff|
+    @merge_request_diffs = options[:merge_request_diffs]
+    diff = options[:merge_request_diff]
+
+    next unless diff.present?
+    next unless @merge_request_diffs.size > 1
+
+    version_index(merge_request_diff)
+  end
+
+  expose :created_at
+  expose :commits_count
+
+  expose :latest?, as: :latest
+
+  expose :short_commit_sha do |merge_request_diff|
+    short_sha(merge_request_diff.head_commit_sha)
+  end
+
+  expose :version_path do |merge_request_diff|
+    start_sha = options[:start_sha]
+    project = merge_request.target_project
+
+    next unless project
+
+    merge_request_version_path(project, merge_request, merge_request_diff, start_sha)
+  end
+
+  expose :compare_path do |merge_request_diff|
+    project = merge_request.target_project
+    diff = options[:merge_request_diff]
+
+    if project && diff
+      merge_request_version_path(project, merge_request, diff, merge_request_diff.head_commit_sha)
+    end
+  end
+
+  def merge_request
+    options[:merge_request]
+  end
+end
diff --git a/app/serializers/merge_request_user_entity.rb b/app/serializers/merge_request_user_entity.rb
new file mode 100644
index 00000000000..33fc7b724d5
--- /dev/null
+++ b/app/serializers/merge_request_user_entity.rb
@@ -0,0 +1,24 @@
+class MergeRequestUserEntity < UserEntity
+  include RequestAwareEntity
+  include BlobHelper
+  include TreeHelper
+
+  expose :can_fork do |user|
+    can?(user, :fork_project, request.project) if project
+  end
+
+  expose :can_create_merge_request do |user|
+    project && can?(user, :create_merge_request_in, project)
+  end
+
+  expose :fork_path, if: -> (*) { project } do |user|
+    params = edit_blob_fork_params("Edit")
+    project_forks_path(project, namespace_key: user.namespace.id, continue: params)
+  end
+
+  def project
+    return false unless request.respond_to?(:project) && request.project
+
+    request.project
+  end
+end
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb
index 8260c6c7b84..0426afc1b4a 100644
--- a/app/serializers/merge_request_widget_entity.rb
+++ b/app/serializers/merge_request_widget_entity.rb
@@ -120,12 +120,12 @@ class MergeRequestWidgetEntity < IssuableEntity
       presenter(merge_request).can_cherry_pick_on_current_merge_request?
     end
 
-    expose :can_create_note do |issue|
-      can?(request.current_user, :create_note, issue.project)
+    expose :can_create_note do |merge_request|
+      can?(request.current_user, :create_note, merge_request)
     end
 
-    expose :can_update do |issue|
-      can?(request.current_user, :update_issue, issue)
+    expose :can_update do |merge_request|
+      can?(request.current_user, :update_merge_request, merge_request)
     end
   end
 
@@ -209,6 +209,10 @@ class MergeRequestWidgetEntity < IssuableEntity
     commit_change_content_project_merge_request_path(merge_request.project, merge_request)
   end
 
+  expose :preview_note_path do |merge_request|
+    preview_markdown_path(merge_request.project, quick_actions_target_type: 'MergeRequest', quick_actions_target_id: merge_request.id)
+  end
+
   expose :merge_commit_path do |merge_request|
     if merge_request.merge_commit_sha
       project_commit_path(merge_request.project, merge_request.merge_commit_sha)
diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb
index 06d603b277e..ce0c31b5806 100644
--- a/app/serializers/note_entity.rb
+++ b/app/serializers/note_entity.rb
@@ -1,5 +1,6 @@
 class NoteEntity < API::Entities::Note
   include RequestAwareEntity
+  include NotesHelper
 
   expose :type
 
@@ -15,16 +16,21 @@ class NoteEntity < API::Entities::Note
 
   expose :current_user do
     expose :can_edit do |note|
-      Ability.allowed?(request.current_user, :admin_note, note)
+      can?(current_user, :admin_note, note)
     end
 
     expose :can_award_emoji do |note|
-      Ability.allowed?(request.current_user, :award_emoji, note)
+      can?(current_user, :award_emoji, note)
+    end
+
+    expose :can_resolve do |note|
+      note.resolvable? && can?(current_user, :resolve_note, note)
     end
   end
 
   expose :resolved?, as: :resolved
   expose :resolvable?, as: :resolvable
+
   expose :resolved_by, using: NoteUserEntity
 
   expose :system_note_icon_name, if: -> (note, _) { note.system? } do |note|
@@ -42,5 +48,23 @@ class NoteEntity < API::Entities::Note
     new_abuse_report_path(user_id: note.author.id, ref_url: Gitlab::UrlBuilder.build(note))
   end
 
+  expose :noteable_note_url do |note|
+    noteable_note_url(note)
+  end
+
+  expose :resolve_path, if: -> (note, _) { note.part_of_discussion? && note.resolvable? } do |note|
+    resolve_project_merge_request_discussion_path(note.project, note.noteable, note.discussion_id)
+  end
+
+  expose :resolve_with_issue_path, if: -> (note, _) { note.part_of_discussion? && note.resolvable? } do |note|
+    new_project_issue_path(note.project, merge_request_to_resolve_discussions_of: note.noteable.iid, discussion_to_resolve: note.discussion_id)
+  end
+
   expose :attachment, using: NoteAttachmentEntity, if: -> (note, _) { note.attachment? }
+
+  private
+
+  def current_user
+    request.current_user
+  end
 end