good_job 2.13.2 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe80504394d81f996c4d912ec4dc0b7c6750b5ecfd949af863a2d6087af68e8
-  data.tar.gz: 4c19aab29e610f5a73fe4682ac9824a6d8894e9713bc2c12e2373153093558b1
+  metadata.gz: 723ecfed33656e11fcabed4f807c7b9735e474cf15701d97faa0d95c84dd4280
+  data.tar.gz: 210f4f8c8d420d46630292212c015d245c2035e8e79dc1b3148fcb40e1b8dbd0
 SHA512:
-  metadata.gz: da255714957639ca3aafae09d0e8d4bba4e7e36ad1cd370b696b67170d88e16525f4e41751e306b5d671f74fffe36873283ad3f667a3183e532c86e255648353
-  data.tar.gz: 0fdf220cc5e6856eac99aef51aa5cd906596f6359c688bcb831d594f7a2355c37346bf63637715fd3669351a952f188f89ce24a01a47c561bcdabb28abdc5f86
+  metadata.gz: 20f4b5844debd83589f2dc4f9cebe7be963f9dd7ec6749227db7fad00aca4366cdb87003776194695db84f2bc23739b65f866460d92622dbad8923ff690b9799
+  data.tar.gz: 3528895af9ce6f1d4d2e33dab0b6a2fa60cb255d3211a0cfc5b0e97d0f2444e7270c696872c47562dd18d822a95a550345068073a50f80d7ebdd0c9eac782bf8

data/CHANGELOG.md

@@ -1,10 +1,52 @@
 # Changelog
 
