que-view 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ced9639e99e58168c4b6e6a43c95f25e7a8dc0e44da579cc3e5bff4260afac
-  data.tar.gz: 035f401a2e5afe417100ecb908ca54e99d467a7af3822a698af734e27bfbee1c
+  metadata.gz: d07972f8adf809f3f10f495824376c64724e1526e7afd6d85a05da93632741e0
+  data.tar.gz: 95d6ce6e4d1340dcb550a1ae4b85560f19a18de0b9c0dec1eea5ce5a44726ddf
 SHA512:
-  metadata.gz: 38a0e562ee5553257cdddffceb963b87b659cc57fd04fc8c78c0a1b6e6c7863d4c86287f0fc03e6df30bbd8823c758b0b78607c56fd39a04fb345649aad72aee
-  data.tar.gz: 7466ab6634be76c84a3587eb800f82fbe7cb355eba7914cae29cd4bcf66054ff519b14d11d3a9be3c5927eb9011486e0d78d287ff7b7ada6ca758a5d77943dc6
+  metadata.gz: 9553edb70775fc2fa268ad2ec3e14d3ab51c3858b54363efbb0d6b8aae85f00d450d99e925cd576dc7117f1ff784bbbe664d763305123598acc35bda57e38e8b
+  data.tar.gz: ce8bc2cbfef7844814f60125bbad375bf676bc2ef14180d5a2bdc2b4a9fd5cc3ac1920f5b5f40b540a2e600ee4107c247c3b89f90d3e7662725de1a6539c2461

data/README.md

