good_job 4.12.1 → 4.13.1

data/app/models/good_job/batch.rb

@@ -184,3 +184,5 @@ module GoodJob
     attr_accessor :record
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_batch, GoodJob::Batch)

data/app/models/good_job/batch_record.rb

@@ -123,3 +123,5 @@ module GoodJob
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_batch_record, GoodJob::BatchRecord)

data/app/models/good_job/discrete_execution.rb

@@ -6,5 +6,6 @@ module GoodJob
   end
 
   include ActiveSupport::Deprecation::DeprecatedConstantAccessor
+
   deprecate_constant :DiscreteExecution, 'Execution', deprecator: GoodJob.deprecator
 end

data/app/models/good_job/job.rb

@@ -250,8 +250,8 @@ module GoodJob
         )
       end
 
-      def job_class_index_migrated?
-        return true if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_job_class)
+      def historic_finished_at_index_migrated?
+        return true unless connection.index_name_exists?(:good_jobs, :index_good_jobs_jobs_on_finished_at)
 
         migration_pending_warning!
         false

data/app/models/good_job/process.rb

@@ -167,3 +167,5 @@ module GoodJob # :nodoc:
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_process, GoodJob::Process)

data/app/models/good_job/setting.rb

@@ -127,3 +127,5 @@ module GoodJob
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_setting, GoodJob::Setting)

data/app/views/good_job/_custom_head.html.erb

@@ -0,0 +1,7 @@
+<%#
+Content added to this partial will be added to the end of the head tag of all GoodJob dashboard pages.
+
+You can make use of the following variables:
+
+- `main_app`: Use this to access helpers (e.g. route helpers) from your application.
+%>

data/app/views/good_job/batches/_jobs.erb

@@ -68,26 +68,26 @@
                   <ul class="dropdown-menu shadow" aria-labelledby="<%= dom_id(job, :actions) %>">
                     <li>
                       <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
-                      <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: t(".actions.reschedule"), data: { confirm: t(".actions.confirm_reschedule"), disable: true } do %>
+                      <%= button_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: t(".actions.reschedule"), data: { turbo_confirm: t(".actions.confirm_reschedule") } do %>
                         <%= render_icon "skip_forward" %>
                         <%= t "good_job.actions.reschedule" %>
                       <% end %>
                     </li>
                     <li>
                       <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
-                      <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: t(".actions.discard"), data: { confirm: t(".actions.confirm_discard"), disable: true } do %>
+                      <%= button_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: t(".actions.discard"), data: { turbo_confirm: t(".actions.confirm_discard") } do %>
                         <%= render_icon "stop" %>
                         <%= t "good_job.actions.discard" %>
                       <% end %>
                     </li>
                     <li>
-                      <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t(".actions.retry"), data: { confirm: t(".actions.confirm_retry"), disable: true } do %>
+                      <%= button_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t(".actions.retry"), data: { turbo_confirm: t(".actions.confirm_retry") } do %>
                         <%= render_icon "arrow_clockwise" %>
                         <%= t "good_job.actions.retry" %>
                       <% end %>
                     </li>
                     <li>
-                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.finished?}", title: t(".actions.destroy"), data: { confirm: t(".actions.confirm_destroy"), disable: true } do %>
+                      <%= button_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.finished?}", title: t(".actions.destroy"), data: { turbo_confirm: t(".actions.confirm_destroy") } do %>
                         <%= render_icon "trash" %>
                         <%= t "good_job.actions.destroy" %>
                       <% end %>

data/app/views/good_job/batches/_table.erb

@@ -58,9 +58,9 @@
                 <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.batch.jobs" %></div>
                 <%= batch.jobs.size %>
               </div>
-              <div class="col text-end">
+              <div class="col text-end d-flex flex-row justify-content-end">
                 <% if batch.discarded? %>
