good_job 2.4.2 → 2.6.2

data/engine/app/charts/good_job/scheduled_by_queue_chart.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module GoodJob
+  class ScheduledByQueueChart
+    def initialize(filter)
+      @filter = filter
+    end
+
+    def data
+      end_time = Time.current
+      start_time = end_time - 1.day
+
+      count_query = Arel.sql(GoodJob::Execution.pg_or_jdbc_query(<<~SQL.squish))
+        SELECT *
+        FROM generate_series(
+          date_trunc('hour', $1::timestamp),
+          date_trunc('hour', $2::timestamp),
+          '1 hour'
+        ) timestamp
+        LEFT JOIN (
+          SELECT
+              date_trunc('hour', scheduled_at) AS scheduled_at,
+              queue_name,
+              count(*) AS count
+            FROM (
+              #{@filter.filtered_query.except(:select, :order).select('queue_name', 'COALESCE(good_jobs.scheduled_at, good_jobs.created_at)::timestamp AS scheduled_at').to_sql}
+            ) sources
+            GROUP BY date_trunc('hour', scheduled_at), queue_name
+        ) sources ON sources.scheduled_at = timestamp
+        ORDER BY timestamp ASC
+      SQL
+
+      binds = [[nil, start_time], [nil, end_time]]
+      executions_data = GoodJob::Execution.connection.exec_query(GoodJob::Execution.pg_or_jdbc_query(count_query), "GoodJob Dashboard Chart", binds)
+
+      queue_names = executions_data.reject { |d| d['count'].nil? }.map { |d| d['queue_name'] || BaseFilter::EMPTY }.uniq
+      labels = []
+      queues_data = executions_data.to_a.group_by { |d| d['timestamp'] }.each_with_object({}) do |(timestamp, values), hash|
+        labels << timestamp.in_time_zone.strftime('%H:%M')
+        queue_names.each do |queue_name|
+          (hash[queue_name] ||= []) << values.find { |d| d['queue_name'] == queue_name }&.[]('count')
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: queues_data.map do |queue, data|
+          label = queue || '(none)'
+          {
+            label: label,
+            data: data,
+            backgroundColor: string_to_hsl(label),
+            borderColor: string_to_hsl(label),
+          }
+        end,
+      }
+    end
+
+    def string_to_hsl(string)
+      hash_value = string.sum
+
+      hue = hash_value % 360
+      saturation = (hash_value % 50) + 50
+      lightness = '50'
+
+      "hsl(#{hue}, #{saturation}%, #{lightness}%)"
+    end
+  end
+end

data/engine/app/controllers/good_job/assets_controller.rb

@@ -15,12 +15,16 @@ module GoodJob
       render file: GoodJob::Engine.root.join("app", "assets", "vendor", "bootstrap", "bootstrap.bundle.min.js")
     end
 
-    def chartist_css
-      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartist", "chartist.css")
+    def chartjs_js
+      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartjs", "chart.min.js")
     end
 
-    def chartist_js
-      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartist", "chartist.js")
+    def rails_ujs_js
+      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "rails_ujs.js")
+    end
+
+    def scripts_js
+      render file: GoodJob::Engine.root.join("app", "assets", "scripts.js")
     end
 
     def style_css

data/engine/app/controllers/good_job/cron_entries_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module GoodJob
+  class CronEntriesController < GoodJob::BaseController
+    def index
+      @cron_entries = CronEntry.all
+    end
+
+    def show
+      @cron_entry = CronEntry.find(params[:id])
+      @jobs_filter = JobsFilter.new(params, @cron_entry.jobs)
+    end
+
+    def enqueue
+      @cron_entry = CronEntry.find(params[:id])
+      @cron_entry.enqueue(Time.current)
+      redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been enqueued.")
+    end
+  end
+end

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 module GoodJob
   class JobsController < GoodJob::BaseController
+    rescue_from GoodJob::ActiveJobJob::AdapterNotGoodJobError,
+                GoodJob::ActiveJobJob::ActionForStateMismatchError,
+                with: :redirect_on_error
+
     def index
       @filter = JobsFilter.new(params)
     end
@@ -10,5 +14,37 @@ module GoodJob
                                       .order(Arel.sql("COALESCE(scheduled_at, created_at) DESC"))
       redirect_to root_path, alert: "Executions for Active Job #{params[:id]} not found" if @executions.empty?
     end
