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

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

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

12 13
  around_action :allow_gitaly_ref_name_caching

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

  def diff_for_path
F
Felipe Artur 已提交
19
    render_diffs
D
Douwe Maan 已提交
20 21
  end

22
  def diffs_batch
23
    diffs = @compare.diffs_in_batch(params[:page], params[:per_page], diff_options: diff_options)
24
    positions = @merge_request.note_positions_for_paths(diffs.diff_file_paths, current_user)
25
    environment = @merge_request.environments_for(current_user, latest: true).last
26 27

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

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

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

40
  def diffs_metadata
41 42
    diffs = @compare.diffs(diff_options)

43
    render json: DiffsMetadataSerializer.new(project: @merge_request.project, current_user: current_user)
44
                   .represent(diffs, additional_attributes)
45 46
  end

D
Douwe Maan 已提交
47 48
  private

49 50 51 52
  def preloadable_mr_relations
    [{ source_project: :namespace }, { target_project: :namespace }]
  end

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

58 59
    diffs.unfold_diff_files(note_positions.unfoldable)
    diffs.write_cache
60

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

67 68
    options = additional_attributes.merge(diff_view: diff_view)

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

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

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

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

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

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

103
    return unless @merge_request_diff&.id
104

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

107
    if @start_sha = params[:start_sha].presence
D
Douwe Maan 已提交
108 109 110 111 112 113 114 115
      @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

116 117 118 119 120
    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

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

F
Felipe Artur 已提交
129 130 131 132 133 134 135 136 137 138 139 140 141
  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

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

    @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)
155
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
D
Douwe Maan 已提交
156
  end
157

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

162 163 164
  def renderable_notes
    define_diff_comment_vars unless @notes

165 166 167 168 169 170 171 172
    draft_notes =
      if current_user
        merge_request.draft_notes.authored_by(current_user)
      else
        []
      end

    @notes.concat(draft_notes)
173
  end
174 175 176 177 178 179 180 181

  def update_diff_discussion_positions!
    return unless Feature.enabled?(:merge_ref_head_comments, @merge_request.target_project, default_enabled: true)
    return unless Feature.enabled?(:merge_red_head_comments_position_on_demand, @merge_request.target_project, default_enabled: true)
    return if @merge_request.has_any_diff_note_positions?

    Discussions::CaptureDiffNotePositionsService.new(@merge_request).execute
  end
D
Douwe Maan 已提交
182
end