-                  <%= link_to retry_batch_path(batch), method: :put, class: "btn btn-sm btn-outline-primary", title: t("good_job.batches.actions.retry"), data: { confirm: t("good_job.batches.actions.confirm_retry") } do %>
+                  <%= button_to retry_batch_path(batch), method: :put, class: "btn btn-sm btn-outline-primary", title: t("good_job.batches.actions.retry"), data: { turbo_confirm: t("good_job.batches.actions.confirm_retry") } do %>
                     <%= render_icon "arrow_clockwise" %>
                     <%= t "good_job.batches.actions.retry" %>
                   <% end %>

data/app/views/good_job/batches/show.html.erb

@@ -12,7 +12,7 @@
       </div>
       <div class="col text-end">
         <% if @batch.discarded? %>
-          <%= button_to retry_batch_path(@batch), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.batches.actions.retry") }, title: t("good_job.batches.actions.retry"), data: { confirm: t("good_job.batches.actions.confirm_retry") } do %>
+          <%= button_to retry_batch_path(@batch), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.batches.actions.retry") }, title: t("good_job.batches.actions.retry"), data: { turbo_confirm: t("good_job.batches.actions.confirm_retry") } do %>
             <%= render_icon "arrow_clockwise" %>
             <%= t "good_job.actions.retry" %>
           <% end %>

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

@@ -58,11 +58,11 @@
             <% end %>
 
             <% if cron_entry.enabled? %>
-              <%= 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: { confirm: t("good_job.cron_entries.actions.confirm_disable") } do %>
+              <%= 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 %>
             <% else %>
-              <%= button_to enable_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.enable") }, title: t("good_job.cron_entries.actions.enable"), data: { confirm: t("good_job.cron_entries.actions.confirm_enable") } do %>
+              <%= button_to enable_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.enable") }, title: t("good_job.cron_entries.actions.enable"), data: { turbo_confirm: t("good_job.cron_entries.actions.confirm_enable") } do %>
                 <%= render_icon "play" %>
               <% end %>
             <% end %>

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

@@ -1,3 +1,6 @@
+<%= form_with(id: "job_action_form", method: :put, model: false, local: true) { nil } %>
+<%= form_with(id: "job_destroy_form", method: :delete, model: false, local: true) { nil } %>
+
 <%= form_with(model: false, url: mass_update_jobs_path(filter.to_params), method: :put, local: true, data: { "checkbox-toggle": "job_ids" }) do |form| %>
   <div class="my-3 card" data-gj-poll-replace id="jobs-table">
     <div class="list-group list-group-flush text-nowrap table-jobs" role="table">
@@ -8,16 +11,16 @@
               <%= check_box_tag('toggle_job_ids', "1", false, data: { "checkbox-toggle-all": "job_ids" }) %>
               <%= label_tag('toggle_job_ids', t(".toggle_all_jobs"), class: "visually-hidden") %>
             </div>
-            <%= form.button type: 'submit', name: 'mass_action', value: 'reschedule', class: 'ms-1 btn btn-sm btn-outline-secondary', title: t(".actions.reschedule_all"), data: { confirm: t(".actions.confirm_reschedule_all"), disable: true } do %>
+            <%= form.button type: 'submit', name: 'mass_action', value: 'reschedule', class: 'ms-1 btn btn-sm btn-outline-secondary', title: t(".actions.reschedule_all"), data: { turbo_confirm: t(".actions.confirm_reschedule_all") } do %>
               <span class="me-1"><%= render_icon "skip_forward" %></span> <%= t "good_job.actions.reschedule" %>
             <% end %>
 
-            <%= form.button type: 'submit', name: 'mass_action', value: 'retry', class: 'btn btn-sm btn-outline-secondary', title: t(".actions.retry_all"), data: { confirm: t(".actions.confirm_retry_all"), disable: true } do %>
+            <%= form.button type: 'submit', name: 'mass_action', value: 'retry', class: 'btn btn-sm btn-outline-secondary', title: t(".actions.retry_all"), data: { turbo_confirm: t(".actions.confirm_retry_all") } do %>
               <span class="me-1"><%= render_icon "arrow_clockwise" %></span> <%= t "good_job.actions.retry" %>
             <% end %>
 
             <div class="btn-group" role="group">
