Skip to content

Commit

Permalink
Add webui routes and view skeleton for request index
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 5d1eecb commit 6358df3
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/api/app/controllers/webui/request_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ class Webui::RequestController < Webui::WebuiController

after_action :verify_authorized, only: [:create]

def index
# TODO
end

def show
# TODO: Remove this `if` condition, and the `else` clause once request_show_redesign is rolled out
if Flipper.enabled?(:request_show_redesign, User.session)
Expand Down
26 changes: 17 additions & 9 deletions src/api/app/views/webui/request/_breadcrumb_items.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
:ruby
current_page = current_page?(request_show_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_build_results_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_rpm_lint_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_changes_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_mentioned_issues_path(@bs_request.number, params[:request_action_id]))
- if current_page
%li.breadcrumb-item.active{ 'aria-current' => 'page' }
Request #{@bs_request.number}
- if Flipper.enabled?(:request_index, User.session!)
- if action_name == 'index'
%li.breadcrumb-item.active{ 'aria-current' => 'page' }
Requests
- else
%li.breadcrumb-item
= link_to('Requests', requests_path)
- if @bs_request.present?
:ruby
current_page = current_page?(request_show_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_build_results_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_rpm_lint_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_changes_path(@bs_request.number, params[:request_action_id])) ||
current_page?(request_mentioned_issues_path(@bs_request.number, params[:request_action_id]))
- if current_page
%li.breadcrumb-item.active{ 'aria-current' => 'page' }
Request #{@bs_request.number}
Empty file.
2 changes: 1 addition & 1 deletion src/api/config/routes/webui.rb
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
get 'request/:number/complete_build_results' => :complete_build_results, as: 'request_complete_build_results', constraints: cons
end

resources :requests, only: [], param: :number, controller: 'webui/bs_requests' do
resources :requests, only: [:index], param: :number, controller: 'webui/request' do
member do
put :toggle_watched_item, controller: 'webui/watched_items'
put :toggle, controller: 'webui/action_seen_by_users'
Expand Down

0 comments on commit 6358df3

Please sign in to comment.