flight_control 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad093eeb61f357dc4aead0c094eb413607dfa234cd7cdf4ed15579a0fa0af51
-  data.tar.gz: a7774ba9273438d984569b4f739795019caaea77d1f1e42b033cd862e0af9231
+  metadata.gz: de1aaa590e44b1aafc7e7fce1e61ca8ddd6b472ec507b92a483fdedbc4f93b88
+  data.tar.gz: 0b961660c79020fab500de5513623ace40e919dc215ba390b6e01881fbf3d3d6
 SHA512:
-  metadata.gz: 9ce93746fa317b44831c7fa4d12bca2590d25a76f4eeb375041df08895f326d1e8c25a414d10da06638b0c072c933c84bdbbe338bbf27a04dd77d0e93e8c9324
-  data.tar.gz: 986514c76126354436fe67b584289a17cf864314f126c9f7c159f1207e48c7dd3816860b82fde3115cc04ecde18e7e483528ae3b93a7d3f8127c2264f89053c5
+  metadata.gz: e0342d2ccd6e3c30b76aa284eca7dcc14d02df7c1f36fcee9820a02b9535fe93775932a684734a12a994c23b7767545957e8469ea3e46ab32245ff7e3852a5d6
+  data.tar.gz: dc7d93b5214bed8a8bd122eb5d2918ec2b5841e9ae5ca5aa8cfb3a0b12fea340b7f0c4acc03bab0997aea1b34609377691a2a550f942204bc3e0e02d5f007691

data/CHANGELOG.md

@@ -2,7 +2,28 @@
 
 ## [Unreleased]
 
-## [2.0.0] - 2026-07-20
+## [2.0.0.beta.2] - 2026-09-08
+
+Ported from mission_control-jobs (upstream 1.1.0...1.2.0 and later):
+
+- Adds `enqueued_at` and `scheduled_at` date-range filters, applied natively by Solid Queue.
+- Adds a `back_to_main_app_path` setting to point the "Back to main app" link somewhere other than the host's root.
+- Routes host-app route helpers used inside the engine through `main_app`, so a base controller redirecting to, say, `new_session_path` keeps working.
+- Loads the engine's stylesheets individually so they also work under Propshaft.
+- Shows the total of pending jobs on the queues page, and how many times a job has been retried.
+- Truncates long job arguments in job lists.
+- Orders failed jobs by when they failed rather than by job id.
+- Submits the job filters on `change` instead of debouncing keystrokes.
+- Swaps only the backtrace when toggling between clean and full.
+- Disables Turbo's prefetching of links on hover.
+- Redirects to the queues index when showing a queue that no longer exists.
+- Shows the raw error when a failed execution's error can't be parsed.
+- Fixes `config.active_job.default_page_size` not being applied.
+- Fixes the "Expires" tooltip of blocked jobs rendering its markup as text.
+- Fixes `JobProxy#duration` when `scheduled_at` isn't set.
+- Avoids N+1 count queries when listing Solid Queue queues.
+
+## [2.0.0.beta.1] - 2026-07-20
 
 - Drops support for Resque and Async adapters to focus on Solid Queue.
 - Drops support for Rails versions below 8.1.

data/README.md

