good_job 4.14.0 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb23908b9969829cfe7d7eec72e7cb9eaac26ee20786e5778c291fccf768532
-  data.tar.gz: 0b49c31b04c2d1b9c447a25ddaa74ca13a6434c984a79e1b47204bdf8f15192a
+  metadata.gz: af515dffcbbdb5c6f3e02ec7a1426b7d59aea355b33791c81cc20d043bcab7f4
+  data.tar.gz: e44f93e479b483af4c3848c7957df934198fb780260c3008c427ff864c3d67a8
 SHA512:
-  metadata.gz: d05ad24c88ef9f7a396b8f3f6a966c5683eb3b984ad853075c11368dd4d9412264e33e76da8cbe62f207dd05fbfc265dbf5c3f20b3c80a4c031a12f44c3126ba
-  data.tar.gz: 0e30892a4f9ad554c15ab7be7c11c2e04f5f87f49963826a4d4e21188b79e5b7b6d89ac9c06906793c259b4ca792aee8072d927efd135cc5a5f81fa6abff2a13
+  metadata.gz: 812281e391af58a897dd119e875be51c7569eaefa021f7fc05d42d69b185819c4077c04e8f40d23c3cf498862e04f8f9285fe9a29931a1d9bba4f1a61650ca37
+  data.tar.gz: 1941b6294d3339c590e2c37188a2f1568a3c32bc5e1f9cb2a76f0c58b94cce6781797d3d86853111a842f435adb8262611eca426dc16001bb6bc1b0a8437bde4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v4.14.1](https://github.com/bensheldon/good_job/tree/v4.14.1) (2026-04-03)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.14.0...v4.14.1)
+
+**Fixed bugs:**
+
+- Fix N+1 queries on cron entries dashboard index page [\#1727](https://github.com/bensheldon/good_job/pull/1727) ([clinejj](https://github.com/clinejj))
+
 ## [v4.14.0](https://github.com/bensheldon/good_job/tree/v4.14.0) (2026-03-31)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.13.3...v4.14.0)

data/app/controllers/good_job/cron_entries_controller.rb

@@ -4,6 +4,10 @@ module GoodJob
   class CronEntriesController < GoodJob::ApplicationController
     def index
       @cron_entries = CronEntry.all
+      @last_jobs = CronEntry.last_jobs_by_key(@cron_entries)
+      @enabled_states = GoodJob::Setting.cron_keys_enabled(
+        @cron_entries.map { |entry| [entry.key, entry.enabled_by_default?] }
+      )
     end
 
     def show

data/app/models/good_job/cron_entry.rb

@@ -18,6 +18,30 @@ module GoodJob # :nodoc:
       configuration.cron_entries
     end
 
+    def self.last_jobs_by_key(cron_entries)
+      cron_keys = cron_entries.map { |entry| entry.key.to_s }
+      return {} if cron_keys.empty?
+
+      from_clause = GoodJob::Job.sanitize_sql_array(
+        ["unnest(ARRAY[?]::text[]) AS cron_keys(cron_key)", cron_keys]
+      )
+
+      join_clause = <<~SQL.squish
+        CROSS JOIN LATERAL (
+          SELECT * FROM good_jobs
+          WHERE good_jobs.cron_key = cron_keys.cron_key
+          ORDER BY cron_at DESC NULLS LAST
+          LIMIT 1
+        ) AS lateral_jobs
+      SQL
+
+      GoodJob::Job
+        .select("lateral_jobs.*")
+        .from(from_clause)
+        .joins(join_clause)
+        .index_by(&:cron_key)
+    end
+
     def self.find(key, configuration: nil)
       all(configuration: configuration).find { |entry| entry.key == key.to_sym }.tap do |cron_entry|
         raise ActiveRecord::RecordNotFound unless cron_entry
@@ -144,13 +168,13 @@ module GoodJob # :nodoc:
       (last_job.cron_at || last_job.created_at).localtime
     end
 
-    private
-
     def enabled_by_default?
       value = params.fetch(:enabled_by_default, true)
       value.respond_to?(:call) ? value.call : value
     end
 
+    private
+
     def cron
       params.fetch(:cron)
     end

data/app/models/good_job/setting.rb

@@ -19,6 +19,16 @@ module GoodJob
       end
     end
 
+    def self.cron_keys_enabled(keys_with_defaults)
+      cron_disabled = find_by(key: CRON_KEYS_DISABLED)&.value || []
+      cron_enabled = find_by(key: CRON_KEYS_ENABLED)&.value || []
+
+      keys_with_defaults.to_h do |key, default|
+        key_s = key.to_s
+        [key_s, default ? cron_disabled.exclude?(key_s) : cron_enabled.include?(key_s)]
+      end
+    end
+
     def self.cron_key_enable(key)
       key_string = key.to_s
       enabled_setting = find_or_initialize_by(key: CRON_KEYS_ENABLED) do |record|

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

@@ -39,14 +39,16 @@
             <%= relative_time cron_entry.next_at %>
           </div>
           <div class="col-6 col-lg-1 text-wrap small">
-            <% if cron_entry.last_job.present? %>
+            <% last_job = @last_jobs[cron_entry.key.to_s] %>
+            <% if last_job.present? %>
+              <% last_job_at = (last_job.cron_at || last_job.created_at).localtime %>
               <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.cron.last_run" %></div>
-              <%= link_to relative_time(cron_entry.last_job_at), cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
+              <%= link_to relative_time(last_job_at), cron_entry_path(cron_entry), title: "Job #{last_job.id}" %>
             <% end %>
           </div>
           <div class="col-6 col-lg-1 text-wrap small">
             <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.cron.status" %></div>
-            <% if cron_entry.enabled? %>
+            <% if @enabled_states[cron_entry.key.to_s] %>
               <span class="text-success"><%= t "good_job.models.cron.states.active" %></span>
             <% else %>
               <span class="text-muted"><%= t "good_job.models.cron.states.paused" %></span>
@@ -57,7 +59,7 @@
               <%= render_icon "skip_forward" %>
             <% end %>
 
-            <% if cron_entry.enabled? %>
+            <% if @enabled_states[cron_entry.key.to_s] %>
               <%= button_to disable_cron_entry_path(cron_entry), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.cron_entries.actions.disable") }, title: t("good_job.cron_entries.actions.disable"), data: { turbo_confirm: t("good_job.cron_entries.actions.confirm_disable") } do %>
                 <%= render_icon "pause" %>
               <% end %>

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '4.14.0'
+  VERSION = '4.14.1'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.1
 platform: ruby
 authors:
 - Ben Sheldon