From 64fe3a1daefceb6edc100a5b6ca199839fdbe656 Mon Sep 17 00:00:00 2001
From: Prakash Senthil Vel <23444145+prakashsvmx@users.noreply.github.com>
Date: Thu, 19 May 2022 07:01:47 +0000
Subject: [PATCH] Store bucket path if it is redirected to restore on login
 (#2006)

---
 portal-ui/src/ProtectedRoutes.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/portal-ui/src/ProtectedRoutes.tsx b/portal-ui/src/ProtectedRoutes.tsx
index 8bcf9b9b0..6302a0f6c 100644
--- a/portal-ui/src/ProtectedRoutes.tsx
+++ b/portal-ui/src/ProtectedRoutes.tsx
@@ -15,8 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useEffect, useState } from "react";
-import { Redirect } from "react-router-dom";
-
+import { Redirect, useLocation } from "react-router-dom";
 import api from "./common/api";
 import { ISessionResponse } from "./screens/Console/types";
 import useApi from "./screens/Console/Common/Hooks/useApi";
@@ -48,6 +47,13 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => {
   const [sessionLoading, setSessionLoading] = useState<boolean>(true);
   const userLoggedIn = useSelector((state: AppState) => state.system.loggedIn);
 
+  const { pathname = "" } = useLocation();
+
+  const StorePathAndRedirect = () => {
+    localStorage.setItem("redirect-path", pathname);
+    return <Redirect to={{ pathname: `${baseUrl}login` }} />;
+  };
+
   useEffect(() => {
     api
       .invoke("GET", `/api/v1/session`)
@@ -104,11 +110,7 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => {
     return null;
   }
   // redirect user to the right page based on session status
-  return userLoggedIn ? (
-    <Component />
-  ) : (
-    <Redirect to={{ pathname: `${baseUrl}login` }} />
-  );
+  return userLoggedIn ? <Component /> : <StorePathAndRedirect />;
 };
 
 export default ProtectedRoute;