+
+    def discard
+      @job = ActiveJobJob.find(params[:id])
+      @job.discard_job("Discarded through dashboard")
+      redirect_back(fallback_location: jobs_path, notice: "Job has been discarded")
+    end
+
+    def reschedule
+      @job = ActiveJobJob.find(params[:id])
+      @job.reschedule_job
+      redirect_back(fallback_location: jobs_path, notice: "Job has been rescheduled")
+    end
+
+    def retry
+      @job = ActiveJobJob.find(params[:id])
+      @job.retry_job
+      redirect_back(fallback_location: jobs_path, notice: "Job has been retried")
+    end
+
+    private
+
+    def redirect_on_error(exception)
+      alert = case exception
+              when GoodJob::ActiveJobJob::AdapterNotGoodJobError
+                "ActiveJob Queue Adapter must be GoodJob."
+              when GoodJob::ActiveJobJob::ActionForStateMismatchError
+                "Job is not in an appropriate state for this action."
+              else
+                exception.to_s
+              end
+      redirect_back(fallback_location: jobs_path, alert: alert)
+    end
   end
 end

data/engine/app/filters/good_job/base_filter.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 module GoodJob
   class BaseFilter
-    attr_accessor :params
+    DEFAULT_LIMIT = 25
+    EMPTY = '[none]'
 
-    def initialize(params)
+    attr_accessor :params, :base_query
+
+    def initialize(params, base_query = nil)
       @params = params
+      @base_query = base_query || default_base_query
     end
 
     def records
@@ -13,7 +17,7 @@ module GoodJob
       filtered_query.display_all(
         after_scheduled_at: after_scheduled_at,
         after_id: params[:after_id]
-      ).limit(params.fetch(:limit, 25))
+      ).limit(params.fetch(:limit, DEFAULT_LIMIT))
     end
 
     def last
@@ -22,13 +26,13 @@ module GoodJob
 
     def job_classes
       base_query.group("serialized_params->>'job_class'").count
-                .sort_by { |name, _count| name }
+                .sort_by { |name, _count| name.to_s }
                 .to_h
     end
 
     def queues
       base_query.group(:queue_name).count
-                .sort_by { |name, _count| name }
+                .sort_by { |name, _count| name.to_s || EMPTY }
                 .to_h
     end
 
@@ -36,65 +40,23 @@ module GoodJob
       raise NotImplementedError
     end
 
-    def to_params(override)
+    def to_params(override = {})
       {
-        state: params[:state],
         job_class: params[:job_class],
-      }.merge(override).delete_if { |_, v| v.nil? }
+        limit: params[:limit],
+        queue_name: params[:queue_name],
+        query: params[:query],
+        state: params[:state],
+      }.merge(override).delete_if { |_, v| v.blank? }
     end
 
-    def chart_data
-      count_query = Arel.sql(GoodJob::Execution.pg_or_jdbc_query(<<~SQL.squish))
-        SELECT *
-        FROM generate_series(
-          date_trunc('hour', $1::timestamp),
-          date_trunc('hour', $2::timestamp),
-          '1 hour'
-        ) timestamp
-        LEFT JOIN (
-          SELECT
-              date_trunc('hour', scheduled_at) AS scheduled_at,
-              queue_name,
-              count(*) AS count
-            FROM (
-              #{filtered_query.except(:select).select('queue_name', 'COALESCE(good_jobs.scheduled_at, good_jobs.created_at)::timestamp AS scheduled_at').to_sql}
-            ) sources
-            GROUP BY date_trunc('hour', scheduled_at), queue_name
-        ) sources ON sources.scheduled_at = timestamp
-        ORDER BY timestamp ASC
-      SQL
-
-      current_time = Time.current
-      binds = [[nil, current_time - 1.day], [nil, current_time]]
-      executions_data = GoodJob::Execution.connection.exec_query(count_query, "GoodJob Dashboard Chart", binds)
-
-      queue_names = executions_data.map { |d| d['queue_name'] }.uniq
-      labels = []
-      queues_data = executions_data.to_a.group_by { |d| d['timestamp'] }.each_with_object({}) do |(timestamp, values), hash|
-        labels << timestamp.in_time_zone.strftime('%H:%M %z')
-        queue_names.each do |queue_name|
-          (hash[queue_name] ||= []) << values.find { |d| d['queue_name'] == queue_name }&.[]('count')
-        end
-      end
-
-      {
-        labels: labels,
-        series: queues_data.map do |queue, data|
-          {
-            name: queue,
-            data: data,
-          }
-        end,
-      }
+    def filtered_query
+      raise NotImplementedError
     end
 
     private
 
-    def base_query
-      raise NotImplementedError
-    end
-
-    def filtered_query
+    def default_base_query
       raise NotImplementedError
     end
   end

