Deduplicate action and bs_request_action

src/api/app/controllers/webui/request_controller.rb

@@ -15,12 +15,10 @@ class Webui::RequestController < Webui::WebuiController
                                         if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
   before_action :set_action_id, only: %i[inline_comment show build_results rpm_lint changes mentioned_issues],
                                 if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
-  before_action :set_bs_request_action, only: %i[show build_results rpm_lint changes mentioned_issues],
-                                        if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
-  before_action :set_influxdb_data_request_actions, only: %i[show build_results rpm_lint changes mentioned_issues],
-                                                    if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
   before_action :set_action, only: %i[inline_comment show build_results rpm_lint changes mentioned_issues],
                              if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
+  before_action :set_influxdb_data_request_actions, only: %i[show build_results rpm_lint changes mentioned_issues],
+                                                    if: -> { Flipper.enabled?(:request_show_redesign, User.session) }
   before_action :set_superseded_request, only: %i[show request_action request_action_changes build_results rpm_lint changes mentioned_issues]
   before_action :check_ajax, only: :sourcediff
   before_action :prepare_request_data, only: %i[show build_results rpm_lint changes mentioned_issues],
@@ -281,15 +279,15 @@ def inline_comment
   end
 
   def build_results
-    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @bs_request_action.tab_visibility.build
+    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @action.tab_visibility.build
 
     @active_tab = 'build_results'
     @project = @staging_project || @action.source_project
     @buildable = @action.source_package || @project
   end
 
   def rpm_lint
-    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @bs_request_action.tab_visibility.rpm_lint
+    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @action.tab_visibility.rpm_lint
 
     @active_tab = 'rpm_lint'
     @ajax_data = {}
@@ -299,13 +297,13 @@ def rpm_lint
   end
 
   def changes
-    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @bs_request_action.tab_visibility.changes
+    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @action.tab_visibility.changes
 
     @active_tab = 'changes'
   end
 
   def mentioned_issues
-    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @bs_request_action.tab_visibility.issues
+    redirect_to request_show_path(params[:number], params[:request_action_id]) unless @action.tab_visibility.issues
 
     @active_tab = 'mentioned_issues'
   end
@@ -485,10 +483,6 @@ def set_action_id
     @action_id = params[:request_action_id] || @supported_actions.first&.id || @actions.first.id
   end
 
-  def set_bs_request_action
-    @bs_request_action = @bs_request.bs_request_actions.find(@action_id)
-  end
-
   def set_action
     @action = @actions.find(@action_id)
   end
@@ -562,7 +556,7 @@ def prepare_request_data
 
   def set_influxdb_data_request_actions
     InfluxDB::Rails.current.tags = {
-      bs_request_action_type: @bs_request_action.class.name
+      bs_request_action_type: @action.class.name
     }
   end
 end

src/api/app/views/webui/request/_request_tabs.html.haml

@@ -3,19 +3,19 @@
     %li.nav-item.scrollable-tab-link
       = link_to('Conversation', request_show_path(bs_request.number, actions_count > 1 ? action : nil),
                 class: "nav-link text-nowrap #{active_tab == 'conversation' ? 'active' : ''}")
-    - if bs_request_action.tab_visibility.build
+    - if action.tab_visibility.build
       %li.nav-item.scrollable-tab-link.active
         = link_to('Build Results', request_build_results_path(bs_request.number, actions_count > 1 ? action : nil),
                   class: "nav-link text-nowrap #{active_tab == 'build_results' ? 'active' : ''}")
-    - if bs_request_action.tab_visibility.rpm_lint
+    - if action.tab_visibility.rpm_lint
       %li.nav-item.scrollable-tab-link
         = link_to('RPM Lint', request_rpm_lint_path(bs_request.number, actions_count > 1 ? action : nil),
                   class: "nav-link text-nowrap #{active_tab == 'rpm_lint' ? 'active' : ''}")
-    - if bs_request_action.tab_visibility.changes
+    - if action.tab_visibility.changes
       %li.nav-item.scrollable-tab-link
         = link_to('Changes', request_changes_path(bs_request.number, actions_count > 1 ? action : nil),
                   class: "nav-link text-nowrap #{active_tab == 'changes' ? 'active' : ''}")
-    - if bs_request_action.tab_visibility.issues
+    - if action.tab_visibility.issues
       %li.nav-item.scrollable-tab-link
         = link_to(request_mentioned_issues_path(bs_request.number, actions_count > 1 ? action : nil),
                   class: "nav-link text-nowrap #{active_tab == 'mentioned_issues' ? 'active' : ''}") do

src/api/app/views/webui/request/beta_show.html.haml

@@ -14,7 +14,7 @@
                   diff_to_superseded_id: @diff_to_superseded_id, page_name: '',
                   bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
     = render partial: 'request_tabs',
-        locals: { bs_request: @bs_request, bs_request_action: @bs_request_action, issues: @issues, action: @action,
+        locals: { bs_request: @bs_request, action: @action, issues: @issues,
                   actions_count: @supported_actions.count, active_tab: @active_tab }
     .container.p-4
       .row

src/api/app/views/webui/request/build_results.html.haml

@@ -11,7 +11,7 @@
                   diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_build_results',
                   bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
     = render partial: 'request_tabs',
-        locals: { bs_request: @bs_request, bs_request_action: @bs_request_action, issues: @issues, action: @action,
+        locals: { bs_request: @bs_request, action: @action, issues: @issues,
                   actions_count: @supported_actions.count, active_tab: @active_tab }
     .container.p-4
       - if @buildable

src/api/app/views/webui/request/changes.html.haml

@@ -11,7 +11,7 @@
                   diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_changes',
                   bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
     = render partial: 'request_tabs',
-        locals: { bs_request: @bs_request, bs_request_action: @bs_request_action, issues: @issues, action: @action,
+        locals: { bs_request: @bs_request, action: @action, issues: @issues,
                   actions_count: @supported_actions.count, active_tab: @active_tab }
     .container.p-4
       .tab-content.sourcediff

src/api/app/views/webui/request/mentioned_issues.html.haml

@@ -11,7 +11,7 @@
                   diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_mentioned_issues',
                   bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
     = render partial: 'request_tabs',
-        locals: { bs_request: @bs_request, bs_request_action: @bs_request_action, issues: @issues, action: @action,
+        locals: { bs_request: @bs_request, action: @action, issues: @issues,
                   actions_count: @supported_actions.count, active_tab: @active_tab }
     .container.p-4
       - if @issues.empty?

src/api/app/views/webui/request/rpm_lint.html.haml

@@ -11,7 +11,7 @@
                   diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_rpm_lint',
                   bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
     = render partial: 'request_tabs',
-        locals: { bs_request: @bs_request, bs_request_action: @bs_request_action, issues: @issues, action: @action,
+        locals: { bs_request: @bs_request, action: @action, issues: @issues,
                   actions_count: @supported_actions.count, active_tab: @active_tab }
     .container.p-4
       - if @action.source_package