239 lines
7.1 KiB
Ruby
239 lines
7.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
|
|
include DiffHelper
|
|
include RendersNotes
|
|
include Gitlab::Cache::Helpers
|
|
include Gitlab::Tracking::Helpers
|
|
|
|
before_action :commit
|
|
before_action :define_diff_vars
|
|
before_action :define_diff_comment_vars, except: [:diffs_batch, :diffs_metadata]
|
|
before_action :update_diff_discussion_positions!
|
|
|
|
around_action :allow_gitaly_ref_name_caching
|
|
|
|
after_action :track_viewed_diffs_events, only: [:diffs_batch]
|
|
|
|
urgency :low, [
|
|
:show,
|
|
:diff_for_path,
|
|
:diffs_batch,
|
|
:diffs_metadata
|
|
]
|
|
|
|
def show
|
|
render_diffs
|
|
end
|
|
|
|
def diff_for_path
|
|
render_diffs
|
|
end
|
|
|
|
# rubocop: disable Metrics/AbcSize
|
|
def diffs_batch
|
|
diff_options_hash = diff_options
|
|
diff_options_hash[:paths] = params[:paths] if params[:paths]
|
|
|
|
diffs = @compare.diffs_in_batch(params[:page], params[:per_page], diff_options: diff_options_hash)
|
|
unfoldable_positions = @merge_request.note_positions_for_paths(diffs.diff_file_paths, current_user).unfoldable
|
|
|
|
options = {
|
|
merge_request: @merge_request,
|
|
commit: commit,
|
|
diff_view: diff_view,
|
|
merge_ref_head_diff: render_merge_ref_head_diff?,
|
|
pagination_data: diffs.pagination_data,
|
|
merge_conflicts_in_diff: display_merge_conflicts_in_diff?
|
|
}
|
|
|
|
# NOTE: Any variables that would affect the resulting json needs to be added to the cache_context to avoid stale cache issues.
|
|
cache_context = [
|
|
current_user&.cache_key,
|
|
unfoldable_positions.map(&:to_h),
|
|
diff_view,
|
|
params[:w],
|
|
params[:expanded],
|
|
params[:page],
|
|
params[:per_page],
|
|
options[:merge_ref_head_diff],
|
|
options[:merge_conflicts_in_diff]
|
|
]
|
|
|
|
return unless stale?(etag: [cache_context + diff_options_hash.fetch(:paths, []), diffs])
|
|
|
|
diffs.unfold_diff_files(unfoldable_positions)
|
|
diffs.write_cache
|
|
|
|
render json: PaginatedDiffSerializer.new(current_user: current_user).represent(diffs, options)
|
|
end
|
|
# rubocop: enable Metrics/AbcSize
|
|
|
|
def diffs_metadata
|
|
diffs = @compare.diffs(diff_options)
|
|
|
|
options = additional_attributes.merge(
|
|
only_context_commits: show_only_context_commits?,
|
|
merge_ref_head_diff: render_merge_ref_head_diff?,
|
|
merge_conflicts_in_diff: display_merge_conflicts_in_diff?
|
|
)
|
|
|
|
render json: DiffsMetadataSerializer.new(project: @merge_request.project, current_user: current_user)
|
|
.represent(diffs, options)
|
|
end
|
|
|
|
private
|
|
|
|
def preloadable_mr_relations
|
|
[{ source_project: :namespace }, { target_project: :namespace }]
|
|
end
|
|
|
|
# Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
|
|
def render_diffs
|
|
diffs = @compare.diffs(diff_options)
|
|
|
|
diffs.unfold_diff_files(note_positions.unfoldable)
|
|
diffs.write_cache
|
|
|
|
request = {
|
|
current_user: current_user,
|
|
project: @merge_request.project,
|
|
render: ->(partial, locals) { view_to_html_string(partial, locals) }
|
|
}
|
|
|
|
options = additional_attributes.merge(
|
|
diff_view: "inline",
|
|
merge_ref_head_diff: render_merge_ref_head_diff?,
|
|
merge_conflicts_in_diff: display_merge_conflicts_in_diff?
|
|
)
|
|
|
|
options[:context_commits] = @merge_request.recent_context_commits
|
|
|
|
render json: DiffsSerializer.new(request).represent(diffs, options)
|
|
end
|
|
|
|
# Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
|
|
def define_diff_vars
|
|
@merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc
|
|
@compare = commit || find_merge_request_diff_compare
|
|
return render_404 unless @compare
|
|
end
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def commit
|
|
return unless commit_id = params[:commit_id].presence
|
|
return unless @merge_request.all_commits.exists?(sha: commit_id) || @merge_request.recent_context_commits.map(&:id).include?(commit_id)
|
|
|
|
@commit ||= @project.commit(commit_id)
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
#
|
|
# Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
|
|
def find_merge_request_diff_compare
|
|
@merge_request_diff =
|
|
if params[:diff_id].present?
|
|
@merge_request.merge_request_diffs.viewable.find_by(id: params[:diff_id])
|
|
else
|
|
@merge_request.merge_request_diff
|
|
end
|
|
|
|
return unless @merge_request_diff&.id
|
|
|
|
@comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }
|
|
|
|
if @start_sha = params[:start_sha].presence
|
|
@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
|
|
|
|
return @merge_request.context_commits_diff if show_only_context_commits? && !@merge_request.context_commits_diff.empty?
|
|
return @merge_request.merge_head_diff if render_merge_ref_head_diff?
|
|
|
|
if @start_sha
|
|
@merge_request_diff.compare_with(@start_sha)
|
|
else
|
|
@merge_request_diff
|
|
end
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def additional_attributes
|
|
{
|
|
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
|
|
|
|
# Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
|
|
def define_diff_comment_vars
|
|
@new_diff_note_attrs = {
|
|
noteable_type: 'MergeRequest',
|
|
noteable_id: @merge_request.id,
|
|
commit_id: @commit&.id
|
|
}
|
|
|
|
@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)
|
|
@notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes), @merge_request)
|
|
end
|
|
|
|
def render_merge_ref_head_diff?
|
|
params[:diff_id].blank? &&
|
|
Gitlab::Utils.to_boolean(params[:diff_head]) &&
|
|
@merge_request.diffable_merge_ref? &&
|
|
@start_sha.nil?
|
|
end
|
|
|
|
def note_positions
|
|
@note_positions ||= Gitlab::Diff::PositionCollection.new(renderable_notes.map(&:position))
|
|
end
|
|
|
|
def renderable_notes
|
|
define_diff_comment_vars unless @notes
|
|
|
|
draft_notes =
|
|
if current_user
|
|
merge_request.draft_notes.authored_by(current_user)
|
|
else
|
|
[]
|
|
end
|
|
|
|
@notes.concat(draft_notes)
|
|
end
|
|
|
|
def update_diff_discussion_positions!
|
|
return if @merge_request.has_any_diff_note_positions?
|
|
|
|
Discussions::CaptureDiffNotePositionsService.new(@merge_request).execute
|
|
end
|
|
|
|
def track_viewed_diffs_events
|
|
return if dnt_enabled?
|
|
|
|
Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter
|
|
.track_mr_diffs_action(merge_request: @merge_request)
|
|
|
|
return unless current_user&.view_diffs_file_by_file
|
|
|
|
Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter
|
|
.track_mr_diffs_single_file_action(merge_request: @merge_request, user: current_user)
|
|
end
|
|
|
|
def display_merge_conflicts_in_diff?
|
|
Feature.enabled?(:display_merge_conflicts_in_diff, @merge_request.project)
|
|
end
|
|
end
|