-              <%= form.button type: 'submit', name: 'mass_action', value: 'discard', class: 'btn btn-sm btn-outline-secondary', title: t(".actions.discard_all"), data: { confirm: t(".actions.confirm_discard_all"), disable: true } do %>
+              <%= form.button type: 'submit', name: 'mass_action', value: 'discard', class: 'btn btn-sm btn-outline-secondary', title: t(".actions.discard_all"), data: { turbo_confirm: t(".actions.confirm_discard_all") } do %>
                 <span class="me-1"><%= render_icon "stop" %></span> <%= t "good_job.actions.discard" %>
               <% end %>
               <button id="destroy-dropdown-toggle" type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
@@ -25,7 +28,7 @@
               </button>
               <ul class="dropdown-menu" aria-labelledby="destroy-dropdown-toggle">
                 <li>
-                  <%= form.button type: 'submit', name: 'mass_action', value: 'destroy', class: 'btn dropdown-item', title: t(".actions.destroy_all"), data: { confirm: t(".actions.confirm_destroy_all"), disable: true } do %>
+                  <%= form.button type: 'submit', name: 'mass_action', value: 'destroy', class: 'btn dropdown-item', title: t(".actions.destroy_all"), data: { turbo_confirm: t(".actions.confirm_destroy_all") } do %>
                     <span class="me-1"><%= render_icon "trash" %></span> <%= t "good_job.actions.destroy" %>
                   <% end %>
                 </li>
@@ -125,33 +128,33 @@
                     <ul class="dropdown-menu shadow" aria-labelledby="<%= dom_id(job, :actions) %>">
                       <li>
                         <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
-                        <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: t("good_job.jobs.actions.reschedule"), data: { confirm: t("good_job.jobs.actions.confirm_reschedule"), disable: true } do %>
+                        <%= tag.button form: "job_action_form", formaction: reschedule_job_path(job.id), class: "dropdown-item #{'disabled' unless job_reschedulable}", title: t("good_job.jobs.actions.reschedule"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_reschedule") } do %>
                           <%= render_icon "skip_forward" %>
                           <%= t "good_job.actions.reschedule" %>
                         <% end %>
                       </li>
                       <li>
                         <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
-                        <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: t("good_job.jobs.actions.discard"), data: { confirm: t("good_job.jobs.actions.confirm_discard"), disable: true } do %>
+                        <%= tag.button form: "job_action_form", formaction: discard_job_path(job.id), class: "dropdown-item #{'disabled' unless job_discardable}", title: t("good_job.jobs.actions.discard"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_discard") } do %>
                           <%= render_icon "stop" %>
                           <%= t "good_job.actions.discard" %>
                         <% end %>
                       </li>
                       <li>
                         <% job_force_discardable = job.status.in? [:running] %>
-                        <%= link_to force_discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_force_discardable}", title: t("good_job.jobs.actions.force_discard"), data: { confirm: t("good_job.jobs.actions.confirm_force_discard"), disable: true } do %>
+                        <%= tag.button form: "job_action_form", formaction: force_discard_job_path(job.id), class: "dropdown-item #{'disabled' unless job_force_discardable}", title: t("good_job.jobs.actions.force_discard"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_force_discard") } do %>
                           <%= render_icon "eject" %>
                           <%= t "good_job.actions.force_discard" %>
                         <% end %>
                       </li>
                       <li>
-                        <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t("good_job.jobs.actions.retry"), data: { confirm: t("good_job.jobs.actions.confirm_retry"), disable: true } do %>
+                        <%= tag.button form: "job_action_form", formaction: retry_job_path(job.id), class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t("good_job.jobs.actions.retry"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_retry") } do %>
                           <%= render_icon "arrow_clockwise" %>
                           <%= t "good_job.actions.retry" %>
                         <% end %>
                       </li>
                       <li>
-                        <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :succeeded]}", title: t("good_job.jobs.actions.destroy"), data: { confirm: t("good_job.jobs.actions.confirm_destroy"), disable: true } do %>
+                        <%= tag.button form: "job_destroy_form", formaction: job_path(job.id), class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :succeeded]}", title: t("good_job.jobs.actions.destroy"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_destroy") } do %>
                           <%= render_icon "trash" %>
                           <%= t "good_job.actions.destroy" %>
                         <% end %>

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

