Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions app/views/mission_control/jobs/shared/_pagination_toolbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
<nav class="buttons is-right" role="navigation" aria-label="pagination">
<span class="mr-3"><%= page.index %> / <%= page.pages_count || "..." %></span>
<%= link_to "Previous page", url_for(page: page.previous_index, **filter_param), class: "pagination-previous", disabled: page.first? %>
<%= link_to "Next page", url_for(page: page.next_index, **filter_param), class: "pagination-next", disabled: page.last? %>
<nav class="pagination is-centered is-small" role="navigation" aria-label="pagination">
<ul class="pagination-list">
<% unless page.first? %>
<li>
<%= link_to "1", url_for(page: 1, **filter_param), class: 'pagination-link', disabled: page.first? %>
</li>
<% unless (page.index - 1) == 1 %>
<li><span class="pagination-ellipsis">&hellip;</span></li>
<li>
<%= link_to page.previous_index, url_for(page: page.previous_index, **filter_param), class: 'pagination-link', disabled: page.first? %>
</li>
<% end
end %>
<li>
<a
class="pagination-link is-current"
aria-label="Page <%= page.index %>"
aria-current="page"
><%= page.index %></a
>
</li>
<% unless page.last? %>
<li>
<%= link_to page.next_index, url_for(page: page.next_index, **filter_param), class: 'pagination-link', disabled: page.last? %>
</li>
<% unless (page.index + 1) == page.pages_count %>
<li><span class="pagination-ellipsis">&hellip;</span></li>
<li>
<%= link_to page.pages_count, url_for(page: page.pages_count, **filter_param), class: 'pagination-link', disabled: page.last? %>
</li>
<% end
end %>
</ul>
</nav>
30 changes: 28 additions & 2 deletions test/controllers/workers_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,34 @@ class MissionControl::Jobs::WorkersControllerTest < ActionDispatch::IntegrationT
get mission_control_jobs.application_workers_url(@application)
assert_response :ok

assert_select "tr.worker", 2
assert_select "nav[aria-label=\"pagination\"]", /1 \/ 3/
assert_select "nav.pagination[role=\"navigation\"][aria-label=\"pagination\"]" do
assert_select "ul.pagination-list" do
assert_select "li a.pagination-link", text: "1", count: 1
assert_select "li a.pagination-link", text: "2", count: 1
assert_select "li a.pagination-link", text: "3", count: 1
end

assert_select "li span.pagination-ellipsis", text: "…", count: 1
end
end
end

test "paginate workers with multiple pages" do
register_workers(count: 20)

stub_const(MissionControl::Jobs::Page, :DEFAULT_PAGE_SIZE, 2) do
get mission_control_jobs.application_workers_url(@application)
assert_response :ok

assert_select "nav.pagination[role=\"navigation\"][aria-label=\"pagination\"]" do
assert_select "ul.pagination-list" do
assert_select "li a.pagination-link", text: "1", count: 1
assert_select "li a.pagination-link", text: "2", count: 1
assert_select "li a.pagination-link", text: "10", count: 1
end

assert_select "li span.pagination-ellipsis", text: "…", count: 1
end
end
end

Expand Down