sidekiq_adhoc_job 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21a2663558c918e59402c9180737fdc70f7520003413770eecaa73cabf86db8
-  data.tar.gz: f0eb1fd9b4c6e9d7b7fd52eaa157bd468bc02585438413c27b42a933097b5ca9
+  metadata.gz: 8c0e73d782590b6b44e800550261cb9c64414eac41a516542beeee8f77345b0a
+  data.tar.gz: 063c9caff1f9b63a7fac67bb8e033153a60531c9bbde195bc1aeb2d509dcd9b9
 SHA512:
-  metadata.gz: cc04bca685843cdc4f68758fbef688bfaaca75ab64deaaece3cb3e082dd54c028230753e1c8d7d2b8001089584c8b6a4fb578fbb2582f22fd604c0a30b492bb9
-  data.tar.gz: 5c3bb8282be7d70ff5a5937b41e7be4db4d4ab4568b302030aef2da554ede3a89e8d9b45afafbd5820b4bc68fc22b75bebb7ffbce183c9c8c773878c5bbb8fa0
+  metadata.gz: 27604c34ae4f16f120ed722dcb92fe4d5e8ce271f2353260f4265212bbd89b7e0ab28a1d5ac606cbfd2b66afab1ed0abeefb61ff2790dc52e09f0d6ff9b5f19a
+  data.tar.gz: 9056e87feb58fb3d38e70eb8a0d7689123bc98ee6e22d0d83f5fcdfb14497533859dd45c7bf8e58dfb8e25514205d27081e74bb3ff5e8c178e3185a82f596f89

data/lib/sidekiq_adhoc_job/services/schedule_adhoc_job.rb

@@ -25,7 +25,9 @@ module SidekiqAdhocJob
                 :allowed_params, :worker_params
 
     def parse_params
-      @worker_params = allowed_params.map { |key| StringUtil.parse(request_params[key], symbolize: true) }
+      @worker_params = allowed_params
+        .reject { |key| request_params[key].empty? }
+        .map { |key| StringUtil.parse(request_params[key], symbolize: true) }
       if !!request_params[:rest_args] && !request_params[:rest_args].empty?
         @worker_params << StringUtil.parse_json(request_params[:rest_args].strip, symbolize: true)
       end

data/lib/sidekiq_adhoc_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAdhocJob
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/sidekiq_adhoc_job/web/job_presenter.rb

@@ -4,7 +4,7 @@ module SidekiqAdhocJob
     class JobPresenter
       include Sidekiq::WebHelpers
 
-      attr_reader :name, :path_name, :queue, :has_rest_args, :args
+      attr_reader :name, :path_name, :queue, :required_args, :optional_args, :has_rest_args
 
       StringUtil ||= ::SidekiqAdhocJob::Utils::String
 
@@ -16,7 +16,6 @@ module SidekiqAdhocJob
         @required_args = args[:req] || []
         @optional_args = args[:opt] || []
         @has_rest_args = !!args[:rest]
-        @args = @required_args + @optional_args
       end
 
       # Builds the presenter instances for the schedule hash

data/lib/sidekiq_adhoc_job/web/locales/en.yml

@@ -1,7 +1,8 @@
 en:
   adhoc_jobs: Adhoc Jobs
   adhoc_jobs_actions: Actions
-  adhoc_jobs_arguments: Required Arguments
+  adhoc_jobs_required_arguments: Required Arguments
+  adhoc_jobs_optional_arguments: Optional Arguments
   adhoc_jobs_go_back: Go Back
   adhoc_jobs_has_rest_arguments: Has Rest Arguments
   adhoc_jobs_name: Job Name

data/lib/sidekiq_adhoc_job/web/templates/jobs/index.html.erb

@@ -6,7 +6,8 @@
       <tr>
         <th><%= t('adhoc_jobs_name') %></th>
         <th><%= t('adhoc_jobs_queue') %></th>
-        <th><%= t('adhoc_jobs_arguments') %></th>
+        <th><%= t('adhoc_jobs_required_arguments') %></th>
+        <th><%= t('adhoc_jobs_optional_arguments') %></th>
         <th><%= t('adhoc_jobs_has_rest_arguments') %></th>
         <th><%= t('adhoc_jobs_actions') %></th>
       </tr>
@@ -17,7 +18,8 @@
         <tr>
           <td><%= job.name %></td>
           <td><%= job.queue %></td>
-          <td><%= job.args.join(', ') %></td>
+          <td><%= job.required_args.join(', ') %></td>
+          <td><%= job.optional_args.join(', ') %></td>
           <td><%= job.has_rest_args %></td>
           <td class="text-center">
             <a class="btn btn-warn btn-xs" href="<%= root_path %>adhoc-jobs/<%= URI.escape(job.path_name) %>">

data/lib/sidekiq_adhoc_job/web/templates/jobs/show.html.erb

@@ -4,10 +4,10 @@
 
 <form method="POST" action="<%= root_path %>adhoc-jobs/<%= URI.escape(@presented_job.path_name) %>/schedule">
   <input type="hidden" name="authenticity_token" value="<%= @csrf_token %>" />
-  <% if @presented_job.args.empty? && !@presented_job.has_rest_args %>
+  <% if @presented_job.required_args.empty? && @presented_job.optional_args.empty? && !@presented_job.has_rest_args %>
     <p>No job arguments</p>
   <% else %>
-    <% @presented_job.args.each do |arg| %>
+    <% @presented_job.required_args.each do |arg| %>
       <div class="form-group row">
         <label class="col-sm-2 col-form-label" for="<%= arg %>">*<%= arg %>:</label>
         <div class="col-sm-4">
@@ -15,6 +15,14 @@
         </div>
       </div>
     <% end %>
+    <% @presented_job.optional_args.each do |arg| %>
+      <div class="form-group row">
+        <label class="col-sm-2 col-form-label" for="<%= arg %>"><%= arg %>:</label>
+        <div class="col-sm-4">
+          <input class="form-control" type="text" name="<%= arg %>" id="<%= arg %>"/>
+        </div>
+      </div>
+    <% end %>
     <% if @presented_job.has_rest_args %>
       <div class="form-group row">
         <label class="col-sm-2 col-form-label" for="rest_args">*Rest arguments (please provide a json string representing the arguments):</label>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_adhoc_job
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Goh Khoon Hiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry