panoptic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2139703571c494d033de27157820fd5a897cc8ea964b51ef526a15c2df009fde
-  data.tar.gz: 1bc481cbaa03329579c5fdc7a58501b2ab00b09afc4952fea960572f787f3c29
+  metadata.gz: 92d310e17406ea0681469b5f4f4ff1d456b9d24ad4c89d4498adc87643f9ed8c
+  data.tar.gz: 9e2faccbac6daf2820c63202adc28292918934e596462443b046be5d4b874c72
 SHA512:
-  metadata.gz: bd1d0d3a182541129e3a84885c69b48ed9145055baeced6df8809fc269c2a62c5479f4253f7ed36fbd420082613c37513ebc92a2bc66b4fa55186ad5f082015c
-  data.tar.gz: eac99da9fcafbb3be1a2282fbf9e72ce242cc2a0dfd70b58e243de8f31184c4879b701088b144f670687d21359e5eb0971a46ef24614fad9a8085f2c123a174c
+  metadata.gz: b596a1d4224631ffb6f1e619958bbed94c20c4bfcb6c64fd967045efd40d785be72d2393b1317dc239866be6ba35952eebbf3eeac22e02cc270626475f325328
+  data.tar.gz: b07d2227e30e712aedaeb5d1213991fba6cb5e467f67466795c3b1fd8d10a92e9fa5c9a98e86f6afc2a71bd2ac4de963c3a5de2a49a3f74494973c666227d4ba

data/app/controllers/panoptic/jobs_controller.rb

@@ -2,8 +2,10 @@
 
 module Panoptic
   class JobsController < ApplicationController
+    include Pagy::Backend
+
     def index
-      @jobs = SolidQueue::Job.order(created_at: :asc).page(params[:page])
+      @pagy, @jobs = pagy(SolidQueue::Job.order(created_at: :asc))
     end
   end
 end

data/app/helpers/panoptic/application_helper.rb

@@ -1,4 +1,5 @@
 module Panoptic
   module ApplicationHelper
+    include Pagy::Frontend
   end
 end

data/app/views/panoptic/jobs/index.html.erb

@@ -1,9 +1,7 @@
 <h1>Jobs</h1>
 
 <div class="d-flex justify-content-end">
-  <div>
-    <%= page_entries_info @jobs %>
-  </div>
+  <%== pagy_info(@pagy)  %> 
 </div>
 
 <table class="table">
@@ -24,5 +22,5 @@
 </table>
 
 <div class="d-flex justify-content-center">
-  <%= paginate @jobs, views_prefix: "panoptic" %>
+  <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>
 </div>

data/config/initializers/pagy.rb

@@ -0,0 +1 @@
+require "pagy/extras/bootstrap"

data/lib/panoptic/engine.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "pagy"
+
 module Panoptic
   class Engine < ::Rails::Engine
     isolate_namespace Panoptic

data/lib/panoptic/version.rb

@@ -1,3 +1,3 @@
 module Panoptic
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoptic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vincent Rolea
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.2'
 description: Web interface for the SoldiQueue queuing backend
 email:
 - 3525369+virolea@users.noreply.github.com
@@ -74,18 +74,12 @@ files:
 - app/views/layouts/panoptic/application.html.erb
 - app/views/panoptic/jobs/_job.html.erb
 - app/views/panoptic/jobs/index.html.erb
-- app/views/panoptic/kaminari/_first_page.html.erb
-- app/views/panoptic/kaminari/_gap.html.erb
-- app/views/panoptic/kaminari/_last_page.html.erb
-- app/views/panoptic/kaminari/_next_page.html.erb
-- app/views/panoptic/kaminari/_page.html.erb
-- app/views/panoptic/kaminari/_paginator.html.erb
-- app/views/panoptic/kaminari/_prev_page.html.erb
 - app/views/panoptic/processes/_process.html.erb
 - app/views/panoptic/processes/index.html.erb
 - app/views/panoptic/queues/_queue.html.erb
 - app/views/panoptic/queues/index.html.erb
 - app/views/shared/_navbar.html.erb
+- config/initializers/pagy.rb
 - config/routes.rb
 - lib/panoptic.rb
 - lib/panoptic/engine.rb

data/app/views/panoptic/kaminari/_first_page.html.erb

@@ -1,3 +0,0 @@
-<li class="page-item">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
-</li>

data/app/views/panoptic/kaminari/_gap.html.erb

@@ -1,3 +0,0 @@
-<li class='page-item disabled'>
-  <%= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link' %>
-</li>

data/app/views/panoptic/kaminari/_last_page.html.erb

@@ -1,3 +0,0 @@
-<li class="page-item">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
-</li>

data/app/views/panoptic/kaminari/_next_page.html.erb

@@ -1,3 +0,0 @@
-<li class="page-item">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
-</li>

data/app/views/panoptic/kaminari/_page.html.erb

@@ -1,9 +0,0 @@
-<% if page.current? %>
-  <li class="page-item active">
-    <%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: 'page-link' %>
-  </li>
-<% else %>
-  <li class="page-item">
-    <%= link_to page, url, remote: remote, rel: page.rel, class: 'page-link' %>
-  </li>
-<% end %>

data/app/views/panoptic/kaminari/_paginator.html.erb

@@ -1,17 +0,0 @@
-<%= paginator.render do %>
-  <nav>
-    <ul class="pagination">
-      <%= first_page_tag unless current_page.first? %>
-      <%= prev_page_tag unless current_page.first? %>
-      <% each_page do |page| %>
-        <% if page.left_outer? || page.right_outer? || page.inside_window? %>
-          <%= page_tag page %>
-        <% elsif !page.was_truncated? -%>
-          <%= gap_tag %>
-        <% end %>
-      <% end %>
-      <%= next_page_tag unless current_page.last? %>
-      <%= last_page_tag unless current_page.last? %>
-    </ul>
-  </nav>
-<% end %>

data/app/views/panoptic/kaminari/_prev_page.html.erb

@@ -1,3 +0,0 @@
-<li class="page-item">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
-</li>