From f1efd350e62a21aeaa9b4a16b18e6b7223ee0910 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:49:45 +0100 Subject: [PATCH] =?UTF-8?q?[v9.3.x]=20Navigation:=20always=20show=20`GetSt?= =?UTF-8?q?artedWithPlugin`=20even=20if=20there's=20install=20control=20wa?= =?UTF-8?q?=E2=80=A6=20(#59206)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Navigation: always show `GetStartedWithPlugin` even if there's install control wa… (#59127) always show `GetStartedWithPlugin` even if there's install control warnings (cherry picked from commit c2f31c26857f9fbc0003e2087e9d2585cd78b5e4) Co-authored-by: Ashley Harrison --- .../app/features/plugins/admin/components/PluginActions.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/app/features/plugins/admin/components/PluginActions.tsx b/public/app/features/plugins/admin/components/PluginActions.tsx index c7b9663a81b..6819da2b6e0 100644 --- a/public/app/features/plugins/admin/components/PluginActions.tsx +++ b/public/app/features/plugins/admin/components/PluginActions.tsx @@ -17,17 +17,19 @@ export const PluginActions = ({ plugin }: Props) => { const isRemotePluginsAvailable = useIsRemotePluginsAvailable(); const latestCompatibleVersion = getLatestCompatibleVersion(plugin?.details?.versions); - if (!plugin || hasInstallControlWarning(plugin, isRemotePluginsAvailable, latestCompatibleVersion)) { + if (!plugin) { return null; } + const hasInstallWarning = hasInstallControlWarning(plugin, isRemotePluginsAvailable, latestCompatibleVersion); const isExternallyManaged = config.pluginAdminExternalManageEnabled; const pluginStatus = plugin.isInstalled ? plugin.hasUpdate ? PluginStatus.UPDATE : PluginStatus.UNINSTALL : PluginStatus.INSTALL; - const isInstallControlsDisabled = plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled(); + const isInstallControlsDisabled = + plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled() || hasInstallWarning; return ( <>