Fix broken Automate icons

app/assets/stylesheets/icon_customizations.scss

@@ -87,9 +87,6 @@ span[class^="product-"], span[class*=" product-"], // i & span tags prevent conf
 .product-group:before {
   content: "\e602";
 }
-.product-ae_instance:before {
-  content: "\e603";
-}
 .product-custom-1:before {
   content: "\e606";
 }

app/controllers/miq_ae_class_controller.rb

@@ -373,13 +373,13 @@ def set_cls(cls)
       glyphicon = "pficon pficon-folder-open"
     when "MiqAeInstance"
       cls = "aei"
-      glyphicon = "product product-ae_instance"
+      glyphicon = "fa fa-file-text-o"
     when "MiqAeField"
       cls = "Field"
       glyphicon = "product product-ae_field"
     when "MiqAeMethod"
       cls = "aem"
-      glyphicon = "product product-ae_method"
+      glyphicon = "product product-method"
     end
     return cls, glyphicon
   end

app/decorators/miq_ae_class_decorator.rb

@@ -0,0 +1,7 @@
+class MiqAeClassDecorator < Draper::Decorator
+  delegate_all
+
+  def fonticon
+    'product product-ae_class'
+  end
+end

app/decorators/miq_ae_instance_decorator.rb

@@ -0,0 +1,7 @@
+class MiqAeInstanceDecorator < Draper::Decorator
+  delegate_all
+
+  def fonticon
+    'fa fa-file-text-o'
+  end
+end

app/decorators/miq_ae_method_decorator.rb

@@ -0,0 +1,7 @@
+class MiqAeMethodDecorator < Draper::Decorator
+  delegate_all
+
+  def fonticon
+    'product product-method'
+  end
+end

app/decorators/miq_ae_namespace_decorator.rb

@@ -0,0 +1,7 @@
+class MiqAeNamespaceDecorator < Draper::Decorator
+  delegate_all
+
+  def fonticon
+    'pficon pficon-folder-close'
+  end
+end

app/helpers/miq_ae_class_helper.rb

@@ -62,10 +62,6 @@ def class_prefix(cls)
     end
   end
 
-  def icon_class(cls)
-    cls.to_s.split("::").last.underscore.sub('miq_', 'product product-')
-  end
-
   def nonblank(*items)
     items.detect { |item| !item.blank? }
   end

app/presenters/tree_node/miq_ae_class.rb

@@ -1,5 +1,4 @@
 module TreeNode
   class MiqAeClass < MiqAeNode
-    set_attribute(:icon, 'product product-ae_class')
   end
 end

app/presenters/tree_node/miq_ae_instance.rb

@@ -1,5 +1,4 @@
 module TreeNode
   class MiqAeInstance < MiqAeNode
-    set_attribute(:icon, 'product product-ae_instance')
   end
 end

app/presenters/tree_node/miq_ae_method.rb

@@ -1,5 +1,4 @@
 module TreeNode
   class MiqAeMethod < MiqAeNode
-    set_attribute(:icon, 'product product-method')
   end
 end

app/presenters/tree_node/miq_ae_namespace.rb

@@ -7,7 +7,7 @@ class MiqAeNamespace < MiqAeNode
       # rubocop:disable LiteralInCondition
       case true
       when [email protected]?
-        icon = 'pficon pficon-folder-close'
+        icon = @object.decorate.fonticon
       when @object.git_enabled?
         image = 'svg/ae_git_domain.svg'
       when @object.name == MiqAeDatastore::MANAGEIQ_DOMAIN

app/presenters/tree_node/miq_ae_node.rb

@@ -2,6 +2,7 @@ module TreeNode
   class MiqAeNode < Node
     set_attribute(:title) { text }
     set_attribute(:tooltip) { "#{ui_lookup(:model => model)}: #{text}" }
+    set_attribute(:icon) { @object.decorate.fonticon }
 
     private
 

app/views/miq_ae_class/_class_instances.html.haml

@@ -17,7 +17,7 @@
               %td.narrow.noclick
                 %input{:type => 'checkbox', :value => cls_cid}
               %td.narrow
-                %i{:class => icon_class(record.class)}
+                %i{:class => record.decorate.fonticon}
               %td
                 = record_name(record)
       :javascript

app/views/miq_ae_class/_class_methods.html.haml

@@ -17,7 +17,7 @@
               %td.narrow.noclick
                 %input{:type => 'checkbox', :value => cls_cid}
               %td.narrow
-                %i{:class => icon_class(record.class)}
+                %i{:class => record.decorate.fonticon}
               %td
                 = record_name(record)
       :javascript

app/views/miq_ae_class/_ns_details.html.haml

@@ -16,7 +16,7 @@
             %td.narrow.noclick
               %input{:type => 'checkbox', :value => cls_cid}
             %td.narrow
-              %i{:class => icon_class(record.class)}
+              %i{:class => record.decorate.fonticon}
             %td
               = record_name(record)
     :javascript

spec/presenters/tree_node/miq_ae_instance_spec.rb

@@ -5,6 +5,6 @@
   let(:object) { FactoryGirl.create(:miq_ae_instance) }
 
   include_examples 'TreeNode::Node#key prefix', 'aei-'
-  include_examples 'TreeNode::Node#icon', 'product product-ae_instance'
+  include_examples 'TreeNode::Node#icon', 'fa fa-file-text-o'
   include_examples 'TreeNode::Node#tooltip prefix', 'Automate Instance'
 end