Fix Performance table formatting, change url from performances to s…

…ingular `performance` (#1393)

app/controllers/good_job/performances_controller.rb

@@ -2,8 +2,8 @@
 
 module GoodJob
   class PerformancesController < ApplicationController
-    def index
-      if GoodJob::DiscreteExecution.monotonic_duration_migrated?
+    def show
+      if GoodJob::DiscreteExecution.duration_interval_migrated?
         @performances = GoodJob::DiscreteExecution
                         .where.not(job_class: nil)
                         .group(:job_class)

app/models/good_job/base_execution.rb

@@ -494,7 +494,7 @@ def perform(lock_id:)
                 finished_at: job_performed_at,
               }
               discrete_execution_attrs[:error_event] = GoodJob::ErrorEvents::ERROR_EVENT_ENUMS[GoodJob::ErrorEvents::ERROR_EVENT_INTERRUPTED] if self.class.error_event_migrated?
-              discrete_execution_attrs[:duration] = monotonic_duration if GoodJob::DiscreteExecution.monotonic_duration_migrated? && Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a')
+              discrete_execution_attrs[:duration] = monotonic_duration if GoodJob::DiscreteExecution.duration_interval_usable?
               discrete_executions.where(finished_at: nil).where.not(performed_at: nil).update_all(discrete_execution_attrs) # rubocop:disable Rails/SkipsModelValidations
             end
           end
@@ -602,7 +602,7 @@ def perform(lock_id:)
         job_attributes[:finished_at] = job_finished_at
         if discrete_execution
           discrete_execution.finished_at = job_finished_at
-          discrete_execution.duration = monotonic_duration if GoodJob::DiscreteExecution.monotonic_duration_migrated? && Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a')
+          discrete_execution.duration = monotonic_duration if GoodJob::DiscreteExecution.duration_interval_usable?
         end
 
         retry_unhandled_error = result.unhandled_error && GoodJob.retry_on_unhandled_error

app/models/good_job/discrete_execution.rb

@@ -28,13 +28,17 @@ def self.backtrace_migrated?
       false
     end
 
-    def self.monotonic_duration_migrated?
+    def self.duration_interval_migrated?
       return true if columns_hash["duration"].present?
 
       migration_pending_warning!
       false
     end
 
+    def self.duration_interval_usable?
+      duration_interval_migrated? && Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a')
+    end
+
     def number
       serialized_params.fetch('executions', 0) + 1
     end
@@ -47,7 +51,7 @@ def queue_latency
     # Monotonic time between when this job started and finished
     def runtime_latency
       # migrated and Rails greater than 6.1
-      if self.class.monotonic_duration_migrated? && Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a')
+      if self.class.duration_interval_usable?
         duration
       elsif performed_at
         (finished_at || Time.current) - performed_at

app/views/good_job/performances/index.html.erb → app/views/good_job/performances/show.html.erb

@@ -13,32 +13,32 @@
       <header class="list-group-item bg-body-tertiary">
         <div class="row small text-muted text-uppercase align-items-center">
           <div class="col-12 col-lg-4"><%= t ".job_class" %></div>
-          <div class="col-lg-1 d-none d-lg-block"><%= t ".executions" %></div>
+          <div class="col-lg-2 d-none d-lg-block"><%= t ".executions" %></div>
 
-          <div class="col-lg-1 d-none d-lg-block"><%= t ".average_duration" %></div>
-          <div class="col-lg-1 d-none d-lg-block"><%= t ".minimum_duration" %></div>
-          <div class="col-lg-1 d-none d-lg-block"><%= t ".maximum_duration" %></div>
+          <div class="col-lg-2 d-none d-lg-block"><%= t ".average_duration" %></div>
+          <div class="col-lg-2 d-none d-lg-block"><%= t ".minimum_duration" %></div>
+          <div class="col-lg-2 d-none d-lg-block"><%= t ".maximum_duration" %></div>
         </div>
       </header>
 
       <% @performances.each do |performance| %>
         <div role="row" class="list-group-item py-3">
           <div class="row align-items-center">
             <div class="col-12 col-lg-4"><%= performance.job_class %></div>
-            <div class="col-6 col-lg-1 text-wrap">
+            <div class="col-6 col-lg-2 text-wrap">
               <div class="d-lg-none small text-muted mt-1"><%= t ".executions" %></div>
               <%= performance.executions_count %>
             </div>
 
-            <div class="col-6 col-lg-1 text-wrap">
+            <div class="col-6 col-lg-2 text-wrap">
               <div class="d-lg-none small text-muted mt-1"><%= t ".average_duration" %></div>
               <%= format_duration performance.avg_duration %>
             </div>
-            <div class="col-6 col-lg-1 text-wrap">
+            <div class="col-6 col-lg-2 text-wrap">
               <div class="d-lg-none small text-muted mt-1"><%= t ".minimum_duration" %></div>
               <%= format_duration performance.min_duration %>
             </div>
-            <div class="col-6 col-lg-1 text-wrap">
+            <div class="col-6 col-lg-2 text-wrap">
               <div class="d-lg-none small text-muted mt-1"><%= t ".maximum_duration" %></div>
               <%= format_duration performance.max_duration %>
             </div>

app/views/good_job/shared/_navbar.erb

@@ -40,7 +40,7 @@
           <% end %>
         </li>
         <li class="nav-item">
-          <%= link_to performances_path, class: ["nav-link", ("active" if controller_name == 'performances')] do %>
+          <%= link_to performance_path, class: ["nav-link", ("active" if controller_name == 'performances')] do %>
             <%= t(".performances") %>
           <% end %>
         </li>

config/locales/de.yml

@@ -197,7 +197,7 @@ de:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Durchschnittliche Dauer
         executions: Hinrichtungen
         job_class: Berufsklasse

config/locales/en.yml

@@ -197,7 +197,7 @@ en:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Average duration
         executions: Executions
         job_class: Job class

config/locales/es.yml

@@ -197,7 +197,7 @@ es:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Duración promedio
         executions: Ejecuciones
         job_class: clase de trabajo

config/locales/fr.yml

@@ -197,7 +197,7 @@ fr:
             trillion: J
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Durée moyenne
         executions: Exécutions
         job_class: Catégorie d'emplois

config/locales/it.yml

@@ -197,7 +197,7 @@ it:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Durata media
         executions: Esecuzioni
         job_class: Classe di lavoro

config/locales/ja.yml

@@ -197,7 +197,7 @@ ja:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: 平均所要時間
         executions: 処刑
         job_class: 職種

config/locales/ko.yml

@@ -197,7 +197,7 @@ ko:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: 평균 지속 시간
         executions: 처형
         job_class: 직업군

config/locales/nl.yml

@@ -197,7 +197,7 @@ nl:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Gemiddelde duur
         executions: Executies
         job_class: Functie klasse

config/locales/pt-BR.yml

@@ -197,7 +197,7 @@ pt-BR:
             trillion: T
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Duração média
         executions: Execuções
         job_class: Classe de trabalho

config/locales/ru.yml

@@ -223,7 +223,7 @@ ru:
             trillion: Т
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Средняя продолжительность
         executions: Казни
         job_class: Класс работы

config/locales/tr.yml

@@ -197,7 +197,7 @@ tr:
             trillion: Trilyon
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Ortalama süre
         executions: İnfazlar
         job_class: İş sınıfı

config/locales/uk.yml

@@ -223,7 +223,7 @@ uk:
             trillion: Трлн
             unit: ''
     performances:
-      index:
+      show:
         average_duration: Середня тривалість
         executions: Страти
         job_class: Клас роботи

config/routes.rb

@@ -31,7 +31,7 @@
 
   resources :processes, only: %i[index]
 
-  resources :performances, only: %i[index]
+  resource :performance, only: %i[show]
 
   scope :frontend, controller: :frontends do
     get "modules/:name", action: :module, as: :frontend_module, constraints: { format: 'js' }

lib/good_job.rb

@@ -287,7 +287,7 @@ def self.deprecator
   def self.migrated?
     # Always update with the most recent migration check
     GoodJob::DiscreteExecution.reset_column_information
-    GoodJob::DiscreteExecution.monotonic_duration_migrated?
+    GoodJob::DiscreteExecution.duration_interval_migrated?
   end
 
   ActiveSupport.run_load_hooks(:good_job, self)

spec/app/controllers/good_job/performances_controller_spec.rb

@@ -14,7 +14,7 @@
 
   describe '#index' do
     it 'renders the index page' do
-      get :index
+      get :show
       expect(response).to have_http_status(:ok)
       expect(response.body).to include('Performance')
     end

spec/app/models/good_job/execution_spec.rb

@@ -702,7 +702,7 @@ def job_params
           created_at: within(0.001).of(good_job.performed_at),
           scheduled_at: within(0.001).of(good_job.created_at),
           finished_at: within(1.second).of(Time.current),
-          duration: Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a') ? be_present : nil,
+          duration: GoodJob::DiscreteExecution.duration_interval_usable? ? be_present : nil,
           error: nil,
           serialized_params: good_job.serialized_params
         )
@@ -741,7 +741,7 @@ def job_params
             created_at: within(1.second).of(Time.current),
             scheduled_at: within(1.second).of(Time.current),
             finished_at: within(1.second).of(Time.current),
-            duration: Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a') ? be_present : nil
+            duration: GoodJob::DiscreteExecution.duration_interval_usable? ? be_present : nil
           )
         end
       end
@@ -766,7 +766,7 @@ def job_params
           expect(good_job.discrete_executions.first).to have_attributes(
             performed_at: within(1.second).of(Time.current),
             finished_at: within(1.second).of(Time.current),
-            duration: Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a') ? be_present : nil
+            duration: GoodJob::DiscreteExecution.duration_interval_usable? ? be_present : nil
           )
         end
       end

spec/lib/good_job/active_job_extensions/interrupt_errors_spec.rb

@@ -83,7 +83,7 @@ def perform
         expect(initial_discrete_execution).to have_attributes(
           performed_at: be_present,
           finished_at: be_present,
-          duration: Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a') ? be_present : nil,
+          duration: GoodJob::DiscreteExecution.duration_interval_usable? ? be_present : nil,
           error: start_with('GoodJob::InterruptError: Interrupted after starting perform at'),
           error_event: GoodJob::Job::ERROR_EVENT_INTERRUPTED
         )
@@ -92,7 +92,7 @@ def perform
         expect(retried_discrete_execution).to have_attributes(
           performed_at: be_present,
           finished_at: be_present,
-          duration: Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a') ? be_present : nil,
+          duration: GoodJob::DiscreteExecution.duration_interval_usable? ? be_present : nil,
           error: start_with('GoodJob::InterruptError: Interrupted after starting perform at'),
           error_event: GoodJob::Job::ERROR_EVENT_RETRIED
         )