rework some of the required_properties logic

phac-nml · Jan 8, 2025 · ca34939 · ca34939
1 parent bc9c565
commit ca34939
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/components/nextflow/samplesheet/file_cell_component.html.erb b/app/components/nextflow/samplesheet/file_cell_component.html.erb
@@ -19,7 +19,7 @@ data: {
       text-sm dark:focus:ring-primary-500 dark:focus:border-primary-500 cursor-pointer
       hover:border-slate-300 border-transparent border-2
     "
-    data-file-cell-required="<%= @required_properties.include?(@property) ? "true" : "false" %>"
+    data-file-cell-required="<%= @required_properties.present? && @required_properties.include?(@property) ? "true" : "false" %>"
   >
     <% unless @selected.empty? %>
       <input

diff --git a/app/views/workflow_executions/file_selector/_file_selector_dialog.html.erb b/app/views/workflow_executions/file_selector/_file_selector_dialog.html.erb
@@ -73,7 +73,7 @@
                 </td>
               </tr>
             <% end %>
-            <% unless file_selector_params["required_properties"] && file_selector_params["required_properties"].include?(file_selector_params["property"]) %>
+            <% unless file_selector_params["required_properties"].present? && file_selector_params["required_properties"].include?(file_selector_params["property"]) %>
               <tr>
                 <td>
                   <%= form.radio_button "attachment_id",

diff --git a/test/controllers/workflow_executions/file_selector_controller_test.rb b/test/controllers/workflow_executions/file_selector_controller_test.rb
@@ -26,7 +26,7 @@ class FileSelectorControllerTest < ActionDispatch::IntegrationTest
         'index' => 1,
         'selected_id' => attachments(:attachment2).id,
         'property' => 'input',
-        'required_properties' => [],
+        'required_properties' => nil,
         'file_type' => 'other',
         'file_selector_arguments' => { pattern: nil }
       }