From c2f31c26857f9fbc0003e2087e9d2585cd78b5e4 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Wed, 23 Nov 2022 11:34:00 +0000 Subject: [PATCH] =?UTF-8?q?Navigation:=20always=20show=20`GetStartedWithPl?= =?UTF-8?q?ugin`=20even=20if=20there's=20install=20control=20wa=E2=80=A6?= =?UTF-8?q?=20(#59127)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit always show `GetStartedWithPlugin` even if there's install control warnings --- .../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 ( <>