solid_queue_web 0.5.5 → 0.7.0

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

@@ -1,21 +1,21 @@
 <h1 class="sqd-page-title" style="margin-bottom: 1.5rem;">Jobs</h1>
 
-<%= turbo_frame_tag "jobs-table", data: { turbo_action: "advance" } do %>
+<%= turbo_frame_tag "jobs-table", data: { turbo_action: "advance", controller: "refresh", refresh_interval_value: 10000 } do %>
 <% discardable = SolidQueueWeb::Job::DISCARDABLE.include?(@status) %>
 
 <div class="sqd-page-header">
   <div class="sqd-filters">
-    <%= link_to "Ready",     jobs_path(status: "ready",     q: @search), class: @status == "ready"     ? "active" : "" %>
-    <%= link_to "Scheduled", jobs_path(status: "scheduled", q: @search), class: @status == "scheduled" ? "active" : "" %>
-    <%= link_to "Running",   jobs_path(status: "claimed",   q: @search), class: @status == "claimed"   ? "active" : "" %>
-    <%= link_to "Blocked",   jobs_path(status: "blocked",   q: @search), class: @status == "blocked"   ? "active" : "" %>
-    <%= link_to "Failed",    jobs_path(status: "failed",    q: @search), class: @status == "failed"    ? "active" : "" %>
+    <%= link_to "Ready",     jobs_path(status: "ready",     q: @search, period: @period), class: @status == "ready"     ? "active" : "" %>
+    <%= link_to "Scheduled", jobs_path(status: "scheduled", q: @search, period: @period), class: @status == "scheduled" ? "active" : "" %>
+    <%= link_to "Running",   jobs_path(status: "claimed",   q: @search, period: @period), class: @status == "claimed"   ? "active" : "" %>
+    <%= link_to "Blocked",   jobs_path(status: "blocked",   q: @search, period: @period), class: @status == "blocked"   ? "active" : "" %>
+    <%= link_to "Failed",    jobs_path(status: "failed",    q: @search, period: @period), class: @status == "failed"    ? "active" : "" %>
   </div>
   <% if discardable && @jobs.any? %>
     <div class="sqd-actions">
       <%= button_to "Discard All", discard_all_jobs_path,
             method: :post,
-            params: { status: @status },
+            params: { status: @status, period: @period },
             class: "sqd-btn sqd-btn--danger",
             data: { confirm: "Discard all #{@jobs.size} #{@status} jobs? This cannot be undone." } %>
     </div>
@@ -24,62 +24,128 @@
 
 <form class="sqd-search" action="<%= jobs_path %>" method="get" data-controller="search">
   <input type="hidden" name="status" value="<%= @status %>">
+  <input type="hidden" name="period" value="<%= @period %>">
   <input class="sqd-search__input" type="search" name="q" value="<%= @search %>"
          placeholder="Filter by job class…" autocomplete="off" aria-label="Filter by job class"
          data-action="input->search#filter">
-  <button type="submit" class="sqd-btn sqd-btn--muted">Search</button>
   <% if @search.present? %>
-    <%= link_to "Clear", jobs_path(status: @status), class: "sqd-btn sqd-btn--muted" %>
+    <%= link_to "Clear", jobs_path(status: @status, period: @period), class: "sqd-btn sqd-btn--muted" %>
   <% end %>
+  <div class="sqd-period-filter" role="group" aria-label="Time period">
+    <%= link_to "All", jobs_path(status: @status, q: @search),                       class: @period.nil?       ? "active" : "", aria: { current: @period.nil?       ? "true" : nil }, aria_label: "All time" %>
+    <%= link_to "1h",  jobs_path(status: @status, q: @search, period: "1h"),  class: @period == "1h"  ? "active" : "", aria: { current: @period == "1h"  ? "true" : nil }, aria_label: "Last 1 hour" %>
+    <%= link_to "24h", jobs_path(status: @status, q: @search, period: "24h"), class: @period == "24h" ? "active" : "", aria: { current: @period == "24h" ? "true" : nil }, aria_label: "Last 24 hours" %>
+    <%= link_to "7d",  jobs_path(status: @status, q: @search, period: "7d"),  class: @period == "7d"  ? "active" : "", aria: { current: @period == "7d"  ? "true" : nil }, aria_label: "Last 7 days" %>
+  </div>
 </form>
 
-<div class="sqd-card" id="jobs-list">
-  <% if @jobs.empty? %>
-    <div class="sqd-empty">No <%= @status %> jobs.</div>
-  <% else %>
-    <table>
-      <thead>
-        <tr>
-          <th scope="col">Job Class</th>
-          <th scope="col">Queue</th>
-          <th scope="col">Priority</th>
-          <th scope="col">Scheduled At</th>
-          <th scope="col">Enqueued At</th>
-          <% if discardable %><th scope="col"><span class="sqd-sr-only">Actions</span></th><% end %>
-        </tr>
-      </thead>
-      <tbody>
-        <% @jobs.each do |execution| %>
-          <% job = execution.job %>
-          <tr id="execution_<%= execution.id %>">
-            <td>
-              <span class="sqd-badge sqd-badge--<%= @status %>"><%= @status %></span>
-              <%= link_to job.class_name, job_path(job), style: "margin-left: 0.5rem;", data: { turbo_frame: "_top" } %>
-            </td>
-            <td>
-              <%= link_to job.queue_name, queue_jobs_path(queue_name: job.queue_name, status: @status),
-                    class: "sqd-mono", style: "color: inherit;" %>
-            </td>
-            <td><%= job.priority %></td>
-            <td class="sqd-mono">
-              <%= job.scheduled_at ? job.scheduled_at.strftime("%Y-%m-%d %H:%M:%S") : "—" %>
-            </td>
-            <td class="sqd-mono"><%= job.created_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
-            <% if discardable %>
+<% if discardable && @jobs.any? %>
+  <div data-controller="selection">
+    <%= form_tag job_selection_path, method: :delete, id: "job-selection-form",
+          data: { turbo_confirm: "Discard selected jobs? This cannot be undone." } do %>
+      <%= hidden_field_tag :status, @status %>
+      <%= hidden_field_tag :period, @period %>
+    <% end %>
+
+    <div class="sqd-selection-bar" data-selection-target="bar" style="display: none;">
+      <span class="sqd-muted-text"><span data-selection-target="count">0</span> selected</span>
+      <button type="button" class="sqd-btn sqd-btn--danger sqd-btn--sm"
+              data-action="click->selection#submit"
+              data-selection-form-id-param="job-selection-form">Discard Selected</button>
+    </div>
+
+    <div class="sqd-card" id="jobs-list">
+      <table>
+        <thead>
+          <tr>
+            <th scope="col">
+              <input type="checkbox" data-selection-target="selectAll"
+                     data-action="change->selection#selectAll"
+                     aria-label="Select all jobs">
+            </th>
+            <th scope="col">Job Class</th>
+            <th scope="col">Queue</th>
+            <th scope="col">Priority</th>
+            <th scope="col">Scheduled At</th>
+            <th scope="col">Enqueued At</th>
+            <th scope="col"><span class="sqd-sr-only">Actions</span></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @jobs.each do |execution| %>
+            <% job = execution.job %>
+            <tr id="execution_<%= execution.id %>">
+              <td>
+                <input type="checkbox" value="<%= execution.id %>"
+                       data-selection-target="checkbox"
+                       data-action="change->selection#toggle"
+                       aria-label="Select job <%= job.class_name %>">
+              </td>
+              <td>
+                <span class="sqd-badge sqd-badge--<%= @status %>"><%= @status %></span>
+                <%= link_to job.class_name, job_path(job), style: "margin-left: 0.5rem;", data: { turbo_frame: "_top" } %>
+              </td>
+              <td>
+                <%= link_to job.queue_name, queue_jobs_path(queue_name: job.queue_name, status: @status),
+                      class: "sqd-mono", style: "color: inherit;" %>
+              </td>
+              <td><%= job.priority %></td>
+              <td class="sqd-mono">
+                <%= job.scheduled_at ? job.scheduled_at.strftime("%Y-%m-%d %H:%M:%S") : "—" %>
+              </td>
+              <td class="sqd-mono"><%= job.created_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
               <td class="sqd-row-actions">
                 <%= button_to "Discard", job_path(execution),
                       method: :delete,
