flight_control 2.0.0.beta.1 → 2.0.0.beta.3

data/config/routes.rb

@@ -0,0 +1,34 @@
+FlightControl::Engine.routes.draw do
+  resources :applications, only: [] do
+    resources :queues, only: [:index, :show] do
+      scope module: :queues do
+        resource :pause, only: [:create, :destroy]
+      end
+    end
+
+    resources :jobs, only: :show do
+      resource :retry, only: :create
+      resource :discard, only: :create
+      resource :dispatch, only: :create
+
+      collection do
+        resource :bulk_retries, only: :create
+        resource :bulk_discards, only: :create
+      end
+    end
+
+    resources :jobs, only: :index, path: ":status/jobs"
+
+    resources :workers, only: [:index, :show]
+    resources :recurring_tasks, only: [:index, :show, :update]
+    resources :job_launches, only: [:new, :create]
+  end
+
+  # Allow referencing urls without providing an application_id. It will default to the first one.
+  resources :queues, only: [:index, :show]
+
+  resources :jobs, only: :show
+  resources :jobs, only: :index, path: ":status/jobs"
+
+  root to: "queues#index"
+end

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.3"
 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.3
 platform: ruby
 authors:
 - Jury Razumau
@@ -313,6 +313,98 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/flight_control_manifest.js
+- app/assets/stylesheets/flight_control/application.css
+- app/assets/stylesheets/flight_control/bulma.min.css
+- app/assets/stylesheets/flight_control/forms.css
+- app/assets/stylesheets/flight_control/jobs.css
+- app/controllers/concerns/flight_control/adapter_features.rb
+- app/controllers/concerns/flight_control/application_scoped.rb
+- app/controllers/concerns/flight_control/basic_authentication.rb
+- app/controllers/concerns/flight_control/failed_jobs_bulk_operations.rb
+- app/controllers/concerns/flight_control/job_filters.rb
+- app/controllers/concerns/flight_control/job_scoped.rb
+- app/controllers/concerns/flight_control/not_found_redirections.rb
+- app/controllers/concerns/flight_control/queue_scoped.rb
+- app/controllers/flight_control/application_controller.rb
+- app/controllers/flight_control/bulk_discards_controller.rb
+- app/controllers/flight_control/bulk_retries_controller.rb
+- app/controllers/flight_control/discards_controller.rb
+- app/controllers/flight_control/dispatches_controller.rb
+- app/controllers/flight_control/job_launches_controller.rb
+- app/controllers/flight_control/jobs_controller.rb
+- app/controllers/flight_control/queues/pauses_controller.rb
+- app/controllers/flight_control/queues_controller.rb
+- app/controllers/flight_control/recurring_tasks_controller.rb
+- app/controllers/flight_control/retries_controller.rb
+- app/controllers/flight_control/workers_controller.rb
+- app/helpers/flight_control/application_helper.rb
+- app/helpers/flight_control/dates_helper.rb
+- app/helpers/flight_control/interface_helper.rb
+- app/helpers/flight_control/jobs_helper.rb
+- app/helpers/flight_control/navigation_helper.rb
+- app/javascript/flight_control/application.js
+- app/javascript/flight_control/controllers/application.js
+- app/javascript/flight_control/controllers/form_controller.js
+- app/javascript/flight_control/controllers/index.js
+- app/javascript/flight_control/controllers/local_time_controller.js
+- app/models/flight_control/application_record.rb
+- app/models/flight_control/current.rb
+- app/models/flight_control/job_launch.rb
+- app/models/flight_control/page.rb
+- app/models/flight_control/recurring_task.rb
+- app/models/flight_control/worker.rb
+- app/views/flight_control/job_launches/new.html.erb
+- app/views/flight_control/jobs/_date_range_filter.html.erb
+- app/views/flight_control/jobs/_error_information.html.erb
+- app/views/flight_control/jobs/_filters.html.erb
+- app/views/flight_control/jobs/_general_information.html.erb
+- app/views/flight_control/jobs/_job.html.erb
+- app/views/flight_control/jobs/_jobs_page.html.erb
+- app/views/flight_control/jobs/_raw_data.html.erb
+- app/views/flight_control/jobs/_title.html.erb
+- app/views/flight_control/jobs/_toolbar.html.erb
+- app/views/flight_control/jobs/blocked/_actions.html.erb
+- app/views/flight_control/jobs/blocked/_job.html.erb
+- app/views/flight_control/jobs/failed/_actions.html.erb
+- app/views/flight_control/jobs/failed/_backtrace_toggle.html.erb
+- app/views/flight_control/jobs/failed/_job.html.erb
+- app/views/flight_control/jobs/finished/_job.html.erb
+- app/views/flight_control/jobs/in_progress/_job.html.erb
+- app/views/flight_control/jobs/index.html.erb
+- app/views/flight_control/jobs/scheduled/_actions.html.erb
+- app/views/flight_control/jobs/scheduled/_job.html.erb
+- app/views/flight_control/jobs/show.html.erb
+- app/views/flight_control/queues/_actions.html.erb
+- app/views/flight_control/queues/_job.html.erb
+- app/views/flight_control/queues/_queue.html.erb
+- app/views/flight_control/queues/_queue_title.html.erb
+- app/views/flight_control/queues/index.html.erb
+- app/views/flight_control/queues/show.html.erb
+- app/views/flight_control/recurring_tasks/_actions.html.erb
+- app/views/flight_control/recurring_tasks/_general_information.html.erb
+- app/views/flight_control/recurring_tasks/_recurring_task.html.erb
+- app/views/flight_control/recurring_tasks/_title.html.erb
+- app/views/flight_control/recurring_tasks/index.html.erb
+- app/views/flight_control/recurring_tasks/show.html.erb
+- app/views/flight_control/shared/_job.html.erb
+- app/views/flight_control/shared/_jobs.html.erb
+- app/views/flight_control/shared/_pagination_toolbar.html.erb
+- app/views/flight_control/workers/_configuration.html.erb
+- app/views/flight_control/workers/_raw_data.html.erb
+- app/views/flight_control/workers/_title.html.erb
+- app/views/flight_control/workers/_worker.html.erb
+- app/views/flight_control/workers/_workers_page.html.erb
+- app/views/flight_control/workers/index.html.erb
+- app/views/flight_control/workers/show.html.erb
+- app/views/layouts/flight_control/_application_selection.html.erb
+- app/views/layouts/flight_control/_flash.html.erb
+- app/views/layouts/flight_control/_navigation.html.erb
+- app/views/layouts/flight_control/application.html.erb
+- app/views/layouts/flight_control/application_selection/_applications.html.erb
+- app/views/layouts/flight_control/application_selection/_servers.html.erb
+- config/importmap.rb
+- config/routes.rb
 - lib/active_job/errors/invalid_operation.rb
 - lib/active_job/errors/job_not_found_error.rb
 - lib/active_job/errors/query_error.rb
@@ -340,6 +432,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