@@ -33,28 +33,28 @@
               form_class: "d-inline-block",
               aria: { label: t("good_job.jobs.actions.reschedule") },
               title: t("good_job.jobs.actions.reschedule"),
-              data: { confirm: t("good_job.jobs.actions.confirm_reschedule") } do %>
+              data: { turbo_confirm: t("good_job.jobs.actions.confirm_reschedule") } do %>
             <%= render_icon "skip_forward" %>
             <%= t "good_job.actions.reschedule" %>
           <% end %>
         <% end %>
 
         <% if @job.status.in? [:scheduled, :retried, :queued] %>
-          <%= button_to discard_job_path(@job.id), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.discard") }, title: t("good_job.jobs.actions.discard"), data: { confirm: t("good_job.jobs.actions.confirm_discard") } do %>
+          <%= button_to discard_job_path(@job.id), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.discard") }, title: t("good_job.jobs.actions.discard"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_discard") } do %>
             <%= render_icon "stop" %>
             <%= t "good_job.actions.discard" %>
           <% end %>
         <% end %>
 
         <% if @job.status == :discarded %>
-          <%= button_to retry_job_path(@job.id), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.retry") }, title: t("good_job.jobs.actions.retry"), data: { confirm: t("good_job.jobs.actions.confirm_retry") } do %>
+          <%= button_to retry_job_path(@job.id), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.retry") }, title: t("good_job.jobs.actions.retry"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_retry") } do %>
             <%= render_icon "arrow_clockwise" %>
             <%= t "good_job.actions.retry" %>
           <% end %>
         <% end %>
 
         <% if @job.status.in? [:discarded, :succeeded] %>
-          <%= button_to job_path(@job.id), method: :delete, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.destroy") }, title: t("good_job.jobs.actions.destroy"), data: { confirm: t("good_job.jobs.actions.confirm_destroy") } do %>
+          <%= button_to job_path(@job.id), method: :delete, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.jobs.actions.destroy") }, title: t("good_job.jobs.actions.destroy"), data: { turbo_confirm: t("good_job.jobs.actions.confirm_destroy") } do %>
             <%= render_icon "trash" %>
             <%= t "good_job.actions.destroy" %>
           <% end %>

data/app/views/good_job/pauses/_group.html.erb

@@ -16,7 +16,7 @@
                 { action: :destroy, type: type, value: value },
                 method: :delete,
                 class: 'btn btn-sm btn-outline-primary',
-                data: { confirm: t('good_job.pauses.index.confirm_unpause', value: value) }
+                data: { turbo_confirm: t('good_job.pauses.index.confirm_unpause', value: value) }
               ) do %>
                   <%= render_icon "play" %>
                   <%= t("good_job.pauses.index.unpause") %>

data/app/views/good_job/pauses/_pause.html.erb

@@ -4,5 +4,5 @@
     { action: :destroy, type: type, value: value },
     method: :delete,
     class: 'btn btn-sm btn-outline-primary',
-    data: { confirm: t('good_job.pauses.index.confirm_unpause', value: value) } %>
+    data: { turbo_confirm: t('good_job.pauses.index.confirm_unpause', value: value) } %>
 </li>

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

@@ -4,14 +4,14 @@
       <h2 class="pt-3 pb-2"><%= title %></h2>
     </div>
 