-                      params: { status: @status },
+                      params: { status: @status, period: @period },
                       class: "sqd-btn sqd-btn--danger sqd-btn--sm",
                       data: { confirm: "Discard this job?" } %>
               </td>
-            <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% else %>
+  <div class="sqd-card" id="jobs-list">
+    <% if @jobs.empty? %>
+      <div class="sqd-empty">No <%= @status %> jobs.</div>
+    <% else %>
+      <table>
+        <thead>
+          <tr>
+            <th scope="col">Job Class</th>
+            <th scope="col">Queue</th>
+            <th scope="col">Priority</th>
+            <th scope="col">Scheduled At</th>
+            <th scope="col">Enqueued At</th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  <% end %>
-</div>
+        </thead>
+        <tbody>
+          <% @jobs.each do |execution| %>
+            <% job = execution.job %>
+            <tr id="execution_<%= execution.id %>">
+              <td>
+                <span class="sqd-badge sqd-badge--<%= @status %>"><%= @status %></span>
+                <%= link_to job.class_name, job_path(job), style: "margin-left: 0.5rem;", data: { turbo_frame: "_top" } %>
+              </td>
+              <td>
+                <%= link_to job.queue_name, queue_jobs_path(queue_name: job.queue_name, status: @status),
+                      class: "sqd-mono", style: "color: inherit;" %>
+              </td>
+              <td><%= job.priority %></td>
+              <td class="sqd-mono">
+                <%= job.scheduled_at ? job.scheduled_at.strftime("%Y-%m-%d %H:%M:%S") : "—" %>
+              </td>
+              <td class="sqd-mono"><%= job.created_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </div>
+<% end %>
 
 <% if @pagy.last > 1 %>
   <%= @pagy.series_nav.html_safe %>

data/app/views/solid_queue_web/processes/index.html.erb

@@ -1,3 +1,4 @@
+<%= turbo_frame_tag "processes", target: "_top", data: { controller: "refresh", refresh_interval_value: 10000 } do %>
 <h1 class="sqd-page-title">Processes</h1>
 
 <div class="sqd-card">
@@ -51,4 +52,5 @@
       </tbody>
     </table>
   <% end %>
-</div>
+</div>
+<% end %>

data/app/views/solid_queue_web/queues/index.html.erb

@@ -10,6 +10,8 @@
           <th scope="col">Name</th>
           <th scope="col">Size</th>
           <th scope="col">Latency</th>
+          <th scope="col">Done (24h)</th>
+          <th scope="col">Failed (24h)</th>
           <th scope="col">Status</th>
           <th scope="col"><span class="sqd-sr-only">Actions</span></th>
         </tr>
@@ -19,7 +21,19 @@
           <tr>
             <td class="sqd-mono"><%= queue.name %></td>
             <td><%= queue.size %></td>
-            <td><%= queue.human_latency %></td>
+            <td>
+              <% if (oldest = @oldest_ready[queue.name]) %>
+                <% age = Time.current - oldest %>
+                <% latency_color = age > 86_400 ? "var(--danger)" : age > 3_600 ? "var(--warning)" : "inherit" %>
+                <abbr title="<%= oldest.strftime("%Y-%m-%d %H:%M:%S UTC") %>">
+                  <span style="color: <%= latency_color %>"><%= format_duration(age) %></span>
+                </abbr>
+              <% else %>
+                <span style="color: var(--muted)">—</span>
+              <% end %>
+            </td>
+            <td style="color: var(--success);"><%= @completed_24h[queue.name] || 0 %></td>
+            <td style="color: <%= (@failed_24h[queue.name] || 0) > 0 ? "var(--danger)" : "inherit" %>;"><%= @failed_24h[queue.name] || 0 %></td>
             <td>
               <% if queue.paused? %>
                 <span class="sqd-badge sqd-badge--paused">Paused</span>

