From 6603c809dd7c4b7ea82b5893ddb690715d8d6cad Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 29 Oct 2021 05:03:19 -0600 Subject: [PATCH] Plugins Catalog: Set external manage link to installation tab (#40994) (#41083) * feat(catalog): set external manage link to installation tab * fix(catalog): use pluginCatalogURL when getting external manage link (cherry picked from commit 5d98155b5f9ef0476c676c343dbedcf5e158b590) Co-authored-by: Jack Westbrook --- .../components/InstallControls/ExternallyManagedButton.tsx | 2 +- public/app/features/plugins/admin/helpers.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/plugins/admin/components/InstallControls/ExternallyManagedButton.tsx b/public/app/features/plugins/admin/components/InstallControls/ExternallyManagedButton.tsx index cbc727393b0..5aa72575014 100644 --- a/public/app/features/plugins/admin/components/InstallControls/ExternallyManagedButton.tsx +++ b/public/app/features/plugins/admin/components/InstallControls/ExternallyManagedButton.tsx @@ -9,7 +9,7 @@ type ExternallyManagedButtonProps = { }; export function ExternallyManagedButton({ pluginId, pluginStatus }: ExternallyManagedButtonProps) { - const externalManageLink = getExternalManageLink(pluginId); + const externalManageLink = `${getExternalManageLink(pluginId)}/?tab=installation`; if (pluginStatus === PluginStatus.UPDATE) { return ( diff --git a/public/app/features/plugins/admin/helpers.ts b/public/app/features/plugins/admin/helpers.ts index e6c9b460916..d954cbd8fc6 100644 --- a/public/app/features/plugins/admin/helpers.ts +++ b/public/app/features/plugins/admin/helpers.ts @@ -189,7 +189,7 @@ export function mapToCatalogPlugin(local?: LocalPlugin, remote?: RemotePlugin, e }; } -export const getExternalManageLink = (pluginId: string) => `https://grafana.com/grafana/plugins/${pluginId}`; +export const getExternalManageLink = (pluginId: string) => `${config.pluginCatalogURL}${pluginId}`; export enum Sorters { nameAsc = 'nameAsc',