3081: auto_environment_variable smart attr for scripts

apps/dashboard/app/helpers/scripts_helper.rb

@@ -16,6 +16,8 @@ def create_editable_widget(form, attrib, format: nil)
       render(partial: editable_partial('editable_number'), locals: locals)
     when 'select'
       render(partial: editable_partial('editable_select'), locals: locals)
+    when 'key_value_pair'
+      render(partial: editable_partial('editable_key_value_pair'), locals: locals)
     else
       render(partial: editable_partial('generic'), locals: locals)
     end
@@ -53,6 +55,11 @@ def auto_accounts_template
     create_editable_widget(script_form_double, attrib)
   end
 
+  def auto_environment_variable_template
+    attrib = SmartAttributes::AttributeFactory.build_auto_environment_variable
+    create_editable_widget(script_form_double, attrib)
+  end
+
   # We need a form builder to build the template divs. These are
   # templates so that they are not a part of the _actual_ form (yet).
   # Otherwise you'd have required fields that you cannot actually edit

apps/dashboard/app/javascript/script_edit.js

@@ -18,6 +18,10 @@ const newFieldData = {
   bc_num_slots: {
     label: "Nodes",
     help: "How many nodes the job will run on."
+  },
+  auto_environment_variable: {
+    label: "Environment Variable",
+    help: "Add an environment variable."
   }
 }
 
@@ -65,7 +69,8 @@ function updateNewFieldOptions(selectMenu) {
     const field = document.getElementById(`script_${newField}`);
 
     // if the field doesn't already exist, it's an option for a new field.
-    if(field === null) {
+    // TODO: maybe JS equiv of ALLOW_MULTIPLE_FIELDS.include?(newField)
+    if(field === null || newField == "auto_environment_variable") {
       const option = document.createElement("option");
       option.value = newField;
       option.text = newFieldData[newField].label;

apps/dashboard/app/lib/smart_attributes.rb

@@ -20,4 +20,5 @@ module SmartAttributes
   require 'smart_attributes/attributes/bc_queue'
   require 'smart_attributes/attributes/bc_vnc_idle'
   require 'smart_attributes/attributes/bc_vnc_resolution'
+  require 'smart_attributes/attributes/auto_environment_variable'
 end

apps/dashboard/app/lib/smart_attributes/attributes/auto_environment_variable.rb

@@ -0,0 +1,21 @@
+module SmartAttributes
+  class AttributeFactory
+    extend AccountCache
+
+    def self.build_auto_environment_variable(opts = {})
+      Attributes::AutoEnvironmentVariable.new('auto_environment_variable', opts)
+    end
+  end
+
+  module Attributes
+    class AutoEnvironmentVariable < Attribute
+      def widget
+        'key_value_pair'
+      end
+
+      def label(*)
+        (opts[:label] || 'Environment Variable').to_s
+      end
+    end
+  end
+end

apps/dashboard/app/views/scripts/edit.html.erb

@@ -30,3 +30,7 @@
 <template id="auto_accounts_template">
   <%= auto_accounts_template %>
 </template>
+
+<template id="auto_environment_variable_template">
+  <%= auto_environment_variable_template %>
+</template>

apps/dashboard/app/views/scripts/editable_form_fields/_editable_key_value_pair.html.erb

@@ -0,0 +1,13 @@
+<%-
+  field_id = "#{form.object_name}_#{attrib.id}"
+-%>
+
+<div class="editable-form-field">
+
+KEY VALUE PAIR FORM: <%= field_id %>
+
+  <div class="d-none edit-group">
+  </div>
+
+  <%= render(partial: 'scripts/editable_form_fields/edit_field_buttons',  locals: { field_id: field_id }) %>
+</div>

apps/dashboard/test/system/jobs_app_test.rb

@@ -372,7 +372,7 @@ def add_bc_num_hours(project_id, script_id)
       new_field_id = 'add_new_field_select'
 
       actual_new_options = page.all("##{new_field_id} option").map(&:value).to_set
-      expected_new_options = ['bc_num_hours', 'auto_queues', 'bc_num_slots', 'auto_accounts'].to_set
+      expected_new_options = ['bc_num_hours', 'auto_queues', 'bc_num_slots', 'auto_accounts', 'auto_environment_variable'].to_set
       assert_equal expected_new_options, actual_new_options
     end
   end