data/engine/app/filters/good_job/executions_filter.rb

@@ -10,16 +10,11 @@ module GoodJob
       }
     end
 
-    private
-
-    def base_query
-      GoodJob::Execution.all
-    end
-
     def filtered_query
       query = base_query
-      query = query.job_class(params[:job_class]) if params[:job_class]
-      query = query.where(queue_name: params[:queue_name]) if params[:queue_name]
+      query = query.job_class(params[:job_class]) if params[:job_class].present?
+      query = query.where(queue_name: params[:queue_name]) if params[:queue_name].present?
+      query = query.search_text(params[:query]) if params[:query].present?
 
       if params[:state]
         case params[:state]
@@ -36,5 +31,11 @@ module GoodJob
 
       query
     end
+
+    private
+
+    def default_base_query
+      GoodJob::Execution.all
+    end
   end
 end

data/engine/app/filters/good_job/jobs_filter.rb

@@ -12,16 +12,13 @@ module GoodJob
       }
     end
 
-    private
-
-    def base_query
-      GoodJob::ActiveJobJob.all
-    end
-
     def filtered_query
-      query = base_query
-      query = query.job_class(params[:job_class]) if params[:job_class]
-      query = query.where(queue_name: params[:queue_name]) if params[:queue_name]
+      query = base_query.includes(:executions)
+                        .joins_advisory_locks.select('good_jobs.*', 'pg_locks.locktype AS locktype')
+
+      query = query.job_class(params[:job_class]) if params[:job_class].present?
+      query = query.where(queue_name: params[:queue_name]) if params[:queue_name].present?
+      query = query.search_text(params[:query]) if params[:query].present?
 
       if params[:state]
         case params[:state]
@@ -42,5 +39,11 @@ module GoodJob
 
       query
     end
+
+    private
+
+    def default_base_query
+      GoodJob::ActiveJobJob.all
+    end
   end
 end

data/engine/app/views/good_job/cron_entries/index.html.erb

@@ -0,0 +1,51 @@
+<% if @cron_entries.present? %>
+  <div class="card my-3">
+    <div class="table-responsive">
+      <table class="table card-table table-bordered table-hover table-sm mb-0">
+        <thead>
+          <th>Key</th>
+          <th>Schedule</th>
+          <th>
+            Properties
+            <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                           data: { bs_toggle: "collapse", bs_target: ".cron-entry-properties" },
+                           aria: { expanded: false, controls: @cron_entries.map { |cron_entry| "##{dom_id(cron_entry, 'properties')}" }.join(" ") }
+            %>
+          </th>
+          <th>Description</th>
+          <th>Next scheduled</th>
+          <th>Last run</th>
+          <th>Actions</th>
+        </thead>
+        <tbody>
+          <% @cron_entries.each do |cron_entry| %>
+            <tr id="<%= dom_id(cron_entry) %>">
+              <td class="font-monospace"><%= cron_entry.key %></td>
+              <td class="font-monospace"><%= cron_entry.schedule %></td>
+              <td>
+                <%= tag.button("Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                        data: { bs_toggle: "collapse", bs_target: "##{dom_id(cron_entry, 'properties')}" },
+                        aria: { expanded: false, controls: dom_id(cron_entry, 'properties') }) %>
+                <%= tag.pre(JSON.pretty_generate(cron_entry.display_properties), id: dom_id(cron_entry, 'properties'), class: "collapse cron-entry-properties") %>
+              </td>
+              <td><%= cron_entry.description %></td>
+              <td><%= cron_entry.next_at %></td>
+              <td>
+                <% if cron_entry.last_job.present? %>
+                  <%= link_to cron_entry.last_at, cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
+                <% end %>
+              </td>
+              <td>
+                <%= button_to enqueue_cron_entry_path(cron_entry.id), method: :post, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: "Run cron entry now" }, title: "Run cron entry now", data: { confirm: "Confirm run cron entry now" } do %>
+                  <%= render "good_job/shared/icons/play" %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% else %>
+  <em>No cron schedules present.</em>
+<% end %>

data/engine/app/views/good_job/cron_entries/show.html.erb

@@ -0,0 +1,4 @@
+<h1 class="mb-3">Cron Entry Key: <code><%= @cron_entry.id %></code></h1>
+
+<%= render 'good_job/shared/filter', filter: @jobs_filter %>
+<%= render 'good_job/jobs/table', jobs: @jobs_filter.records %>

data/engine/app/views/good_job/{shared/_executions_table.erb → executions/_table.erb}