@@ -107,6 +107,23 @@ If you do this, you can disable the default HTTP Basic Authentication using the
 config.flight_control.http_basic_auth_enabled = false
 ```
 
+Your base controller's code runs inside the engine, whose route helpers take precedence. Route helpers of your app that Flight Control doesn't define itself, like `new_session_path` from Rails' authentication generator, still work as they are, for example from a `before_action` that redirects to the login page. Helpers that both your app and Flight Control define, like `root_path`, resolve to Flight Control's; use `main_app.root_path` to reach your app's.
+
+#### Authentication via route constraints
+
+You can also keep authentication out of Flight Control's controllers altogether and restrict access when mounting the engine, using [route constraints](https://guides.rubyonrails.org/routing.html#advanced-constraints). For example, with the sessions created by Rails' authentication generator:
+
+```ruby
+# config/routes.rb
+Rails.application.routes.draw do
+  constraints ->(request) { Session.find_by(id: request.cookie_jar.signed[:session_id])&.user&.admin? } do
+    mount FlightControl::Engine, at: "/jobs"
+  end
+end
+```
+
+Requests that don't satisfy the constraint never reach the engine. As with a custom base controller, disable HTTP Basic Authentication if you don't want both.
+
 ### Other configuration settings
 
 Besides `base_controller_class`, you can also set the following for `FlightControl` or `config.flight_control`:
@@ -116,6 +133,7 @@ Besides `base_controller_class`, you can also set the following for `FlightContr
 - `internal_query_count_limit`: in count queries, the maximum number of records that will be counted if the adapter needs to limit these queries. True counts above this number will be returned as `INFINITY`. This keeps count queries fast—defaults to `500,000`
 - `scheduled_job_delay_threshold`: the time duration before a scheduled job is considered delayed. Defaults to `1.minute` (a job is considered delayed if it hasn't transitioned from the `scheduled` status 1 minute after the scheduled time).
 - `show_console_help`: whether to show the console help. If you don't want the console help message, set this to `false`—defaults to `true`.
+- `back_to_main_app_path`: an optional string path for the "Back to main app" link. Example: `'/admin'`. Defaults to the host app's `root_path` when available.
 - `backtrace_cleaner`: a backtrace cleaner used for optionally filtering backtraces on the Failed Jobs detail page. Defaults to `Rails::BacktraceCleaner.new`. See the [Advanced configuration](#advanced-configuration) section for how to configure/override this setting on a per application/server basis.
 - `filter_arguments`: an array of strings representing the job argument keys you want to filter out in the UI. This is useful for hiding sensitive user data. Currently, only root-level hash keys are supported.
 
@@ -223,6 +241,11 @@ ActiveJob.jobs.finished.where(job_class_name: "SomeJob")
 
 # All jobs in progress being run by a given worker
 ActiveJob.jobs.in_progress.where(worker_id: 42)
+
+# Filtering by dates takes a range, which can be open on either end
+ActiveJob.jobs.failed.where(enqueued_at: 2.days.ago..)
+ActiveJob.jobs.scheduled.where(scheduled_at: Time.now..1.hour.from_now)
+ActiveJob.jobs.finished.where(finished_at: ..1.week.ago)
 ```
 
 Some examples of bulk operations:

data/lib/active_job/job_proxy.rb

@@ -28,7 +28,8 @@ class ActiveJob::JobProxy < ActiveJob::Base
 
   def duration
     ended_at = finished_at || failed_at
-    ended_at - scheduled_at if ended_at && scheduled_at
+    started_at = scheduled_at || enqueued_at
+    ended_at - started_at if ended_at && started_at
   end
 
   ActiveJob::JobsRelation::STATUSES.each do |status|

data/lib/active_job/jobs_relation.rb

@@ -23,9 +23,9 @@ class ActiveJob::JobsRelation
   include Enumerable
 
   STATUSES = %i[pending failed in_progress blocked scheduled finished]
-  FILTERS = %i[queue_name job_class_name]
+  FILTERS = %i[queue_name job_class_name scheduled_at enqueued_at]
 
-  PROPERTIES = %i[queue_name status offset_value limit_value job_class_name worker_id recurring_task_id finished_at]
+  PROPERTIES = %i[queue_name status offset_value limit_value job_class_name worker_id recurring_task_id finished_at scheduled_at enqueued_at]
   attr_reader(*PROPERTIES, :default_page_size)
 
   delegate :last, :[], :reverse, to: :to_a
@@ -52,13 +52,17 @@ class ActiveJob::JobsRelation
   # * <tt>:worker_id</tt> - To only include the jobs processed by the provided worker.
   # * <tt>:recurring_task_id</tt> - To only include the jobs corresponding to runs of a recurring task.
   # * <tt>:finished_at</tt> - (Range) To only include the jobs finished between the provided range
-  def where(job_class_name: nil, queue_name: nil, worker_id: nil, recurring_task_id: nil, finished_at: nil)
+  # * <tt>:scheduled_at</tt> - (Range) To only include the jobs scheduled between the provided range
+  # * <tt>:enqueued_at</tt> - (Range) To only include the jobs enqueued between the provided range
+  def where(job_class_name: nil, queue_name: nil, worker_id: nil, recurring_task_id: nil, finished_at: nil, scheduled_at: nil, enqueued_at: nil)
     # Remove nil arguments to avoid overriding parameters when concatenating +where+ clauses
     arguments = {job_class_name: job_class_name,
                  queue_name: queue_name&.to_s,
                  worker_id: worker_id,
                  recurring_task_id: recurring_task_id,
-                 finished_at: finished_at}.compact
+                 finished_at: finished_at,
+                 scheduled_at: scheduled_at,
+                 enqueued_at: enqueued_at}.compact
 
     clone_with(**arguments)
   end
@@ -273,7 +277,15 @@ class ActiveJob::JobsRelation
   end
 
   def satisfy_filter?(job)
-    filters.all? { |property| public_send(property) == job.public_send(property) }
+    filters.all? { |property| satisfies_filter?(public_send(property), job.public_send(property)) }
+  end
+
+  def satisfies_filter?(filter_value, job_value)
+    if filter_value.is_a?(Range)
+      filter_value.cover?(job_value)
+    else
+      filter_value == job_value
+    end
   end
 
   def filters

data/lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -5,12 +5,14 @@ module ActiveJob::QueueAdapters::SolidQueueExt
 
   def queues
     queues = SolidQueue::Queue.all
-    pauses = SolidQueue::Pause.where(queue_name: queues.map(&:name)).index_by(&:queue_name)
+    queue_names = queues.map(&:name)
+    pauses = SolidQueue::Pause.where(queue_name: queue_names).index_by(&:queue_name)
+    sizes = SolidQueue::ReadyExecution.where(queue_name: queue_names).group(:queue_name).count
 
     queues.collect do |queue|
       {
         name: queue.name,
-        size: queue.size,
+        size: sizes[queue.name] || 0,
         active: pauses[queue.name].nil?
       }
     end
@@ -41,7 +43,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
   end
 
   def supported_job_filters(*)
-    [:queue_name, :job_class_name, :finished_at]
+    [:queue_name, :job_class_name, :finished_at, :scheduled_at, :enqueued_at]
   end
 
   def jobs_count(jobs_relation)
@@ -129,6 +131,11 @@ module ActiveJob::QueueAdapters::SolidQueueExt
         message: solid_queue_job.failed_execution.message,
         backtrace: solid_queue_job.failed_execution.backtrace || []
     end
+  rescue JSON::ParserError
+    ActiveJob::ExecutionError.new \
+      error_class: "",
+      message: solid_queue_job.failed_execution.error_before_type_cast,
+      backtrace: []
   end
 
   def dispatch_immediately(job)
@@ -183,7 +190,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
     attr_reader :jobs_relation
 
     delegate :queue_name, :limit_value, :limit_value_provided?, :offset_value, :job_class_name,
-      :default_page_size, :worker_id, :recurring_task_id, :finished_at, to: :jobs_relation
+      :default_page_size, :worker_id, :recurring_task_id, :finished_at, :scheduled_at, :enqueued_at, to: :jobs_relation
 
     def executions
       execution_class_by_status
@@ -192,6 +199,8 @@ module ActiveJob::QueueAdapters::SolidQueueExt
         .then { |executions| filter_executions_by_class(executions) }
         .then { |executions| filter_executions_by_process_id(executions) }
         .then { |executions| filter_executions_by_task_key(executions) }
+        .then { |executions| filter_executions_by_scheduled_at(executions) }
+        .then { |executions| filter_executions_by_enqueued_at(executions) }
         .then { |executions| limit(executions) }
         .then { |executions| offset(executions) }
     end
@@ -201,6 +210,8 @@ module ActiveJob::QueueAdapters::SolidQueueExt
         .then { |jobs| filter_jobs_by_queue(jobs) }
         .then { |jobs| filter_jobs_by_class(jobs) }
         .then { |jobs| filter_jobs_by_finished_at(jobs) }
+        .then { |jobs| filter_jobs_by_scheduled_at(jobs) }
+        .then { |jobs| filter_jobs_by_enqueued_at(jobs) }
         .then { |jobs| limit(jobs) }
         .then { |jobs| offset(jobs) }
     end
@@ -210,9 +221,13 @@ module ActiveJob::QueueAdapters::SolidQueueExt
     end
 
     def order_executions(executions)
-      # Follow polling order for scheduled executions, the rest newest first
+      # Follow polling order for scheduled executions, the rest newest first.
+      # Failed executions go by their own id: a job can fail again after being
+      # retried, and what's newest is the failure, not the job.
       if solid_queue_status.scheduled?
         executions.ordered
+      elsif solid_queue_status.failed?
+        executions.order(id: :desc)
       else
         executions.order(job_id: :desc)
       end
@@ -286,6 +301,29 @@ module ActiveJob::QueueAdapters::SolidQueueExt
       finished_at.present? ? jobs.where(finished_at: finished_at) : jobs
     end
 
+    def filter_executions_by_scheduled_at(executions)
+      return executions unless scheduled_at.present?
+
+      if solid_queue_status.scheduled?
+        executions.where(scheduled_at: scheduled_at)
+      else
+        executions.where(job: {scheduled_at: scheduled_at})
+      end
+    end
+
+    def filter_jobs_by_scheduled_at(jobs)
+      scheduled_at.present? ? jobs.where(scheduled_at: scheduled_at) : jobs
+    end
+
+    # Jobs are created when enqueued
+    def filter_executions_by_enqueued_at(executions)
+      enqueued_at.present? ? executions.where(job: {created_at: enqueued_at}) : executions
+    end
+
+    def filter_jobs_by_enqueued_at(jobs)
+      enqueued_at.present? ? jobs.where(created_at: enqueued_at) : jobs
+    end
+
     def limit(executions_or_jobs)
       limit_value.present? ? executions_or_jobs.limit(limit_value) : executions_or_jobs
     end

data/lib/flight_control/engine.rb

@@ -38,12 +38,18 @@ module FlightControl
       end
     end
 
+    initializer "flight_control.host_route_helpers" do |app|
+      ActiveSupport.on_load(:after_routes_loaded) do
+        FlightControl::HostRouteHelpers.define_from(app.routes, FlightControl::Engine.routes)
+      end
+    end
+
     initializer "flight_control.http_basic_auth" do |app|
       FlightControl.http_basic_auth_user ||= app.credentials.dig(:flight_control, :http_basic_auth_user)
       FlightControl.http_basic_auth_password ||= app.credentials.dig(:flight_control, :http_basic_auth_password)
     end
 
-    initializer "flight_control.active_job.extensions" do
+    initializer "flight_control.active_job.extensions", before: "active_job.set_configs" do
       ActiveSupport.on_load :active_job do
         include ActiveJob::Querying
         include ActiveJob::Executing

data/lib/flight_control/host_route_helpers.rb

@@ -0,0 +1,34 @@
+# Route helpers of the host app that the engine doesn't define itself, routed through +main_app+.
+#
+# Flight Control's controllers inherit from the host app's +ApplicationController+ (see
+# +base_controller_class+), so host code such as a +before_action+ redirecting to
+# +new_session_path+ runs inside the engine, where route helpers resolve against the engine's
+# routes and raise +ActionController::UrlGenerationError+. This module defines, for every route
+# helper the host app has and the engine doesn't, a method delegating to the host app's routes,
+# so that code keeps working unchanged.
+#
+# Helpers defined by both, like +root_path+, keep resolving to the engine's, as in any isolated
+# engine; use +main_app.root_path+ for the host's.
+module FlightControl::HostRouteHelpers
+  class << self
+    def define_from(host_routes, engine_routes)
+      undefine_all
+
+      (host_routes.named_routes.helper_names - engine_routes.named_routes.helper_names).each do |name|
+        define_method(name) { |*args| main_app.public_send(name, *args) }
+        defined_helpers << name
+      end
+    end
+
+    private
+
+    def undefine_all
+      defined_helpers.each { |name| remove_method(name) }
+      defined_helpers.clear
+    end
+
+    def defined_helpers
+      @defined_helpers ||= []
+    end
+  end
+end

data/lib/flight_control/version.rb

@@ -1,3 +1,3 @@
 module FlightControl
-  VERSION = "2.0.0.beta.1"
+  VERSION = "2.0.0.beta.2"
 end

data/lib/flight_control.rb

@@ -24,6 +24,7 @@ module FlightControl
 
   mattr_accessor :show_console_help, default: true
   mattr_accessor :backtrace_cleaner
+  mattr_accessor :back_to_main_app_path
 
   mattr_accessor :importmap, default: Importmap::Map.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flight_control
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Jury Razumau
@@ -340,6 +340,7 @@ files:
 - lib/flight_control/errors/incompatible_adapter.rb
 - lib/flight_control/errors/resource_not_found.rb
 - lib/flight_control/errors/unsupported_adapter.rb
+- lib/flight_control/host_route_helpers.rb
 - lib/flight_control/i18n_config.rb
 - lib/flight_control/identified_by_name.rb
 - lib/flight_control/identified_elements.rb