Merge pull request #14084 from saraycp/refactor_supported_actions_code

Set supported actions only once
openSUSE · Mar 30, 2023 · 01044e2 · 01044e2
2 parents d01b565 + fb90c2b
commit 01044e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/api/app/views/webui/request/_actions_details.html.haml b/src/api/app/views/webui/request/_actions_details.html.haml
@@ -1,8 +1,5 @@
-:ruby
-  submit_actions = bs_request.bs_request_actions.where(type: [:add_role, :submit])
-  submit_actions_count = submit_actions.count
 
-- if submit_actions_count > 1
+- if actions_count > 1
   .d-flex.flex-wrap.align-items-center
     .input-group.w-auto
       = link_to('Previous', request_show_path(number: bs_request.number, request_action_id: prev_action&.id,
@@ -20,7 +17,7 @@
                 %span Seen
               %span Action
               %span.float-end Revision
-          - submit_actions.each_with_index do |action_item, action_index|
+          - actions.each_with_index do |action_item, action_index|
             %li.border-top
               = link_to((render partial: 'action_text', locals: { action: action_item, action_index: action_index }),
                                                         request_show_path(number: bs_request.number,
@@ -34,12 +31,11 @@
                 class: "btn btn-primary btn-sm #{next_action ? '' : 'disabled'}",
                 id: 'next-action-button')
 
-    - active_action_index = submit_actions.find_index(active_action) + 1
-    %span.ms-2 Showing ##{active_action_index} (of #{submit_actions_count})
-
+    - active_action_index = actions.find_index(active_action) + 1
+    %span.ms-2 Showing ##{active_action_index} (of #{actions_count})
 %h5.mt-4
   Action details
-  - if submit_actions_count > 1 && User.session
+  - if actions_count > 1 && User.session
     %span#action-seen-by-user-wrapper
       = render ActionSeenByUserComponent.new(action: active_action, user: User.session!)
 

diff --git a/src/api/app/views/webui/request/beta_show.html.haml b/src/api/app/views/webui/request/beta_show.html.haml
@@ -73,8 +73,10 @@
               = render TimeComponent.new(time: @bs_request.accept_at)
       .mt-4
         -# action description, prev + dropdown select + next
+           TODO: once we support all types of actions, we have to send @actions instead of @supported_actions
         = render partial: 'actions_details', locals: { bs_request: @bs_request, action: @action, active_action: @active_action,
                                                        prev_action: @prev_action, next_action: @next_action,
+                                                       actions: @supported_actions, actions_count: @supported_actions.count,
                                                        diff_to_superseded_id: @diff_to_superseded_id, diff_limit: @diff_limit }
 
     .border-bottom