Merge pull request #8887 from kbrock/add-provider-information

Add icons and provider name to a few screens

Author: Fryguy

app/helpers/auth_key_pair_cloud_helper/textual_summary.rb

@@ -5,13 +5,17 @@ module AuthKeyPairCloudHelper::TextualSummary
   # Groups
   #
   def textual_group_relationships
-    TextualGroup.new(_("Relationships"), %i[vms])
+    TextualGroup.new(_("Relationships"), %i[provider vms])
   end
 
   def textual_group_properties
     TextualGroup.new(_("Properties"), %i[name fingerprint])
   end
 
+  def textual_provider
+    textual_link(@record.ext_management_system)
+  end
+
   #
   # Items
   #

app/helpers/resource_pool_helper/textual_summary.rb

@@ -3,6 +3,10 @@ module ResourcePoolHelper::TextualSummary
   # Groups
   #
 
+  def textual_ext_management_system
+    textual_link(@record.ext_management_system)
+  end
+
   def textual_group_properties
     TextualGroup.new(
       _("Properties"),
@@ -16,7 +20,7 @@ def textual_group_properties
   def textual_group_relationships
     TextualGroup.new(
       _("Relationships"),
-      %i[parent_datacenter parent_cluster parent_host direct_vms allvms_size resource_pools]
+      %i[ext_management_system parent_datacenter parent_cluster parent_host direct_vms allvms_size resource_pools]
     )
   end
 

lib/gtl_formatter.rb

@@ -91,7 +91,9 @@ def self.format_cols(view, row, controller, options)
         "prov_type" => :service_template_format,
       },
     }
+    # all tables get a first column for icons.
     cols.push(format_icon_column(view, row, controller, options[:clickable])) if VIEW_WITH_CUSTOM_ICON.include?(view.db)
+    # row is a ruport object, so we use listicon_item to look up the original record for the row.
     record = controller.listicon_item(view, row['id'])
     view.col_order.each_with_index do |col, col_idx|
       next if view.column_is_hidden?(col, controller)
@@ -104,7 +106,12 @@ def self.format_cols(view, row, controller, options)
         celltext, span = send(special_cases[view.extras[:filename]][view.col_order[col_idx]], row[col])
       elsif COLUMN_WITH_IMAGE.key?(col)
         # Generate html for the list icon
-        icon, icon2, image = send(COLUMN_WITH_IMAGE[col], record)
+        # NOTE: COLUMN_WITH_IMAGE basically whitelists these associations
+        associations = col.split('.')[0..-2] # drop the last value - the column name
+        # follow associations so we can pass the approperiate record to be decorated / displayed
+        col_record = associations.inject(record) { |r, association_name| r.send(association_name) }
+        # NOTE: currently this only calls fonticon_or_fileicon
+        icon, icon2, image = send(COLUMN_WITH_IMAGE[col], col_record)
         text = format_col_for_display(view, row, col)
         item = {:title => text,
                 :image => ActionController::Base.helpers.image_path(image.to_s),
@@ -162,6 +169,8 @@ def self.textual_power_state_whitelisted(state)
     quad_icon[:background]
   end
 
+  # NOTE: this is for the icon column
+  #       so unlike the others, there is no text here
   def self.format_icon_column(view, row, controller, clickable)
     item = controller.listicon_item(view, row['id'])
     icon, icon2, image = fonticon_or_fileicon(item)

product/views/Container.yaml

@@ -30,20 +30,25 @@ include:
   container_image:
     columns:
     - name
+  ext_management_system:
+    columns:
+    - name
 
 # Included tables and columns for query performance
 include_for_find:
 
 # Order of columns (from all tables)
 col_order:
 - name
+- ext_management_system.name
 - container_group.name
 - container_image.name
 - state
 
 # Column titles, in order
 headers:
 - Name
+- Provider
 - Pod Name
 - Image
 - State

product/views/ManageIQ_Providers_CloudManager_AuthKeyPair.yaml

@@ -21,9 +21,13 @@ db: ManageIQ::Providers::CloudManager::AuthKeyPair
 cols:
 - name
 - fingerprint
+- type
 
 # Included tables (joined, has_one, has_many) and columns
 include:
+  ext_management_system:
+    columns:
+    - name
 
 # Included tables and columns for query performance
 include_for_find:
@@ -32,11 +36,13 @@ include_for_find:
 col_order:
 - name
 - fingerprint
+- ext_management_system.name
 
 # Column titles, in order
 headers:
 - Name
 - Fingerprint
+- Provider
 
 # Condition(s) string for the SQL query
 conditions:

product/views/PlacementGroup.yaml

@@ -39,12 +39,14 @@ include_for_find:
 col_order:
 - name
 - id
+- ext_management_system.name
 - total_vms
 
 # Column titles, in order
 headers:
 - Name
 - ID
+- Provider
 - Total VMs
 
 # Condition(s) string for the SQL query

product/views/ResourcePool.yaml

@@ -30,10 +30,14 @@ cols:
 
 # Included tables (joined, has_one, has_many) and columns
 include:
+  ext_management_system:
+    columns:
+    - name
 
 # Order of columns (from all tables)
 col_order:
 - name
+- ext_management_system.name
 - v_direct_vms
 - v_total_vms
 - v_total_miq_templates
@@ -45,6 +49,7 @@ col_order:
 # Column titles, in order
 headers:
 - Name
+- Provider
 - Direct VMs
 - Total VMs
 - Total Templates

product/views/Switch.yaml

@@ -23,15 +23,23 @@ cols:
 - ports
 - switch_uuid
 
+# Included tables (joined, has_one, has_many) and columns
+include:
+  ext_management_system:
+    columns:
+    - name
+
 # Order of columns (from all tables)
 col_order:
 - name
+- ext_management_system.name
 - ports
 - switch_uuid
 
 # Column titles, in order
 headers:
 - Name
+- Provider
 - Ports
 - UUID
 

spec/helpers/auth_key_pair_cloud_helper/textual_summary_spec.rb

@@ -1,4 +1,4 @@
 describe AuthKeyPairCloudHelper::TextualSummary do
-  include_examples "textual_group", "Relationships", %i(vms)
-  include_examples "textual_group", "Properties", %i(name fingerprint)
+  include_examples "textual_group", "Relationships", %i[provider vms]
+  include_examples "textual_group", "Properties", %i[name fingerprint]
 end

spec/helpers/resource_pool_helper/textual_summary_spec.rb

@@ -10,6 +10,7 @@
   )
 
   include_examples "textual_group", "Relationships", %i(
+    ext_management_system
     parent_datacenter
     parent_cluster
     parent_host