mission_control-jobs 1.0.1 → 1.1.0

data/app/controllers/concerns/mission_control/jobs/job_filters.rb

@@ -4,7 +4,7 @@ module MissionControl::Jobs::JobFilters
   included do
     before_action :set_filters
 
-    helper_method :active_filters?
+    helper_method :active_filters?, :jobs_filter_param
   end
 
   private
@@ -20,6 +20,14 @@ module MissionControl::Jobs::JobFilters
       @job_filters.any?
     end
 
+    def jobs_filter_param
+      if @job_filters&.any?
+        { filter: @job_filters }
+      else
+        {}
+      end
+    end
+
     def finished_at_range_params
       range_start, range_end = params.dig(:filter, :finished_at_start), params.dig(:filter, :finished_at_end)
       if range_start || range_end

data/app/controllers/mission_control/jobs/application_controller.rb

@@ -12,6 +12,7 @@ class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_co
   include MissionControl::Jobs::BasicAuthentication
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
+  include MissionControl::Jobs::JobFilters
 
   around_action :set_current_locale
 

data/app/controllers/mission_control/jobs/discards_controller.rb

@@ -13,6 +13,6 @@ class MissionControl::Jobs::DiscardsController < MissionControl::Jobs::Applicati
 
     def redirect_location
       status = @job.status.presence_in(supported_job_statuses) || :failed
-      application_jobs_url(@application, status)
+      application_jobs_url(@application, status, **jobs_filter_param)
     end
 end

data/app/controllers/mission_control/jobs/jobs_controller.rb

@@ -1,5 +1,5 @@
 class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationController
-  include MissionControl::Jobs::JobScoped, MissionControl::Jobs::JobFilters
+  include MissionControl::Jobs::JobScoped
 
   skip_before_action :set_job, only: :index
 

data/app/controllers/mission_control/jobs/retries_controller.rb

@@ -3,7 +3,7 @@ class MissionControl::Jobs::RetriesController < MissionControl::Jobs::Applicatio
 
   def create
     @job.retry
-    redirect_to application_jobs_url(@application, :failed), notice: "Retried job with id #{@job.job_id}"
+    redirect_to application_jobs_url(@application, :failed, **jobs_filter_param), notice: "Retried job with id #{@job.job_id}"
   end
 
   private

data/app/helpers/mission_control/jobs/application_helper.rb

@@ -4,5 +4,6 @@ module MissionControl::Jobs
     #
     # We can't rely on +config.action_controller.include_all_helpers = true+ in the host app.
     include DatesHelper, JobsHelper, NavigationHelper, InterfaceHelper
+    include MissionControl::Jobs::Engine.routes.url_helpers
   end
 end

data/app/helpers/mission_control/jobs/navigation_helper.rb

@@ -37,14 +37,6 @@ module MissionControl::Jobs::NavigationHelper
     MissionControl::Jobs::Current.server.name == server.name
   end
 
-  def jobs_filter_param
-    if @job_filters&.any?
-      { filter: @job_filters }
-    else
-      {}
-    end
-  end
-
   def jobs_count_with_status(status)
     count = ActiveJob.jobs.with_status(status).count
     if count.infinite?

data/app/views/layouts/mission_control/jobs/_application_selection.html.erb

@@ -1,6 +1,9 @@
 <nav class="navbar" role="navigation" aria-label="main navigation">
   <div class="navbar-menu is-active mb-4">
     <div class="navbar-start">
+      <% if defined?(main_app.root_path) %>
+        <%= link_to "Back to main app", main_app.root_path %>
+      <% end %>
     </div>
 
     <div class="navbar-end">

data/app/views/mission_control/jobs/jobs/_filters.html.erb

@@ -1,45 +1,55 @@
 <div class="filter level-left">
-  <div class="field is-grouped">
-    <div class="control">
-      <%= form_for :filter, url: application_jobs_path(MissionControl::Jobs::Current.application, jobs_status), method: :get,
-        data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
+  <%= form_for :filter, url: application_jobs_path(MissionControl::Jobs::Current.application, jobs_status), method: :get,
+    data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
 
+    <div class="field is-grouped">
+      <div class="control">
+        <%= form.label :job_class_name, class: "label" %>
         <div class="select is-rounded">
-          <%= form.text_field :job_class_name, value: @job_filters[:job_class_name], class: "input", list: "job-classes", placeholder: "Filter by job class..." %>
+          <%= form.text_field :job_class_name, value: @job_filters[:job_class_name], class: "input", list: "job-classes", placeholder: "Filter by job class...", autocomplete: "off" %>
         </div>
