mission_control-jobs 0.4.0 → 0.6.0

data/app/assets/stylesheets/mission_control/jobs/jobs.css

@@ -25,7 +25,7 @@ table.jobs {
         width: 45%;
     }
     &.scheduled th.job-header {
-        width: 60%;
+        width: 40%;
     }
     &.finished th.job-header {
         width: 65%;

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

@@ -1,6 +1,14 @@
 class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_controller_class.constantize
+  ActionController::Base::MODULES.each do |mod|
+    include mod unless self < mod
+  end
+
   layout "mission_control/jobs/application"
 
+  # Include helpers if not already included
+  helper MissionControl::Jobs::ApplicationHelper unless self < MissionControl::Jobs::ApplicationHelper
+  helper Importmap::ImportmapTagsHelper unless self < Importmap::ImportmapTagsHelper
+
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
 

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

@@ -8,7 +8,7 @@ class MissionControl::Jobs::DiscardsController < MissionControl::Jobs::Applicati
 
   private
     def jobs_relation
-      ActiveJob.jobs.failed
+      ActiveJob.jobs
     end
 
     def redirect_location

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

@@ -3,11 +3,16 @@ class MissionControl::Jobs::DispatchesController < MissionControl::Jobs::Applica
 
   def create
     @job.dispatch
-    redirect_to application_jobs_url(@application, :blocked), notice: "Dispatched job with id #{@job.job_id}"
+    redirect_to redirect_location, notice: "Dispatched job with id #{@job.job_id}"
   end
 
   private
-  def jobs_relation
-    ApplicationJob.jobs.blocked
-  end
+    def jobs_relation
+      ActiveJob.jobs
+    end
+
+    def redirect_location
+      status = @job.status.presence_in(supported_job_statuses) || :blocked
+      application_jobs_url(@application, status)
+    end
 end

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

@@ -15,7 +15,6 @@ class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationCo
   end
 
   private
-
     def jobs_relation
       filtered_jobs
     end

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

@@ -1,6 +1,7 @@
 class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::ApplicationController
   before_action :ensure_supported_recurring_tasks
-  before_action :set_recurring_task, only: :show
+  before_action :set_recurring_task, only: [ :show, :update ]
+  before_action :ensure_recurring_task_can_be_enqueued, only: :update
 
   def index
     @recurring_tasks = MissionControl::Jobs::Current.server.recurring_tasks
@@ -10,6 +11,14 @@ class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::App
     @jobs_page = MissionControl::Jobs::Page.new(@recurring_task.jobs, page: params[:page].to_i)
   end
 
+  def update
+    if (job = @recurring_task.enqueue) && job.successfully_enqueued?
+      redirect_to application_job_path(@application, job.job_id), notice: "Enqueued recurring task #{@recurring_task.id}"
+    else
+      redirect_to application_recurring_task_path(@application, @recurring_task.id), alert: "Something went wrong enqueuing this recurring task"
+    end
+  end
+
   private
     def ensure_supported_recurring_tasks
       unless recurring_tasks_supported?
@@ -20,4 +29,10 @@ class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::App
     def set_recurring_task
       @recurring_task = MissionControl::Jobs::Current.server.find_recurring_task(params[:id])
     end
+
+    def ensure_recurring_task_can_be_enqueued
+      unless @recurring_task.runnable?
+        redirect_to application_recurring_task_path(@application, @recurring_task.id), alert: "This task can't be enqueued"
+      end
+    end
 end

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

@@ -26,7 +26,7 @@ module MissionControl::Jobs::JobsHelper
   def attribute_names_for_job_status(status)
     case status.to_s
     when "failed"      then [ "Error", "" ]
-    when "blocked"     then [ "Queue", "Blocked by", "Block expiry", "" ]
+    when "blocked"     then [ "Queue", "Blocked by", "" ]
     when "finished"    then [ "Queue", "Finished" ]
     when "scheduled"   then [ "Queue", "Scheduled", "" ]
     when "in_progress" then [ "Queue", "Run by", "Running since" ]
@@ -39,7 +39,6 @@ module MissionControl::Jobs::JobsHelper
   end
 
   private
-
     def renderable_job_arguments_for(job)
       job.serialized_arguments.collect do |argument|
         as_renderable_argument(argument)
@@ -53,7 +52,7 @@ module MissionControl::Jobs::JobsHelper
       when Array
         as_renderable_array(argument)
       else
-        ActiveJob::Arguments.deserialize([ argument ])
+        ActiveJob::Arguments.deserialize([ argument ]).first
       end
     rescue ActiveJob::DeserializationError
       argument.to_s
@@ -65,12 +64,18 @@ module MissionControl::Jobs::JobsHelper
         argument["_aj_globalid"]
       elsif argument["_aj_serialized"] == "ActiveJob::Serializers::ModuleSerializer"
         argument["value"]
+      elsif argument["_aj_serialized"]
+        ActiveJob::Arguments.deserialize([ argument ]).first
       else
-        ActiveJob::Arguments.deserialize([ argument ])
+        argument.without("_aj_symbol_keys", "_aj_ruby2_keywords")
+          .transform_values { |v| as_renderable_argument(v) }
+          .map { |k, v| "#{k}: #{v}" }
+          .join(", ")
+          .then { |s| "{#{s}}" }
       end
     end
 
     def as_renderable_array(argument)
-      "(#{argument.collect { |part| as_renderable_argument(part) }.join(", ")})"
+      "[#{argument.collect { |part| as_renderable_argument(part) }.join(", ")}]"
     end
 end

data/app/models/mission_control/jobs/recurring_task.rb

@@ -12,6 +12,14 @@ class MissionControl::Jobs::RecurringTask
     ActiveJob::JobsRelation.new(queue_adapter: queue_adapter).where(recurring_task_id: id)
   end
 
+  def enqueue
+    queue_adapter.enqueue_recurring_task(id)
+  end
+
+  def runnable?
+    queue_adapter.can_enqueue_recurring_task?(id)
+  end
+
   private
     attr_reader :queue_adapter
 end

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

@@ -7,7 +7,8 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <meta name="turbo-cache-control" content="no-cache">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.1/css/bulma.min.css">
+
+  <%= stylesheet_link_tag "mission_control/jobs/bulma.min" %>
   <%= stylesheet_link_tag "mission_control/jobs/application", "data-turbo-track": "reload" %>
   <%= javascript_importmap_tags "application", importmap: MissionControl::Jobs.importmap  %>
 </head>

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

@@ -26,6 +26,17 @@
       <%= formatted_time(job.enqueued_at.to_datetime) %>
     </td>
   </tr>
+  <% if job.scheduled? %>
+    <tr>
+      <th>Scheduled</th>
+      <td>
+        <%= formatted_time(job.scheduled_at) %>
+        <% if job_delayed?(job) %>
+          <div class="is-danger tag ml-4">delayed</div>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
   <% if job.failed? %>
     <tr>
       <th>Failed</th>

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

@@ -1,3 +1,3 @@
 <div class="buttons is-right">
-  <%= button_to "Dispatch", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
 </div>

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></td>
-<td><%= formatted_time(job.blocked_until) %></td>
+<td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div>
+    <div class="has-text-grey is-size-7">Until <%= formatted_time(job.blocked_until) %></div>
+</td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
 </td>

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

@@ -1,4 +1,5 @@
 <div class="buttons is-right">
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
   <%= button_to "Discard", application_job_discard_path(@application, job.job_id), 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?" } } %>
 </div>

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

@@ -0,0 +1,5 @@
+<div class="buttons is-right">
+  <% if recurring_task.runnable? %>
+    <%= button_to "Run now", application_recurring_task_path(@application, recurring_task.id), class: "button is-warning is-light mr-0", method: :put %>
+  <% end %>
+</div>

data/app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb

@@ -16,4 +16,7 @@
   <td> <%= recurring_task.schedule %> </td>
   <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? formatted_time(recurring_task.last_enqueued_at) : "Never" %></div></td>
   <td class="next_time"><div class="has-text-grey"><%= formatted_time(recurring_task.next_time) %></div></td>
+  <td class="pr-0">
+    <%= render "mission_control/jobs/recurring_tasks/actions", recurring_task: recurring_task %>
+  </td>
 </tr>

data/app/views/mission_control/jobs/recurring_tasks/_title.html.erb

@@ -3,5 +3,8 @@
     <div class="level-left">
       <%= recurring_task.id %>
     </div>
+    <div class="level-right">
+      <%= render "mission_control/jobs/recurring_tasks/actions", recurring_task: recurring_task %>
+    </div>
   </div>
 </h1>

data/app/views/mission_control/jobs/recurring_tasks/index.html.erb

@@ -7,8 +7,9 @@
     <th></th>
     <th>Job</th>
     <th>Schedule</th>
-    <th>Last enqueued at</th>
-    <th>Next run</th>
+    <th>Last enqueued</th>
+    <th>Next</th>
+    <th></th>
   </tr>
   </thead>
 

data/config/routes.rb

@@ -20,7 +20,7 @@ MissionControl::Jobs::Engine.routes.draw do
     resources :jobs, only: :index, path: ":status/jobs"
 
     resources :workers, only: [ :index, :show ]
-    resources :recurring_tasks, only: [ :index, :show ]
+    resources :recurring_tasks, only: [ :index, :show, :update ]
   end
 
   # Allow referencing urls without providing an application_id. It will default to the first one.

data/lib/active_job/executing.rb

@@ -25,7 +25,7 @@ module ActiveJob::Executing
   end
 
   def dispatch
-    ActiveJob.jobs.blocked.dispatch_job(self)
+    ActiveJob.jobs.dispatch_job(self)
   end
 
   private

data/lib/active_job/jobs_relation.rb

@@ -154,7 +154,12 @@ class ActiveJob::JobsRelation
   end
 
   # Dispatch the provided job.
+  #
+  # This operation is only valid for blocked or scheduled jobs. It will
+  # raise an error +ActiveJob::Errors::InvalidOperation+ otherwise.
   def dispatch_job(job)
+    raise ActiveJob::Errors::InvalidOperation, "This operation can only be performed on blocked or scheduled jobs, but this job is #{job.status}" unless job.blocked? || job.scheduled?
+
     queue_adapter.dispatch_job(job, self)
   end
 

data/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb

@@ -20,6 +20,18 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
     end
   end
 
+  def enqueue_recurring_task(task_id)
+    if task = SolidQueue::RecurringTask.find_by(key: task_id)
+      task.enqueue(at: Time.now)
+    end
+  end
+
+  def can_enqueue_recurring_task?(task_id)
+    if task = SolidQueue::RecurringTask.find_by(key: task_id)
+      task.valid?
+    end
+  end
+
   private
     def recurring_task_attributes_from_solid_queue_recurring_task(task)
       {

data/lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -123,9 +123,13 @@ module ActiveJob::QueueAdapters::SolidQueueExt
     end
 
     def dispatch_immediately(job)
-      SolidQueue::Job.transaction do
-        job.dispatch_bypassing_concurrency_limits
-        job.blocked_execution.destroy!
+      if job.blocked?
+        SolidQueue::Job.transaction do
+          job.dispatch_bypassing_concurrency_limits
+          job.blocked_execution.destroy!
+        end
+      else
+        job.scheduled_execution.update!(scheduled_at: Time.now)
       end
     end
 

data/lib/mission_control/jobs/engine.rb

@@ -7,6 +7,13 @@ module MissionControl
     class Engine < ::Rails::Engine
       isolate_namespace MissionControl::Jobs
 
+      initializer "mission_control-jobs.middleware" do |app|
+        if app.config.api_only
+          app.middleware.use ActionDispatch::Flash
+          app.middleware.use ::Rack::MethodOverride
+        end
+      end
+
       config.mission_control = ActiveSupport::OrderedOptions.new unless config.try(:mission_control)
       config.mission_control.jobs = ActiveSupport::OrderedOptions.new
 
@@ -80,6 +87,7 @@ module MissionControl
       end
 
       initializer "mission_control-jobs.assets" do |app|
+        app.config.assets.paths << root.join("app/assets/stylesheets")
         app.config.assets.paths << root.join("app/javascript")
         app.config.assets.precompile += %w[ mission_control_jobs_manifest ]
       end

data/lib/mission_control/jobs/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Jobs
-    VERSION = "0.4.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +305,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-rails
+  name: propshaft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -358,6 +358,7 @@ files:
 - Rakefile
 - app/assets/config/mission_control_jobs_manifest.js
 - app/assets/stylesheets/mission_control/jobs/application.css
+- app/assets/stylesheets/mission_control/jobs/bulma.min.css
 - app/assets/stylesheets/mission_control/jobs/forms.css
 - app/assets/stylesheets/mission_control/jobs/jobs.css
 - app/controllers/concerns/mission_control/jobs/adapter_features.rb
@@ -425,6 +426,7 @@ files:
 - app/views/mission_control/jobs/queues/_queue_title.html.erb
 - app/views/mission_control/jobs/queues/index.html.erb
 - app/views/mission_control/jobs/queues/show.html.erb
+- app/views/mission_control/jobs/recurring_tasks/_actions.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_general_information.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_title.html.erb