diffs_controller.rb 5.6 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]
11
  before_action :update_diff_discussion_positions!
D
Douwe Maan 已提交
12

13 14
  around_action :allow_gitaly_ref_name_caching

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

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

23
  def diffs_batch
24
    return render_404 unless Feature.enabled?(:diffs_batch_load, @merge_request.project, default_enabled: true)
25

26
    diffs = @compare.diffs_in_batch(params[:page], params[:per_page], diff_options: diff_options)
27 28 29
    positions = @merge_request.note_positions_for_paths(diffs.diff_file_paths, current_user)

    diffs.unfold_diff_files(positions.unfoldable)
30
    diffs.write_cache
31 32 33

    options = {
      merge_request: @merge_request,
34
      diff_view: diff_view,
35 36 37 38 39 40
      pagination_data: diffs.pagination_data
    }

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

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

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

D
Douwe Maan 已提交
48 49
  private

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

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

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

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

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

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

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

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

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

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

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

104
    return unless @merge_request_diff&.id
105

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

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

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

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

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

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

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

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

163 164 165
  def renderable_notes
    define_diff_comment_vars unless @notes

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

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

  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 已提交
183
end