+      </div>
 
+      <div class="control">
+        <%= form.label :queue_name, class: "label" %>
         <div class="select is-rounded">
-          <%= form.text_field :queue_name, value: @job_filters[:queue_name], class: "input", list: "queue-names", placeholder: "Filter by queue name..." %>
+          <%= form.text_field :queue_name, value: @job_filters[:queue_name], class: "input", list: "queue-names", placeholder: "Filter by queue name...", autocomplete: "off" %>
         </div>
+      </div>
 
-        <% if jobs_status == "finished" %>
+      <% if jobs_status == "finished" %>
+        <div class="control">
+          <%= form.label :finished_at_start, class: "label" %>
           <div class="select is-rounded">
             <%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
           </div>
+        </div>
 
+        <div class="control">
+          <%= form.label :finished_at_end, class: "label" %>
           <div class="select is-rounded">
             <%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
           </div>
-        <% end %>
+        </div>
+      <% end %>
 
-        <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
+      <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
 
-        <datalist id="job-classes" class="is-hidden">
-          <% job_class_names.each do |job_class_name| %>
-            <option value="<%= job_class_name %>"></option>
-          <% end %>
-        </datalist>
+      <datalist id="job-classes" class="is-hidden">
+        <% job_class_names.each do |job_class_name| %>
+          <option value="<%= job_class_name %>"></option>
+        <% end %>
+      </datalist>
 
-        <datalist id="queue-names" class="is-hidden">
-          <% queue_names.each do |queue_name| %>
-            <option value="<%= queue_name %>"></option>
-          <% end %>
-        </datalist>
-      <% end %>
-    </div>
+      <datalist id="queue-names" class="is-hidden">
+        <% queue_names.each do |queue_name| %>
+          <option value="<%= queue_name %>"></option>
+        <% end %>
+      </datalist>
 
-    <div class="control">
-      <%= link_to "Clear", application_jobs_path(MissionControl::Jobs::Current.application, jobs_status, job_class_name: nil, queue_name: nil, finished_at: nil..nil), class: "button" %>
+      <div class="control is-align-self-flex-end">
+        <%= link_to "Clear", application_jobs_path(MissionControl::Jobs::Current.application, jobs_status, job_class_name: nil, queue_name: nil, finished_at: nil..nil), class: "button" %>
+      </div>
     </div>
-  </div>
+  <% end %>
 </div>

data/app/views/mission_control/jobs/jobs/_general_information.html.erb

@@ -47,11 +47,17 @@
   <% end %>
   <% if job.finished_at.present? %>
     <tr>
-      <th>Finished at</th>
+      <th>Finished</th>
       <td>
         <%= time_distance_in_words_with_title(job.finished_at) %> ago
       </td>
     </tr>
+    <tr>
+      <th>Duration</th>
+      <td>
+        <%= job.duration.round(3) %> seconds
+      </td>
+    </tr>
   <% end %>
   <% if job.worker_id.present? %>
     <tr>

data/app/views/mission_control/jobs/jobs/blocked/_job.html.erb

@@ -1,6 +1,7 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
-<td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div>
-    <div class="has-text-grey is-size-7">Expires <%= bidirectional_time_distance_in_words_with_title(job.blocked_until) %></div>
+<td>
+  <div class="is-family-monospace is-size-7"><%= job.blocked_by %></div>
+  <div class="has-text-grey is-size-7"><%= job.blocked_until ? "Expires #{bidirectional_time_distance_in_words_with_title(job.blocked_until)}" : "" %></div>
 </td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>

data/app/views/mission_control/jobs/jobs/failed/_actions.html.erb

@@ -1,5 +1,5 @@
 <div class="buttons is-right">
-  <%= button_to "Discard", application_job_discard_path(@application, job.job_id), class: "button is-danger is-light mr-0",
+  <%= button_to "Discard", application_job_discard_path(@application, job.job_id, params: jobs_filter_param), class: "button is-danger is-light mr-0",
     form: { data: { turbo_confirm: "This will delete the job and can't be undone. Are you sure?" } } %>
-  <%= button_to "Retry", application_job_retry_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
+  <%= button_to "Retry", application_job_retry_path(@application, job.job_id, params: jobs_filter_param), class: "button is-warning is-light mr-0" %>
 </div>

data/app/views/mission_control/jobs/queues/_queue.html.erb

@@ -1,6 +1,6 @@
 <tr class="queue">
   <td>
