Skip to content

Commit c7b408a

Browse files
committed
List all request actions into a separated tab page
1 parent 75a4cdd commit c7b408a

File tree

8 files changed

+44
-20
lines changed

8 files changed

+44
-20
lines changed

src/api/app/components/bs_request_description_component.rb renamed to src/api/app/components/bs_request_actions_component.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This component renders the request description based on the type of the actions
22

3-
class BsRequestDescriptionComponent < ApplicationComponent
3+
class BsRequestActionsComponent < ApplicationComponent
44
attr_reader :bs_request, :types
55

66
def initialize(bs_request:)

src/api/app/controllers/webui/request_controller.rb

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,29 @@ class Webui::RequestController < Webui::WebuiController
77

88
before_action :require_login,
99
except: %i[show beta_show sourcediff diff request_action request_action_changes request_action_details inline_comment build_results
10-
changes changes_diff mentioned_issues chart_build_results complete_build_results]
10+
changes changes_diff mentioned_issues chart_build_results complete_build_results request_actions]
1111
# requests do not really add much value for our page rank :)
1212
before_action :lockout_spiders
1313
before_action :require_request,
1414
only: %i[changerequest show beta_show request_action request_action_changes request_action_details inline_comment build_results
15-
changes changes_diff mentioned_issues chart_build_results complete_build_results]
16-
before_action :set_actions, only: %i[inline_comment beta_show build_results changes changes_diff mentioned_issues chart_build_results complete_build_results request_action_changes request_action_details],
15+
changes changes_diff mentioned_issues chart_build_results complete_build_results request_actions]
16+
before_action :set_actions, only: %i[inline_comment beta_show build_results changes changes_diff mentioned_issues chart_build_results
17+
complete_build_results request_action_changes request_action_details request_actions],
1718
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
1819
before_action :set_actions_deprecated, only: [:show]
1920
before_action :set_action, only: %i[inline_comment beta_show build_results changes changes_diff mentioned_issues request_action_details request_action_changes],
2021
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
21-
before_action :set_influxdb_data_request_actions, only: %i[beta_show build_results changes changes_diff mentioned_issues],
22+
before_action :set_influxdb_data_request_actions, only: %i[beta_show build_results changes changes_diff mentioned_issues request_actions],
2223
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
23-
before_action :set_superseded_request, only: %i[show beta_show request_action request_action_changes build_results changes changes_diff mentioned_issues]
24+
before_action :set_superseded_request, only: %i[show beta_show request_action request_action_changes build_results changes changes_diff mentioned_issues request_actions]
2425
before_action :check_ajax, only: :sourcediff
25-
before_action :prepare_request_data, only: %i[beta_show build_results changes mentioned_issues],
26+
before_action :prepare_request_data, only: %i[beta_show build_results changes mentioned_issues request_actions],
2627
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
27-
before_action :prepare_request_header_data, only: %i[beta_show build_results changes mentioned_issues],
28+
before_action :prepare_request_header_data, only: %i[beta_show build_results changes mentioned_issues request_actions],
2829
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
2930
before_action :cache_diff_data, only: %i[changes request_action_changes],
3031
if: -> { Flipper.enabled?(:request_show_redesign, User.possibly_nobody) }
31-
before_action :check_beta_user_redirect, only: %i[beta_show build_results changes mentioned_issues changes_diff]
32+
before_action :check_beta_user_redirect, only: %i[beta_show build_results changes mentioned_issues changes_diff request_actions]
3233

3334
after_action :verify_authorized, only: [:create]
3435

@@ -331,6 +332,10 @@ def build_results
331332
@buildable = @action.source_package || @project
332333
end
333334

335+
def request_actions
336+
@active_tab = 'actions'
337+
end
338+
334339
def changes
335340
@active_tab = 'changes'
336341
end

src/api/app/views/webui/request/_request_header.html.haml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
current_object: bs_request)
2020

