From 3cd7deec518627dd40f9ae678daa596326c8c15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Fri, 1 Jun 2018 16:19:00 +0200 Subject: [PATCH 1/5] Replace status_img with a more generic provider_status in QuadiconHelper --- app/decorators/host_decorator.rb | 3 +-- .../manageiq/providers/cloud_manager_decorator.rb | 3 +-- .../providers/container_manager_decorator.rb | 3 +-- .../manageiq/providers/infra_manager_decorator.rb | 3 +-- .../providers/network_manager_decorator.rb | 3 +-- .../providers/physical_infra_manager_decorator.rb | 3 +-- app/helpers/quadicon_helper.rb | 14 +++++++++----- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb index d04df602a12..5d08e464395 100644 --- a/app/decorators/host_decorator.rb +++ b/app/decorators/host_decorator.rb @@ -16,9 +16,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(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 index 255caa1ff5d..00e8c17f52d 100644 --- a/app/decorators/manageiq/providers/cloud_manager_decorator.rb +++ b/app/decorators/manageiq/providers/cloud_manager_decorator.rb @@ -20,9 +20,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(QuadiconHelper.provider_status(authentication_status)) } 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 index c94c4ad996e..f2cd474289e 100644 --- a/app/decorators/manageiq/providers/container_manager_decorator.rb +++ b/app/decorators/manageiq/providers/container_manager_decorator.rb @@ -20,9 +20,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(QuadiconHelper.provider_status(authentication_status)) } 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 index 4d054a1d0ad..44ca0ecee6d 100644 --- a/app/decorators/manageiq/providers/infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/infra_manager_decorator.rb @@ -20,9 +20,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(QuadiconHelper.provider_status(authentication_status)) } 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 index cefcc8a054a..eb19738868d 100644 --- a/app/decorators/manageiq/providers/network_manager_decorator.rb +++ b/app/decorators/manageiq/providers/network_manager_decorator.rb @@ -26,9 +26,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(QuadiconHelper.provider_status(authentication_status)) } 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 index 60d8e0c2be9..6e3126ed018 100644 --- a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb @@ -20,9 +20,8 @@ def quadicon :tooltip => ui_lookup(:model => type) }, :bottom_right => { - :fileicon => QuadiconHelper.status_img(authentication_status), :tooltip => authentication_status - } + }.merge(QuadiconHelper.provider_status(authentication_status)) } icon[:middle] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb index 2e156c612a6..25833c0782e 100644 --- a/app/helpers/quadicon_helper.rb +++ b/app/helpers/quadicon_helper.rb @@ -34,12 +34,16 @@ module QuadiconHelper 'template' => {:fonticon => 'pficon pficon-template', :background => '#336699'}, }.freeze - def self.status_img(status) + def self.provider_status(status, enabled = true) 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'} + when "Valid" + {:fileicon => '100/checkmark.png'} + when "None" + {:fileicon => '100/unknown.png'} + else + {:fileicon => '100/exclamationpoint.png'} end end From 3fe80f064b2222895cf566e5a7ff35f9683b0ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Fri, 1 Jun 2018 16:20:19 +0200 Subject: [PATCH 2/5] Display pficon-asleep icon in bottom-right quad for disabled providers --- app/decorators/manageiq/providers/cloud_manager_decorator.rb | 2 +- .../manageiq/providers/container_manager_decorator.rb | 2 +- app/decorators/manageiq/providers/infra_manager_decorator.rb | 2 +- app/decorators/manageiq/providers/network_manager_decorator.rb | 2 +- .../manageiq/providers/physical_infra_manager_decorator.rb | 2 +- app/helpers/quadicon_helper.rb | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/decorators/manageiq/providers/cloud_manager_decorator.rb b/app/decorators/manageiq/providers/cloud_manager_decorator.rb index 00e8c17f52d..75affce68b3 100644 --- a/app/decorators/manageiq/providers/cloud_manager_decorator.rb +++ b/app/decorators/manageiq/providers/cloud_manager_decorator.rb @@ -21,7 +21,7 @@ def quadicon }, :bottom_right => { :tooltip => authentication_status - }.merge(QuadiconHelper.provider_status(authentication_status)) + }.merge(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 index f2cd474289e..d9e7d914587 100644 --- a/app/decorators/manageiq/providers/container_manager_decorator.rb +++ b/app/decorators/manageiq/providers/container_manager_decorator.rb @@ -21,7 +21,7 @@ def quadicon }, :bottom_right => { :tooltip => authentication_status - }.merge(QuadiconHelper.provider_status(authentication_status)) + }.merge(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 index 44ca0ecee6d..3d6faaa219e 100644 --- a/app/decorators/manageiq/providers/infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/infra_manager_decorator.rb @@ -21,7 +21,7 @@ def quadicon }, :bottom_right => { :tooltip => authentication_status - }.merge(QuadiconHelper.provider_status(authentication_status)) + }.merge(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 index eb19738868d..b83329bd343 100644 --- a/app/decorators/manageiq/providers/network_manager_decorator.rb +++ b/app/decorators/manageiq/providers/network_manager_decorator.rb @@ -27,7 +27,7 @@ def quadicon }, :bottom_right => { :tooltip => authentication_status - }.merge(QuadiconHelper.provider_status(authentication_status)) + }.merge(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 index 6e3126ed018..73f78515313 100644 --- a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb +++ b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb @@ -21,7 +21,7 @@ def quadicon }, :bottom_right => { :tooltip => authentication_status - }.merge(QuadiconHelper.provider_status(authentication_status)) + }.merge(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 index 25833c0782e..6f8deaa8a41 100644 --- a/app/helpers/quadicon_helper.rb +++ b/app/helpers/quadicon_helper.rb @@ -35,6 +35,9 @@ module QuadiconHelper }.freeze 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 + case status when "Invalid" {:fileicon => '100/x.png'} From 381a8a2514412eb56573ebdc6b9167e725e51df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Fri, 1 Jun 2018 16:27:31 +0200 Subject: [PATCH 3/5] Set the bottom right quad tooltip for providers and hosts --- app/decorators/host_decorator.rb | 4 +--- .../manageiq/providers/cloud_manager_decorator.rb | 4 +--- .../providers/container_manager_decorator.rb | 4 +--- .../manageiq/providers/infra_manager_decorator.rb | 4 +--- .../providers/network_manager_decorator.rb | 4 +--- .../providers/physical_infra_manager_decorator.rb | 4 +--- app/helpers/quadicon_helper.rb | 15 ++++++++++----- 7 files changed, 16 insertions(+), 23 deletions(-) diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb index 5d08e464395..6318f0b3694 100644 --- 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] = 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 index 75affce68b3..83d054f6759 100644 --- 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] = 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 index d9e7d914587..e982acc434a 100644 --- 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] = 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 index 3d6faaa219e..0cdf552eeb0 100644 --- 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] = 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 index b83329bd343..cbe639b6515 100644 --- 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] = 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 index 73f78515313..fb80e07c670 100644 --- 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] = QuadiconHelper::POLICY_SHIELD if get_policies.present? icon diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb index 6f8deaa8a41..aa4a7047aeb 100644 --- a/app/helpers/quadicon_helper.rb +++ b/app/helpers/quadicon_helper.rb @@ -36,17 +36,22 @@ 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 + unless enabled + return { + :fonticon => 'pficon pficon-asleep', + :tooltip => _('This provider is paused, no data is currently collected from it') + } + end 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 From cd4b42be9d6e7808384bf9918919264140ab41c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Mon, 4 Jun 2018 22:27:42 +0200 Subject: [PATCH 4/5] Update tooltip/status for StorageManagerDecorator --- .../manageiq/providers/storage_manager_decorator.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/decorators/manageiq/providers/storage_manager_decorator.rb b/app/decorators/manageiq/providers/storage_manager_decorator.rb index fbd01974005..792ee1b5a3a 100644 --- 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 From b0202ec3168613152b84c0c414462d99c34aceb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 6 Jun 2018 11:57:55 +0200 Subject: [PATCH 5/5] Update tooltip for provider data collection pause on quadicons --- app/helpers/quadicon_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb index aa4a7047aeb..cea04dcf6e1 100644 --- a/app/helpers/quadicon_helper.rb +++ b/app/helpers/quadicon_helper.rb @@ -39,7 +39,7 @@ def self.provider_status(status, enabled = true) unless enabled return { :fonticon => 'pficon pficon-asleep', - :tooltip => _('This provider is paused, no data is currently collected from it') + :tooltip => _('Data collection for this provider is suspended.') } end