From be0ff0253a89f8fb0ad8179d5aaaa51f9c736bcd Mon Sep 17 00:00:00 2001
From: Yulia Shanyrova <yulia.shanyrova@grafana.com>
Date: Mon, 8 Dec 2025 16:33:20 +0100
Subject: [PATCH] change route from datasource new to add-new-connection

---
 public/app/features/connections/Connections.tsx  | 7 +++++--
 public/app/features/datasources/state/actions.ts | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/app/features/connections/Connections.tsx b/public/app/features/connections/Connections.tsx
index 4d40c5684b7..fa19a9119ee 100644
--- a/public/app/features/connections/Connections.tsx
+++ b/public/app/features/connections/Connections.tsx
@@ -13,7 +13,6 @@ import { DataSourceDetailsPage } from './pages/DataSourceDetailsPage';
 import { DataSourcesListPage } from './pages/DataSourcesListPage';
 import { EditDataSourcePage } from './pages/EditDataSourcePage';
 import { InsightsFeatureHighlightPage } from './pages/InsightsFeatureHighlightPage';
-import { NewDataSourcePage } from './pages/NewDataSourcePage';
 import { PermissionsFeatureHighlightPage } from './pages/PermissionsFeatureHighlightPage';
 
 function RedirectToAddNewConnection() {
@@ -40,7 +39,11 @@ export default function Connections() {
       <Route caseSensitive path={'/'} element={<ConnectionsHomePage />} />
       {/* The route paths need to be relative to the parent path (ROUTES.Base), so we need to remove that part */}
       <Route caseSensitive path={ROUTES.DataSources.replace(ROUTES.Base, '')} element={<DataSourcesListPage />} />
-      <Route caseSensitive path={ROUTES.DataSourcesNew.replace(ROUTES.Base, '')} element={<NewDataSourcePage />} />
+      <Route
+        caseSensitive
+        path={ROUTES.DataSourcesNew.replace(ROUTES.Base, '')}
+        element={<Navigate replace to={{ pathname: ROUTES.AddNewConnection, search: '?cat=data-source' }} />}
+      />
       <Route
         caseSensitive
         path={ROUTES.DataSourcesDetails.replace(ROUTES.Base, '')}
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index 961c78c8208..f0a2c8c51c5 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -251,7 +251,7 @@ export function addDataSource(
     };
 
     const result = await api.createDataSource(newInstance);
-    const editLink = editRoute.replace(/:uid/gi, result.datasource.uid);
+    // const editLink = editRoute.replace(/:uid/gi, result.datasource.uid);
 
     await getDatasourceSrv().reload();
     await contextSrv.fetchUserPermissions();
@@ -264,7 +264,7 @@ export function addDataSource(
       path: window.location.pathname,
     });
 
-    locationService.push(editLink);
+    locationService.push('/add-new-connection?cat=data-source');
   };
 }