From 88cdc38afa623aed8d41a6aabb850ba16c111a3d Mon Sep 17 00:00:00 2001
From: mikkancso <miklos.tolnai@grafana.com>
Date: Mon, 21 Aug 2023 15:58:02 +0200
Subject: [PATCH] Connections: Redirect from outdated URLs (#73278)

Connections: redirect from outdated URLs
---
 .../app/features/connections/Connections.tsx  | 19 ++++++++++++++++++-
 public/app/features/connections/constants.ts  |  4 ++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/public/app/features/connections/Connections.tsx b/public/app/features/connections/Connections.tsx
index f7ef10fcb92..bf96adbfac0 100644
--- a/public/app/features/connections/Connections.tsx
+++ b/public/app/features/connections/Connections.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Redirect, Route, Switch } from 'react-router-dom';
+import { Redirect, Route, Switch, useLocation } from 'react-router-dom';
 
 import { DataSourcesRoutesContext } from 'app/features/datasources/state';
 import { StoreState, useSelector } from 'app/types';
@@ -14,6 +14,18 @@ import {
   NewDataSourcePage,
 } from './pages';
 
+function RedirectToAddNewConnection() {
+  const { search } = useLocation();
+  return (
+    <Redirect
+      to={{
+        pathname: ROUTES.AddNewConnection,
+        search,
+      }}
+    />
+  );
+}
+
 export default function Connections() {
   const navIndex = useSelector((state: StoreState) => state.navIndex);
   const isAddNewConnectionPageOverridden = Boolean(navIndex['standalone-plugin-page-/connections/add-new-connection']);
@@ -41,6 +53,11 @@ export default function Connections() {
           <Route exact sensitive path={ROUTES.AddNewConnection} component={AddNewConnectionPage} />
         )}
 
+        {/* Redirect from earlier routes to updated routes */}
+        <Route exact path={ROUTES.ConnectDataOutdated} component={RedirectToAddNewConnection} />
+        <Redirect from={`${ROUTES.Base}/your-connections/:page`} to={`${ROUTES.Base}/:page`} />
+        <Redirect from={ROUTES.YourConnectionsOutdated} to={ROUTES.DataSources} />
+
         {/* Not found */}
         <Route component={() => <Redirect to="/notfound" />} />
       </Switch>
diff --git a/public/app/features/connections/constants.ts b/public/app/features/connections/constants.ts
index 406e9d41f8c..7598896883d 100644
--- a/public/app/features/connections/constants.ts
+++ b/public/app/features/connections/constants.ts
@@ -13,4 +13,8 @@ export const ROUTES = {
   // Add new connection
   AddNewConnection: `/${ROUTE_BASE_ID}/add-new-connection`,
   DataSourcesDetails: `/${ROUTE_BASE_ID}/datasources/:id`,
+
+  // Outdated
+  ConnectDataOutdated: `/${ROUTE_BASE_ID}/connect-data`,
+  YourConnectionsOutdated: `/${ROUTE_BASE_ID}/your-connections`,
 } as const;