-    <%= form_with(model: false, url: "", method: :get, local: true, id: "filter_form", class: "") do |form| %>
+    <%= form_with(model: false, url: "", method: :get, local: true, data: { controller: "form" }) do |form| %>
       <%= hidden_field_tag :poll, params[:poll] %>
       <%= hidden_field_tag :state, params[:state] %>
       <%= hidden_field_tag :locale, params[:locale] if params[:locale] %>
       <div class="d-md-flex flex-row w-100">
         <div class="me-md-2 mb-2 mb-md-0">
           <%= label_tag "job_queue_filter", t(".queue_name"), class: "visually-hidden" %>
-          <select name="queue_name" id="job_queue_filter" class="form-select form-select-sm">
+          <select name="queue_name" id="job_queue_filter" class="form-select form-select-sm" data-action="change->form#submit">
             <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>><%= t ".all_queues" %></option>
 
             <% filter.queues.each do |name, count| %>
@@ -22,7 +22,7 @@
 
         <div class="me-md-2 mb-2 mb-md-0">
           <%= label_tag "job_class_filter", t(".job_name"), class: "visually-hidden" %>
-          <select name="job_class" id="job_class_filter" class="form-select form-select-sm">
+          <select name="job_class" id="job_class_filter" class="form-select form-select-sm" data-action="change->form#submit">
             <option value="" <%= "selected='selected'" if params[:job_class].blank? %>><%= t ".all_jobs" %></option>
 
             <% filter.job_classes.each do |name, count| %>
@@ -56,20 +56,10 @@
         <li class="nav-item">
           <%= link_to filter.to_params(state: name), class: "nav-link #{'active' if params[:state] == name}" do %>
             <%= t(name, scope: 'good_job.status') %>
-            <span data-async-values-target="value" data-async-values-key="<%= name %>" data-async-values-zero-class="text-bg-secondary" class="badge text-bg-primary rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="<%= name %>" data-async-values-zero-class="bg-secondary" class="badge text-bg-primary rounded-pill d-none" id="filter_state_<%= name %>" data-turbo-permanent></span>
           <% end %>
         </li>
       <% end %>
     </ul>
   </div>
-
-  <script nonce="<%= content_security_policy_nonce %>">
-    document.addEventListener("DOMContentLoaded", () => {
-      document.querySelectorAll("#job_class_filter, #job_queue_filter").forEach((filter) => {
-        filter.addEventListener("change", () => {
-          document.querySelector("#filter_form").submit();
-        });
-      })
-    })
-  </script>
 </div>

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

@@ -18,25 +18,25 @@
         <li class="nav-item">
           <%= link_to jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] do %>
             <%= t(".jobs") %>
-            <span data-async-values-target="value" data-async-values-key="jobs_count" class="badge text-bg-secondary rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="jobs_count" class="badge text-bg-secondary rounded-pill d-none" id="navbar_jobs_count" data-turbo-permanent></span>
         <% end %>
         </li>
         <li class="nav-item">
           <%= link_to batches_path, class: ["nav-link", ("active" if controller_name == 'batches')] do %>
             <%= t ".batches" %>
-            <span data-async-values-target="value" data-async-values-key="batches_count" class="badge text-bg-secondary rounded-pill  d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="batches_count" class="badge text-bg-secondary rounded-pill d-none" id="navbar_batches_count" data-turbo-permanent></span>
           <% end %>
         </li>
         <li class="nav-item">
           <%= link_to cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] do %>
             <%= t(".cron_schedules") %>
-            <span data-async-values-target="value" data-async-values-key="cron_entries_count" class="badge text-bg-secondary rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="cron_entries_count" class="badge text-bg-secondary rounded-pill d-none" id="navbar_cron_entries_count" data-turbo-permanent></span>
         <% end %>
         </li>
         <li class="nav-item">
           <%= link_to processes_path, class: ["nav-link", ("active" if controller_name == 'processes')] do %>
             <%= t(".processes") %>
-            <span data-async-values-target="value" data-async-values-key="processes_count" data-async-values-zero-class="text-bg-danger" class="badge text-bg-secondary rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="processes_count" data-async-values-zero-class="bg-danger" class="badge text-bg-secondary rounded-pill d-none" id="navbar_processes_count" data-turbo-permanent></span>
           <% end %>
         </li>
         <li class="nav-item">
