From bf541ee3d10ae3b68ff8b3cbe26153247fe2981e Mon Sep 17 00:00:00 2001
From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Date: Wed, 21 Dec 2022 14:21:04 +0100
Subject: [PATCH] DatasourceList: Fixes using sub path on datasources URL
 (#59597)

---
 .../features/datasources/components/DataSourceAddButton.tsx | 3 ++-
 .../app/features/datasources/components/DataSourcesList.tsx | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/app/features/datasources/components/DataSourceAddButton.tsx b/public/app/features/datasources/components/DataSourceAddButton.tsx
index 030fae9aaab..54acd193748 100644
--- a/public/app/features/datasources/components/DataSourceAddButton.tsx
+++ b/public/app/features/datasources/components/DataSourceAddButton.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { config } from '@grafana/runtime';
 import { LinkButton } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
@@ -11,7 +12,7 @@ export function DataSourceAddButton(): JSX.Element | null {
   const dataSourcesRoutes = useDataSourcesRoutes();
 
   return canCreateDataSource ? (
-    <LinkButton icon="plus" href={dataSourcesRoutes.New}>
+    <LinkButton icon="plus" href={config.appSubUrl + dataSourcesRoutes.New}>
       Add new data source
     </LinkButton>
   ) : null;
diff --git a/public/app/features/datasources/components/DataSourcesList.tsx b/public/app/features/datasources/components/DataSourcesList.tsx
index 39cc16c1f4d..cc41d384036 100644
--- a/public/app/features/datasources/components/DataSourcesList.tsx
+++ b/public/app/features/datasources/components/DataSourcesList.tsx
@@ -2,6 +2,7 @@ import { css } from '@emotion/css';
 import React from 'react';
 
 import { DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { LinkButton, Card, Tag, useStyles2 } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
@@ -71,9 +72,10 @@ export function DataSourcesListView({ dataSources, dataSourcesCount, isLoading,
       {/* List */}
       <ul className={styles.list}>
         {dataSources.map((dataSource) => {
+          const dsLink = config.appSubUrl + dataSourcesRoutes.Edit.replace(/:uid/gi, dataSource.uid);
           return (
             <li key={dataSource.uid}>
-              <Card href={dataSourcesRoutes.Edit.replace(/:uid/gi, dataSource.uid)}>
+              <Card href={dsLink}>
                 <Card.Heading>{dataSource.name}</Card.Heading>
                 <Card.Figure>
                   <img src={dataSource.typeLogoUrl} alt="" height="40px" width="40px" className={styles.logo} />
@@ -86,7 +88,7 @@ export function DataSourcesListView({ dataSources, dataSourcesCount, isLoading,
                   ]}
                 </Card.Meta>
                 <Card.Tags>
-                  <LinkButton icon="apps" fill="outline" variant="secondary" href="/dashboard/new">
+                  <LinkButton icon="apps" fill="outline" variant="secondary" href={config.appSubUrl + '/dashboard/new'}>
                     Build a Dashboard
                   </LinkButton>
                   {canExploreDataSources && (