@@ -44,7 +44,7 @@
               <%= tag.pre JSON.pretty_generate(execution.serialized_params), id: dom_id(execution, "params"), class: "collapse job-params" %>
             </td>
             <td>
-              <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution" do %>
+              <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution", data: { confirm: "Confirm delete" } do %>
                 <%= render "good_job/shared/icons/trash" %>
               <% end %>
             </td>

data/engine/app/views/good_job/executions/index.html.erb

@@ -1,11 +1,11 @@
 <div class="card my-3 p-6">
-  <%= render 'good_job/shared/chart', chart_data: @filter.chart_data %>
+  <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
 <%= render 'good_job/shared/filter', filter: @filter %>
 
 <% if @filter.records.present? %>
-  <%= render 'good_job/shared/executions_table', executions: @filter.records %>
+  <%= render 'good_job/executions/table', executions: @filter.records %>
 
   <nav aria-label="Job pagination" class="mt-3">
     <ul class="pagination">

data/engine/app/views/good_job/{shared/_jobs_table.erb → jobs/_table.erb}

@@ -22,7 +22,7 @@
       </thead>
       <tbody>
         <% jobs.each do |job| %>
-          <tr id="<%= dom_id(job) %>">
+          <tr class="<%= dom_class(job) %>" id="<%= dom_id(job) %>">
             <td>
               <%= link_to job_path(job.id) do %>
                 <code><%= job.id %></code>
@@ -43,11 +43,23 @@
               %>
               <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
             </td>
-<!--            <td>-->
-              <%#= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution" do %>
-                <%#= render "good_job/shared/icons/trash" %>
-              <%# end %>
-<!--            </td>-->
+            <td>
+              <div class="text-nowrap">
+                <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
+                <%= button_to reschedule_job_path(job.id), method: :put, class: "btn btn-sm #{job_reschedulable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_reschedulable, aria: { label: "Reschedule job" }, title: "Reschedule job", data: { confirm: "Confirm reschedule" } do %>
+                  <%= render "good_job/shared/icons/skip_forward" %>
+                <% end %>
+
+                <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
+                <%= button_to discard_job_path(job.id), method: :put, class: "btn btn-sm #{job_discardable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_discardable, aria: { label: "Discard job" }, title: "Discard job", data: { confirm: "Confirm discard" } do %>
+                  <%= render "good_job/shared/icons/stop" %>
+                <% end %>
+
+                <%= button_to retry_job_path(job.id), method: :put, class: "btn btn-sm #{job.status == :discarded ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: job.status != :discarded, aria: { label: "Retry job" }, title: "Retry job", data: { confirm: "Confirm retry" } do %>
+                  <%= render "good_job/shared/icons/arrow_clockwise" %>
+                <% end %>
+              </div>
+            </td>
           </tr>
         <% end %>
       </tbody>

data/engine/app/views/good_job/jobs/index.html.erb

@@ -1,7 +1,20 @@
 <div class="card my-3 p-6">
-  <%= render 'good_job/shared/chart', chart_data: @filter.chart_data %>
+  <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
 <%= render 'good_job/shared/filter', filter: @filter %>
 
-<%= render 'good_job/shared/jobs_table', jobs: @filter.records %>
+<% if @filter.records.present? %>
+  <%= render 'good_job/jobs/table', jobs: @filter.records %>
+  <nav aria-label="Job pagination" class="mt-3">
+    <ul class="pagination">
+      <li class="page-item">
+        <%= link_to(@filter.to_params(after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id), class: "page-link") do %>
+          Older jobs <span aria-hidden="true">&raquo;</span>
+        <% end %>
+      </li>
+    </ul>
+  </nav>
+<% else %>
+  <em>No jobs present.</em>
+<% end %>

data/engine/app/views/good_job/jobs/show.html.erb

@@ -1,3 +1,3 @@
-<h1>ActiveJob ID: <code><%= @executions.first.id %></code></h1>
+<h1 class="mb-3">ActiveJob ID: <code><%= @executions.first.id %></code></h1>
 
-<%= render 'good_job/shared/executions_table', executions: @executions %>
+<%= render 'good_job/executions/table', executions: @executions %>

data/engine/app/views/good_job/shared/_chart.erb

@@ -1,52 +1,25 @@
-<div id="chart"></div>
+<div class="chart-wrapper">
+  <canvas id="chart"></canvas>
+</div>
 
 <%= javascript_tag nonce: true do %>
