fix: add session storage stored login-redirect as override for initia…

…l redirect

Signed-off-by: andreas-unleash <[email protected]>

frontend/src/component/InitialRedirect.tsx

@@ -3,11 +3,13 @@ import { useNavigate } from 'react-router-dom';
 import useProjects from '../hooks/api/getters/useProjects/useProjects';
 import { useLastViewedProject } from '../hooks/useLastViewedProject';
 import Loader from './common/Loader/Loader';
+import { getSessionStorageItem, setSessionStorageItem } from "../utils/storage";
 
 export const InitialRedirect = () => {
     const { lastViewed } = useLastViewedProject();
     const { projects, loading } = useProjects();
     const navigate = useNavigate();
+    const sessionRedirect = getSessionStorageItem('login-redirect');
 
     // Redirect based on project and last viewed
     const getRedirect = useCallback(() => {
@@ -23,10 +25,11 @@ export const InitialRedirect = () => {
     }, [lastViewed, projects]);
 
     const redirect = () => {
-        navigate(getRedirect(), { replace: true });
+        navigate(sessionRedirect ?? getRedirect(), { replace: true });
     };
 
     useEffect(() => {
+        setSessionStorageItem('login-redirect');
         redirect();
     }, [getRedirect]);
 

frontend/src/component/user/Login/Login.tsx

@@ -31,7 +31,6 @@ const Login = () => {
         query.get('redirect') || getSessionStorageItem('login-redirect') || '/';
 
     if (user) {
-        setSessionStorageItem('login-redirect');
         return <Navigate to={parseRedirectParam(redirect)} replace />;
     }