From 7b18b101b42beeffc0d8fda0611f9a54fa0707d5 Mon Sep 17 00:00:00 2001
From: Kamal Galrani <KamalGalrani@users.noreply.github.com>
Date: Mon, 18 May 2020 13:06:31 +0530
Subject: [PATCH] Dashboard/Links: Fixes open in new window for dashboard link
 (#24772)

* fixes target in dashboard link

* Update DashboardLinks.tsx

* Revert "Update DashboardLinks.tsx"

This reverts commit 2b23db8dc4bc6e8db5de6f09b0ab3b7cf29b11d1.
---
 .../dashboard/components/SubMenu/DashboardLinks.tsx         | 6 +++++-
 .../dashboard/components/SubMenu/DashboardsDropdown.tsx     | 2 +-
 public/app/features/dashboard/state/DashboardModel.ts       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
index 39092e48806..d2f231f503a 100644
--- a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
+++ b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
@@ -25,7 +25,11 @@ export const DashboardLinks: FC<Props> = ({ dashboard }) => {
           }
 
           const linkElement = (
-            <a className="gf-form-label" href={sanitizeUrl(linkInfo.href)} target={link.target}>
+            <a
+              className="gf-form-label"
+              href={sanitizeUrl(linkInfo.href)}
+              target={link.targetBlank ? '_blank' : '_self'}
+            >
               <Icon name={iconMap[link.icon] as IconName} />
               <span>{sanitize(linkInfo.title)}</span>
             </a>
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx b/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx
index 08fc46d0324..11ffa485391 100644
--- a/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx
+++ b/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx
@@ -45,7 +45,7 @@ export class DashboardsDropdown extends PureComponent<Props, State> {
       <div className="gf-form">
         <a
           className="gf-form-label pointer"
-          target={link.target}
+          target={link.targetBlank ? '_blank' : '_self'}
           onClick={this.onDropDownClick}
           data-placement="bottom"
           data-toggle="dropdown"
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index e53e285f4be..192ac526113 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -44,7 +44,7 @@ export interface DashboardLink {
   asDropdown: boolean;
   tags: [];
   searchHits?: [];
-  target: string;
+  targetBlank: boolean;
 }
 
 export class DashboardModel {