sidekiq-belt 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5172fbb6524305c54365270d2cbd464351a3e7ff990da9b08cb5a9a32f7f40a
-  data.tar.gz: f4c42f4fe4e5e3b7ddb103e03612a7fade9b55885f7fb094d28bc33dca59dd50
+  metadata.gz: 1f2ad0b7e0a234a3f527f27a450a25c6cdf14c34387bfb38593e3637eed9eac1
+  data.tar.gz: a3eff6ee04902f1d4ae8e493f5d96e99038ca57511fc1720cc7343a0acd04525
 SHA512:
-  metadata.gz: d9ce134a5e9962330c6086cbdddaeaca5109fea7545ad44c144cd8d7590f43ce5a3ecf93a75076f6009f7af97038ccc3ca2205f8c72802ca946588fb16c98b62
-  data.tar.gz: c282c58813f4a0a1a5cef2a60dacd0b47082889a2a7aaaefa6ad5be9f6ec7b018f9e0dff415a5a7ec48ea75312bb5d7fc12ecf2617c68bd773a5ba0a73d8b426
+  metadata.gz: 21012fc5d259e318c26a62765a74ab985f5ad1bff20757616672d2d37ce2f33e85b6c52318eb8b67c6fbeb51c62714f72a4e367330a3f84cc95a199c5a05c823
+  data.tar.gz: f04b7d0a4d5fa342d29d2220c32f05545c9ad824c5c869fcbe8e5ec80c401d0d1f7a1665e4b79cb728609ea161d3e2959decb19c43738384a526b562b17fba02

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
-## [2.0.0] - 2024-09-27
+
+## [2.0.2] - 2025-03-23
+- Dynamic args on Jobs Run
+
+## [2.0.1] - 2025-03-11
+- Fix Support to Sidekiq-ent and Sidekiq-pro v8
+
+## [2.0.0] - 2025-02-09
 - Support for Sidekiq v8
 
 ## [1.0.0] - 2024-11-19

data/README.md

@@ -113,6 +113,16 @@ Sidekiq::Belt.configure do |config|
 
   config.run_jobs << { class: "CWorker", args: ["a"], group: "Etc" }
   config.run_jobs << { class: "DWorker", args: ["a"], group: "Etc" }
