Skip to content

Commit

Permalink
Build new request item view
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Donisa <daniel.donisa@suse.com>
Co-authored-by: Dario Leidi <dleidi@suse.com>
Co-authored-by: Eduardo Navarro <enavarro@suse.com>
Co-authored-by: Jacob Michalskie <jacob.michalskie@suse.com>
Co-authored-by: Lukas Krause <lkrause@suse.de>
Co-authored-by: Rubhan Azeem <rubhan.azeem@suse.com>
  • Loading branch information
6 people committed Jul 17, 2024
1 parent 7d524bb commit 9d01d07
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/api/app/controllers/webui/request_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Webui::RequestController < Webui::WebuiController
after_action :verify_authorized, only: [:create]

def index
@bs_requests = []
@bs_requests = BsRequest.all.page(params[:page])
end

def show
Expand Down
37 changes: 37 additions & 0 deletions src/api/app/views/webui/request/_request_item.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.row
.col-auto
%i.fas.fa-code-pull-request
.col
.d-flex.justify-content-between
%strong
- if bs_request.bs_request_actions.count == 1
= bs_request.bs_request_actions.first.class.sti_name.to_s.humanize.titleize
- else
Multiple Action
Request #{bs_request.number}
= render BsRequestStateBadgeComponent.new(state: bs_request.state, css_class: 'mb-auto')
%div
- if bs_request.bs_request_actions.count == 1
- if bs_request.bs_request_actions.first.source_project.present?
= render BsRequestActionSourceAndTargetComponent.new(bs_request)
%div
= render partial: 'webui/shared/collapsible_text', locals: { text: 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')
= bs_request.creator
created
= render TimeComponent.new(time: bs_request.created_at)
- unless bs_request.bs_request_actions.count == 1
%span.ps-2
%i.fas.fa-list-check
= bs_request.bs_request_actions.count
actions
- if bs_request.comments.any?
%span.ps-2
%i.fas.fa-comment
= pluralize(bs_request.comments.count, 'comment')
- if bs_request.reviews.any?
%span.ps-2
%i.fas.fa-magnifying-glass
= pluralize(bs_request.reviews.count, 'reviews')
4 changes: 2 additions & 2 deletions src/api/app/views/webui/request/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
= render partial: 'webui/shared/loading', locals: { text: 'Loading...', wrapper_css: ['loading'] }
.col-md-8.col-lg-9.px-0.px-md-3#request-list
.card
.card-body
.list-group.list-group-flush
- if @bs_requests.blank?
.text-center
%p There are no requests available
Expand All @@ -22,7 +22,7 @@
%span.ms-3= page_entries_info(@bs_requests)
.pt-3#requests
- @bs_requests.each do |bs_request|
.border-bottom.py-2{ id: "request-heading#{bs_request.number}" }
= link_to(request_show_path(bs_request.number), class: 'list-group-item', id: "request-heading#{bs_request.number}") do
.mb-0
.row
= render partial: 'request_item', locals: { bs_request: bs_request }
Expand Down

0 comments on commit 9d01d07

Please sign in to comment.