@@ -47,13 +47,13 @@
         <li class="nav-item">
           <%= link_to pauses_path, class: ["nav-link", ("active" if controller_name == 'pauses')] do %>
             <%= t(".pauses") %>
-            <span data-async-values-target="value" data-async-values-key="pauses_count" data-async-values-zero-class="d-none" class="badge text-bg-warning rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="pauses_count" data-async-values-zero-class="d-none" class="badge text-bg-warning rounded-pill d-none" id="navbar_pauses_count" data-turbo-permanent></span>
           <% end %>
         </li>
         <li class="nav-item">
           <%= link_to cleaner_index_path, class: ["nav-link", ("active" if controller_name == 'cleaner')] do %>
             <%= t(".cleaner") %>
-            <span data-async-values-target="value" data-async-values-key="discarded_count" class="badge text-bg-secondary rounded-pill d-none"></span>
+            <span data-async-values-target="value" data-async-values-key="discarded_count" class="badge text-bg-secondary rounded-pill d-none" id="navbar_discarded_count" data-turbo-permanent></span>
           <% end %>
         </li>
       </ul>

data/app/views/layouts/good_job/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= I18n.locale %>" data-bs-theme="auto">
+<html lang="<%= I18n.locale %>" data-bs-theme="auto" data-turbo-unloaded>
   <head>
     <meta charset="utf-8">
     <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
@@ -18,20 +18,24 @@
     </script>
 
     <%# Do not use asset tag helpers to avoid paths being overriden by config.asset_host %>
-    <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css, locale: nil), nonce: content_security_policy_nonce %>
-    <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css, locale: nil), nonce: content_security_policy_nonce, data: { turbo_track: "reload" } %>
+    <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, locale: nil), nonce: content_security_policy_nonce, data: { turbo_track: "reload" } %>
     <%= tag.script "", src: frontend_static_path(:bootstrap, format: :js, locale: nil), nonce: content_security_policy_nonce %>
     <%= tag.script "", src: frontend_static_path(:chartjs, format: :js, locale: nil), nonce: content_security_policy_nonce %>
-    <%= tag.script "", src: frontend_static_path(:rails_ujs, format: :js, locale: nil), nonce: content_security_policy_nonce %>
     <%= tag.script "", src: frontend_static_path(:es_module_shims, format: :js, locale: nil), async: true, nonce: content_security_policy_nonce %>
+
     <% importmaps = GoodJob::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil) } %>
-    <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
-    <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>
+    <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce, data: { turbo_track: "reload" }) %>
+    <% importmaps.each do |_module_name, path| %>
+      <%= tag.link rel: "modulepreload", href: path, nonce: content_security_policy_nonce %>
+    <% end %>
+
+    <%= tag.script "import \"application\";".html_safe, type: "module", nonce: content_security_policy_nonce %>
 
-    <title>Good Job Dashboard</title>
-    <%= tag.link rel: "icon", href: 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="10 0 100 100"><text y=".90em" font-size="90">👍</text></svg>' %>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
+
+    <%= render "good_job/custom_head" %>
   </head>
   <body>
     <div class="d-flex flex-column min-vh-100">

data/config/brakeman.ignore

@@ -7,7 +7,7 @@
       "check_name": "Render",
       "message": "Render path contains parameter value",
       "file": "app/controllers/good_job/frontends_controller.rb",
-      "line": 47,
+      "line": 52,
       "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(file => (self.class.js_modules[params[:id].to_sym] or raise(ActionController::RoutingError, \"Not Found\")), {})",
       "render_path": null,
@@ -23,29 +23,6 @@
       ],
       "note": "Files are explicitly enumerated in the array"
     },
-    {
-      "warning_type": "Dynamic Render Path",
-      "warning_code": 15,
-      "fingerprint": "b0c2888c9b217671d90d0141b49b036af3b2a70c63b02968cc97ae2052c86272",
-      "check_name": "Render",
-      "message": "Render path contains parameter value",
-      "file": "app/controllers/good_job/frontends_controller.rb",
-      "line": 41,
-      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(file => ({ :css => ({ :bootstrap => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"vendor\", \"bootstrap\", \"bootstrap.min.css\"), :style => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"style.css\") }), :js => ({ :bootstrap => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"vendor\", \"bootstrap\", \"bootstrap.bundle.min.js\"), :chartjs => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"vendor\", \"chartjs\", \"chart.min.js\"), :es_module_shims => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"vendor\", \"es_module_shims.js\"), :rails_ujs => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"vendor\", \"rails_ujs.js\") }), :svg => ({ :icons => GoodJob::Engine.root.join(\"app\", \"frontend\", \"good_job\", \"icons.svg\") }) }.dig(params[:format].to_sym, params[:id].to_sym) or raise(ActionController::RoutingError, \"Not Found\")), {})",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "GoodJob::FrontendsController",
-        "method": "static"
-      },
-      "user_input": "params[:id].to_sym",
-      "confidence": "Weak",
-      "cwe_id": [
-        22
-      ],
-      "note": "Files are explicitly enumerated in the array"
-    },
     {
       "warning_type": "Dangerous Eval",
       "warning_code": 13,
@@ -115,7 +92,30 @@
         77
       ],
       "note": ""
+    },
+    {
+      "warning_type": "Dynamic Render Path",
+      "warning_code": 15,
+      "fingerprint": "ebc35a48169b7ee1f2e1b024f3bf6abe7138924a3a318ab2ad405c2b6e9bbb55",
+      "check_name": "Render",
+      "message": "Render path contains parameter value",
+      "file": "app/controllers/good_job/frontends_controller.rb",
+      "line": 46,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(file => ({ :css => ({ :bootstrap => asset_path(\"vendor\", \"bootstrap\", \"bootstrap.min.css\"), :style => asset_path(\"style.css\") }), :js => ({ :bootstrap => asset_path(\"vendor\", \"bootstrap\", \"bootstrap.bundle.min.js\"), :chartjs => asset_path(\"vendor\", \"chartjs\", \"chart.min.js\"), :es_module_shims => asset_path(\"vendor\", \"es_module_shims.js\"), :turbo => asset_path(\"vendor\", \"turbo.js\") }), :svg => ({ :icons => asset_path(\"icons.svg\") }) }.dig(params[:format].to_sym, params[:id].to_sym) or raise(ActionController::RoutingError, \"Not Found\")), {})",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "GoodJob::FrontendsController",
+        "method": "static"
+      },
+      "user_input": "params[:id].to_sym",
+      "confidence": "Weak",
+      "cwe_id": [
+        22
+      ],
+      "note": ""
     }
   ],
-  "brakeman_version": "7.0.2"
+  "brakeman_version": "7.1.1"
 }

data/config/locales/de.yml

@@ -2,7 +2,7 @@
 de:
   good_job:
     actions:
-      destroy: Zerstören
+      destroy: Löschen
       discard: Verwerfen
       force_discard: Verwerfen erzwingen
       inspect: Prüfen
@@ -17,11 +17,11 @@ de:
         title: Batches
       jobs:
         actions:
-          confirm_destroy: Bist du sicher, dass du diesen Job zerstören wilst?
+          confirm_destroy: Bist du sicher, dass du diesen Job löschen wilst?
           confirm_discard: Bist du sicher, dass du diesen Job verwerfen willst?
           confirm_reschedule: Bist du sicher, dass du diesen Job verschieben willst?
           confirm_retry: Bist du sicher, dass du diesen Job erneut versuchen willst?
-          destroy: Job zerstören
+          destroy: Job löschen
           discard: Job verwerfen
           reschedule: Job neu planen
           retry: Job wiederholen
@@ -38,15 +38,15 @@ de:
     cleaner:
       index:
         all: All
-        class: Class
+        class: Klasse
         exception: Exception
-        grouped_by_class: Discards grouped by Class
-        grouped_by_exception: Discards grouped by Exception
-        last_1_hour: Last 1 hour
-        last_24_hours: Last 24 hours
-        last_3_days: Last 3 days
-        last_3_hours: Last 3 hours
-        last_7_days: Last 7 days
+        grouped_by_class: Discards groupiert nach Klasse
+        grouped_by_exception: Discards groupiert nach Exception
+        last_1_hour: Letzte Stunde
+        last_24_hours: Letzte 24 Stunden
+        last_3_days: Letzte 3 Tage
+        last_3_hours: Letzte 3 Stunden
+        last_7_days: Letzte 7 Tage
         title: Discard Cleaner
         total: Total
     cron_entries:
@@ -126,18 +126,18 @@ de:
         past: Vor %{time}
     jobs:
       actions:
-        confirm_destroy: Bist du sicher, dass du diesen Job zerstören willst?
+        confirm_destroy: Bist du sicher, dass du diesen Job löschen willst?
         confirm_discard: Bist du sicher, dass du diesen Job verwerfen willst?
         confirm_force_discard: Bist du sicher, dass du das Verwerfen dieses Jobs erzwingen möchten? Der Job wird als verworfen markiert, aber der laufende Job wird nicht gestoppt – er wird jedoch bei Fehlern nicht erneut versucht.
         confirm_reschedule: Bist du sicher, dass du diesen Job verschieben willst?
         confirm_retry: Bist du sicher, dass du diesen Job wiederholen willst?
-        destroy: Job zerstören
+        destroy: Job löschen
         discard: Job verwerfen
         force_discard: Job verwerfen erzwingen
         reschedule: Job neu planen
         retry: Job wiederholen
       destroy:
-        notice: Hiob wurde zerstört
+        notice: Job wurde gelöscht
       discard:
         notice: Job wurde verworfen
       executions:
@@ -145,14 +145,14 @@ de:
         full_trace: Full Trace
         in_queue: in der Warteschlange
         runtime: Laufzeit
-        title: Hinrichtungen
+        title: Ausführungen
       force_discard:
         notice: Der Job wurde zwangsweise verworfen. Die Ausführung wird fortgesetzt, bei Fehlern wird der Vorgang jedoch nicht wiederholt
       index:
         job_pagination: Job-Paginierung
         older_jobs: Ältere Jobs
       reschedule:
-        notice: Job wurde neu planen
+        notice: Job wurde neu geplant
       retry:
         notice: Job wurde wiederholt
       show:
@@ -166,7 +166,7 @@ de:
           confirm_discard_all: Bist du sicher, dass du die ausgewählten Jobs verferfen willst?
           confirm_reschedule_all: Bist du sicher, dass du die ausgewählten Jobs neu planen willst?
           confirm_retry_all: Bist du sicher, dass du die ausgewählten Jobs wiederholen willst?
-          destroy_all: Alle zerstören
+          destroy_all: Alle löschen
           discard_all: Alle verwerfen
           reschedule_all: Alle neu planen
           retry_all: Alle wiederholen
@@ -220,11 +220,11 @@ de:
             unit: ''
     pauses:
       index:
-        confirm_pause: Sind Sie sicher, dass Sie %{value} pausieren möchten?
-        confirm_unpause: Sind Sie sicher, dass Sie %{value} fortsetzen möchten?
-        disabled: Die experimentelle Pausenfunktion von GoodJob ist standardmäßig deaktiviert, da sie die Leistung beeinträchtigen kann. Konfigurieren Sie sie zur Aktivierung
+        confirm_pause: Bist du sicher, dass du %{value} pausieren möchten?
+        confirm_unpause: Bist du sicher, dass du %{value} fortsetzen möchten?
+        disabled: Die experimentelle Pausenfunktion von GoodJob ist standardmäßig deaktiviert, da sie die Leistung beeinträchtigen kann. Konfiguriere sie zur Aktivierung.
         job_class: Job-Klasse
-        label: Label
+        label: Etikette
         pause: Pausieren
         queue: Warteschlange
         title: Pausen