Merge pull request #14720 from ncounter/workflow-run-menu

Workflow run menu enhancements
openSUSE · Jul 28, 2023 · c851e47 · c851e47
2 parents 06a2cc4 + d662f1d
commit c851e47
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/api/app/components/workflow_run_filter_component.html.haml b/src/api/app/components/workflow_run_filter_component.html.haml
@@ -9,11 +9,11 @@
                                                                <p><b>Succeeded: </b>Workflow run execution was successful</p>
                                                                <p><b>Running: </b>Workflow run is still in progress</p>
                                                                <p><b>Failed: </b>Workflow run failed at some point</p>' } }
-  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Succeeded', amount: @count['success'],
+  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Succeeded', amount: @count['success'], icon: 'fas fa-check text-primary',
                                               filter_item: { status: 'success' }, selected_filter: @selected_filter)
-  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Running', amount: @count['running'],
+  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Running', amount: @count['running'], icon: 'fas fa-running',
                                               filter_item: { status: 'running' }, selected_filter: @selected_filter)
-  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Failed', amount: @count['fail'],
+  = render WorkflowRunFilterLinkComponent.new(token: @token, text: 'Failed', amount: @count['fail'], icon: 'fas fa-exclamation-triangle text-danger',
                                               filter_item: { status: 'fail' }, selected_filter: @selected_filter)
 .list-group.list-group-flush.mt-5.mb-2
   %h5.mx-3

diff --git a/src/api/app/components/workflow_run_filter_link_component.html.haml b/src/api/app/components/workflow_run_filter_link_component.html.haml
@@ -1,4 +1,7 @@
-= link_to(token_workflow_runs_path(@token, @filter_item), class: "list-group-item list-group-item-action #{css_for_link}") do
-  = @text
+= link_to(token_workflow_runs_path(@token, @filter_item),
+          class: "list-group-item list-group-item-action #{css_for_link} d-flex justify-content-between") do
+  %span
+    = icon_tag
+    = @text
   - if @amount.positive?
-    %span.badge.align-text-top.ms-2{ class: css_for_badge_color }>= @amount
+    %span= @amount
diff --git a/src/api/app/components/workflow_run_filter_link_component.rb b/src/api/app/components/workflow_run_filter_link_component.rb
@@ -1,20 +1,21 @@
 class WorkflowRunFilterLinkComponent < ApplicationComponent
-  def initialize(text:, filter_item:, selected_filter:, token:, amount:)
+  def initialize(text:, filter_item:, selected_filter:, token:, amount:, icon: '')
     super
 
     @text = text
     @filter_item = filter_item
     @selected_filter = selected_filter
     @amount = amount || 0
     @token = token
+    @icon = icon
   end
 
   def css_for_link
     workflow_run_filter_matches? ? 'active' : ''
   end
 
-  def css_for_badge_color
-    workflow_run_filter_matches? ? 'text-bg-light' : 'text-bg-primary'
+  def icon_tag
+    tag.i(class: ['me-1', @icon, ('text-light' if workflow_run_filter_matches?)]) if @icon != ''
   end
 
   private