+## [v2.14.2](https://github.com/bensheldon/good_job/tree/v2.14.2) (2022-05-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.14.1...v2.14.2)
+
+**Fixed bugs:**
+
+- Reintroduce fixed "Apply to all" mass action [\#586](https://github.com/bensheldon/good_job/pull/586) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- how to get the number of tasks in the queue and the size of the queue? [\#564](https://github.com/bensheldon/good_job/issues/564)
+- GoodJob tells me to upgrade but migrations fail [\#544](https://github.com/bensheldon/good_job/issues/544)
+
+**Merged pull requests:**
+
+- Update development dependencies [\#584](https://github.com/bensheldon/good_job/pull/584) ([bensheldon](https://github.com/bensheldon))
+- Refactor Dashboard Live Poll javascript [\#582](https://github.com/bensheldon/good_job/pull/582) ([bensheldon](https://github.com/bensheldon))
+
+## [v2.14.1](https://github.com/bensheldon/good_job/tree/v2.14.1) (2022-04-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.14.0...v2.14.1)
+
+**Fixed bugs:**
+
+- Temporarily disable Mass Action "Apply to all" because the action is badly scoped [\#583](https://github.com/bensheldon/good_job/pull/583) ([bensheldon](https://github.com/bensheldon))
+
+## [v2.14.0](https://github.com/bensheldon/good_job/tree/v2.14.0) (2022-04-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.13.2...v2.14.0)
+
+**Implemented enhancements:**
+
+- Add mass update operations for jobs to Dashboard [\#578](https://github.com/bensheldon/good_job/pull/578) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Allow "mass"-actions through Dashboard \(e.g. retry all\) [\#446](https://github.com/bensheldon/good_job/issues/446)
+
+**Merged pull requests:**
+
+- Track down incompatibility/race condition between JRuby and RSpec mocks in tests [\#581](https://github.com/bensheldon/good_job/pull/581) ([bensheldon](https://github.com/bensheldon))
+
 ## [v2.13.2](https://github.com/bensheldon/good_job/tree/v2.13.2) (2022-04-25)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.13.1...v2.13.2)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
 - Namespaces assets per Rails docs [\#580](https://github.com/bensheldon/good_job/pull/580) ([kylekthompson](https://github.com/kylekthompson))
 
@@ -12,6 +54,11 @@
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.13.0...v2.13.1)
 
+**Implemented enhancements:**
+
+- Dashboard: Use toasts to show notices and alerts [\#577](https://github.com/bensheldon/good_job/pull/577) ([bkeepers](https://github.com/bkeepers))
+- Remove executions from the dashboard [\#576](https://github.com/bensheldon/good_job/pull/576) ([bkeepers](https://github.com/bkeepers))
+
 **Fixed bugs:**
 
 - `ActionMailer::MailDeliveryJob` executing twice [\#329](https://github.com/bensheldon/good_job/issues/329)
@@ -26,8 +73,6 @@
 
 **Merged pull requests:**
 
-- Dashboard: Use toasts to show notices and alerts [\#577](https://github.com/bensheldon/good_job/pull/577) ([bkeepers](https://github.com/bkeepers))
-- Remove executions from the dashboard [\#576](https://github.com/bensheldon/good_job/pull/576) ([bkeepers](https://github.com/bkeepers))
 - Use javascript importmaps for Dashboard [\#574](https://github.com/bensheldon/good_job/pull/574) ([bensheldon](https://github.com/bensheldon))
 
 ## [v2.13.0](https://github.com/bensheldon/good_job/tree/v2.13.0) (2022-04-19)
@@ -50,10 +95,13 @@
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.1...v2.12.2)
 
+**Fixed bugs:**
+
+- Un-deprecate Adapter's `execution_mode` argument [\#567](https://github.com/bensheldon/good_job/pull/567) ([bensheldon](https://github.com/bensheldon))
+
 **Merged pull requests:**
 
 - Dashboard: added NL translations [\#568](https://github.com/bensheldon/good_job/pull/568) ([eelcoj](https://github.com/eelcoj))
-- Un-deprecate Adapter's `execution_mode` argument [\#567](https://github.com/bensheldon/good_job/pull/567) ([bensheldon](https://github.com/bensheldon))
 
 ## [v2.12.1](https://github.com/bensheldon/good_job/tree/v2.12.1) (2022-04-18)
 

data/engine/app/assets/good_job/modules/application.js

@@ -1,12 +1,16 @@
 /*jshint esversion: 6, strict: false */
 
+import renderCharts from "charts";
+import checkboxToggle from "checkbox_toggle";
 import documentReady from "document_ready";
 import showToasts from "toasts";
-import renderCharts from "charts";
-import Poller from "poller";
+import LivePoll from "live_poll";
 
 documentReady(function() {
   renderCharts();
   showToasts();
-  Poller.start();
+  checkboxToggle();
+
+  const livePoll = new LivePoll
+  livePoll.start();
 });

data/engine/app/assets/good_job/modules/checkbox_toggle.js

@@ -0,0 +1,51 @@
+/*jshint esversion: 6, strict: false */
+
+// How to use:
+//<form data-checkbox-toggle="{key}">
+//  <input type="checkbox" data-checkbox-toggle-all="{key}" />
+//
+//  <input type="checkbox" data-checkbox-toggle-each="{key}" />
+//  <input type="checkbox" data-checkbox-toggle-each="{key}" />
+//  ...
+
+export default function checkboxToggle() {
+  document.querySelectorAll("form[data-checkbox-toggle]").forEach(function (form) {
+    const keyName = form.dataset.checkboxToggle;
+    const checkboxToggle = form.querySelector(`input[type=checkbox][data-checkbox-toggle-all=${keyName}]`);
+    const checkboxes = form.querySelectorAll(`input[type=checkbox][data-checkbox-toggle-each=${keyName}]`);
+    const showables = form.querySelectorAll(`[data-checkbox-toggle-show=${keyName}]`);
+
+    // Check or uncheck all checkboxes
+    checkboxToggle.addEventListener("change", function (event) {
+      checkboxes.forEach(function (checkbox) {
+        checkbox.checked = checkboxToggle.checked;
+      });
+
+      showables.forEach(function (showable) {
+        showable.classList.toggle("d-none", !checkboxToggle.checked);
+        showable.disabled = ! checkboxToggle.checked;
+      });
+    });
+
+    // check or uncheck the "all" checkbox when all checkboxes are checked or unchecked
+    form.addEventListener("change", function (event) {
+      if (!event.target.matches(`input[type=checkbox][data-checkbox-toggle-each=${keyName}]`)) {
+        return;
+      }
+      const checkedCount = Array.from(checkboxes).filter(function (checkbox) {
+        return checkbox.checked;
+      }).length;
+
+      const allChecked = checkedCount === checkboxes.length;
+      const indeterminateChecked = !allChecked && checkedCount > 0;
+
+      checkboxToggle.checked = allChecked;
+      checkboxToggle.indeterminate = indeterminateChecked;
+
+      showables.forEach(function (showable) {
+        showable.classList.toggle("d-none", !allChecked);
+        showable.disabled = !allChecked;
+      });
+    });
+  });
+}

data/engine/app/assets/good_job/modules/live_poll.js

@@ -0,0 +1,81 @@
+/*jshint esversion: 6, strict: false */
+import renderCharts from "charts";
+
+const MINIMUM_POLL_INTERVAL = 1;
+const STORAGE_KEY = "live_poll";
+
+function getStorage(key) {
+  const value = localStorage.getItem('good_job-' + key);
+
+  if (value === 'true') {
+    return true;
+  } else if (value === 'false') {
+    return false;
+  } else {
+    return value;
+  }
+}
+
+function setStorage(key, value) {
+  localStorage.setItem('good_job-' + key, value);
+}
+
+function removeStorage(key) {
+  localStorage.removeItem('good_job-' + key);
+}
+
+export default class LivePoll {
+  start() {
+    const checkbox = document.querySelector('input[name="live_poll"]');
+
+    if (!checkbox.checked && getStorage(STORAGE_KEY)) {
+      checkbox.checked = true;
+      checkbox.value = getStorage(STORAGE_KEY)
+    }
+
+    checkbox.addEventListener('change', () => {
+      this.togglePolling();
+    });
+
+    this.togglePolling();
+  }
+
+  togglePolling = () => {
+    const checkbox = document.querySelector('input[name="live_poll"]');
+    const enabled = checkbox.checked;
+    const pollIntervalMilliseconds = Math.max(parseInt(checkbox.value), MINIMUM_POLL_INTERVAL) * 1000;
+
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+
+    if (enabled) {
+      setStorage(STORAGE_KEY, checkbox.value);
+      this.interval = setInterval(LivePoll.refreshPage, pollIntervalMilliseconds);
+    } else {
+      removeStorage(STORAGE_KEY);
+    }
+  }
+
+  static refreshPage() {
+    fetch(window.location.href)
+      .then(resp => resp.text())
+      .then(LivePoll.updatePageContent);
+  }
+
+  static updatePageContent(newContent) {
+    const domParser = new DOMParser();
+    const newDom = domParser.parseFromString(newContent, "text/html");
+
+    const newElements = newDom.querySelectorAll('[data-live-poll-region]');
+    newElements.forEach((newElement) => {
+      const regionName = newElement.getAttribute('data-live-poll-region');
+      const originalElement = document.querySelector(`[data-live-poll-region="${regionName}"]`);
+
+      originalElement.replaceWith(newElement);
+    });
+
+    renderCharts(false);
+  }
+}

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

@@ -6,12 +6,12 @@ module GoodJob
     end
 
     def show
-      @cron_entry = CronEntry.find(params[:id])
+      @cron_entry = CronEntry.find(params[:cron_key])
       @jobs_filter = JobsFilter.new(params, @cron_entry.jobs)
     end
 
     def enqueue
-      @cron_entry = CronEntry.find(params[:id])
+      @cron_entry = CronEntry.find(params[:cron_key])
       @cron_entry.enqueue(Time.current)
       redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been enqueued.")
     end

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

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 module GoodJob
   class JobsController < GoodJob::ApplicationController
+    DISCARD_MESSAGE = "Discarded through dashboard"
+
+    ACTIONS = {
+      discard: "discarded",
+      reschedule: "rescheduled",
+      retry: "retried",
+    }.freeze
+
     rescue_from GoodJob::ActiveJobJob::AdapterNotGoodJobError,
                 GoodJob::ActiveJobJob::ActionForStateMismatchError,
                 with: :redirect_on_error
@@ -9,6 +17,41 @@ module GoodJob
       @filter = JobsFilter.new(params)
     end
 
+    def mass_update
+      mass_action = params.fetch(:mass_action, "").to_sym
+      raise ActionController::BadRequest, "#{mass_action} is not a valid mass action" unless mass_action.in?(ACTIONS.keys)
+
+      jobs = if params[:all_job_ids]
+               JobsFilter.new(params).filtered_query
+             else
+               job_ids = params.fetch(:job_ids, [])
+               ActiveJobJob.where(active_job_id: job_ids)
+             end
+
+      processed_jobs = jobs.map do |job|
+        case mass_action
+        when :discard
+          job.discard_job(DISCARD_MESSAGE)
+        when :reschedule
+          job.reschedule_job
+        when :retry
+          job.retry_job
+        end
+
+        job
+      rescue GoodJob::ActiveJobJob::ActionForStateMismatchError
+        nil
+      end.compact
+
+      notice = if processed_jobs.any?
+                 "Successfully #{ACTIONS[mass_action]} #{processed_jobs.count} #{'job'.pluralize(processed_jobs.count)}"
+               else
+                 "No jobs were #{ACTIONS[mass_action]}"
+               end
+
+      redirect_back(fallback_location: jobs_path, notice: notice)
+    end
+
     def show
       @executions = GoodJob::Execution.active_job_id(params[:id])
                                       .order(Arel.sql("COALESCE(scheduled_at, created_at) DESC"))
@@ -17,7 +60,7 @@ module GoodJob
 
     def discard
       @job = ActiveJobJob.find(params[:id])
-      @job.discard_job("Discarded through dashboard")
+      @job.discard_job(DISCARD_MESSAGE)
       redirect_back(fallback_location: jobs_path, notice: "Job has been discarded")
     end
 

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

@@ -47,6 +47,7 @@ module GoodJob
         queue_name: params[:queue_name],
         query: params[:query],
         state: params[:state],
+        cron_key: params[:cron_key],
       }.merge(override).delete_if { |_, v| v.blank? }
     end
 
@@ -54,6 +55,10 @@ module GoodJob
       raise NotImplementedError
     end
 
+    def filtered_count
+      filtered_query.count
+    end
+
     private
 
     def default_base_query

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

@@ -13,12 +13,12 @@ module GoodJob
     end
 
     def filtered_query
-      query = base_query.includes(:executions)
-                        .joins_advisory_locks.select("#{GoodJob::ActiveJobJob.table_name}.*", 'pg_locks.locktype AS locktype')
+      query = base_query.includes(:executions).includes_advisory_locks
 
       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?
+      query = query.where(cron_key: params[:cron_key]) if params[:cron_key].present?
 
       if params[:state]
         case params[:state]
@@ -40,6 +40,10 @@ module GoodJob
       query
     end
 
+    def filtered_count
+      filtered_query.unscope(:select).count
+    end
+
     private
 
     def default_base_query

data/engine/app/helpers/good_job/application_helper.rb

@@ -20,5 +20,11 @@ module GoodJob
 
       content_tag :span, status.to_s, class: classes
     end
+
+    def render_icon(name)
+      # workaround to render svg icons without all of the log messages
+      partial = lookup_context.find_template("good_job/shared/icons/#{name}", [], true)
+      partial.render(self, {})
+    end
   end
 end

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

@@ -3,4 +3,4 @@
 <% end %>
 
 <%= render 'good_job/shared/filter', title: title, filter: @jobs_filter %>
-<%= render 'good_job/jobs/table', jobs: @jobs_filter.records %>
+<%= render 'good_job/jobs/table', jobs: @jobs_filter.records, filter: @jobs_filter %>

data/engine/app/views/good_job/executions/_table.erb

@@ -1,4 +1,4 @@
-<div class="my-3" data-gj-poll-replace id="executions-table">
+<div class="my-3" data-live-poll-region="executions-table">
   <div class="table-responsive">
     <table class="table table-hover table-sm mb-0" id="executions_index_table">
       <thead>
@@ -46,7 +46,7 @@
               </td>
               <td>
                 <%= 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" %>
+                  <%= render_icon "trash" %>
                 <% end %>
               </td>
             </tr>

data/engine/app/views/good_job/jobs/_table.erb

@@ -1,72 +1,110 @@
-<div class="my-3" data-gj-poll-replace id="jobs-table">
+<div class="my-3">
   <div class="table-responsive">
-    <table class="table table-hover table-sm mb-0">
-      <thead>
-        <tr>
-          <th>ActiveJob ID</th>
-          <th>State</th>
-          <th>Job Class</th>
-          <th>Queue</th>
-          <th>Scheduled At</th>
-          <th>Executions</th>
-          <th>Error</th>
-          <th>
-            ActiveJob Params&nbsp;
-            <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                           data: { bs_toggle: "collapse", bs_target: ".job-params" },
-                           aria: { expanded: false, controls: jobs.map { |job| "##{dom_id(job, "params")}" }.join(" ") }
-            %>
-          </th>
-          <th>Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% if jobs.present? %>
-          <% jobs.each do |job| %>
-            <tr class="<%= dom_class(job) %>" id="<%= dom_id(job) %>">
-              <td>
-                <%= link_to job_path(job.id) do %>
-                  <code><%= job.id %></code>
+    <%= form_with(url: mass_update_jobs_path(filter.to_params), method: :put, local: true, data: { "checkbox-toggle": "job_ids" }) do |form| %>
+      <table class="table table-hover table-sm mb-0 table-jobs">
+        <thead>
+          <tr>
+            <th><%= check_box_tag('toggle_job_ids', "1", false, data: { "checkbox-toggle-all": "job_ids" }) %></th>
+            <th>ActiveJob ID</th>
+            <th>State</th>
+            <th>Job Class</th>
+            <th>Queue</th>
+            <th>Scheduled At</th>
+            <th>Executions</th>
+            <th>Error</th>
+            <th>
+              ActiveJob Params&nbsp;
+              <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                             data: { bs_toggle: "collapse", bs_target: ".job-params" },
+                             aria: { expanded: false, controls: jobs.map { |job| "##{dom_id(job, "params")}" }.join(" ") }
+              %>
+            </th>
+            <th>
+              Actions<br>
+
+              <div class="d-inline text-nowrap">
+                <%= form.button type: 'submit', name: 'mass_action', value: 'reschedule', class: 'btn btn-sm btn-outline-primary', title: "Reschedule all", data: { confirm: "Confirm reschedule all", disable: true } do %>
+                  <%= render_icon "skip_forward" %> All
                 <% end %>
-              </td>
-              <td><%= status_badge(job.status) %></td>
-              <td><%= job.job_class %></td>
-              <td><%= job.queue_name %></td>
-              <td><%= relative_time(job.scheduled_at || job.created_at) %></td>
-              <td><%= job.executions_count %></td>
-              <td class="text-break"><%= truncate(job.recent_error, length: 1_000) %></td>
-              <td>
-                <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                  data: { bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}" },
-                  aria: { expanded: false, controls: dom_id(job, "params") }
-                %>
-                <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
-              </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 %>
+                <%= form.button type: 'submit', name: 'mass_action', value: 'discard', class: 'btn btn-sm btn-outline-primary', title: "Discard all", data: { confirm: "Confirm discard all", disable: true } do %>
+                  <%= render_icon "stop" %> All
+                <% 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" %>
+                <%= form.button type: 'submit', name: 'mass_action', value: 'retry', class: 'btn btn-sm btn-outline-primary', title: "Retry all", data: { confirm: "Confirm retry all", disable: true } do %>
+                  <%= render_icon "arrow_clockwise" %> All
+                <% end %>
+              </div>
+            </th>
+          </tr>
+          <tr class="d-none" data-checkbox-toggle-show="job_ids">
+            <td class="text-center table-warning" colspan="10">
+              <label>
+                <%= check_box_tag "all_job_ids", 1, false, disabled: true, data: { "checkbox-toggle-show": "job_ids"} %>
+                Apply to all <%= filter.filtered_count %> <%= "job".pluralize(filter.filtered_count) %>.
+              </label>
+            </td>
+          </tr>
+        </thead>
+        <tbody>
+          <% if jobs.present? %>
+            <% jobs.each do |job| %>
+              <tr class="<%= dom_class(job) %>" id="<%= dom_id(job) %>">
+                <td><%= check_box_tag 'job_ids[]', job.id, false, data: { "checkbox-toggle-each": "job_ids" } %></td>
+                <td>
+                  <%= link_to job_path(job.id) do %>
+                    <code><%= job.id %></code>
                   <% end %>
-                </div>
-              </td>
+                </td>
+                <td><%= status_badge(job.status) %></td>
+                <td><%= job.job_class %></td>
+                <td><%= job.queue_name %></td>
+                <td><%= relative_time(job.scheduled_at || job.created_at) %></td>
+                <td><%= job.executions_count %></td>
+                <td class="text-break"><%= truncate(job.recent_error, length: 1_000) %></td>
+                <td>
+                  <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                                 data: { bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}" },
+                                 aria: { expanded: false, controls: dom_id(job, "params") }
+                  %>
+                  <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
+                </td>
+                <td>
+                  <div class="text-nowrap">
+                    <% if job.status.in? [:scheduled, :retried, :queued] %>
+                      <%= link_to reschedule_job_path(job.id), method: :put, class: "btn btn-sm btn-outline-primary", title: "Reschedule job", data: { confirm: "Confirm reschedule", disable: true } do %>
+                        <%= render_icon "skip_forward" %>
+                      <% end %>
+                    <% else %>
+                      <button class="btn btn-sm btn-outline-secondary" disabled><%= render_icon "skip_forward" %></button>
+                    <% end %>
+
+                    <% if job.status.in? [:scheduled, :retried, :queued] %>
+                      <%= link_to discard_job_path(job.id), method: :put, class: "btn btn-sm btn-outline-primary", title: "Discard job", data: { confirm: "Confirm discard", disable: true } do %>
+                        <%= render_icon "stop" %>
+                      <% end %>
+                    <% else %>
+                      <button class="btn btn-sm btn-outline-secondary" disabled><%= render_icon "stop" %></button>
+                    <% end %>
+
+                    <% if job.status == :discarded %>
+                      <%= link_to retry_job_path(job.id), method: :put, class: "btn btn-sm btn-outline-primary", title: "Retry job", data: { confirm: "Confirm retry", disable: true } do %>
+                        <%= render_icon "arrow_clockwise" %>
+                      <% end %>
+                    <% else %>
+                      <button class="btn btn-sm btn-outline-secondary" disabled><%= render_icon "arrow_clockwise" %></button>
+                    <% end %>
+                  </div>
+                </td>
+              </tr>
+            <% end %>
+          <% else %>
+            <tr>
+              <td colspan="10" class="py-2 text-center text-muted">No jobs found.</td>
             </tr>
           <% end %>
-        <% else %>
-          <tr>
-            <td colspan="8" class="py-2 text-center text-muted">No jobs found.</td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    <% end %>
   </div>
 </div>

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

@@ -1,15 +1,17 @@
 <%= render 'good_job/shared/filter', title: "Jobs", filter: @filter %>
 <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
-<%= render 'good_job/jobs/table', jobs: @filter.records %>
 
-<% if @filter.records.present? %>
-  <nav aria-label="Job pagination" class="mt-3" data-gj-poll-replace id="jobs-pagination">
-    <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>
-<% end %>
+<div data-live-poll-region="jobs-table">
+  <%= render 'good_job/jobs/table', jobs: @filter.records, filter: @filter %>
+  <% if @filter.records.present? %>
+    <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>
+  <% end %>
+</div>

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

@@ -2,7 +2,7 @@
   <h2>Processes</h2>
 </div>
 
-<div data-gj-poll-replace id="processes">
+<div data-live-poll-region="processes">
   <% if !GoodJob::Process.migrated? %>
     <div class="card my-3">
       <div class="card-body">

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

@@ -1,4 +1,4 @@
-<div class="py-4" data-gj-poll-replace id="chart">
+<div class="py-4" data-live-poll-region="chart">
   <div class="chart-wrapper container-fluid">
     <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
   </div>

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

@@ -1,4 +1,4 @@
-<div data-gj-poll-replace id="filter">
+<div data-live-poll-region id="filter">
   <div class="bg-light break-out">
     <h2 class="container-fluid pt-3 pb-2"><%= title %></h2>
 

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

@@ -1,4 +1,4 @@
-<footer class="footer mt-auto py-3 bg-light border-top text-muted small" id="footer" data-gj-poll-replace>
+<footer class="footer mt-auto py-3 bg-light border-top text-muted small" id="footer" data-live-poll-region="footer">
   <div class="container-fluid">
     <div class="row">
       <div class="col-6">

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

@@ -14,14 +14,14 @@
           <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if  controller_name == 'processes')] %>
+          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if controller_name == 'processes')] %>
         </li>
       </ul>
       <div class="nav-item pe-2">
-        <div class="form-check">
-          <input type="checkbox" id="toggle-poll" name="toggle-poll" <%= 'checked' if params[:poll].present? %>>
-          <label for="toggle-poll"><%= t(".live_poll") %></label>
-        </div>
+        <label>
+          <%= check_box_tag "live_poll", params.fetch("poll", 30), params[:poll].present? %>
+          <%= t(".live_poll") %>
+        </label>
       </div>
       <ul class="navbar-nav">
         <li class="nav-item dropdown">

data/engine/config/routes.rb

@@ -5,6 +5,11 @@ GoodJob::Engine.routes.draw do
   resources :executions, only: %i[destroy]
 
   resources :jobs, only: %i[index show] do
+    collection do
+      get :mass_update, to: redirect(path: 'jobs')
+      put :mass_update
+    end
+
     member do
       put :discard
       put :reschedule
@@ -12,7 +17,7 @@ GoodJob::Engine.routes.draw do
     end
   end
 
-  resources :cron_entries, only: %i[index show] do
+  resources :cron_entries, only: %i[index show], param: :cron_key do
     member do
       post :enqueue
     end

data/lib/good_job/active_job_job.rb

@@ -148,7 +148,7 @@ module GoodJob
     # Tests whether the job is being executed right now.
     # @return [Boolean]
     def running?
-      # Avoid N+1 Query: `.joins_advisory_locks.select('good_jobs.*', 'pg_locks.locktype AS locktype')`
+      # Avoid N+1 Query: `.includes_advisory_locks`
       if has_attribute?(:locktype)
         self['locktype'].present?
       else
@@ -157,7 +157,7 @@ module GoodJob
     end
 
     # Retry a job that has errored and been discarded.
-    # This action will create a new job {Execution} record.
+    # This action will create a new {Execution} record for the job.
     # @return [ActiveJob::Base]
     def retry_job
       with_advisory_lock do
@@ -165,7 +165,7 @@ module GoodJob
         active_job = execution.active_job
 
         raise AdapterNotGoodJobError unless active_job.class.queue_adapter.is_a? GoodJob::Adapter
-        raise ActionForStateMismatchError unless status == :discarded
+        raise ActionForStateMismatchError if execution.finished_at.blank? || execution.error.blank?
 
         # Update the executions count because the previous execution will not have been preserved
         # Do not update `exception_executions` because that comes from rescue_from's arguments
@@ -176,7 +176,7 @@ module GoodJob
           current_thread.execution = execution
 
           execution.class.transaction(joinable: false, requires_new: true) do
-            new_active_job = active_job.retry_job(wait: 0, error: error)
+            new_active_job = active_job.retry_job(wait: 0, error: execution.error)
             execution.save
           end
         end
@@ -189,11 +189,11 @@ module GoodJob
     # @return [void]
     def discard_job(message)
       with_advisory_lock do
-        raise ActionForStateMismatchError unless status.in? [:scheduled, :queued, :retried]
-
         execution = head_execution(reload: true)
         active_job = execution.active_job
 
+        raise ActionForStateMismatchError if execution.finished_at.present?
+
         job_error = GoodJob::ActiveJobJob::DiscardJobError.new(message)
 
         update_execution = proc do
@@ -216,7 +216,9 @@ module GoodJob
     # @return [void]
     def reschedule_job(scheduled_at = Time.current)
       with_advisory_lock do
-        raise ActionForStateMismatchError unless status.in? [:scheduled, :queued, :retried]
+        execution = head_execution(reload: true)
+
+        raise ActionForStateMismatchError if execution.finished_at.present?
 
         execution = head_execution(reload: true)
         execution.update(scheduled_at: scheduled_at)

data/lib/good_job/configuration.rb

@@ -159,7 +159,7 @@ module GoodJob
     alias enable_cron? enable_cron
 
     def cron
-      env_cron = JSON.parse(ENV['GOOD_JOB_CRON'], symbolize_names: true) if ENV['GOOD_JOB_CRON'].present?
+      env_cron = JSON.parse(ENV.fetch('GOOD_JOB_CRON'), symbolize_names: true) if ENV['GOOD_JOB_CRON'].present?
 
       options[:cron] ||
         rails_config[:cron] ||

data/lib/good_job/lockable.rb

@@ -82,6 +82,16 @@ module GoodJob
         joins(sanitize_sql_for_conditions([join_sql, { table_name: table_name }]))
       end)
 
+      # Joins the current query with Postgres's +pg_locks+ table AND SELECTs the resulting columns
+      # @!method joins_advisory_locks(column: _advisory_lockable_column)
+      # @!scope class
+      # @param column [String, Symbol] column values to Advisory Lock against
+      # @return [ActiveRecord::Relation]
+      scope :includes_advisory_locks, (lambda do |column: _advisory_lockable_column|
+        owns_advisory_lock_sql = "#{connection.quote_table_name('pg_locks')}.#{connection.quote_column_name('pid')} = pg_backend_pid() AS owns_advisory_lock"
+        joins_advisory_locks(column: column).select("#{quoted_table_name}.*, #{connection.quote_table_name('pg_locks')}.locktype, #{owns_advisory_lock_sql}")
+      end)
+
       # Find records that do not have an advisory lock on them.
       # @!method advisory_unlocked(column: _advisory_lockable_column)
       # @!scope class

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.13.2'
+  VERSION = '2.14.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -362,8 +362,9 @@ files:
 - README.md
 - engine/app/assets/good_job/modules/application.js
 - engine/app/assets/good_job/modules/charts.js
+- engine/app/assets/good_job/modules/checkbox_toggle.js
 - engine/app/assets/good_job/modules/document_ready.js
-- engine/app/assets/good_job/modules/poller.js
+- engine/app/assets/good_job/modules/live_poll.js
 - engine/app/assets/good_job/modules/toasts.js
 - engine/app/assets/good_job/scripts.js
 - engine/app/assets/good_job/style.css

data/engine/app/assets/good_job/modules/poller.js

@@ -1,93 +0,0 @@
-/*jshint esversion: 6, strict: false */
-import renderCharts from "charts";
-
-// NOTE: this file is a bit disorganized. Please do not use it as a template for how to organize a JS module.
-
-const DEFAULT_POLL_INTERVAL_SECONDS = 30;
-const MINIMUM_POLL_INTERVAL = 1000;
-
-function getStorage(key) {
-  const value = localStorage.getItem('good_job-' + key);
-
-  if (value === 'true') {
-    return true;
-  } else if (value === 'false') {
-    return false;
-  } else {
-    return value;
-  }
-}
-
-function setStorage(key, value) {
-  localStorage.setItem('good_job-' + key, value);
-}
-
-function updatePageContent(newContent) {
-  const domParser = new DOMParser();
-  const parsedDOM = domParser.parseFromString(newContent, "text/html");
-
-  const newElements = parsedDOM.querySelectorAll('[data-gj-poll-replace]');
-
-  for (let i = 0; i < newElements.length; i++) {
-    const newEl = newElements[i];
-    const oldEl = document.getElementById(newEl.id);
-
-    if (oldEl) {
-      oldEl.replaceWith(newEl);
-    }
-  }
-
-  renderCharts(false);
-}
-
-function refreshPage() {
-  fetch(window.location.href)
-    .then(resp => resp.text())
-    .then(updatePageContent);
-}
-
-const Poller = {
-  start: () => {
-    Poller.updateSettings();
-    Poller.pollUpdates();
-
-    const checkbox = document.querySelector('input[name="toggle-poll"]');
-    checkbox.addEventListener('change', Poller.togglePoll)
-  },
-
-  togglePoll: (event) => {
-    Poller.pollEnabled = event.currentTarget.checked;
-    setStorage('pollEnabled', Poller.pollEnabled);
-  },
-
-  updateSettings: () => {
-    const queryString = window.location.search;
-    const urlParams = new URLSearchParams(queryString);
-
-    if (urlParams.has('poll')) {
-      const parsedInterval = (parseInt(urlParams.get('poll')) || DEFAULT_POLL_INTERVAL_SECONDS) * 1000;
-      Poller.pollInterval = Math.max(parsedInterval, MINIMUM_POLL_INTERVAL);
-      setStorage('pollInterval', Poller.pollInterval);
-
-      Poller.pollEnabled = true;
-    } else {
-      Poller.pollInterval = getStorage('pollInterval') || (DEFAULT_POLL_INTERVAL_SECONDS * 1000);
-      Poller.pollEnabled = getStorage('pollEnabled') || false;
-    }
-
-    document.getElementById('toggle-poll').checked = Poller.pollEnabled;
-  },
-
-  pollUpdates: () => {
-    setTimeout(() => {
-      if (Poller.pollEnabled === true) {
-        refreshPage();
-        Poller.pollUpdates();
-      } else {
-        Poller.pollUpdates();
-      }
-    }, Poller.pollInterval);
-  },
-};
-
-export { Poller as default };