diffs_controller.rb 5.0 KB
Newer Older
1 2
# frozen_string_literal: true

D
Douwe Maan 已提交
3 4 5 6 7
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
  include DiffHelper
  include RendersNotes

  before_action :apply_diff_view_cookie!
8 9
  before_action :commit
  before_action :define_diff_vars
10
  before_action :define_diff_comment_vars, except: [:diffs_batch, :diffs_metadata]
D
Douwe Maan 已提交
11 12

  def show
F
Felipe Artur 已提交
13
    render_diffs
D
Douwe Maan 已提交
14 15 16
  end

  def diff_for_path
F
Felipe Artur 已提交
17
    render_diffs
D
Douwe Maan 已提交
18 19
  end

20
  def diffs_batch
21
    return render_404 unless Feature.enabled?(:diffs_batch_load, @merge_request.project, default_enabled: true)
22

23
    diffs = @compare.diffs_in_batch(params[:page], params[:per_page], diff_options: diff_options)
24 25 26
    positions = @merge_request.note_positions_for_paths(diffs.diff_file_paths, current_user)

    diffs.unfold_diff_files(positions.unfoldable)
27
    diffs.write_cache
28 29 30

    options = {
      merge_request: @merge_request,
31
      diff_view: diff_view,
32 33 34 35 36 37
      pagination_data: diffs.pagination_data
    }

    render json: PaginatedDiffSerializer.new(current_user: current_user).represent(diffs, options)
  end

38
  def diffs_metadata
39 40
    diffs = @compare.diffs(diff_options)

41
    render json: DiffsMetadataSerializer.new(project: @merge_request.project)
42
                   .represent(diffs, additional_attributes)
43 44
  end

D
Douwe Maan 已提交
45 46
  private

47 48 49 50
  def preloadable_mr_relations
    [{ source_project: :namespace }, { target_project: :namespace }]
  end

51
  # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
F
Felipe Artur 已提交
52
  def render_diffs
53
    diffs = @compare.diffs(diff_options)
54
    @environment = @merge_request.environments_for(current_user, latest: true).last
55

56 57
    diffs.unfold_diff_files(note_positions.unfoldable)
    diffs.write_cache
58

59 60 61 62 63 64
    request = {
      current_user: current_user,
      project: @merge_request.project,
      render: ->(partial, locals) { view_to_html_string(partial, locals) }
    }

65 66
    options = additional_attributes.merge(diff_view: diff_view)

67
    if @merge_request.project.context_commits_enabled?
68
      options[:context_commits] = @merge_request.recent_context_commits
69 70
    end

71
    render json: DiffsSerializer.new(request).represent(diffs, options)
F
Felipe Artur 已提交
72 73
  end

74
  # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
D
Douwe Maan 已提交
75
  def define_diff_vars
76
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc
77
    @compare = commit || find_merge_request_diff_compare
78 79 80
    return render_404 unless @compare
  end

81
  # rubocop: disable CodeReuse/ActiveRecord
M
micael.bergeron 已提交
82
  def commit
83 84
    return unless commit_id = params[:commit_id].presence
    return unless @merge_request.all_commits.exists?(sha: commit_id)
M
micael.bergeron 已提交
85 86 87

    @commit ||= @project.commit(commit_id)
  end
88
  # rubocop: enable CodeReuse/ActiveRecord
M
micael.bergeron 已提交
89

90
  # rubocop: disable CodeReuse/ActiveRecord
91 92
  #
  # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
93
  def find_merge_request_diff_compare
D
Douwe Maan 已提交
94
    @merge_request_diff =
95 96
      if params[:diff_id].present?
        @merge_request.merge_request_diffs.viewable.find_by(id: params[:diff_id])
D
Douwe Maan 已提交
97 98 99 100
      else
        @merge_request.merge_request_diff
      end

101 102
    return unless @merge_request_diff

D
Douwe Maan 已提交
103 104
    @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

105
    if @start_sha = params[:start_sha].presence
D
Douwe Maan 已提交
106 107 108 109 110 111 112 113
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        @start_sha = @merge_request_diff.head_commit_sha
        @start_version = @merge_request_diff
      end
    end

114 115 116 117 118
    if Gitlab::Utils.to_boolean(params[:diff_head]) && @merge_request.diffable_merge_ref?
      return CompareService.new(@project, @merge_request.merge_ref_head.sha)
        .execute(@project, @merge_request.target_branch)
    end

119 120 121 122 123
    if @start_sha
      @merge_request_diff.compare_with(@start_sha)
    else
      @merge_request_diff
    end
D
Douwe Maan 已提交
124
  end
125
  # rubocop: enable CodeReuse/ActiveRecord
D
Douwe Maan 已提交
126

F
Felipe Artur 已提交
127 128 129 130 131 132 133 134 135 136 137 138 139
  def additional_attributes
    {
      environment: @environment,
      merge_request: @merge_request,
      merge_request_diff: @merge_request_diff,
      merge_request_diffs: @merge_request_diffs,
      start_version: @start_version,
      start_sha: @start_sha,
      commit: @commit,
      latest_diff: @merge_request_diff&.latest?
    }
  end

140
  # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
D
Douwe Maan 已提交
141 142 143
  def define_diff_comment_vars
    @new_diff_note_attrs = {
      noteable_type: 'MergeRequest',
144 145
      noteable_id: @merge_request.id,
      commit_id: @commit&.id
D
Douwe Maan 已提交
146 147 148 149 150 151 152
    }

    @diff_notes_disabled = false

    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?

    @grouped_diff_discussions = @merge_request.grouped_diff_discussions(@compare.diff_refs)
153
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
D
Douwe Maan 已提交
154
  end
155

156 157 158 159
  def note_positions
    @note_positions ||= Gitlab::Diff::PositionCollection.new(renderable_notes.map(&:position))
  end

160 161 162 163 164
  def renderable_notes
    define_diff_comment_vars unless @notes

    @notes
  end
D
Douwe Maan 已提交
165
end
166 167

Projects::MergeRequests::DiffsController.prepend_if_ee('EE::Projects::MergeRequests::DiffsController')