@@ -1,7 +1,16 @@
 # Que::View
 Rails engine inspired by [Que::Web](https://github.com/statianzo/que-web) for [Que](https://github.com/que-rb/que) job queue.
 SQL queries came from Que::Web, some styling from there too.
-Benefits for using this one: independent from Sinatra (que-web based on Sinatra)
+
+Benefits for using this one:
+- no Sinatra (que-web based on Sinatra),
+- no Foundation for styles,
+- no jQuery,
+- Que::Web was last updated 2 years ago.
+
+<img width="1735" alt="Снимок экрана 2024-02-21 в 15 10 35" src="https://github.com/kortirso/que-view/assets/6195394/cd2812c7-abb0-48d9-92d5-4dbef93bcd9e">
+<img width="1735" alt="Снимок экрана 2024-02-21 в 15 11 12" src="https://github.com/kortirso/que-view/assets/6195394/8af01e7f-a002-4ef1-aeff-f96fd27c639f">
+
 
 ## Installation
 
@@ -44,13 +53,5 @@ Add this line to assets/config/manifest.js
 //= link que/view/application.css
 ```
 
-## TODO
-
-- [X] rescheduling jobs
-- [X] deleting jobs
-- [ ] better styles for UI
-- [ ] rendering running jobs
-- [ ] tests
-
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/stylesheets/que/view/application.css

@@ -20,67 +20,64 @@
   font-family: 'Source Sans Pro';
 }
 
-.row {
-  display: flex;
-  flex-direction: row;
-  margin: 0 auto;
-  max-width: 75rem;
-  width: 100%;
-}
-
-.row .column {
-  flex: 1;
-  padding: 1rem;
-}
-
-.row table {
-  flex: 1;
-  margin-bottom: 1rem;
-}
-
-table th, table td {
-  padding: .25rem .75rem;
-  border-bottom: 1px solid #BBB;
+html, body {
+  margin: 0;
+  padding: 0;
 }
 
-table th {
-  text-align: left;
+body {
+  background: #fafafa;
 }
 
-table tbody tr:nth-of-type(2n), table tbody tr:hover {
-  background: #DDD;
+.row {
+  display: flex;
 }
 
-table tbody tr:nth-of-type(2n):hover {
-  background: #CCC;
+.content {
+  padding: 1rem;
 }
 
-table p {
-  margin: 0;
+.actions {
+  display: flex;
 }
 
-.actions {
+.dashboard-row {
   display: flex;
+  margin: 0 auto;
+  width: 100%;
+  border: 1px solid #a8a29e;
+  border-radius: .25rem;
+  overflow: hidden;
 }
 
-.dashboard-stat {
+.dashboard-row .dashboard-stat {
   text-align: center;
   display: table;
   width: 100%;
+  background: #fff;
+  border-right: 1px solid #a8a29e;
+}
+
+.dashboard-row .dashboard-stat:hover {
+  background: #f5f5f4;
 }
 
-.dashboard-stat a {
+.dashboard-row .dashboard-stat:nth-last-of-type(1) {
+  border: none;
+}
+
+.dashboard-row .dashboard-stat a {
   text-decoration: none;
 }
 
-.dashboard-stat .cell {
+.dashboard-row .dashboard-stat .cell {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  height: 200px;
+  height: 150px;
 }
 
-.dashboard-stat h2 {
+.dashboard-row .dashboard-stat h2 {
   color: #222;
   font-size: 1rem;
   font-weight: normal;
@@ -88,24 +85,23 @@ table p {
   margin: 0;
 }
 
-.dashboard-stat.running {
-  background: #CFD0C1;
-}
-
-.dashboard-stat.scheduled {
-  background: #828E8C;
-}
-
-.dashboard-stat.failing {
-  background: #E8866C;
-}
-
 .dashboard-value {
-  font-size: 5rem;
-  line-height: 5rem;
+  font-size: 2rem;
+  line-height: 2rem;
   color: black;
 }
 
+.btn-primary {
+  cursor: pointer;
+  border: none;
+  border-radius: .25rem;
+  background: #fde68a;
+  border: 1px solid #fcd34d;
+  border-radius: .25rem;
+  padding: .25rem .5rem;
+  margin-right: .5rem;
+}
+
 .btn-danger {
   cursor: pointer;
   border: none;
@@ -114,3 +110,124 @@ table p {
   padding: .25rem .5rem;
   margin-right: .5rem;
 }
+
+.pagination {
+  margin: 1rem auto;
+}
+
+.pagination .pagination-link {
+  margin: 0 .5rem 0 0;
+  padding: .25rem .5rem;
+  background: #fde68a;
+  border: 1px solid #fcd34d;
+  border-radius: .25rem;
+  text-decoration: none;
+}
+
+.pagination .pagination-link.disabled {
+  background: #fef3c7;
+}
+
+.pagination .total-pages {
+  margin: 0 .5rem 0 0;
+  padding: .25rem .5rem;
+}
+
+.navigation {
+  display: flex;
+  padding: 0 1rem;
+  background: #fff;
+  border-bottom: 1px solid #e7e5e4;
+  color: #000;
+}
+
+.navigation h1 {
+  margin: 0 2rem 0 0;
+  display: flex;
+  align-items: center;
+}
+
+.navigation h1 a {
+  text-decoration: none;
+  color: #000;
+}
+
+.navigation .navigation-section {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.navigation .navigation-section ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  display: flex;
+}
+
+.navigation .navigation-section ul.version li {
+  margin-left: 1rem;
+}
+
+.navigation .navigation-section ul li a {
+  display: inline-block;
+  padding: 1rem;
+  text-decoration: none;
+  color: #000;
+}
+
+.navigation .navigation-section ul li.active {
+  background: #e7e5e4;
+}
+
+.search-form .form-select {
+  margin-right: 1rem;
+  padding: .5rem 1rem;
+  border: 1px solid #e7e5e4;
+  border-radius: .25rem;
+  background: #fff;
+}
+
+table {
+  width: 100%;
+  margin-bottom: 1rem;
+  background: #fff;
+  border: 1px solid #e7e5e4;
+  border-bottom: none;
+  border-radius: .25rem;
+}
+
+table th, table td {
+  padding: .5rem .75rem;
+  border-bottom: 1px solid #e7e5e4;
+}
+
+table th {
+  text-align: left;
+  font-weight: normal;
+  text-transform: uppercase;
+}
+
+table tbody tr:nth-of-type(2n), table tbody tr:hover {
+  background: #EEE;
+}
+
+table tbody tr:nth-of-type(2n):hover {
+  background: #DDD;
+}
+
+table p {
+  margin: 0;
+}
+
+@media screen and (max-width: 768px) {
+  .dashboard-row {
+    flex-direction: column;
+  }
+
+  .dashboard-row .dashboard-stat {
+    border-right: none;
+    border-bottom: 1px solid #a8a29e;
+  }
+}

data/app/controllers/que/view/jobs_controller.rb

@@ -5,11 +5,13 @@ module Que
     class JobsController < Que::View::ApplicationController
       PER_PAGE = 20
 
+      before_action :find_queue_names, only: %i[index]
+      before_action :find_job_names, only: %i[index]
       before_action :find_job, only: %i[show]
 
       def index
-        @jobs = find_jobs(params[:status])
-        @jobs_amount = find_jobs_amount(params[:status])
+        @jobs = find_jobs(index_params)
+        paginate
       end
 
       def show; end
@@ -48,6 +50,18 @@ module Que
 
       private
 
+      def find_queue_names
+        @queue_names = [
+          ['All queues', nil]
+        ] + ::Que::View.fetch_queue_names
+      end
+
+      def find_job_names
+        @job_names = [
+          ['All jobs', nil]
+        ] + ::Que::View.fetch_job_names(params[:queue_name])
+      end
+
       def find_job
         @job = ::Que::View.fetch_job(params[:id])[0]
         return if @job
@@ -55,16 +69,32 @@ module Que
         redirect_to root_path, notice: 'Job is not found'
       end
 
-      def find_jobs(status)
-        case status&.to_sym
-        when :failing then ::Que::View.fetch_failing_jobs(PER_PAGE, offset, search)
-        when :scheduled then ::Que::View.fetch_scheduled_jobs(PER_PAGE, offset, search)
+      def paginate
+        return if %w[failing scheduled].exclude?(params[:status])
+        return unless @jobs.any?
+
+        @pagination = Que::View::Pagination.new(
+          params: {
+            page: page,
+            per_page: params[:per_page] || PER_PAGE,
+            count: find_jobs_total_amount(params[:status])
+          }
+        )
+      end
+
+      def find_jobs(params)
+        case params[:status]&.to_sym
+        when :running then ::Que::View.fetch_running_jobs(params)
+        when :failing then ::Que::View.fetch_failing_jobs(PER_PAGE, offset, params)
+        when :scheduled then ::Que::View.fetch_scheduled_jobs(PER_PAGE, offset, params)
+        when :finished then ::Que::View.fetch_finished_jobs(PER_PAGE, offset, params)
+        when :expired then ::Que::View.fetch_expired_jobs(PER_PAGE, offset, params)
         else []
         end
       end
 
-      def find_jobs_amount(status)
-        ::Que::View.fetch_dashboard_stats(search)[0][status&.to_sym]
+      def find_jobs_total_amount(status)
+        ::Que::View.fetch_dashboard_stats[0][status&.to_sym]
       end
 
       def reschedule_all_jobs(status, time)
@@ -83,25 +113,16 @@ module Que
         end
       end
 
-      def search
-        return '%' unless search_param
-
-        "%#{search_param}%"
-      end
-
-      def search_param
-        sanitised = (params[:search] || '').gsub(/[^0-9a-z:]/i, '')
-        return if sanitised.empty?
-
-        sanitised
+      def offset
+        (page - 1) * PER_PAGE
       end
 
       def page
         (params[:page] || 1).to_i
       end
 
-      def offset
-        (page - 1) * PER_PAGE
+      def index_params
+        params.permit(:status, :queue_name, :job_name).to_h.symbolize_keys
       end
     end
   end

data/app/controllers/que/view/welcome_controller.rb

@@ -4,7 +4,7 @@ module Que
   module View
     class WelcomeController < Que::View::ApplicationController
       def index
-        @dashboard_stats = ::Que::View.fetch_dashboard_stats('%')[0]
+        @dashboard_stats = ::Que::View.fetch_dashboard_stats[0]
       end
     end
   end

data/app/views/layouts/que/view/application.html.erb

@@ -7,6 +7,35 @@
     <%= stylesheet_link_tag 'que/view/application', media: 'all' %>
   </head>
   <body>
-    <%= yield %>
+    <nav class="navigation" role="navigation">
+      <h1><%= link_to 'Que View', root_path %></h1>
+      <section class="navigation-section">
+        <ul>
+          <li class="<%= 'active' if params[:status] == 'scheduled' %>">
+            <%= link_to 'Scheduled', jobs_path(status: 'scheduled') %>
+          </li>
+          <li class="<%= 'active' if params[:status] == 'failing' %>">
+            <%= link_to 'Failing', jobs_path(status: 'failing') %>
+          </li>
+          <li class="<%= 'active' if params[:status] == 'running' %>">
+            <%= link_to 'Running', jobs_path(status: 'running') %>
+          </li>
+          <li class="<%= 'active' if params[:status] == 'finished' %>">
+            <%= link_to 'Finished', jobs_path(status: 'finished') %>
+          </li>
+          <li class="<%= 'active' if params[:status] == 'expired' %>">
+            <%= link_to 'Expired', jobs_path(status: 'expired') %>
+          </li>
+        </ul>
+        <ul class="version">
+          <li>Que <%= Que::VERSION %></li>
+          <li>Que View <%= Que::View::VERSION %></li>
+          <li><%= Time.now.utc.strftime("%Y-%m-%d %H:%M:%S") %></li>
+        </ul>
+      </section>
+    </nav>
+    <section class="content">
+      <%= yield %>
+    </section>
   </body>
 </html>

data/app/views/que/view/jobs/index.html.erb

@@ -1,55 +1,82 @@
-<div class="row">
-  <% if @jobs.size.positive? %>
-    <table cellspacing="0">
-      <thead>
+<%= form_with url: jobs_path, method: :get, class: 'search-form' do |form| %>
+  <%= form.hidden_field :status, value: params[:status] %>
+  <div class="row">
+    <%= form.select :queue_name, options_for_select(@queue_names, params[:queue_name]), {}, class: 'form-select' %>
+    <%= form.select :job_name, options_for_select(@job_names, params[:job_name]), {}, class: 'form-select' %>
+    <%= form.submit 'Search', class: 'btn-primary' %>
+  </div>
+<% end %>
+<% if @jobs.any? %>
+  <% if @pagination %>
+    <div class="row pagination">
+      <% if @pagination.previous_page? %>
+        <%= link_to 'First', jobs_path(status: params[:status], page: 1), class: 'pagination-link' %>
+        <%= link_to '< Previous', jobs_path(status: params[:status], page: @pagination.previous_page), class: 'pagination-link' %>
+      <% else %>
+        <p class="pagination-link disabled">First</p>
+        <p class="pagination-link disabled">&#60; Previous</p>
+      <% end %>
+      <p class="total-pages"><%= "Page #{@pagination.page} of #{@pagination.total_pages}" %></p>
+      <% if @pagination.next_page? %>
+        <%= link_to 'Next >', jobs_path(status: params[:status], page: @pagination.next_page), class: 'pagination-link' %>
+        <%= link_to 'Last', jobs_path(status: params[:status], page: @pagination.total_pages), class: 'pagination-link' %>
+      <% else %>
+        <p class="pagination-link disabled">Next &#62;</p>
+        <p class="pagination-link disabled">Last </p>
+      <% end %>
+    </div>
+  <% end %>
+  <table cellspacing="0" class="jobs-list">
+    <thead>
+      <tr>
+        <th>ID</th>
+        <th>Job</th>
+        <th>Queue</th>
+        <th>Run at</th>
+        <th>Arguments</th>
+        <% if params[:status] == 'failing' %>
+          <th>Failures</th>
+          <th>Error</th>
+        <% end %>
+        <% if %w[failing scheduled].include?(params[:status]) %>
+          <th>Actions</th>
+        <% end %>
+      </tr>
+    </thead>
+    <tbody>
+      <% @jobs.each do |job| %>
         <tr>
-          <th>ID</th>
-          <th>Run at</th>
-          <th>Job</th>
-          <th>Arguments</th>
-          <th>Queue</th>
+          <td><%= link_to job[:id], job_path(job[:id]) %></td>
+          <td><%= humanized_job_class(job) %></td>
+          <td><%= job[:queue] %></td>
+          <td><%= job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>
+          <td>
+            <% job.dig(:args, 0, :arguments).each do |argument| %>
+              <p><%= argument %></p>
+            <% end %>
+          </td>
           <% if params[:status] == 'failing' %>
-            <th>Failures</th>
-            <th>Error</th>
+            <td><%= job[:error_count] %></td>
+            <td><%= format_error(job) %></td>
           <% end %>
           <% if %w[failing scheduled].include?(params[:status]) %>
-            <th></th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody>
-        <% @jobs.each do |job| %>
-          <tr>
-            <td><%= link_to job[:id], job_path(job[:id]) %></td>
-            <td><%= job[:run_at].utc %></td>
-            <td><%= humanized_job_class(job) %></td>
-            <td><%= job[:queue] %></td>
             <td>
-              <% job.dig(:args, 0, :arguments).each do |argument| %>
-                <p><%= argument %></p>
-              <% end %>
-            </td>
-            <% if params[:status] == 'failing' %>
-              <td><%= job[:error_count] %></td>
-              <td><%= format_error(job) %></td>
-            <% end %>
-            <% if %w[failing scheduled].include?(params[:status]) %>
-              <td class="actions">
+              <div class="actions">
                 <%= button_to 'Run', job_path(job[:id]), class: 'btn-danger', method: :patch, onclick: "return confirm('Are you sure you wish to reschedule job?')" %>
                 <%= button_to 'Delete', job_path(job[:id]), class: 'btn-danger', method: :delete, onclick: "return confirm('Are you sure you wish to delete job?')" %>
-              </td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  <% else %>
-    <p>No jobs found</p>
-  <% end %>
-</div>
-<% if %w[failing scheduled].include?(params[:status]) && @jobs_amount.positive? %>
+              </div>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
   <div class="row">
     <%= button_to 'Run All', reschedule_all_jobs_path(status: params[:status]), class: 'btn-danger', method: :post, onclick: "return confirm('Are you sure you wish to reschedule all jobs?')" %>
     <%= button_to 'Delete All', destroy_all_jobs_path(status: params[:status]), class: 'btn-danger', method: :delete, onclick: "return confirm('Are you sure you wish to delete all jobs?')" %>
   </div>
+<% else %>
+  <div class="row">
+    <p>No jobs found</p>
+  </div>
 <% end %>

data/app/views/que/view/jobs/show.html.erb

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <th>Run at</th>
-        <td><%= @job[:run_at].utc %></td>
+        <td><%= @job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>
       </tr>
       <tr>
         <th>Failures</th>

data/app/views/que/view/welcome/index.html.erb

@@ -1,38 +1,60 @@
-<div class="row">
-  <div class="column">
-    <div class="dashboard-stat running">
-      <%= link_to jobs_path(status: 'running') do %>
-        <div class="cell">
-          <h2>Running</h2>
-          <span class="dashboard-value">
-            <%= @dashboard_stats[:running] %>
-          </span>
-        </div>
-      <% end %>
+<div class="dashboard-row">
+  <div class="dashboard-stat">
+    <div class="cell">
+      <h2>Total</h2>
+      <span class="dashboard-value">
+        <%= @dashboard_stats[:total] %>
+      </span>
     </div>
   </div>
-  <div class="column">
-    <div class="dashboard-stat scheduled">
-      <%= link_to jobs_path(status: 'scheduled') do %>
-        <div class="cell">
-          <h2>Scheduled</h2>
-          <span class="dashboard-value">
-            <%= @dashboard_stats[:scheduled] %>
-          </span>
-        </div>
-      <% end %>
-    </div>
+  <div class="dashboard-stat">
+    <%= link_to jobs_path(status: 'scheduled') do %>
+      <div class="cell">
+        <h2>Scheduled</h2>
+        <span class="dashboard-value">
+          <%= @dashboard_stats[:scheduled] %>
+        </span>
+      </div>
+    <% end %>
   </div>
-  <div class="column">
-    <div class="dashboard-stat failing">
-      <%= link_to jobs_path(status: 'failing') do %>
-        <div class="cell">
-          <h2>Failing</h2>
-          <span class="dashboard-value">
-            <%= @dashboard_stats[:failing] %>
-          </span>
-        </div>
-      <% end %>
-    </div>
+  <div class="dashboard-stat">
+    <%= link_to jobs_path(status: 'failing') do %>
+      <div class="cell">
+        <h2>Failing</h2>
+        <span class="dashboard-value">
+          <%= @dashboard_stats[:failing] %>
+        </span>
+      </div>
+    <% end %>
+  </div>
+  <div class="dashboard-stat">
+    <%= link_to jobs_path(status: 'running') do %>
+      <div class="cell">
+        <h2>Running</h2>
+        <span class="dashboard-value">
+          <%= @dashboard_stats[:running] %>
+        </span>
+      </div>
+    <% end %>
+  </div>
+  <div class="dashboard-stat">
+    <%= link_to jobs_path(status: 'finished') do %>
+      <div class="cell">
+        <h2>Finished</h2>
+        <span class="dashboard-value">
+          <%= @dashboard_stats[:finished] %>
+        </span>
+      </div>
+    <% end %>
+  </div>
+  <div class="dashboard-stat">
+    <%= link_to jobs_path(status: 'expired') do %>
+      <div class="cell">
+        <h2>Expired</h2>
+        <span class="dashboard-value">
+          <%= @dashboard_stats[:expired] %>
+        </span>
+      </div>
+    <% end %>
   </div>
 </div>

data/lib/que/view/dsl.rb

@@ -4,8 +4,24 @@ module Que
   module View
     # rubocop: disable Metrics/ClassLength
     class DSL
-      def fetch_dashboard_stats(...)
-        execute(fetch_dashboard_stats_sql(...))
+      def fetch_dashboard_stats
+        execute(fetch_dashboard_stats_sql)
+      end
+
+      def fetch_queue_names
+        execute(fetch_queue_names_sql).map { |queues_data|
+          ["#{queues_data[:queue_name]} (#{queues_data[:count_all]})", queues_data[:queue_name]]
+        }
+      end
+
+      def fetch_job_names(...)
+        execute(fetch_job_names_sql(...)).map { |jobs_data|
+          ["#{jobs_data[:job_name]} (#{jobs_data[:count_all]})", jobs_data[:job_name]]
+        }
+      end
+
+      def fetch_running_jobs(...)
+        Que.job_states
       end
 
       def fetch_failing_jobs(...)
@@ -16,6 +32,14 @@ module Que
         execute(fetch_scheduled_jobs_sql(...))
       end
 
+      def fetch_finished_jobs(...)
+        execute(fetch_finished_jobs_sql(...))
+      end
+
+      def fetch_expired_jobs(...)
+        execute(fetch_expired_jobs_sql(...))
+      end
+
       def fetch_job(...)
         execute(fetch_job_sql(...))
       end
@@ -47,46 +71,82 @@ module Que
       private
 
       # rubocop: disable Metrics/MethodLength
-      def fetch_dashboard_stats_sql(search)
+      def fetch_dashboard_stats_sql
         <<-SQL.squish
-          SELECT count(*)                    AS total,
-                 count(locks.job_id)         AS running,
+          SELECT count(*) AS total,
+                 count(locks.job_id) AS running,
                  coalesce(sum((error_count > 0 AND locks.job_id IS NULL)::int), 0) AS failing,
-                 coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled
+                 coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled,
+                 coalesce(sum((finished_at IS NOT NULL)::int), 0) AS finished,
+                 coalesce(sum((expired_at IS NOT NULL)::int), 0) AS expired
           FROM que_jobs
           LEFT JOIN (
             SELECT (classid::bigint << 32) + objid::bigint AS job_id
             FROM pg_locks
             WHERE locktype = 'advisory'
           ) locks ON (que_jobs.id=locks.job_id)
-          WHERE
-            job_class ILIKE ('#{search}')
-            OR que_jobs.args #>> '{0, job_class}' ILIKE ('#{search}')
         SQL
       end
 
-      def fetch_failing_jobs_sql(per_page, offset, search)
+      def fetch_queue_names_sql
         <<-SQL.squish
-          SELECT que_jobs.*
+          SELECT COUNT(*) AS count_all, queue AS queue_name
           FROM que_jobs
-          LEFT JOIN (
-            SELECT (classid::bigint << 32) + objid::bigint AS job_id
-            FROM pg_locks
-            WHERE locktype = 'advisory'
-          ) locks ON (que_jobs.id=locks.job_id)
+          GROUP BY queue
+        SQL
+      end
+
+      def fetch_job_names_sql(queue_name)
+        <<-SQL.squish
+          SELECT COUNT(*) AS count_all, args #>> '{0, job_class}' AS job_name
+          FROM que_jobs
+          #{queue_name.present? ? "WHERE queue = '#{queue_name}'" : ""}
+          GROUP BY args #>> '{0, job_class}'
+        SQL
+      end
+
+      def fetch_failing_jobs_sql(per_page, offset, params)
+        where_condition = <<-SQL.squish
           WHERE locks.job_id IS NULL
             AND error_count > 0
-            AND (
-              job_class ILIKE ('#{search}')
-              OR que_jobs.args #>> '{0, job_class}' ILIKE ('#{search}')
-            )
-          ORDER BY run_at, id
-          LIMIT #{per_page}::int
-          OFFSET #{offset}::int
+            #{search_condition(params)}
+        SQL
+        fetch_jobs_sql(per_page, offset, where_condition)
+      end
+
+      def fetch_scheduled_jobs_sql(per_page, offset, params)
+        where_condition = <<-SQL.squish
+          WHERE locks.job_id IS NULL
+            AND error_count = 0
+            #{search_condition(params)}
         SQL
+        fetch_jobs_sql(per_page, offset, where_condition)
       end
 
-      def fetch_scheduled_jobs_sql(per_page, offset, search)
+      def fetch_finished_jobs_sql(per_page, offset, params)
+        where_condition = <<-SQL.squish
+          WHERE finished_at IS NOT NULL
+            #{search_condition(params)}
+        SQL
+        fetch_jobs_sql(per_page, offset, where_condition)
+      end
+
+      def fetch_expired_jobs_sql(per_page, offset, params)
+        where_condition = <<-SQL.squish
+          WHERE expired_at IS NOT NULL
+            #{search_condition(params)}
+        SQL
+        fetch_jobs_sql(per_page, offset, where_condition)
+      end
+
+      def search_condition(params)
+        result = ''
+        result += "AND queue = '#{params[:queue_name]}'" if params[:queue_name].present?
+        result += "AND args #>> '{0, job_class}' = ('#{params[:job_name]}')" if params[:job_name].present?
+        result
+      end
+
+      def fetch_jobs_sql(per_page, offset, where_condition)
         <<-SQL.squish
           SELECT que_jobs.*
           FROM que_jobs
@@ -95,12 +155,7 @@ module Que
             FROM pg_locks
             WHERE locktype = 'advisory'
           ) locks ON (que_jobs.id=locks.job_id)
-          WHERE locks.job_id IS NULL
-            AND error_count = 0
-            AND (
-              job_class ILIKE ('#{search}')
-              OR que_jobs.args #>> '{0, job_class}' ILIKE ('#{search}')
-            )
+          #{where_condition}
           ORDER BY run_at, id
           LIMIT #{per_page}::int
           OFFSET #{offset}::int

data/lib/que/view/pagination.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Que
+  module View
+    class Pagination
+      attr_reader :page, :count, :per_page
+
+      def initialize(params: {})
+        @page = params[:page]
+        @count = params[:count]
+        @per_page = params[:per_page]
+      end
+
+      def offset
+        return 0 if page == 1
+
+        per_page * (page.to_i - 1)
+      end
+
+      def next_page
+        page + 1 unless last_page?
+      end
+
+      def next_page?
+        page < total_pages
+      end
+
+      def previous_page
+        page - 1 unless first_page?
+      end
+
+      def previous_page?
+        page > 1
+      end
+
+      def last_page?
+        page == total_pages
+      end
+
+      def first_page?
+        page == 1
+      end
+
+      def total_pages
+        (count / per_page.to_f).ceil
+      end
+    end
+  end
+end

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.2.3'
+    VERSION = '0.3.1'
   end
 end

data/lib/que/view.rb

@@ -6,13 +6,14 @@ require 'que/view/version'
 require 'que/view/engine'
 require 'que/view/configuration'
 require 'que/view/dsl'
+require 'que/view/pagination'
 
 module Que
   module View
     extend self
     extend Forwardable
 
-    # Public: Configure emailbutler.
+    # Public: Configure que view.
     #
     #   Que::View.configure do |config|
     #   end
@@ -26,15 +27,17 @@ module Que
       @configuration ||= Configuration.new
     end
 
-    # Public: Default per thread emailbutler instance if configured.
+    # Public: Default per thread que view instance if configured.
     # Returns Que::View::DSL instance.
     def instance
       Thread.current[:que_view_instance] ||= DSL.new
     end
 
     # Public: All the methods delegated to instance. These should match the interface of Que::View::DSL.
-    def_delegators :instance,
-                   :fetch_dashboard_stats, :fetch_failing_jobs, :fetch_scheduled_jobs, :fetch_job,
+    def_delegators :instance, :fetch_dashboard_stats,
+                   :fetch_queue_names, :fetch_job_names,
+                   :fetch_running_jobs, :fetch_failing_jobs, :fetch_scheduled_jobs, :fetch_finished_jobs,
+                   :fetch_expired_jobs, :fetch_job,
                    :delete_failing_jobs, :delete_scheduled_jobs, :delete_job,
                    :reschedule_scheduled_jobs, :reschedule_failing_jobs, :reschedule_job
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-view
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -175,6 +175,7 @@ files:
 - lib/que/view/configuration.rb
 - lib/que/view/dsl.rb
 - lib/que/view/engine.rb
+- lib/que/view/pagination.rb
 - lib/que/view/version.rb
 homepage: https://github.com/kortirso/que-view
 licenses: