Set the bottom right quad tooltip for providers and hosts

ManageIQ · Jun 1, 2018 · 7f16269 · 7f16269
1 parent 104f44e
commit 7f16269
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 26 deletions.
diff --git a/app/decorators/ext_management_system_decorator.rb b/app/decorators/ext_management_system_decorator.rb
@@ -19,9 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb
@@ -15,9 +15,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/cloud_manager_decorator.rb b/app/decorators/manageiq/providers/cloud_manager_decorator.rb
@@ -19,9 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/container_manager_decorator.rb b/app/decorators/manageiq/providers/container_manager_decorator.rb
@@ -19,9 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/infra_manager_decorator.rb b/app/decorators/manageiq/providers/infra_manager_decorator.rb
@@ -19,9 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/network_manager_decorator.rb b/app/decorators/manageiq/providers/network_manager_decorator.rb
@@ -25,9 +25,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb
@@ -19,9 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
@@ -31,17 +31,20 @@ module QuadiconHelper
 
   def self.provider_status(status, enabled = true)
     # If the provider is suspended, we don't care about the status itself
-    return { :fonticon => 'pficon pficon-asleep' } unless enabled
+    return {
+      :fonticon => 'pficon pficon-asleep',
+      :tooltip  => _('This provider is paused, no data is currently collected from it')
+    } unless enabled
 
     case status
     when "Invalid"
-      {:fileicon => '100/x.png'}
+      {:fileicon => '100/x.png', :tooltip => _('Invalid authentication credentials')}
     when "Valid"
-      {:fileicon => '100/checkmark.png'}
+      {:fileicon => '100/checkmark.png', :tooltip => _('Authentication credentials are valid')}
     when "None"
-      {:fileicon => '100/unknown.png'}
+      {:fileicon => '100/unknown.png', :tooltip => _('Could not determine the authentication status')}
     else
-      {:fileicon => '100/exclamationpoint.png'}
+      {:fileicon => '100/exclamationpoint.png', :tooltip => _('Authentication status is %{status}') % {:status => status} }
     end
   end