data/app/views/solid_queue_web/search/index.html.erb

@@ -0,0 +1,64 @@
+<h1 class="sqd-page-title" style="margin-bottom: 1.5rem;">Search Jobs</h1>
+
+<datalist id="job-class-list">
+  <% @job_classes.each do |klass| %>
+    <option value="<%= klass %>">
+  <% end %>
+</datalist>
+
+<form class="sqd-search sqd-search--global" action="<%= search_path %>" method="get" data-controller="search">
+  <input class="sqd-search__input sqd-search__input--lg" type="search" name="q"
+         value="<%= @query %>" placeholder="Search by job class name…"
+         list="job-class-list" autocomplete="off"
+         aria-label="Search all jobs by class name"
+         data-action="change->search#select">
+  <% if @query.present? %>
+    <%= link_to "Clear", search_path, class: "sqd-btn sqd-btn--muted" %>
+  <% end %>
+</form>
+
+<% if @query.present? %>
+  <% if @results.empty? %>
+    <div class="sqd-empty" style="margin-top: 1rem;">No jobs found matching &ldquo;<%= @query %>&rdquo;.</div>
+  <% else %>
+    <% @results.each do |status, data| %>
+      <div class="sqd-search-group">
+        <div class="sqd-search-group__header">
+          <span class="sqd-badge sqd-badge--<%= status %>"><%= status %></span>
+          <span class="sqd-muted-text">
+            <%= pluralize(data[:total], "match", "matches") %>
+            <% if data[:total] > SolidQueueWeb::SearchController::LIMIT %>
+              &mdash; showing first <%= SolidQueueWeb::SearchController::LIMIT %>
+            <% end %>
+          </span>
+          <% if status == "failed" %>
+            <%= link_to "View all →", failed_jobs_path(q: @query), class: "sqd-btn sqd-btn--muted sqd-btn--sm" %>
+          <% else %>
+            <%= link_to "View all →", jobs_path(status: status, q: @query), class: "sqd-btn sqd-btn--muted sqd-btn--sm" %>
+          <% end %>
+        </div>
+        <div class="sqd-card">
+          <table>
+            <thead>
+              <tr>
+                <th scope="col">Job Class</th>
+                <th scope="col">Queue</th>
+                <th scope="col">Enqueued At</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% data[:executions].each do |execution| %>
+                <% job = execution.job %>
+                <tr>
+                  <td><%= link_to job.class_name, job_path(job) %></td>
+                  <td class="sqd-mono"><%= job.queue_name %></td>
+                  <td class="sqd-mono"><%= job.created_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/config/importmap.rb

@@ -1,2 +1,4 @@
 pin "solid_queue_web", to: "solid_queue_web/application.js"
 pin "solid_queue_web/search_controller", to: "solid_queue_web/search_controller.js"
+pin "solid_queue_web/refresh_controller", to: "solid_queue_web/refresh_controller.js"
+pin "solid_queue_web/selection_controller", to: "solid_queue_web/selection_controller.js"

data/config/routes.rb

@@ -1,25 +1,35 @@
 SolidQueueWeb::Engine.routes.draw do
   root to: "dashboard#index"
 
-  resources :recurring_tasks, only: [ :index ]
-  resources :processes, only: [ :index ]
-  resources :queues, only: [ :index ], param: :name do
+  get "search", to: "search#index", as: :search
+  get "history", to: "history#index", as: :history
+
+  resources :recurring_tasks, only: [:index]
+  resources :processes, only: [:index]
+  resources :queues, only: [:index], param: :name do
     member do
       post :pause
       post :resume
     end
-    resources :jobs, path: "list", only: [ :index, :destroy ], controller: "queues/jobs" do
+    resources :jobs, path: "list", only: [:index, :destroy], controller: "queues/jobs" do
       collection do
         post :discard_all
       end
     end
   end
