From dee80e48dd5f6ad9a7801468f69b89aff22bd850 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Fri, 28 Feb 2025 16:42:20 +0100 Subject: [PATCH] Refactor @user_or_group to @group It's never a user... --- .../webui/groups/bs_requests_controller.rb | 18 +++++++++--------- .../webui/users/bs_requests_controller.rb | 7 +------ .../bs_requests/_breadcrumb_items.html.haml | 2 +- .../webui/groups/bs_requests/index.html.haml | 4 ++-- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/api/app/controllers/webui/groups/bs_requests_controller.rb b/src/api/app/controllers/webui/groups/bs_requests_controller.rb index 9f5b2020390..e767dd89525 100644 --- a/src/api/app/controllers/webui/groups/bs_requests_controller.rb +++ b/src/api/app/controllers/webui/groups/bs_requests_controller.rb @@ -25,7 +25,7 @@ def index end format.json do parsed_params = BsRequest::DataTable::ParamsParser.new(params).parsed_params - requests_query = BsRequest::DataTable::FindForUserOrGroupQuery.new(@user_or_group, request_method, parsed_params) + requests_query = BsRequest::DataTable::FindForUserOrGroupQuery.new(@group, request_method, parsed_params) @requests_data_table = BsRequest::DataTable::Table.new(requests_query, parsed_params[:draw]) render 'webui/shared/bs_requests/index' @@ -36,7 +36,7 @@ def index private def set_group - @user_or_group = Group.find_by_title!(params[:group_title]) + @group = Group.find_by_title!(params[:group_title]) end def request_method @@ -46,7 +46,7 @@ def request_method def set_bs_request return unless Flipper.enabled?(:request_index, User.session) - @bs_requests = @user_or_group.requests + @bs_requests = @group.requests end def filter_involvement @@ -56,17 +56,17 @@ def filter_involvement @bs_requests = case when @selected_filter['involvement'].include?('incoming') - @bs_requests.where(bs_request_actions: { target_project_id: @user_or_group.involved_projects }) - .or(@bs_requests.where(bs_request_actions: { target_package_id: @user_or_group.involved_packages })) + @bs_requests.where(bs_request_actions: { target_project_id: @group.involved_projects }) + .or(@bs_requests.where(bs_request_actions: { target_package_id: @group.involved_packages })) when @selected_filter['involvement'].include?('review') - @bs_requests.where(reviews: { group: @user_or_group }) - .or(@bs_requests.where(reviews: { project: @user_or_group.involved_projects })) - .or(@bs_requests.where(reviews: { package: @user_or_group.involved_packages })) + @bs_requests.where(reviews: { group: @group }) + .or(@bs_requests.where(reviews: { project: @group.involved_projects })) + .or(@bs_requests.where(reviews: { package: @group.involved_packages })) end end def redirect_legacy - redirect_to(group_path(@user_or_group)) unless Flipper.enabled?(:request_index, User.session) || request.format.json? + redirect_to(group_path(@group)) unless Flipper.enabled?(:request_index, User.session) || request.format.json? end end end diff --git a/src/api/app/controllers/webui/users/bs_requests_controller.rb b/src/api/app/controllers/webui/users/bs_requests_controller.rb index c8e7a5f349b..bcba732d515 100644 --- a/src/api/app/controllers/webui/users/bs_requests_controller.rb +++ b/src/api/app/controllers/webui/users/bs_requests_controller.rb @@ -3,7 +3,6 @@ module Users class BsRequestsController < WebuiController before_action :redirect_legacy before_action :require_login - before_action :set_user before_action :set_bs_requests include Webui::RequestsFilter @@ -26,7 +25,7 @@ def index # TODO: Remove this old index action when request_index feature is rolled-over format.json do parsed_params = BsRequest::DataTable::ParamsParser.new(params).parsed_params - requests_query = BsRequest::DataTable::FindForUserOrGroupQuery.new(@user_or_group, request_method, parsed_params) + requests_query = BsRequest::DataTable::FindForUserOrGroupQuery.new(User.session, request_method, parsed_params) @requests_data_table = BsRequest::DataTable::Table.new(requests_query, parsed_params[:draw]) render 'webui/shared/bs_requests/index' @@ -62,10 +61,6 @@ def filter_involvement end end - def set_user - @user_or_group = User.session - end - def request_method REQUEST_METHODS[params[:dataTableId]] || :requests end diff --git a/src/api/app/views/webui/groups/bs_requests/_breadcrumb_items.html.haml b/src/api/app/views/webui/groups/bs_requests/_breadcrumb_items.html.haml index 5f23430ad1d..0ca35f40f36 100644 --- a/src/api/app/views/webui/groups/bs_requests/_breadcrumb_items.html.haml +++ b/src/api/app/views/webui/groups/bs_requests/_breadcrumb_items.html.haml @@ -4,4 +4,4 @@ - else Groups %li.breadcrumb-item.active{ 'aria-current' => 'page' } - = @user_or_group + = @group diff --git a/src/api/app/views/webui/groups/bs_requests/index.html.haml b/src/api/app/views/webui/groups/bs_requests/index.html.haml index 3ea26bc16a5..4cdeaa9b86a 100644 --- a/src/api/app/views/webui/groups/bs_requests/index.html.haml +++ b/src/api/app/views/webui/groups/bs_requests/index.html.haml @@ -4,10 +4,10 @@ %div %ul.card-header.nav.nav-tabs.pt-2.px-3.pb-0.flex-nowrap %li.nav-item - = link_to(group_path(@user_or_group), class: 'nav-link', title: 'Requests') do + = link_to(group_path(@group), class: 'nav-link', title: 'Requests') do Group Members %span.badge.text-bg-primary - = @user_or_group.users.size + = @group.users.size %li.nav-item %a.nav-link.active Group Requests