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

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

  before_action :apply_diff_view_cookie!
M
micael.bergeron 已提交
9
  before_action :commit
D
Douwe Maan 已提交
10 11 12 13
  before_action :define_diff_vars
  before_action :define_diff_comment_vars

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

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

  private

F
Felipe Artur 已提交
23 24
  def render_diffs
    @environment = @merge_request.environments_for(current_user).last
25 26 27 28 29 30
    notes_grouped_by_path = renderable_notes.group_by { |note| note.position.file_path }

    @diffs.diff_files.each do |diff_file|
      notes = notes_grouped_by_path.fetch(diff_file.file_path, [])
      notes.each { |note| diff_file.unfold_diff_lines(note.position) }
    end
F
Felipe Artur 已提交
31

32 33
    @diffs.write_cache

34 35 36 37 38 39 40
    request = {
      current_user: current_user,
      project: @merge_request.project,
      render: ->(partial, locals) { view_to_html_string(partial, locals) }
    }

    render json: DiffsSerializer.new(request).represent(@diffs, additional_attributes)
F
Felipe Artur 已提交
41 42
  end

D
Douwe Maan 已提交
43
  def define_diff_vars
44
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc
45
    @compare = commit || find_merge_request_diff_compare
46 47 48 49 50
    return render_404 unless @compare

    @diffs = @compare.diffs(diff_options)
  end

51
  # rubocop: disable CodeReuse/ActiveRecord
M
micael.bergeron 已提交
52 53
  def commit
    return nil unless commit_id = params[:commit_id].presence
54
    return nil unless @merge_request.all_commits.exists?(sha: commit_id)
M
micael.bergeron 已提交
55 56 57

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

60
  # rubocop: disable CodeReuse/ActiveRecord
61
  def find_merge_request_diff_compare
D
Douwe Maan 已提交
62
    @merge_request_diff =
63 64
      if diff_id = params[:diff_id].presence
        @merge_request.merge_request_diffs.viewable.find_by(id: diff_id)
D
Douwe Maan 已提交
65 66 67 68
      else
        @merge_request.merge_request_diff
      end

69 70
    return unless @merge_request_diff

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

73
    if @start_sha = params[:start_sha].presence
D
Douwe Maan 已提交
74 75 76 77 78 79 80 81
      @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

82 83 84 85 86
    if @start_sha
      @merge_request_diff.compare_with(@start_sha)
    else
      @merge_request_diff
    end
D
Douwe Maan 已提交
87
  end
88
  # rubocop: enable CodeReuse/ActiveRecord
D
Douwe Maan 已提交
89

F
Felipe Artur 已提交
90 91 92 93 94 95 96 97 98 99 100 101 102
  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

D
Douwe Maan 已提交
103 104 105
  def define_diff_comment_vars
    @new_diff_note_attrs = {
      noteable_type: 'MergeRequest',
106 107
      noteable_id: @merge_request.id,
      commit_id: @commit&.id
D
Douwe Maan 已提交
108 109 110 111 112 113 114
    }

    @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)
115
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
D
Douwe Maan 已提交
116
  end
117 118 119 120 121 122

  def renderable_notes
    define_diff_comment_vars unless @notes

    @notes
  end
D
Douwe Maan 已提交
123
end