rocketjob_mission_control 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbfd41e61d560efbe85ea348422db61e94994bcfefd571b82afcdfdce7534a2
-  data.tar.gz: 6934f51cf09cd3c030b5570550f6eee72a8211837f84cc6ad0fae658183b09a5
+  metadata.gz: 672b98f43803c00da5285184197598c13e6d68c66e9757f4fe34bde84e0f0949
+  data.tar.gz: e1dff7e6033aafdb33c1b326bc7756698cc17bd773c74410c9dca1e1f00f7b1c
 SHA512:
-  metadata.gz: afed3c27f0b56957f8e6f2ddbe1b72a5d42880dc37ae92cede6ab896d357f54bc0e711b22c5d3d7a8c3b412cac4063b7c25523a5752b6ae9509fa10d4f39bfad
-  data.tar.gz: 1c4fd43091c5299cd7357cfe7b60da2dc3ebe03cbe975de24d8f64897b8605b0a73280d9bbba4a68d451b57ef58c4bf1390d0f47faca17bdf4985605cecfae59
+  metadata.gz: 2d13db013b7dbb66845a98eaa4d009c1e30029f0783bb58836d8da48e9a430b24ceb1d27f2fef91e93ac5f1b6312b42e10aeb5ef1520305c01cb9dc01d1454ec
+  data.tar.gz: d1ed38f093b515a0e3aba81f45386ee8b4f56290f1da9da882fd9412d6063bc83437e8f147a8c40ee39c00e0418890a208efc592f622546e578cfd2b17284e4d

data/app/helpers/rocket_job_mission_control/application_helper.rb

@@ -93,7 +93,7 @@ module RocketJobMissionControl
           f.text_field(field_name, value: value ? value.to_json : "", class: "form-control", placeholder: '{"key1":"value1", "key2":"value2", "key3":"value3"}')
       when "Array"
         options = value.present? ? Array(value) : []
-        f.select(field_name, options_for_select(options, options), {}, {class: "selectize form-control", multiple: true})
+        f.select(field_name, options_for_select(options, options), {include_hidden: true}, {class: "selectize form-control", multiple: true})
       else
         "[#{field.type.name}]".html_safe +
           f.text_field(field_name, value: value, class: "form-control", placeholder: placeholder)

data/app/models/rocket_job_mission_control/job_sanitizer.rb

@@ -36,6 +36,11 @@ module RocketJobMissionControl
             target.errors.add(:properties, e.message)
             value = nil
           end
+        when "Array"
+          # remove blank entries from rails converted arrays when using multi-select input
+          if !value.blank?
+            value.reject! { |v| v.empty? }
+          end
         end
 
         if value.blank? && !value.is_a?(Hash)

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = "6.0.4".freeze
+  VERSION = "6.0.5".freeze
 end

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -15,9 +15,9 @@ module RocketJobMissionControl
 
       let :existing_dirmon_entry do
         RocketJob::DirmonEntry.create!(
-          name:           "Test",
+          name:           "Existing path test",
           job_class_name: job_class_name,
-          pattern:        "the_path"
+          pattern:        "existing_path"
         )
       end
 
@@ -26,9 +26,9 @@ module RocketJobMissionControl
       let :one_dirmon_entry_for_every_state do
         dirmon_entry_states.collect do |state|
           RocketJob::DirmonEntry.create!(
-            name:           "Test",
+            name:           "Test_for_state_#{state}",
             job_class_name: job_class_name,
-            pattern:        "the_path",
+            pattern:        "path_for_state_#{state}",
             state:          state
           )
         end
@@ -375,27 +375,27 @@ module RocketJobMissionControl
                 json          = JSON.parse(response.body)
                 expected_data = {
                   pending:  {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.pending.first.id}\">\n          <i class=\"fas fa-inbox pending\" style=\"font-size: 75%\" title=\"pending\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.pending.first.id}\">\n          <i class=\"fas fa-inbox pending\" style=\"font-size: 75%\" title=\"pending\"></i>\n          Test_for_state_pending\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
-                    "2"           => "the_path",
+                    "2"           => "path_for_state_pending",
                     "DT_RowClass" => "card callout callout-pending"
                   },
                   enabled:  {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.enabled.first.id}\">\n          <i class=\"fas fa-check enabled\" style=\"font-size: 75%\" title=\"enabled\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.enabled.first.id}\">\n          <i class=\"fas fa-check enabled\" style=\"font-size: 75%\" title=\"enabled\"></i>\n          Test_for_state_enabled\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
-                    "2"           => "the_path",
+                    "2"           => "path_for_state_enabled",
                     "DT_RowClass" => "card callout callout-enabled"
                   },
                   failed:   {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.failed.first.id}\">\n          <i class=\"fas fa-exclamation-triangle failed\" style=\"font-size: 75%\" title=\"failed\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.failed.first.id}\">\n          <i class=\"fas fa-exclamation-triangle failed\" style=\"font-size: 75%\" title=\"failed\"></i>\n          Test_for_state_failed\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
-                    "2"           => "the_path",
+                    "2"           => "path_for_state_failed",
                     "DT_RowClass" => "card callout callout-failed"
                   },
                   disabled: {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.disabled.first.id}\">\n          <i class=\"fas fa-stop disabled\" style=\"font-size: 75%\" title=\"disabled\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.disabled.first.id}\">\n          <i class=\"fas fa-stop disabled\" style=\"font-size: 75%\" title=\"disabled\"></i>\n          Test_for_state_disabled\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
-                    "2"           => "the_path",
+                    "2"           => "path_for_state_disabled",
                     "DT_RowClass" => "card callout callout-disabled"
                   }
                 }
@@ -404,7 +404,7 @@ module RocketJobMissionControl
                   assert_equal 0, json["draw"]
                   assert_equal 4, json["recordsTotal"]
                   assert_equal 4, json["recordsFiltered"]
-                  assert_equal [expected_data[:pending], expected_data[:enabled], expected_data[:failed], expected_data[:disabled]], json["data"]
+                  assert_equal [expected_data[:disabled], expected_data[:enabled], expected_data[:failed], expected_data[:pending]], json["data"]
                 else
                   assert_equal 0, json["draw"]
                   assert_equal 1, json["recordsTotal"]

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -92,6 +92,15 @@ class JobSanitizerTest < Minitest::Test
         assert_equal 0, @job.errors.count
         assert_equal({hash_field: {}}, cleansed)
       end
+
+      it "removes blank entries from rails converted arrays when using multi-select input" do
+        properties = {
+          array: ["", "rf@exp.com", "rm@exp.com", "lb@exp.com"]
+        }
+        cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
+        assert_equal 0, @job.errors.count
+        assert_equal({array: ["rf@exp.com", "rm@exp.com", "lb@exp.com"]}, cleansed)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Michael Cloutier
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: access-granted