Merge pull request #339 from akaene/fix/system-tab-preselect

Fix for system pre-select

src/components/routes/AppRoutes.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import Login from "@components/login/Login";
-import { BrowserRouter, Route, Routes } from "react-router-dom";
+import { BrowserRouter, Route, Routes, Navigate } from "react-router-dom";
 import Logout from "@components/Logout";
 import Register from "@components/register/Register";
 import { createHashHistory } from "history";
@@ -68,10 +68,6 @@ const AppRoutes = () => {
       path: ROUTES.FHA,
       element: <FhaOverview />,
     },
-    {
-      path: "/*",
-      element: <SystemsOverview />,
-    },
   ];
 
   const getElement = (path, element) => {
@@ -101,6 +97,7 @@ const AppRoutes = () => {
         <Routes>
           <Route path={ROUTES.OIDC_SIGNIN_CALLBACK} element={<OidcSignInCallback />} />
           <Route path={ROUTES.OIDC_SILENT_CALLBACK} element={<OidcSilentCallback />} />
+          <Route path={ROUTES.ROOT} element={<Navigate to={ROUTES.SYSTEMS} />} />
 
           {routes.map((r) => {
             if (isUsingOidcAuth()) {

src/components/routes/PublicRoute.tsx

@@ -7,11 +7,7 @@ import { ROUTES } from "@utils/constants";
 const Element = ({ component: Component, loggedUser, restricted, ...props }) => {
   return (
     <>
-      {loggedUser && loggedUser.authenticated && restricted ? (
-        <Navigate to={ROUTES.DASHBOARD} />
-      ) : (
-        <Component {...props} />
-      )}
+      {loggedUser && loggedUser.authenticated && restricted ? <Navigate to={ROUTES.ROOT} /> : <Component {...props} />}
     </>
   );
 };

src/utils/constants.tsx

@@ -43,7 +43,7 @@ export const ROUTES = {
   OIDC_SIGNIN_CALLBACK: "/oidc-signin-callback",
   OIDC_SILENT_CALLBACK: "/oidc-silent-callback",
 
-  DASHBOARD: "/",
+  ROOT: "/",
   SYSTEMS: "/systems",
   FTA: "/fta",
   FMEA: "/fmea",