-    <%= link_to queue.name, application_queue_path(@application, queue.name) %>
+    <%= link_to queue.name, application_queue_path(@application, queue) %>
     <% if queue.paused? %>
       <span class="ml-4 tag is-warning">Paused</span>
     <% end %>

data/lib/active_job/job_proxy.rb

@@ -24,6 +24,10 @@ class ActiveJob::JobProxy < ActiveJob::Base
     raise UnsupportedError, "A JobProxy doesn't support immediate execution, only enqueuing."
   end
 
+  def duration
+    finished_at - scheduled_at
+  end
+
   ActiveJob::JobsRelation::STATUSES.each do |status|
     define_method "#{status}?" do
       self.status == status

data/lib/active_job/queues.rb

@@ -13,17 +13,21 @@ class ActiveJob::Queues
   include Enumerable
 
   delegate :each, to: :values
-  delegate :values, to: :queues_by_name, private: true
-  delegate :[], :size, :length, :to_s, :inspect, to: :queues_by_name
+  delegate :values, to: :queues_by_id, private: true
+  delegate :size, :length, :to_s, :inspect, to: :queues_by_id
 
   def initialize(queues)
-    @queues_by_name = queues.index_by(&:name).with_indifferent_access
+    @queues_by_id = queues.index_by(&:id).with_indifferent_access
   end
 
   def to_h
-    queues_by_name.dup
+    queues_by_id.dup
+  end
+
+  def [](name)
+    queues_by_id[name.to_s.parameterize]
   end
 
   private
-    attr_reader :queues_by_name
+    attr_reader :queues_by_id
 end

data/lib/mission_control/jobs/engine.rb

@@ -35,8 +35,8 @@ module MissionControl
       end
 
       initializer "mission_control-jobs.http_basic_auth" do |app|
-        MissionControl::Jobs.http_basic_auth_user = app.credentials.dig(:mission_control, :http_basic_auth_user)
-        MissionControl::Jobs.http_basic_auth_password = app.credentials.dig(:mission_control, :http_basic_auth_password)
+        MissionControl::Jobs.http_basic_auth_user ||= app.credentials.dig(:mission_control, :http_basic_auth_user)
+        MissionControl::Jobs.http_basic_auth_password ||= app.credentials.dig(:mission_control, :http_basic_auth_password)
       end
 
       initializer "mission_control-jobs.active_job.extensions" do
@@ -63,13 +63,6 @@ module MissionControl
       end
 
       config.after_initialize do |app|
-        unless app.config.eager_load
-          # When loading classes lazily (development), we want to make sure
-          # the base host +ApplicationController+ class is loaded when loading the
-          # Engine's +ApplicationController+, or it will fail to load the class.
-          MissionControl::Jobs.base_controller_class.constantize
-        end
-
         if MissionControl::Jobs.applications.empty?
           queue_adapters_by_name = MissionControl::Jobs.adapters.each_with_object({}) do |adapter, hsh|
             hsh[adapter] = ActiveJob::QueueAdapters.lookup(adapter).new
@@ -103,10 +96,12 @@ module MissionControl
 
       initializer "mission_control-jobs.importmap", after: "importmap" do |app|
         MissionControl::Jobs.importmap.draw(root.join("config/importmap.rb"))
-        MissionControl::Jobs.importmap.cache_sweeper(watches: root.join("app/javascript"))
+        if app.config.importmap.sweep_cache && app.config.reloading_enabled?
+          MissionControl::Jobs.importmap.cache_sweeper(watches: root.join("app/javascript"))
 
-        ActiveSupport.on_load(:action_controller_base) do
-          before_action { MissionControl::Jobs.importmap.cache_sweeper.execute_if_updated }
+          ActiveSupport.on_load(:action_controller_base) do
+            before_action { MissionControl::Jobs.importmap.cache_sweeper.execute_if_updated }
+          end
         end
       end
     end

data/lib/mission_control/jobs/i18n_config.rb

@@ -1,9 +1,17 @@
 class MissionControl::Jobs::I18nConfig < ::I18n::Config
+  AVAILABLE_LOCALES = [ :en ]
+  AVAILABLE_LOCALES_SET = [ :en, "en" ]
+  DEFAULT_LOCALE = :en
+
   def available_locales
-    [ :en ]
+    AVAILABLE_LOCALES
+  end
+
+  def available_locales_set
+    AVAILABLE_LOCALES_SET
   end
 
   def default_locale
-    :en
+    DEFAULT_LOCALE
   end
 end

data/lib/mission_control/jobs/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Jobs
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord