mission_control-jobs 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced6558306cb1d5dce82b59a848a16904e39600a0b65982b124a9788d4d47989
-  data.tar.gz: 2a973ec0f123903d0ecd42f47d19e2f213d2659fed58f9521ed7f080ca6c9807
+  metadata.gz: d7d0d51d0662e0351ff33ed1b2a480a7f1d11c593eefbe89a630a980de5a1b24
+  data.tar.gz: a9c05be3a1b2b0975c3d7095ac3d3433c502b5afd87a942996ced2aa01485b6c
 SHA512:
-  metadata.gz: 8a374110adc1bf32f56c680ce5024dce8f2b4d9812380dbbc0af0a3006b56c25614c92b653d4c9738d92601c610e78a2f566f929456b184cf2f08a9f3920ce62
-  data.tar.gz: 2a7be00afe61ee9f6441e955f85cb4eee5361945c0f6208140cfd0d98883c7d6ec702a4785590c9822c20db9961e7ea089614ec869e37c7571156f0850f2040b
+  metadata.gz: de6116de1a5b4fd7b87d4aba9e245953147edaa3cf8dd9e5e464be815dec79d74977dbe60b638246a6fe3625f9cb050aaceb9cd09c73eda857b1756006700328
+  data.tar.gz: 4e133652b36ec90c22fc9e77170e985d6b18c1a68ae73ce43361a1ea5be9c14820f8db594ce713bbcf7a8a6540766f9f6d4a5974dd51a9510fb94040f57fde76

data/README.md

@@ -65,6 +65,7 @@ This library extends Active Job with a querying interface and the following sett
 ## Adapter Specifics
 
 - **Resque**: Queue pausing is supported only if you have `resque-pause` installed in your project
+- **Solid Queue**: Requires version >= 0.9.
 
 ## Advanced configuration
 

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

@@ -1,16 +1,2 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */
-
+@import url("./forms.css");
+@import url("./jobs.css");

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/helpers/mission_control/jobs/application_helper.rb

@@ -3,6 +3,6 @@ module MissionControl::Jobs
     # Explicit helper inclusion because ApplicationController inherits from the host app.
     #
     # We can't rely on +config.action_controller.include_all_helpers = true+ in the host app.
-    include DatesHelper, JobsHelper, NavigationHelper, UiHelper
+    include DatesHelper, JobsHelper, NavigationHelper, InterfaceHelper
   end
 end

data/app/helpers/mission_control/jobs/{ui_helper.rb → interface_helper.rb}

@@ -1,4 +1,4 @@
-module MissionControl::Jobs::UiHelper
+module MissionControl::Jobs::InterfaceHelper
   def blank_status_notice(message)
     tag.div message, class: "mt-6 has-text-centered is-size-3 has-text-grey"
   end

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

@@ -1,7 +1,7 @@
 class MissionControl::Jobs::RecurringTask
   include ActiveModel::Model
 
-  attr_accessor :id, :job_class_name, :arguments, :schedule, :last_enqueued_at
+  attr_accessor :id, :job_class_name, :command, :arguments, :schedule, :last_enqueued_at, :queue_name, :priority
 
   def initialize(queue_adapter: ActiveJob::Base.queue_adapter, **kwargs)
     @queue_adapter = queue_adapter

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

@@ -1,16 +1,37 @@
 <table class="table">
   <tbody>
-  <tr>
-    <th>Job class</th>
-    <td><%= recurring_task.job_class_name %></td>
-  </tr>
-  <tr>
-    <th>Arguments</th>
-    <td><div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div></td>
-  </tr>
+  <% if recurring_task.job_class_name.present? %>
+    <tr>
+      <th>Job class</th>
+      <td><%= recurring_task.job_class_name %></td>
+    </tr>
+
+    <tr>
+      <th>Arguments</th>
+      <td><div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div></td>
+    </tr>
+  <% elsif recurring_task.command.present? %>
+    <tr>
+      <th>Command</th>
+      <td><div class="is-family-monospace"><%= recurring_task.command %></div></td>
+    </tr>
+  <% end %>
+
   <tr>
     <th>Schedule</th>
     <td><%= recurring_task.schedule %></td>
   </tr>
+  <% if recurring_task.queue_name.present? %>
+    <tr>
+      <th>Queue</th>
+      <td><%= recurring_task.queue_name %></td>
+    </tr>
+  <% end %>
+  <% if recurring_task.priority.present? %>
+    <tr>
+      <th>Priority</th>
+      <td><%= recurring_task.priority %></td>
+    </tr>
+  <% end %>
   </tbody>
 </table>

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

@@ -3,10 +3,14 @@
     <%= link_to recurring_task.id, application_recurring_task_path(@application, recurring_task.id) %>
   </td>
   <td>
-    <%= link_to recurring_task.job_class_name, application_recurring_task_path(@application, recurring_task.id) %>
+    <% if recurring_task.job_class_name.present? %>
+      <%= recurring_task.job_class_name %>
 
-    <% if recurring_task.arguments.present? %>
-      <div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div>
+      <% if recurring_task.arguments.present? %>
+        <div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div>
+      <% end %>
+    <% elsif recurring_task.command.present? %>
+      <div class="is-family-monospace"><%= recurring_task.command %></div>
     <% end %>
   </td>
   <td> <%= recurring_task.schedule %> </td>

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

@@ -4,36 +4,32 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
   end
 
   def recurring_tasks
-    tasks = recurring_tasks_from_dispatchers
-    last_enqueued_at_times = recurring_task_last_enqueued_at(tasks.keys)
+    tasks = SolidQueue::RecurringTask.all
+    last_enqueued_at_times = recurring_task_last_enqueued_at(tasks.map(&:key))
 
-    recurring_tasks_from_dispatchers.collect do |task_id, task_attrs|
-      recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
-        id: task_id,
-        last_enqueued_at: last_enqueued_at_times[task_id]
+    tasks.collect do |task|
+      recurring_task_attributes_from_solid_queue_recurring_task(task).merge \
+        last_enqueued_at: last_enqueued_at_times[task.key]
     end
   end
 
   def find_recurring_task(task_id)
-    if task_attrs = recurring_tasks_from_dispatchers[task_id]
-      recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
-        id: task_id,
-        last_enqueued_at: recurring_task_last_enqueued_at(task_id).values&.first
+    if task = SolidQueue::RecurringTask.find_by(key: task_id)
+      recurring_task_attributes_from_solid_queue_recurring_task(task).merge \
+        last_enqueued_at: recurring_task_last_enqueued_at(task.key).values&.first
     end
   end
 
   private
-    def recurring_tasks_from_dispatchers
-      SolidQueue::Process.where(kind: "Dispatcher").flat_map do |process|
-        process.metadata["recurring_schedule"]
-      end.compact.reduce({}, &:merge)
-    end
-
-    def recurring_task_attributes_from_solid_queue_task_attributes(task_attributes)
+    def recurring_task_attributes_from_solid_queue_recurring_task(task)
       {
-        job_class_name: task_attributes["class_name"],
-        arguments: task_attributes["arguments"],
-        schedule: task_attributes["schedule"]
+        id: task.key,
+        job_class_name: task.class_name,
+        command: task.command,
+        arguments: task.arguments,
+        schedule: task.schedule,
+        queue_name: task.queue_name,
+        priority: task.priority
       }
     end
 

data/lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -118,7 +118,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
         ActiveJob::ExecutionError.new \
           error_class: solid_queue_job.failed_execution.exception_class,
           message: solid_queue_job.failed_execution.message,
-          backtrace: solid_queue_job.failed_execution.backtrace
+          backtrace: solid_queue_job.failed_execution.backtrace || []
       end
     end
 

data/lib/mission_control/jobs/engine.rb

@@ -4,12 +4,15 @@ require "mission_control/jobs/engine"
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
+require "propshaft"
 
 module MissionControl
   module Jobs
     class Engine < ::Rails::Engine
       isolate_namespace MissionControl::Jobs
 
+      config.middleware.use ActionDispatch::Flash unless config.action_dispatch.flash
+
       config.mission_control = ActiveSupport::OrderedOptions.new unless config.try(:mission_control)
       config.mission_control.jobs = ActiveSupport::OrderedOptions.new
 
@@ -87,6 +90,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.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: propshaft
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +300,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/mission_control_jobs_manifest.js
 - app/assets/stylesheets/mission_control/jobs/application.css
 - app/assets/stylesheets/mission_control/jobs/forms.css
 - app/assets/stylesheets/mission_control/jobs/jobs.css
@@ -310,9 +323,9 @@ files:
 - app/controllers/mission_control/jobs/workers_controller.rb
 - app/helpers/mission_control/jobs/application_helper.rb
 - app/helpers/mission_control/jobs/dates_helper.rb
+- app/helpers/mission_control/jobs/interface_helper.rb
 - app/helpers/mission_control/jobs/jobs_helper.rb
 - app/helpers/mission_control/jobs/navigation_helper.rb
-- app/helpers/mission_control/jobs/ui_helper.rb
 - app/javascript/mission_control/jobs/application.js
 - app/javascript/mission_control/jobs/controllers/application.js
 - app/javascript/mission_control/jobs/controllers/form_controller.js

data/app/assets/config/mission_control_jobs_manifest.js

@@ -1,4 +0,0 @@
-//= link_directory ../stylesheets/mission_control/jobs .css
-//= link_directory ../../javascript/mission_control/jobs .js
-//= link_directory ../../javascript/mission_control/jobs/controllers .js
-//= link_directory ../../javascript/mission_control/jobs/helpers .js