-  new Chartist.Line('#chart', <%== chart_data.to_json %>, {
-    height: '300px',
-    fullWidth: true,
-    chartPadding: {
-      right: 40,
-      top: 20,
-      bottom: 20
+  const chartData = <%== chart_data.to_json %>;
+
+  const ctx = document.getElementById('chart').getContext('2d');
+  const chart = new Chart(ctx, {
+    type: 'line',
+    data: {
+      labels: chartData.labels,
+      datasets: chartData.datasets
     },
-    axisX: {
-      labelInterpolationFnc: function(value, index) {
-        return index % 3 === 0 ? value : null;
+    options: {
+      responsive: true,
+      maintainAspectRatio: false,
+      scales: {
+        y: {
+          beginAtZero: true
+        }
       }
-    },
-    axisY: {
-      low: 0,
-      onlyInteger: true
     }
-  })
-
-  // https://www.smashingmagazine.com/2014/12/chartist-js-open-source-library-responsive-charts/
-  const chartEl = document.getElementById('chart');
-  const tooltipEl = document.createElement('div')
-
-  tooltipEl.classList.add('tooltip', 'tooltip-hidden');
-  chartEl.appendChild(tooltipEl);
-
-  document.body.addEventListener('mouseenter', function (event) {
-    if (!(event.target.matches && event.target.matches('.ct-point'))) return;
-
-    const seriesName = event.target.closest('.ct-series').getAttribute('ct:series-name');
-    const value = event.target.getAttribute('ct:value');
-
-    tooltipEl.innerText = seriesName + ': ' + value;
-    tooltipEl.classList.remove('tooltip-hidden');
-  }, true);
-
-  document.body.addEventListener('mouseleave', function (event) {
-    if (!(event.target.matches && event.target.matches('.ct-point'))) return;
-
-    tooltipEl.classList.add('tooltip-hidden');
-  }, true);
-
-  document.body.addEventListener('mousemove', function(event) {
-    if (!(event.target.matches && event.target.matches('.ct-point'))) return;
-
-    tooltipEl.style.left = (event.offsetX || event.originalEvent.layerX) + tooltipEl.offsetWidth + 10 + 'px';
-    tooltipEl.style.top = (event.offsetY || event.originalEvent.layerY) + tooltipEl.offsetHeight - 20 + 'px';
-  }, true);
+  });
 <% end %>

data/engine/app/views/good_job/shared/_filter.erb

@@ -1,52 +1,66 @@
 <div class='card mb-2'>
   <div class='card-body d-flex flex-wrap'>
-
-    <div class='me-4'>
+    <div class='mb-2 me-4'>
       <small>Filter by job class</small>
       <br>
-      <% @filter.job_classes.each do |name, count| %>
+      <% filter.job_classes.each do |name, count| %>
         <% if params[:job_class] == name %>
-          <%= link_to(@filter.to_params(job_class: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(job_class: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(job_class: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(job_class: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>
       <% end %>
     </div>
 
-    <div class='me-4'>
+    <div class='mb-2 me-4'>
       <small>Filter by state</small>
       <br>
-      <% @filter.states.each do |name, count| %>
+      <% filter.states.each do |name, count| %>
         <% if params[:state] == name %>
-          <%= link_to(@filter.to_params(state: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(state: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(state: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(state: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>
       <% end %>
     </div>
 
-    <div>
+    <div class='mb-2 me-4'>
       <small>Filter by queue</small>
       <br>
-      <% @filter.queues.each do |name, count| %>
+      <% filter.queues.each do |name, count| %>
         <% if params[:queue_name] == name %>
-          <%= link_to(@filter.to_params(queue_name: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(queue_name: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(queue_name: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(queue_name: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>
       <% end %>
     </div>
+
+    <div class="mb-2">
+      <%= form_with(url: "", method: :get, local: true) do |form| %>
+        <% filter.to_params(query: nil).each do |key, value| %>
+          <%= form.hidden_field(key.to_sym, value: value) %>
+        <% end %>
+
+        <small><%= form.label :query, "Search" %></small>
+        <div class="input-group input-group-sm">
+          <%= form.search_field :query, value: params[:query], class: "form-control" %>
+          <%= form.button "Search", type: "submit", name: nil, class: "btn btn-sm btn-outline-secondary" %>
+          <%= link_to "Clear", filter.to_params(query: nil), class: "btn btn-sm btn-outline-secondary" %>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>

data/engine/app/views/good_job/shared/icons/_arrow_clockwise.html.erb

@@ -0,0 +1,5 @@
+<!-- https://icons.getbootstrap.com/icons/arrow-clockwise/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
+  <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z" />
+</svg>