Merge pull request #4790 from thornbill/redirect-with-search

src/components/router/Redirect.tsx

@@ -1,17 +1,28 @@
 import React from 'react';
-import { Navigate, Route } from 'react-router-dom';
+import { Navigate, Route, useLocation } from 'react-router-dom';
 
 export interface Redirect {
     from: string
     to: string
 }
 
+const RedirectWithSearch = ({ to }: { to: string }) => {
+    const { search } = useLocation();
+
+    return (
+        <Navigate
+            replace
+            to={`${to}${search}`}
+        />
+    );
+};
+
 export function toRedirectRoute({ from, to }: Redirect) {
     return (
         <Route
             key={from}
             path={from}
-            element={<Navigate replace to={to} />}
+            element={<RedirectWithSearch to={to} />}
         />
     );
 }