From a3681a33535af08cdae082b079f85031c2df0223 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Thu, 8 Dec 2022 15:00:07 +0000 Subject: [PATCH] Command Palette: Links now work when grafana is served under a subpath (#60033) strip base when pushing urls to locationService --- .../features/commandPalette/actions/global.static.actions.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/commandPalette/actions/global.static.actions.tsx b/public/app/features/commandPalette/actions/global.static.actions.tsx index d376a93b461..3ab6ca206fe 100644 --- a/public/app/features/commandPalette/actions/global.static.actions.tsx +++ b/public/app/features/commandPalette/actions/global.static.actions.tsx @@ -1,7 +1,7 @@ import { Action, Priority } from 'kbar'; import React from 'react'; -import { isIconName, NavModelItem } from '@grafana/data'; +import { isIconName, locationUtil, NavModelItem } from '@grafana/data'; import { locationService } from '@grafana/runtime'; import { Icon } from '@grafana/ui'; import { changeTheme } from 'app/core/services/theme'; @@ -35,7 +35,7 @@ function navTreeToActions(navTree: NavModelItem[], parent?: NavModelItem): Actio id: idForNavItem(navItem), name: text, // TODO: translate section: isCreateAction ? SECTION_ACTIONS : SECTION_PAGES, - perform: url ? () => locationService.push(url) : undefined, + perform: url ? () => locationService.push(locationUtil.stripBaseFromUrl(url)) : undefined, parent: parent && idForNavItem(parent), // Only show icons for top level items