mission_control-jobs 0.5.0 → 0.6.0

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/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, :update ]
+  before_action :ensure_recurring_task_can_be_enqueued, only: :update
 
   def index
     @recurring_tasks = MissionControl::Jobs::Current.server.recurring_tasks
@@ -14,7 +15,7 @@ class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::App
     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), alert: "Something went wrong enqueuing this recurring task"
+      redirect_to application_recurring_task_path(@application, @recurring_task.id), alert: "Something went wrong enqueuing this recurring task"
     end
   end
 
@@ -28,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

@@ -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

@@ -16,6 +16,10 @@ class MissionControl::Jobs::RecurringTask
     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/recurring_tasks/_actions.html.erb

@@ -1,3 +1,5 @@
 <div class="buttons is-right">
-  <%= button_to "Run now", application_recurring_task_path(@application, recurring_task.id), class: "button is-warning is-light mr-0", method: :put %>
+  <% 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/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb

@@ -26,6 +26,12 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
     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/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.5.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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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