Merge pull request #13727 from dmarcoux/authorization-accordion_revie…

…ws_component Only display AccordionReviewsComponent if the user can handle the request
openSUSE · Jan 19, 2023 · 731e47f · 731e47f
2 parents c6e11c1 + d0eb7b8
commit 731e47f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/api/app/components/accordion_reviews_component.rb b/src/api/app/components/accordion_reviews_component.rb
@@ -1,7 +1,8 @@
 class AccordionReviewsComponent < ApplicationComponent
-  def initialize(request_reviews, request_state)
+  def initialize(request_reviews, request_state, can_handle_request:)
     super
 
+    @can_handle_request = can_handle_request
     @accepted_reviews = request_reviews.select(&:accepted?)
     @accepted_reviews_count = @accepted_reviews.size
     @pending_reviews = request_reviews.select(&:new?)
@@ -12,7 +13,8 @@ def initialize(request_reviews, request_state)
   end
 
   def render?
-    (@accepted_reviews_count + @pending_reviews_count + @declined_reviews_count).positive? &&
+    @can_handle_request &&
+      (@accepted_reviews_count + @pending_reviews_count + @declined_reviews_count).positive? &&
       # Declined is not really a final state, since the request can always be reopened...
       (BsRequest::FINAL_REQUEST_STATES.exclude?(@request_state) || @request_state == :declined)
   end

diff --git a/src/api/app/views/webui/request/beta_show_tabs/_conversation.html.haml b/src/api/app/views/webui/request/beta_show_tabs/_conversation.html.haml
@@ -79,7 +79,7 @@
           %strong auto-accepted
           in #{time_ago_in_words(bs_request.accept_at)}.
 
-    = render AccordionReviewsComponent.new(request_reviews, bs_request.state)
+    = render AccordionReviewsComponent.new(request_reviews, bs_request.state, can_handle_request: policy(bs_request).handle_request?)
 
     = render RequestDecisionComponent.new(bs_request: bs_request, action: action,
                                           is_target_maintainer: is_target_maintainer,

diff --git a/src/api/spec/components/previews/accordion_reviews_component_preview.rb b/src/api/spec/components/previews/accordion_reviews_component_preview.rb
@@ -4,6 +4,6 @@ def preview
     pending_reviews = Review.opened.take(3)
     accepted_reviews = Review.accepted.take(2)
     declined_review = Review.declined.take(1)
-    render(AccordionReviewsComponent.new(pending_reviews + accepted_reviews + declined_review, :review))
+    render(AccordionReviewsComponent.new(pending_reviews + accepted_reviews + declined_review, :review, can_handle_request: true))
   end
 end