Merge pull request #4022 from skateman/provider-suspended-quadicon

Display providers' suspended status in their quadicon
ManageIQ · Jun 7, 2018 · 8bfa17f · 8bfa17f
2 parents f0eac47 + b0202ec
commit 8bfa17f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 33 deletions.
diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb
@@ -15,10 +15,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD 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,10 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD 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,10 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD 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,10 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD 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,10 +25,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD 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,10 +19,7 @@ def quadicon
         :fileicon => fileicon,
         :tooltip  => ui_lookup(:model => type)
       },
-      :bottom_right => {
-        :fileicon => QuadiconHelper.status_img(authentication_status),
-        :tooltip  => authentication_status
-      }
+      :bottom_right => QuadiconHelper.provider_status(authentication_status, enabled?)
     }
     icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present?
     icon

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

diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
@@ -34,12 +34,24 @@ module QuadiconHelper
     'template'                  => {:fonticon => 'pficon pficon-template', :background => '#336699'},
   }.freeze
 
-  def self.status_img(status)
+  def self.provider_status(status, enabled = true)
+    # If the provider is suspended, we don't care about the status itself
+    unless enabled
+      return {
+        :fonticon => 'pficon pficon-asleep',
+        :tooltip  => _('Data collection for this provider is suspended.')
+      }
+    end
+
     case status
-    when "Invalid" then "100/x.png"
-    when "Valid"   then "100/checkmark.png"
-    when "None"    then "100/unknown.png"
-    else                "100/exclamationpoint.png"
+    when "Invalid"
+      {:fileicon => '100/x.png', :tooltip => _('Invalid authentication credentials')}
+    when "Valid"
+      {:fileicon => '100/checkmark.png', :tooltip => _('Authentication credentials are valid')}
+    when "None"
+      {:fileicon => '100/unknown.png', :tooltip => _('Could not determine the authentication status')}
+    else
+      {:fileicon => '100/exclamationpoint.png', :tooltip => _('Authentication status is %{status}') % {:status => status} }
     end
   end