From 9eb8ec9fa9eaa35dfc197449feaebcb640b10b6c Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 12 Jun 2023 15:58:38 +0100
Subject: [PATCH] Command Palette: Links opened in a new tab now route
 correctly when Grafana is served under a subpath (#69845)

don't strip base from url since we're not using locationSrv.push anymore
---
 .../app/features/commandPalette/actions/dashboardActions.ts  | 5 ++---
 public/app/features/commandPalette/actions/staticActions.ts  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/app/features/commandPalette/actions/dashboardActions.ts b/public/app/features/commandPalette/actions/dashboardActions.ts
index 44d6ff4ebf6..be10a89d11c 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.ts
@@ -1,7 +1,6 @@
 import debounce from 'debounce-promise';
 import { useEffect, useRef, useState } from 'react';
 
-import { locationUtil } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
@@ -43,7 +42,7 @@ export async function getRecentDashboardActions(): Promise<CommandPaletteAction[
       name: `${name}`,
       section: t('command-palette.section.recent-dashboards', 'Recent dashboards'),
       priority: RECENT_DASHBOARDS_PRORITY,
-      url: locationUtil.stripBaseFromUrl(url),
+      url,
     };
   });
 
@@ -72,7 +71,7 @@ export async function getSearchResultActions(searchQuery: string): Promise<Comma
           ? t('command-palette.section.dashboard-search-results', 'Dashboards')
           : t('command-palette.section.folder-search-results', 'Folders'),
       priority: SEARCH_RESULTS_PRORITY,
-      url: locationUtil.stripBaseFromUrl(url),
+      url,
       subtitle: data.view.dataFrame.meta?.custom?.locationInfo[location]?.name,
     };
   });
diff --git a/public/app/features/commandPalette/actions/staticActions.ts b/public/app/features/commandPalette/actions/staticActions.ts
index dd702722b41..12f69fe247f 100644
--- a/public/app/features/commandPalette/actions/staticActions.ts
+++ b/public/app/features/commandPalette/actions/staticActions.ts
@@ -1,4 +1,4 @@
-import { locationUtil, NavModelItem } from '@grafana/data';
+import { NavModelItem } from '@grafana/data';
 import { t } from 'app/core/internationalization';
 import { changeTheme } from 'app/core/services/theme';
 
@@ -32,7 +32,7 @@ function navTreeToActions(navTree: NavModelItem[], parents: NavModelItem[] = [])
       id: idForNavItem(navItem),
       name: text,
       section: section,
-      url: url && locationUtil.stripBaseFromUrl(url),
+      url,
       target,
       parent: parents.length > 0 && !isCreateAction ? idForNavItem(parents[parents.length - 1]) : undefined,
       priority: priority,