Merge pull request #14118 from ncounter/request-status-watch-list

BsRequest state as a hint in the watchlist
openSUSE · Apr 11, 2023 · cc1b9fc · cc1b9fc
2 parents 40da70d + 7986fc1
commit cc1b9fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/api/app/components/bs_request_state_badge_component.rb b/src/api/app/components/bs_request_state_badge_component.rb
@@ -7,7 +7,10 @@ def initialize(bs_request:, css_class: nil)
   end
 
   def call
-    tag.span(@bs_request.state,
-             class: ['badge', "bg-#{helpers.request_badge_color(@bs_request.state)}", @css_class])
+    content_tag(
+      :span,
+      tag.i(class: 'fas fa-code-pull-request me-1').concat(@bs_request.state),
+      class: ['badge', "bg-#{helpers.request_badge_color(@bs_request.state)}", @css_class]
+    )
   end
 end
diff --git a/src/api/app/components/watched_items_list_component.html.haml b/src/api/app/components/watched_items_list_component.html.haml
@@ -38,7 +38,7 @@
         - name = "##{item.number} #{helpers.request_type_of_action(item)}"
         .d-flex.flex-row.flex-wrap.align-items-baseline.collapsible-tooltip-parent
           = link_to(request_show_path(item.number), class: 'text-word-break-all') do
-            %i.fas.fa-code-pull-request.me-1
+            = render BsRequestStateBadgeComponent.new(bs_request: item)
             = name
           %i.fa.fa-question-circle.text-light.px-2.collapsible-tooltip{ title: 'Click to keep it open' }
           = link_to('#', class: 'text-light ms-auto',
@@ -51,7 +51,6 @@
         .extended-info.mt-2.mb-3.collapsed
           .triangle.left
           .extended-info-content
-            = render BsRequestStateBadgeComponent.new(bs_request: item, css_class: 'mt-2 ms-2')
             %p.px-2.pt-2= render(BsRequestActionSourceAndTargetComponent.new(item))
 - else
   %p.text-muted= empty_list_text