que-view 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54cde016dccd6207b38924f717a5aeb3ea9ccae0eef215f848c2621c8af4945
-  data.tar.gz: 0d44f6c8e723e8533c8f640b58996a2b25b7d444115c761e95879c6a91ca3331
+  metadata.gz: 1b7b44890b63b063c130537e5fcc117f40bf1236dd89b156ca48e87a78d71248
+  data.tar.gz: 629fd230eb265fdbe7a41f0aec19e37f4047d797750eb635612687cceb7d5af9
 SHA512:
-  metadata.gz: 72bde7eb6e7d6a2ae64e380eedb7f8ce45eb609116a017e71dc1af0ea7acdb5df7293cfb5015474b6d0793570b9062ca735e95878ea1e65e570dd95f0ba4f3d3
-  data.tar.gz: 659f6cfb80c3bb746f2f0088638e3e6f8d7acd63cc47ab0584df44762a9b18266736fd80bb4820c0a91d0e1b12b3262f7209c7321c7cf867b3ca9f2ee7c7eae9
+  metadata.gz: 1412a8a378aaa977fd92b40c79dad153267cbf50d1e7ac7409380469106269e5b96484d12193ac57ee78187ad172e79a61783e54e0948aff9242e4947bf6d381
+  data.tar.gz: ac32754839e4105584d330cc34a19cb5fccb48f8ce60afd58c1c3f5bb9b933a7ab4bd8616e109d7a2a5b91b384dff878b4a5699ee576f5d5fa1822c60d4392b0

data/README.md

@@ -4,12 +4,13 @@ SQL queries came from Que::Web, some styling from there too.
 
 Benefits for using this one:
 - no Sinatra (que-web based on Sinatra),
-- no Foundation for styles,
-- no jQuery,
+- no Foundation for styles (and no external styles at all),
+- no jQuery (and no java scripts at all),
 - 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">
+<img width="1731" alt="Снимок экрана 2024-03-03 в 08 28 09" src="https://github.com/kortirso/que-view/assets/6195394/fdaf315d-6c6e-40ee-a60f-cd740cc7ec93">
+<img width="1734" alt="Снимок экрана 2024-03-03 в 08 27 47" src="https://github.com/kortirso/que-view/assets/6195394/e45d334e-7637-41f8-af16-d6a9ac35f263">
+<img width="1730" alt="Снимок экрана 2024-03-03 в 23 09 57" src="https://github.com/kortirso/que-view/assets/6195394/d790066f-3e96-4775-afd6-018750d0afd3">
 
 
 ## Installation
@@ -53,15 +54,5 @@ Add this line to assets/config/manifest.js
 //= link que/view/application.css
 ```
 
-## TODO
-
-- [X] rescheduling jobs
-- [X] deleting jobs
-- [X] better styles for UI
-- [X] rendering running jobs
-- [ ] searching/filtering through jobs by name, queue
-- [X] pagination for jobs list page
-- [ ] 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

@@ -21,71 +21,67 @@
 }
 
 html, body {
-  padding: 0;
   margin: 0;
+  padding: 0;
 }
 
-.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;
+body {
+  background: #fafafa;
 }
 
-table th {
-  text-align: left;
+h1 {
+  margin-top: 0;
 }
 
-table tbody tr:nth-of-type(2n), table tbody tr:hover {
-  background: #EEE;
+.row {
+  display: flex;
 }
 
-table tbody tr:nth-of-type(2n):hover {
-  background: #DDD;
+.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-row .dashboard-stat:nth-last-of-type(1) {
+  border: none;
 }
 
-.dashboard-stat a {
+.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;
@@ -93,24 +89,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;
@@ -121,7 +116,7 @@ table p {
 }
 
 .pagination {
-  margin: 1rem auto;
+  margin: 0 auto 1rem;
 }
 
 .pagination .pagination-link {
@@ -144,18 +139,21 @@ table p {
 
 .navigation {
   display: flex;
-  padding: .5rem 1rem;
-  background: #52525b;
-  color: #fff;
+  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: #fff;
+  color: #000;
 }
 
 .navigation .navigation-section {
@@ -178,17 +176,79 @@ table p {
 
 .navigation .navigation-section ul li a {
   display: inline-block;
-  padding: .5rem;
+  padding: 1rem;
   text-decoration: none;
-  color: #fff;
+  color: #000;
+}
+
+.navigation .navigation-section ul li.active {
+  background: #e7e5e4;
+}
+
+.search-form {
+  margin-bottom: 1rem;
 }
 
-.navigation .navigation-section ul li.active a {
-  text-decoration: underline;
+.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;
+}
+
+.lockers {
+  margin-top: 2rem;
+}
+
+.lockers .locker-process {
+  display: flex;
+  flex-direction: column;
+}
+
+.metrics a {
+  color: #000;
 }
 
 @media screen and (max-width: 768px) {
-  .row {
+  .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,10 +5,12 @@ 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 = find_jobs(index_params)
         paginate
       end
 
@@ -48,6 +50,25 @@ 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
+
+        redirect_to root_path, notice: 'Job is not found'
+      end
+
       def paginate
         return if %w[failing scheduled].exclude?(params[:status])
         return unless @jobs.any?
@@ -61,24 +82,19 @@ module Que
         )
       end
 
-      def find_job
-        @job = ::Que::View.fetch_job(params[:id])[0]
-        return if @job
-
-        redirect_to root_path, notice: 'Job is not found'
-      end
-
-      def find_jobs(status)
-        case status&.to_sym
-        when :running then ::Que::View.fetch_running_jobs(search)
-        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 find_jobs(params)
+        case params[:status]&.to_sym
+        when :running then ::Que::View.fetch_running_jobs
+        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_total_amount(status)
-        ::Que::View.fetch_dashboard_stats(search)[0][status&.to_sym]
+        ::Que::View.fetch_dashboard_stats[0][status&.to_sym]
       end
 
       def reschedule_all_jobs(status, time)
@@ -97,19 +113,6 @@ 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
-      end
-
       def offset
         (page - 1) * PER_PAGE
       end
@@ -117,6 +120,10 @@ module Que
       def page
         (params[:page] || 1).to_i
       end
+
+      def index_params
+        params.permit(:status, :queue_name, :job_name).to_h.symbolize_keys
+      end
     end
   end
 end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Que
+  module View
+    class QueueMetricsController < Que::View::ApplicationController
+      before_action :find_queue_metrics, only: %i[index]
+
+      def index; end
+
+      private
+
+      def find_queue_metrics
+        @queue_metrics = ::Que::View.fetch_queue_metrics
+      end
+    end
+  end
+end

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

@@ -4,7 +4,8 @@ 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]
+        @lockers = ::Que::View.fetch_que_lockers
       end
     end
   end

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

@@ -11,15 +11,24 @@
       <h1><%= link_to 'Que View', root_path %></h1>
       <section class="navigation-section">
         <ul>
-          <li class="<%= 'active' if params[:status] == 'running' %>">
-            <%= link_to 'Running', jobs_path(status: 'running') %>
-          </li>
           <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>
+          <li class="<%= 'active' if current_page?(queue_metrics_path) %>">
+            <%= link_to 'Queue metrics', queue_metrics_path %>
+          </li>
         </ul>
         <ul class="version">
           <li>Que <%= Que::VERSION %></li>
@@ -28,6 +37,8 @@
         </ul>
       </section>
     </nav>
-    <%= yield %>
+    <section class="content">
+      <%= yield %>
+    </section>
   </body>
 </html>

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

@@ -1,76 +1,77 @@
-<% 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 %>
+<h1><%= params[:status].capitalize %> jobs</h1>
+<%= form_with url: jobs_path, method: :get, class: 'search-form' do |form| %>
+  <%= form.hidden_field :status, value: params[:status] %>
   <div class="row">
-    <table cellspacing="0">
-      <thead>
-        <tr>
-          <th>ID</th>
-          <th>Run at</th>
-          <th>Job</th>
-          <th>Queue</th>
-          <th>Arguments</th>
-          <% if params[:status] == 'failing' %>
-            <th>Failures</th>
-            <th>Error</th>
-          <% 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].strftime("%Y-%m-%d %H:%M:%S") %></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>
-                <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?')" %>
-                </div>
-              </td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= 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>
-<% else %>
-  <div class="row">
-    <p>No jobs found</p>
+<% end %>
+<% 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 %>
-<% if @pagination&.count&.positive? %>
+<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>
+        <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' %>
+          <td><%= job[:error_count] %></td>
+          <td><%= format_error(job) %></td>
+        <% end %>
+        <% if %w[failing scheduled].include?(params[:status]) %>
+          <td>
+            <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?')" %>
+            </div>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<% if @pagination && %w[failing scheduled].include?(params[:status]) %>
   <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?')" %>

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

@@ -0,0 +1,29 @@
+<div class="metrics">
+  <h1>Queue Metrics</h1>
+  <table cellspacing="0">
+    <thead>
+      <tr>
+        <th>Queue</th>
+        <th>Scheduled</th>
+        <th>Failing</th>
+        <th>Running</th>
+        <th>Finished</th>
+        <th>Expired</th>
+        <th>Latency</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @queue_metrics.each do |queue, values| %>
+        <tr>
+          <td><%= queue %></td>
+          <td><%= link_to values[:scheduled], jobs_path(status: 'scheduled', queue_name: queue) %></td>
+          <td><%= link_to values[:failing], jobs_path(status: 'failing', queue_name: queue) %></td>
+          <td><%= link_to values[:running], jobs_path(status: 'running', queue_name: queue) %></td>
+          <td><%= link_to values[:finished], jobs_path(status: 'finished', queue_name: queue) %></td>
+          <td><%= link_to values[:expired], jobs_path(status: 'expired', queue_name: queue) %></td>
+          <td></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -1,38 +1,86 @@
-<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>
+<div class="lockers">
+  <h1>Processes</h1>
+  <table cellspacing="0">
+    <thead>
+      <tr>
+        <th>ID</th>
+        <th>Worker count</th>
+        <th>Worker priorities</th>
+        <th>Listening</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @lockers.each.with_index do |locker, index| %>
+        <tr>
+          <td class="locker-process">
+            <span>Process <%= index + 1 %></span>
+            <span><strong>Queues:</strong> <%= locker[:queues][1..-2].split(',').join(', ') %></span>
+          </td>
+          <td><%= locker[:worker_count] %></td>
+          <td><%= locker[:worker_priorities] %></td>
+          <td><%= locker[:listening] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>

data/config/routes.rb

@@ -5,6 +5,7 @@ Que::View::Engine.routes.draw do
     post :reschedule_all, on: :collection
     delete :destroy_all, on: :collection
   end
+  resources :queue_metrics, only: %i[index]
 
   root 'welcome#index'
 end

data/lib/que/view/dsl.rb

@@ -4,11 +4,34 @@ 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_running_jobs(...)
+      def fetch_que_lockers
+        execute(fetch_que_lockers_sql)
+      end
+
+      def fetch_queue_metrics
+        execute(fetch_queue_metrics_sql).each_with_object({}) { |element, acc|
+          acc[element[:queue_name].to_sym] ||= basis_queue_stats
+          acc[element[:queue_name].to_sym][element[:status].to_sym] = element[:count_all]
+        }
+      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
 
@@ -20,6 +43,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
@@ -50,47 +81,121 @@ module Que
 
       private
 
+      def basis_queue_stats
+        { scheduled: 0, failing: 0, running: 0, finished: 0, expired: 0 }
+      end
+
       # 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_que_lockers_sql
         <<-SQL.squish
-          SELECT que_jobs.*
+          SELECT *
+          FROM que_lockers
+        SQL
+      end
+
+      def fetch_queue_metrics_sql
+        <<-SQL.squish
+          SELECT COUNT(*) AS count_all, queue AS queue_name,
+            CASE
+            WHEN expired_at IS NOT NULL THEN 'expired'
+            WHEN finished_at IS NOT NULL THEN 'finished'
+            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
+            ELSE 'running'
+            END status
           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,
+            CASE
+            WHEN expired_at IS NOT NULL THEN 'expired'
+            WHEN finished_at IS NOT NULL THEN 'finished'
+            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
+            ELSE 'running'
+            END
+        SQL
+      end
+
+      def fetch_queue_names_sql
+        <<-SQL.squish
+          SELECT COUNT(*) AS count_all, queue AS queue_name
+          FROM que_jobs
+          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, search)
+      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_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
@@ -99,12 +204,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/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/lib/que/view.rb

@@ -34,8 +34,10 @@ module Que
     end
 
     # Public: All the methods delegated to instance. These should match the interface of Que::View::DSL.
-    def_delegators :instance, :fetch_dashboard_stats,
-                   :fetch_running_jobs, :fetch_failing_jobs, :fetch_scheduled_jobs, :fetch_job,
+    def_delegators :instance, :fetch_dashboard_stats, :fetch_que_lockers, :fetch_queue_metrics,
+                   :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.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -164,11 +164,13 @@ files:
 - app/assets/stylesheets/que/view/application.css
 - app/controllers/que/view/application_controller.rb
 - app/controllers/que/view/jobs_controller.rb
+- app/controllers/que/view/queue_metrics_controller.rb
 - app/controllers/que/view/welcome_controller.rb
 - app/helpers/que/view/application_helper.rb
 - app/views/layouts/que/view/application.html.erb
 - app/views/que/view/jobs/index.html.erb
 - app/views/que/view/jobs/show.html.erb
+- app/views/que/view/queue_metrics/index.html.erb
 - app/views/que/view/welcome/index.html.erb
 - config/routes.rb
 - lib/que/view.rb