+
+  config.run_jobs << { class: "EWorker", args: [
+      { dynamic: 'text', title: 'Observation' },
+      { dynamic: 'integer', title: 'Number of test' },
+      'fixed value A',
+      { dynamic: 'boolean', title: 'Boolean data' },
+      { dynamic: 'enum', title: 'Enum data', options: ['option1', 'option2', 'option3'], default: 'option2' },
+      'fixed value B'
+    ], group: "Etc" }
+  config.run_jobs << { class: "FWorker", args: ["a"], group: "Etc" }
 end
 ```
 

data/lib/sidekiq/belt/community/run_job.rb

@@ -20,11 +20,32 @@ module Sidekiq
           jobs
         end
 
-        def self.run_job(job_id)
+        def self.dynamic_type?(arg, type)
+          return false unless arg.is_a?(Hash)
+
+          arg[:dynamic].to_s == type
+        end
+
+        def self.run_job(job_id, extra_args = {})
           job = Sidekiq::Belt.config.run_jobs[job_id.to_i]
           job.transform_keys(&:to_sym)
 
-          Module.const_get(job[:class]).perform_async(*job.fetch(:args, []))
+          args = job.fetch(:args, [])
+
+          new_args = []
+          args.each_with_index do |arg, i|
+            if dynamic_type?(arg, "text") || dynamic_type?(arg, "enum")
+              new_args[i] = extra_args.shift
+            elsif dynamic_type?(arg, "integer")
+              new_args[i] = extra_args.shift.to_i
+            elsif dynamic_type?(arg, "boolean")
+              new_args[i] = extra_args.shift == "true"
+            else
+              new_args << arg
+            end
+          end
+
+          Module.const_get(job[:class]).perform_async(*new_args)
         end
 
         module SidekiqRunJob
@@ -36,7 +57,9 @@ module Sidekiq
             end
 
             app.post("/run_jobs/:rjid/run") do
-              Sidekiq::Belt::Community::RunJob.run_job(route_params(:rjid).to_i)
+              args = url_params("args")
+
+              Sidekiq::Belt::Community::RunJob.run_job(route_params(:rjid).to_i, args)
 
               return redirect "#{root_path}run_jobs"
             end

data/lib/sidekiq/belt/community/views/run_jobs.erb

@@ -14,10 +14,35 @@
       <% jobs.each do |job| %>
         <tr>
           <td><%= job[:class] %></td>
-          <td><%= job[:args].inspect %></td>
-          <td style='width: 100px'>
-            <form action="<%= root_path %>run_jobs/<%= job[:id] %>/run" method="post">
+          <td colspan="2">
+            <form action="<%= root_path %>run_jobs/<%= job[:id] %>/run" class="force-run-form" method="post">
+              <%= '[' %>
+              <% (job[:args] || []).each_with_index do |arg, i| %>
+                <% if Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'text') %>
+                  <input type="text" class="form-control" name="args[]" title="<%= arg[:title] %>" required='true' placeholder="<%= arg[:title] %>" value="<%= arg[:default] %>"  />
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'integer') %>
+                 <input type="number" class="form-control" name="args[]" title="<%= arg[:title] %>" required='true' placeholder="<%= arg[:title] %>" value="<%= arg[:default] %>" />
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'boolean') %>
+                  <select class="form-control" name="args[]" required='true' title="<%= arg[:title] %>" placeholder="<%= arg[:title] %>">
+                    <option value="true" <%= arg[:default] == 'true' ? 'selected' : '' %>>true</option>
+                    <option value="false" <%= arg[:default] == 'false' ? 'selected' : '' %>>false</option>
+                  </select>
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'enum') %>
+                  <select class="form-control" name="args[]" required='true' title="<%= arg[:title] %>" placeholder="<%= arg[:title] %>">
+                    <% arg[:options].each do |option| %>
+                      <option value="<%= option %>" <%= arg[:default].to_s == option.to_s ? 'selected' : '' %>><%= option %></option>
+                    <% end %>
+                  </select>
+                <% else %>
+                  <input type="hidden" name="args[]" value="<%= arg %>" />
+                  <%= arg.inspect %>
+                <% end %>
+                <%= ',' if i < (job[:args] || []).size - 1 %>
+              <% end %>
+              <%= ']' %>
+
               <%= csrf_tag %>
+
               <input class="btn btn-danger" type="submit" name="run" value="<%= t('Run') %>"
                 data-confirm="Run the job <%= job[:klass] %>? <%= t('AreYouSure') %>" />
             </form>

data/lib/sidekiq/belt/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Belt
-    VERSION = "2.0.0"
+    VERSION = "2.0.2"
   end
 end

data/lib/sidekiq/web_action_helper.rb

@@ -10,11 +10,13 @@ module Sidekiq
         replace_views = Sidekiq::Config::DEFAULTS[:replace_views] || {}
 
         replace_views.each do |key, content_blocks|
-          if Sidekiq::VERSION.to_i >= 8
-            next if Sidekiq::Web::Application.match(self.class.full_env).nil?
-          elsif WebRoute.new("", key, true).match("", self.class.full_env["PATH_INFO"]).nil?
-            next
-          end
+          router = if Sidekiq::VERSION.to_i >= 8
+                     Sidekiq::Web::Route.new(self.class.sidekiq_request_method, key, true)
+                   else
+                     WebRoute.new(self.class.sidekiq_request_method, key, true)
+                   end
+
+          next if router.match(self.class.sidekiq_request_method, self.class.sidekiq_path_info).nil?
 
           content_blocks.each do |content_block|
             content_block.call(content)
@@ -25,12 +27,13 @@ module Sidekiq
       end
 
       class << self
-        attr_accessor :full_env
+        attr_accessor :sidekiq_request_method, :sidekiq_path_info
       end
     end
 
     def erb(content, options = {})
-      ERB.full_env = env
+      ERB.sidekiq_request_method = env["REQUEST_METHOD"].to_s.downcase
+      ERB.sidekiq_path_info = env["PATH_INFO"].to_s
 
       super
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-belt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
 bindir: exe
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and Sidekiq
   Enterprise by adding essential utilities.