Modify dynamic loading based on whether it is initial load or a refresh

https://bugzilla.redhat.com/show_bug.cgi?id=1559757

app/models/dialog.rb

@@ -88,9 +88,19 @@ def validate_field_data
  result
  end
 
- def init_fields_with_values(values)
+ def load_values_into_fields(values)
+ dialog_field_hash.each do |_key, field|
+ field.dialog = self
+ field.value = values[field.automate_key_name] || values[field.name]
+ end
+ end
+
+ def initialize_value_context(values)
  dialog_field_hash.each do |key, field|
  field.dialog = self
+ end
+
+ dialog_field_hash.each do |_key, field|
  field.initialize_value_context
  end
  end

app/models/dialog_field.rb

@@ -91,6 +91,10 @@ def self.field_types
  FIELD_CONTROLS
  end
 
+ def extract_dynamic_values
+ value
+ end
+
  def initialize_value_context
  @value = values_from_automate if dynamic && @value.blank?
  end
@@ -127,6 +131,7 @@ def resource
  end
 
  def update_and_serialize_values
+ trigger_automate_value_updates
  DialogFieldSerializer.serialize(self)
  end
 

app/models/dialog_field_check_box.rb

@@ -28,7 +28,7 @@ def refresh_json_value
  end
 
  def trigger_automate_value_updates
- values_from_automate
+ @value = values_from_automate
  end
 
  private

app/models/dialog_field_date_control.rb

@@ -45,7 +45,7 @@ def refresh_json_value
  end
 
  def trigger_automate_value_updates
- values_from_automate
+ @value = values_from_automate
  end
 
  private

app/models/dialog_field_serializer.rb

@@ -17,8 +17,8 @@ def serialize(dialog_field, all_attributes = false)
  }
 
  if dialog_field.dynamic?
- dynamic_values = dialog_field.trigger_automate_value_updates
- extra_attributes["values"] = dynamic_values
+ # dynamic_values = dialog_field.trigger_automate_value_updates
+ extra_attributes["values"] = dialog_field.extract_dynamic_values
  end
 
  if dialog_field.type == "DialogFieldTagControl"

app/models/dialog_field_sorted_item.rb

@@ -44,6 +44,10 @@ def values
  raw_values
  end
 
+ def extract_dynamic_values
+ @raw_values
+ end
+
  def get_default_value
  trigger_automate_value_updates
  default_value

app/models/dialog_field_text_box.rb

@@ -70,7 +70,7 @@ def refresh_json_value
  end
 
  def trigger_automate_value_updates
- values_from_automate
+ @value = values_from_automate
  end
 
  private

app/models/resource_action_workflow.rb

@@ -103,8 +103,10 @@ def load_dialog(resource_action, values, options)
  dialog.target_resource = @target
  if options[:display_view_only]
  dialog.init_fields_with_values_for_request(values)
+ elsif options[:refresh]
+ dialog.load_values_into_fields(values)
  else
- dialog.init_fields_with_values(values)
+ dialog.initialize_value_context(values)
  end
  end
  dialog