-  resources :jobs, path: "list", only: [ :index, :show, :destroy ] do
+
+  # Singular selection resources must be defined before the member routes of their
+  # parent resources, otherwise DELETE /list/selection matches /list/:id first.
+  resource :job_selection, path: "list/selection", only: [:destroy], controller: "jobs/selections"
+  resources :jobs, path: "list", only: [:index, :show, :destroy] do
     collection do
       post :discard_all
     end
   end
-  resources :failed_jobs, only: [ :index, :destroy ] do
+
+  resource :failed_job_selection, path: "failed_jobs/selection", only: [:create, :destroy],
+           controller: "failed_jobs/selections"
+  resources :failed_jobs, only: [:index, :destroy] do
     collection do
       post :retry_all
       post :discard_all

data/lib/solid_queue_web/version.rb

@@ -1,3 +1,3 @@
 module SolidQueueWeb
-  VERSION = "0.5.5"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_web
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Chuck Smith
@@ -91,24 +91,42 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/stylesheets/solid_queue_web/_01_base.css
+- app/assets/stylesheets/solid_queue_web/_02_layout.css
+- app/assets/stylesheets/solid_queue_web/_03_stats.css
+- app/assets/stylesheets/solid_queue_web/_04_table.css
+- app/assets/stylesheets/solid_queue_web/_05_badges.css
+- app/assets/stylesheets/solid_queue_web/_06_buttons.css
+- app/assets/stylesheets/solid_queue_web/_07_forms.css
+- app/assets/stylesheets/solid_queue_web/_08_detail.css
+- app/assets/stylesheets/solid_queue_web/_09_pagination.css
+- app/assets/stylesheets/solid_queue_web/_10_responsive.css
+- app/assets/stylesheets/solid_queue_web/_11_throughput.css
 - app/assets/stylesheets/solid_queue_web/application.css
 - app/controllers/solid_queue_web/application_controller.rb
 - app/controllers/solid_queue_web/dashboard_controller.rb
+- app/controllers/solid_queue_web/failed_jobs/selections_controller.rb
 - app/controllers/solid_queue_web/failed_jobs_controller.rb
+- app/controllers/solid_queue_web/history_controller.rb
+- app/controllers/solid_queue_web/jobs/selections_controller.rb
 - app/controllers/solid_queue_web/jobs_controller.rb
 - app/controllers/solid_queue_web/processes_controller.rb
 - app/controllers/solid_queue_web/queues/jobs_controller.rb
 - app/controllers/solid_queue_web/queues_controller.rb
 - app/controllers/solid_queue_web/recurring_tasks_controller.rb
+- app/controllers/solid_queue_web/search_controller.rb
 - app/helpers/solid_queue_web/application_helper.rb
 - app/javascript/solid_queue_web/application.js
+- app/javascript/solid_queue_web/refresh_controller.js
 - app/javascript/solid_queue_web/search_controller.js
+- app/javascript/solid_queue_web/selection_controller.js
 - app/jobs/solid_queue_web/application_job.rb
 - app/models/solid_queue_web/application_record.rb
 - app/models/solid_queue_web/job.rb
 - app/views/layouts/solid_queue_web/application.html.erb
 - app/views/solid_queue_web/dashboard/index.html.erb
 - app/views/solid_queue_web/failed_jobs/index.html.erb
+- app/views/solid_queue_web/history/index.html.erb
 - app/views/solid_queue_web/jobs/destroy.turbo_stream.erb
 - app/views/solid_queue_web/jobs/index.html.erb
 - app/views/solid_queue_web/jobs/show.html.erb
@@ -117,6 +135,7 @@ files:
 - app/views/solid_queue_web/queues/jobs/destroy.turbo_stream.erb
 - app/views/solid_queue_web/queues/jobs/index.html.erb
 - app/views/solid_queue_web/recurring_tasks/index.html.erb
+- app/views/solid_queue_web/search/index.html.erb
 - config/importmap.rb
 - config/routes.rb
 - lib/solid_queue_web.rb