<%= link_to jobs_path(status: "ready"), class: "sqd-stat sqd-stat--ready sqd-stat--link" do %>
-
<%= @stats[:ready] %>
+
<%= @stats.counts[:ready] %>
Ready
<% end %>
<%= link_to jobs_path(status: "scheduled"), class: "sqd-stat sqd-stat--scheduled sqd-stat--link" do %>
-
<%= @stats[:scheduled] %>
+
<%= @stats.counts[:scheduled] %>
Scheduled
<% end %>
<%= link_to jobs_path(status: "claimed"), class: "sqd-stat sqd-stat--claimed sqd-stat--link" do %>
-
<%= @stats[:claimed] %>
+
<%= @stats.counts[:claimed] %>
Running
<% end %>
<%= link_to jobs_path(status: "blocked"), class: "sqd-stat sqd-stat--blocked sqd-stat--link" do %>
-
<%= @stats[:blocked] %>
+
<%= @stats.counts[:blocked] %>
Blocked
<% end %>
<%= link_to failed_jobs_path, class: "sqd-stat sqd-stat--failed sqd-stat--link" do %>
-
<%= @stats[:failed] %>
+
<%= @stats.counts[:failed] %>
Failed
<% end %>
<%= link_to queues_path, class: "sqd-stat sqd-stat--queues sqd-stat--link" do %>
-
<%= @stats[:queues] %>
+
<%= @stats.counts[:queues] %>
Queues
<% end %>
<%= link_to recurring_tasks_path, class: "sqd-stat sqd-stat--recurring sqd-stat--link" do %>
-
<%= @stats[:recurring] %>
+
<%= @stats.counts[:recurring] %>
Recurring
<% end %>
<%= link_to processes_path, class: "sqd-stat sqd-stat--processes sqd-stat--link" do %>
-
<%= @stats[:processes] %>
+
<%= @stats.counts[:processes] %>
Processes
<% end %>
<%= link_to history_path(period: "1h"), class: "sqd-stat sqd-stat--done sqd-stat--link" do %>
-
<%= @throughput[:completed_1h] %>
+
<%= @stats.throughput[:completed_1h] %>
Done (1h)
<% end %>
<%= link_to history_path(period: "24h"), class: "sqd-stat sqd-stat--done sqd-stat--link" do %>
-
<%= @throughput[:completed_24h] %>
+
<%= @stats.throughput[:completed_24h] %>
Done (24h)
<% end %>
- <% if @throughput[:completed_24h] == 0 %>
+ <% if @stats.throughput[:completed_24h] == 0 %>
No completed jobs in the last 24 hours
<% else %>
- <% @sparkline.each_with_index do |count, i| %>
+ <% @stats.sparkline.each_with_index do |count, i| %>
<% pct = (count.to_f / max_val * 100).round %>
<% hour_start = (12 - i).hours.ago %>
<% show_tick = [0, 3, 6, 9, 11].include?(i) %>
@@ -74,6 +74,36 @@
<% end %>
+<% current_depth = @stats.counts[:ready] + @stats.counts[:scheduled] + @stats.counts[:claimed] + @stats.counts[:blocked] + @stats.counts[:failed] %>
+<% max_depth = [@stats.depth_sparkline.max, 1].max %>
+
+
+ <% if @stats.depth_sparkline.all?(&:zero?) %>
+
No active jobs in the last 12 hours
+ <% else %>
+
+ <% @stats.depth_sparkline.each_with_index do |depth, i| %>
+ <% pct = (depth.to_f / max_depth * 100).round %>
+ <% t = i == 11 ? Time.current : (12 - i).hours.ago %>
+ <% show_tick = [0, 3, 6, 9, 11].include?(i) %>
+
+
+
: <%= depth %> <%= "job".pluralize(depth) %> in queue">
+
+
<%= show_tick ? (i == 11 ? "now" : t.strftime("%-I%p").downcase) : "" %>
+
+ <% end %>
+
+ <% end %>
+
+
- <% if @stats[:failed] > 0 %>
+ <% if @stats.counts[:failed] > 0 %>
- <%= pluralize(@stats[:failed], "failed job") %> need attention.
+ <%= pluralize(@stats.counts[:failed], "failed job") %> need attention.
- <%= button_to "Retry All Failed", retry_all_failed_path,
+ <%= button_to "Retry All Failed", retry_all_failed_jobs_path,
method: :post,
class: "sqd-btn sqd-btn--primary",
- data: { confirm: "Retry all #{@stats[:failed]} failed #{"job".pluralize(@stats[:failed])}?" } %>
+ data: { confirm: "Retry all #{@stats.counts[:failed]} failed #{"job".pluralize(@stats.counts[:failed])}?" } %>
<%= link_to "Review →", failed_jobs_path, class: "sqd-btn sqd-btn--muted" %>
<% end %>
- <% if @stats[:blocked] > 0 %>
+ <% if @stats.counts[:blocked] > 0 %>
- <%= pluralize(@stats[:blocked], "blocked job") %>.
+ <%= pluralize(@stats.counts[:blocked], "blocked job") %>.
- <%= button_to "Discard All Blocked", discard_all_blocked_path,
- method: :post,
+ <%= button_to "Discard All Blocked", blocked_jobs_path,
+ method: :delete,
class: "sqd-btn sqd-btn--danger",
- data: { confirm: "Discard all #{@stats[:blocked]} blocked #{"job".pluralize(@stats[:blocked])}? This cannot be undone." } %>
+ data: { confirm: "Discard all #{@stats.counts[:blocked]} blocked #{"job".pluralize(@stats.counts[:blocked])}? This cannot be undone." } %>
<%= link_to "Review →", jobs_path(status: "blocked"), class: "sqd-btn sqd-btn--muted" %>
diff --git a/config/routes.rb b/config/routes.rb
index 713b71a..fbf7be9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,6 @@
SolidQueueWeb::Engine.routes.draw do
root to: "dashboard#index"
- post "retry_all_failed", to: "dashboard#retry_all_failed", as: :retry_all_failed
- post "discard_all_blocked", to: "dashboard#discard_all_blocked", as: :discard_all_blocked
+ resource :blocked_jobs, only: [:destroy]
get "search", to: "search#index", as: :search
get "history", to: "history#index", as: :history
diff --git a/spec/requests/solid_queue_web/blocked_jobs_spec.rb b/spec/requests/solid_queue_web/blocked_jobs_spec.rb
new file mode 100644
index 0000000..b45a001
--- /dev/null
+++ b/spec/requests/solid_queue_web/blocked_jobs_spec.rb
@@ -0,0 +1,38 @@
+require "rails_helper"
+
+RSpec.describe "BlockedJobs", type: :request do
+ let!(:blocked_job) do
+ j = SolidQueue::Job.create!(
+ queue_name: "default", class_name: "TestJob",
+ arguments: {}.to_json, active_job_id: SecureRandom.uuid
+ )
+ j.ready_execution&.destroy
+ j.update!(concurrency_key: "TestJob/1")
+ allow_any_instance_of(SolidQueue::BlockedExecution).to receive(:set_expires_at)
+ SolidQueue::BlockedExecution.create!(
+ job: j, queue_name: j.queue_name, priority: j.priority, expires_at: 1.hour.from_now
+ )
+ j
+ end
+
+ describe "DELETE /jobs/blocked_jobs" do
+ it "discards all blocked jobs and redirects to the dashboard" do
+ delete "/jobs/blocked_jobs"
+ expect(response).to redirect_to("/jobs/")
+ follow_redirect!
+ expect(response.body).to include("discarded")
+ end
+
+ it "removes the blocked execution" do
+ expect { delete "/jobs/blocked_jobs" }.to change(SolidQueue::BlockedExecution, :count).by(-1)
+ end
+
+ it "handles failure gracefully" do
+ allow(SolidQueue::BlockedExecution).to receive(:discard_all_from_jobs).and_raise(RuntimeError, "boom")
+ delete "/jobs/blocked_jobs"
+ expect(response).to redirect_to("/jobs/")
+ follow_redirect!
+ expect(response.body).to include("Could not discard blocked jobs")
+ end
+ end
+end
diff --git a/spec/requests/solid_queue_web/dashboard_spec.rb b/spec/requests/solid_queue_web/dashboard_spec.rb
index 87a3d77..088ad0d 100644
--- a/spec/requests/solid_queue_web/dashboard_spec.rb
+++ b/spec/requests/solid_queue_web/dashboard_spec.rb
@@ -46,74 +46,6 @@
end
end
- describe "POST /jobs/retry_all_failed" do
- let!(:failed_job) do
- j = SolidQueue::Job.create!(
- queue_name: "default", class_name: "TestJob",
- arguments: {}.to_json, active_job_id: SecureRandom.uuid
- )
- SolidQueue::FailedExecution.create!(
- job: j,
- error: { exception_class: "RuntimeError", message: "boom", backtrace: [] }
- )
- j
- end
-
- it "retries all failed jobs and redirects to the dashboard" do
- post "/jobs/retry_all_failed"
- expect(response).to redirect_to("/jobs/")
- follow_redirect!
- expect(response.body).to include("queued for retry")
- end
-
- it "removes the failed execution" do
- expect { post "/jobs/retry_all_failed" }.to change(SolidQueue::FailedExecution, :count).by(-1)
- end
-
- it "handles failure gracefully" do
- allow(SolidQueue::FailedExecution).to receive(:retry_all).and_raise(RuntimeError, "boom")
- post "/jobs/retry_all_failed"
- expect(response).to redirect_to("/jobs/")
- follow_redirect!
- expect(response.body).to include("Could not retry failed jobs")
- end
- end
-
- describe "POST /jobs/discard_all_blocked" do
- let!(:blocked_job) do
- j = SolidQueue::Job.create!(
- queue_name: "default", class_name: "TestJob",
- arguments: {}.to_json, active_job_id: SecureRandom.uuid
- )
- j.ready_execution&.destroy
- j.update!(concurrency_key: "TestJob/1")
- allow_any_instance_of(SolidQueue::BlockedExecution).to receive(:set_expires_at)
- SolidQueue::BlockedExecution.create!(
- job: j, queue_name: j.queue_name, priority: j.priority, expires_at: 1.hour.from_now
- )
- j
- end
-
- it "discards all blocked jobs and redirects to the dashboard" do
- post "/jobs/discard_all_blocked"
- expect(response).to redirect_to("/jobs/")
- follow_redirect!
- expect(response.body).to include("discarded")
- end
-
- it "removes the blocked execution" do
- expect { post "/jobs/discard_all_blocked" }.to change(SolidQueue::BlockedExecution, :count).by(-1)
- end
-
- it "handles failure gracefully" do
- allow(SolidQueue::BlockedExecution).to receive(:discard_all_from_jobs).and_raise(RuntimeError, "boom")
- post "/jobs/discard_all_blocked"
- expect(response).to redirect_to("/jobs/")
- follow_redirect!
- expect(response.body).to include("Could not discard blocked jobs")
- end
- end
-
describe "authentication" do
after { SolidQueueWeb.instance_variable_set(:@authenticate, nil) }