Add configuration script table

Author: GilbertCherrie

app/controllers/application_controller/miq_request_methods.rb

@@ -312,6 +312,14 @@ def sort_configured_system_grid
     sort_grid('configured_system', @edit[:wf].get_field(:src_configured_system_ids, :service)[:values])
   end
 
+  # get the sort column that was clicked on, else use the current one
+  def sort_configuration_script_grid
+    assert_privileges("miq_request_edit")
+    return unless load_edit("prov_edit__#{params[:id]}", "show_list")
+
+    sort_grid('configuration_script', @edit[:wf].get_field(:src_configuration_script_id, :service)[:values])
+  end
+
   # get the sort column that was clicked on, else use the current one
   def sort_pxe_img_grid
     assert_privileges("miq_request_edit")
@@ -824,6 +832,8 @@ def prov_get_form_vars
               elsif v.id.to_i == val.to_i
                 @edit[:new][f.to_sym] = [val, v.name] # Save [value, description]
               end
+            elsif evm_object_class == :ConfigurationScriptBase
+              @edit[:new][f.to_sym] = [val, v.name] # Save [value, name]
             elsif v[1].to_i == val.to_i
               @edit[:new][f.to_sym] = [val, v[0]] # Save [value, description]
             end

app/helpers/request_info_helper.rb

@@ -3,7 +3,7 @@ module RequestInfoHelper
 
   PROV_FIELD_TYPES = [:vm, :host, :ds, :template, :vc, :pxe_img, :iso_img, :window_image].freeze
 
-  PROV_FIELDS = [:src_vm_id, :placement_host_name, :placement_ds_name, :attached_ds, :sysprep_custom_spec, :customization_template_id, :pxe_image_id, :iso_image_id, :windows_image_id].freeze
+  PROV_FIELDS = [:src_vm_id, :placement_host_name, :placement_ds_name, :attached_ds, :sysprep_custom_spec, :customization_template_id, :pxe_image_id, :iso_image_id, :windows_image_id, :src_configuration_script_id].freeze
 
   def provision_tab_configuration(workflow)
     prov_tab_labels = workflow.provisioning_tab_list.pluck(:name)
@@ -54,6 +54,8 @@ def prov_grid_data(field, field_id, spec_required)
              {:type => :iso_img, :iso_img => @iso_imgs}
            when :windows_image_id
              {:type => :window_image, :window_images => @windows_images}
+           when :src_configuration_script_id
+             {:type => :configuration_script, :configuration_scripts => @configuration_scripts}
            else
              {}
            end
@@ -93,6 +95,23 @@ def prov_vm_data(data)
     {:headers => headers, :rows => rows, :selected => :src_vm_id, :none_index => data[:none_index]}
   end
 
+  def prov_configuration_script_data(data)
+    edit = data[:edit]
+    headers = prov_grid_configuration_script_header(edit, data[:configuration_scripts], data[:type])
+    rows = []
+    if data[:configuration_scripts]
+      rows += [prov_row_item(data[:none_index], none_cells(edit[:configuration_script_headers].length - 1))]
+      if data[:configuration_scripts]
+        rows += data[:configuration_scripts].map do |configuration_script|
+          prov_row_item(configuration_script.id.to_s, prov_configuration_script_grid_cells(configuration_script))
+        end
+      end
+    else
+      rows.push({:id => data[:script].id.to_s, :clickable => true, :cells => prov_configuration_script_grid_cells(data[:script])})
+    end
+    {:headers => headers, :rows => rows, :selected => :src_configuration_script_id, :none_index => data[:none_index]}
+  end
+
   def prov_host_data(data)
     edit = data[:edit]
     options = edit || data[:options_data]
@@ -200,6 +219,20 @@ def prov_grid_vm_header(edit, clones, vms, type)
     headers
   end
 
+  def prov_grid_configuration_script_header(edit, configuration_scripts, type)
+    header_keys = prov_header_keys(type.to_s)
+    headers = []
+    edit[header_keys[:columns]].each_with_index do |h, index|
+      item = prov_grid_header_item(edit[header_keys[:headers]][h])
+      if configuration_scripts
+        item[:sort_choice] = h
+        item[:sort_data] = prov_sort_data(edit, index, header_keys)
+      end
+      headers.push(item)
+    end
+    headers
+  end
+
   def prov_grid_host_header(edit, options, type)
     header_keys = prov_header_keys(type.to_s)
     headers = []
@@ -272,6 +305,13 @@ def prov_vm_grid_cells(data, edit)
     cells
   end
 
+  def prov_configuration_script_grid_cells(data)
+    [
+      prov_cell_data(data.name),
+      prov_cell_data(data.description),
+    ]
+  end
+
   def prov_host_grid_cells(data, options)
     options[:host_columns].map do |col|
       prov_cell_data(data.send(col))

app/views/miq_request/_prov_configuration_script_grid.html.haml

@@ -5,7 +5,7 @@
   %table.table.table-bordered.table-striped
     %thead
       %tr
-      - options[:configuraction_script_headers].each do |header, name|
+      - options[:configuration_script_headers].each do |header, name|
         %th
           -# Replaced to exclude non-view table fields from sorting
           -# dont show sort on show screen, need @edit variables for sort to work

app/views/miq_request/_prov_field.html.haml

@@ -200,6 +200,7 @@
       - elsif [:placement_folder_name].include?(field)
         -# wider Pull Down field that fits into 1280 wide screens
         .col-md-8
+          - field_hash[:display] = :edit
           - if @edit && field_hash[:display] == :edit && !@edit[:stamp_typ]
             -# Allow editing of this pulldown field
             - if field_hash[:values].blank?
@@ -239,7 +240,7 @@
                :retirement_warn, :cloud_network, :network_port, :cloud_subnet,
                :floating_ip_address, :resource_group, :load_balancer,
                :sysprep_auto_logon_count, :sysprep_domain_name, :sysprep_server_license_mode,
-               :vlan, :cloud_tenant, :src_configuration_profile_id, :src_configuration_script_id, :vm_minimum_memory,
+               :vlan, :cloud_tenant, :src_configuration_profile_id, :vm_minimum_memory,
                :vm_maximum_memory, :boot_disk_size, :subnet, :placement_group, :shared_processor_pool].include?(field)
         -# Pull Down fields
         -# Multiple select Pull Down fields

config/routes.rb

@@ -2226,6 +2226,7 @@
         retrieve_email
         show_list
         sort_configured_system_grid
+        sort_configuration_script_grid
         sort_ds_grid
         sort_host_grid
         sort_iso_img_grid