Merge pull request #723 from skateman/fix-automate-simulation-tree

Reorganize the logic in lookup_attrs for AutomateSimulationTree
ManageIQ · Mar 20, 2017 · 9ddef18 · 9ddef18
2 parents 3afab91 + e46da6f
commit 9ddef18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app/helpers/miq_ae_class_helper.rb b/app/helpers/miq_ae_class_helper.rb
@@ -114,6 +114,8 @@ def ae_field_fonticon(field)
       'product product-relationship'
     when 'state'
       'product product-state'
+    when 'element'
+      'product product-element'
     else
       raise NotImplementedError, "Missing fonticon for MiqAeField type #{field}"
     end

diff --git a/app/presenters/tree_builder_automate_simulation_results.rb b/app/presenters/tree_builder_automate_simulation_results.rb
@@ -49,13 +49,7 @@ def lookup_attrs(el)
         :tooltip => el.attributes["name"],
         :icon    => 'product product-attribute'
       }
-    elsif !el.text.blank?
-      {
-        :text => el.text,
-        :tip  => el.text,
-        :icon => ae_field_fonticon(el.name.underscore)
-      }
-    else
+    elsif el.name.starts_with?('MiqAeService')
       key = el.name.sub(/^MiqAeService/, '').gsub('_', '::')
       base_obj = key.safe_constantize.try(:new)
       obj = TreeNode.new(base_obj) if TreeNode.exists?(base_obj)
@@ -66,6 +60,13 @@ def lookup_attrs(el)
         :icon    => obj ? obj.icon : nontreenode_icon(base_obj),
         :image   => obj ? obj.image : nil
       }
+    else
+      text = !el.text.blank? ? el.text : el.name
+      {
+        :text => text,
+        :tip  => text,
+        :icon => ae_field_fonticon(el.name.underscore)
+      }
     end
   end