Connections: Redirect from outdated URLs (#73278)

Connections: redirect from outdated URLs
pull/73486/head^2
mikkancso 2 years ago committed by GitHub
parent ec9c35fae5
commit 88cdc38afa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      public/app/features/connections/Connections.tsx
  2. 4
      public/app/features/connections/constants.ts

@ -1,5 +1,5 @@
import * as React from 'react'; 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 { DataSourcesRoutesContext } from 'app/features/datasources/state';
import { StoreState, useSelector } from 'app/types'; import { StoreState, useSelector } from 'app/types';
@ -14,6 +14,18 @@ import {
NewDataSourcePage, NewDataSourcePage,
} from './pages'; } from './pages';
function RedirectToAddNewConnection() {
const { search } = useLocation();
return (
<Redirect
to={{
pathname: ROUTES.AddNewConnection,
search,
}}
/>
);
}
export default function Connections() { export default function Connections() {
const navIndex = useSelector((state: StoreState) => state.navIndex); const navIndex = useSelector((state: StoreState) => state.navIndex);
const isAddNewConnectionPageOverridden = Boolean(navIndex['standalone-plugin-page-/connections/add-new-connection']); 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} /> <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 */} {/* Not found */}
<Route component={() => <Redirect to="/notfound" />} /> <Route component={() => <Redirect to="/notfound" />} />
</Switch> </Switch>

@ -13,4 +13,8 @@ export const ROUTES = {
// Add new connection // Add new connection
AddNewConnection: `/${ROUTE_BASE_ID}/add-new-connection`, AddNewConnection: `/${ROUTE_BASE_ID}/add-new-connection`,
DataSourcesDetails: `/${ROUTE_BASE_ID}/datasources/:id`, DataSourcesDetails: `/${ROUTE_BASE_ID}/datasources/:id`,
// Outdated
ConnectDataOutdated: `/${ROUTE_BASE_ID}/connect-data`,
YourConnectionsOutdated: `/${ROUTE_BASE_ID}/your-connections`,
} as const; } as const;

Loading…
Cancel
Save