2121
-# author + datetime + (if superseding -> "Superseds something")
22-
.card-text.px-4.pb-4
22+
.card-text.px-4
2323
%p.fst-italic
2424
Created by
2525
= user_with_realname_and_icon(bs_request.creator)
@@ -70,10 +70,6 @@
7070
This is a
7171
%mark.text-light.bg-maintenance.text-nowrap.text Maintenance Release
7272
request
73-
.mt-4
74-
%h5.mt-4
75-
Actions
76-
= render BsRequestDescriptionComponent.new(bs_request:)
7773
- if Flipper.enabled?(:labels, User.session)
7874
.mt-4
7975
= render partial: 'webui/shared/label', collection: bs_request.labels, as: :label

src/api/app/views/webui/request/_request_tabs.html.haml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
%li.nav-item.scrollable-tab-link.active
88
= link_to('Build Results', request_build_results_path(bs_request.number),
99
class: "nav-link text-nowrap #{active_tab == 'build_results' ? 'active' : ''}")
10+
%li.nav-item.scrollable-tab-link
11+
= link_to('Actions', request_actions_path(bs_request.number),
12+
class: "nav-link text-nowrap #{active_tab == 'actions' ? 'active' : ''}")
1013
%li.nav-item.scrollable-tab-link
1114
= link_to(request_changes_path(bs_request.number, actions_count > 1 ? action : nil),
1215
class: "nav-link text-nowrap #{active_tab == 'changes' ? 'active' : ''}") do
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
:ruby
2+
@pagetitle = "Request #{@bs_request.number}: #{@action.name}"
3+
4+
.card
5+
.card-body.p-0
6+
= render partial: 'request_header',
7+
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
8+
prev_action: @prev_action, next_action: @next_action, actions: @actions,
9+
diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_actions',
10+
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects,
11+
current_notification: @current_notification }
12+
= render partial: 'request_tabs',
13+
locals: { bs_request: @bs_request, action: @action, issues: @issues,
14+
actions_count: @actions.count, active_tab: @active_tab }
15+
16+
.container.p-4
17+
%h5
18+
Actions
19+
= render BsRequestActionsComponent.new(bs_request: @bs_request)

src/api/config/routes/webui.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
# We can't apply the filename constraint, it prevents the use of `/` in file names.
327327
get 'requests/:number/actions/:request_action_id/changes/*filename' => :changes_diff, as: 'request_changes_diff', format: false, constraints: cons.except(:filename)
328328
get 'requests/:number/(actions/:request_action_id)/mentioned_issues' => :mentioned_issues, as: 'request_mentioned_issues', constraints: cons
329+
get 'requests/:number/(actions/:request_action_id)/actions' => :request_actions, as: 'request_actions', constraints: cons
329330
post 'request/sourcediff' => :sourcediff
330331
post 'request/changerequest' => :changerequest
331332
get 'request/diff/:number' => :diff
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
class BsRequestDescriptionComponentPreview < ViewComponent::Preview
2-
# Previews at http://HOST:PORT/rails/view_components/bs_request_description_component
1+
class BsRequestActionsComponentPreview < ViewComponent::Preview
2+
# Previews at http://HOST:PORT/rails/view_components/bs_request_actions_component
33
def submit_preview
44
bs_request = BsRequestAction.where(type: :submit).last.bs_request
5-
render(BsRequestDescriptionComponent.new(bs_request: bs_request))
5+
render(BsRequestActionsComponent.new(bs_request: bs_request))
66
end
77

88
def delete_preview
99
bs_request = BsRequestAction.where(type: :delete).last.bs_request
10-
render(BsRequestDescriptionComponent.new(bs_request: bs_request))
10+
render(BsRequestActionsComponent.new(bs_request: bs_request))
1111
end
1212

1313
def add_role_preview
1414
bs_request = BsRequestAction.where(type: :add_role).last.bs_request
15-
render(BsRequestDescriptionComponent.new(bs_request: bs_request))
15+
render(BsRequestActionsComponent.new(bs_request: bs_request))
1616
end
1717

1818
def change_devel_preview
1919
bs_request = BsRequestAction.where(type: :change_devel).last.bs_request
20-
render(BsRequestDescriptionComponent.new(bs_request: bs_request))
20+
render(BsRequestActionsComponent.new(bs_request: bs_request))
2121
end
2222
end

0 commit comments

Comments
 (0)