Merge pull request #17302 from ncounter/request-list-with-description

Unify request description of list page and detail page

Author: ncounter

src/api/app/components/bs_request_action_description_component.rb

@@ -1,35 +1,46 @@
 # This component renders the request action description based on the type of the action
 
 class BsRequestActionDescriptionComponent < ApplicationComponent
-  attr_reader :action
+  attr_reader :action, :text_only
 
   delegate :project_or_package_link, to: :helpers
   delegate :user_with_realname_and_icon, to: :helpers
   delegate :requester_str, to: :helpers
   delegate :creator_intentions, to: :helpers
 
-  def initialize(action:)
+  def initialize(action:, text_only: false)
     super
     @action = action
+    @text_only = text_only
   end
 
   # rubocop:disable Metrics/CyclomaticComplexity
   # rubocop:disable Rails/OutputSafety
   # rubocop:disable Style/FormatString
   def description
     creator = action.bs_request.creator
+
     source_project_hash = { project: action.source_project, package: action.source_package, trim_to: nil }
     target_project_hash = { project: action.target_project, package: action.target_package, trim_to: nil }
 
-    source_container = project_or_package_link(source_project_hash)
-    target_container = project_or_package_link(target_project_hash)
+    source_and_target_component = BsRequestActionSourceAndTargetComponent.new(action.bs_request)
+
+    if text_only
+      source_container = source_and_target_component.source
+      target_container = source_and_target_component.target
+    else
+      source_container = project_or_package_link(source_project_hash)
+      target_container = project_or_package_link(target_project_hash)
+    end
+
+    source_and_target_container = source_and_target_component.combine(source_container, target_container)
 
     description = case action.type
                   when 'submit'
-                    'Submit %{source_container} to %{target_container}' %
-                    { source_container: source_container, target_container: target_container }
+                    'Submit %{source_and_target_container}' % { source_and_target_container: source_and_target_container }
                   when 'delete'
-                    target_repository = "repository #{link_to(action.target_repository, repositories_path(target_project_hash))} for " if action.target_repository
+                    repository_content = text_only ? action.target_repository : link_to(action.target_repository, repositories_path(target_project_hash))
+                    target_repository = "repository #{repository_content} for " if action.target_repository
 
                     'Delete %{target_repository}%{target_container}' %
                     { target_repository: target_repository, target_container: target_container }
@@ -44,14 +55,14 @@ def description
                     'Set %{source_container} to be devel project/package of %{target_container}' %
                     { source_container: source_container, target_container: target_container }
                   when 'maintenance_incident'
-                    'Submit update from %{source_container} to %{target_container}' %
-                    { source_container: source_container, target_container: target_container }
+                    'Submit update from %{source_and_target_container}' %
+                    { source_and_target_container: source_and_target_container }
                   when 'maintenance_release'
-                    'Maintenance release %{source_container} to %{target_container}' %
-                    { source_container: source_container, target_container: target_container }
+                    'Maintenance release %{source_and_target_container}' %
+                    { source_and_target_container: source_and_target_container }
                   when 'release'
-                    'Release %{source_container} to %{target_container}' %
-                    { source_container: source_container, target_container: target_container }
+                    'Release %{source_and_target_container}' %
+                    { source_and_target_container: source_and_target_container }
                   end
 
     # HACK: this is just a porting of the already existing way of passing the string to the view

src/api/app/components/bs_request_action_source_and_target_component.rb

@@ -9,17 +9,9 @@ def initialize(bs_request)
   end
 
   def call
-    capture do
-      if source.present?
-        concat(tag.span(source))
-        concat(tag.i(nil, class: 'fas fa-long-arrow-alt-right text-info mx-2'))
-      end
-      concat(tag.span(target))
-    end
+    combine(source, target)
   end
 
-  private
-
   def source
     @source ||= if number_of_bs_request_actions > 1
                   ''
@@ -33,4 +25,14 @@ def target
 
     [bs_request_action.target_project, bs_request_action.target_package].compact.join(' / ')
   end
+
+  def combine(source, target)
+    capture do
+      if source.present?
+        concat(tag.span(source))
+        concat(tag.i(nil, class: 'fas fa-long-arrow-alt-right text-info mx-2'))
+      end
+      concat(tag.span(target))
+    end
+  end
 end

src/api/app/views/webui/shared/bs_requests/_request_item.html.haml

@@ -20,9 +20,13 @@
         .mb-1
           = render partial: 'webui/shared/label', collection: bs_request.labels, as: :label
       .mb-1
-        = render BsRequestActionSourceAndTargetComponent.new(bs_request)
-      .mb-2.request-index-description.text-truncate
-        = bs_request.description
+        - if bs_request_actions_count != 1
+          = render BsRequestActionSourceAndTargetComponent.new(bs_request)
+        - else
+          .mb-2.request-index-description.text-truncate
+            = render BsRequestActionDescriptionComponent.new(action: bs_request.bs_request_actions.first, text_only: true)
+        .mb-2.request-index-description.text-truncate
+          = bs_request.description
       .text-end
         %span
           = render AvatarComponent.new(name: bs_request.creator, email: User.find_by_login(bs_request.creator).email, custom_css: 'align-text-bottom')

src/api/spec/components/previews/bs_request_action_description_component_preview.rb

@@ -5,8 +5,33 @@ def submit_preview
     render(BsRequestActionDescriptionComponent.new(action: action))
   end
 
+  def submit_preview_text_only
+    action = BsRequestAction.where(type: :submit).last
+    render(BsRequestActionDescriptionComponent.new(action: action, text_only: true))
+  end
+
+  def delete_preview
+    action = BsRequestAction.where(type: :delete).last
+    render(BsRequestActionDescriptionComponent.new(action: action))
+  end
+
+  def delete_preview_text_only
+    action = BsRequestAction.where(type: :delete).last
+    render(BsRequestActionDescriptionComponent.new(action: action, text_only: true))
+  end
+
   def add_role_preview
     action = BsRequestAction.where(type: :add_role).first
     render(BsRequestActionDescriptionComponent.new(action: action))
   end
+
+  def change_devel_preview
+    action = BsRequestAction.where(type: :change_devel).first
+    render(BsRequestActionDescriptionComponent.new(action: action))
+  end
+
+  def change_devel_preview_text_only
+    action = BsRequestAction.where(type: :change_devel).first
+    render(BsRequestActionDescriptionComponent.new(action: action, text_only: true))
+  end
 end