fix identity identifier in URL

0xPolygonID · Oct 2, 2024 · 946f954 · 946f954
1 parent 76d148a
commit 946f954
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/ui/src/components/shared/Router.tsx b/ui/src/components/shared/Router.tsx
@@ -21,7 +21,7 @@ import { Schemas } from "src/components/schemas/Schemas";
 import { NotFound } from "src/components/shared/NotFound";
 import { useIdentityContext } from "src/contexts/Identity";
 import { Layout, ROUTES, RouteID } from "src/routes";
-import { ROOT_PATH } from "src/utils/constants";
+import { IDENTIFIER_SEARCH_PARAM, ROOT_PATH } from "src/utils/constants";
 
 const COMPONENTS: Record<RouteID, ComponentType> = {
   connectionDetails: ConnectionDetails,
@@ -61,7 +61,17 @@ export function Router() {
     <Routes>
       {identifier ? (
         <>
-          <Route element={<Navigate to={ROUTES.schemas.path} />} path={ROOT_PATH} />
+          <Route
+            element={
+              <Navigate
+                to={{
+                  pathname: ROUTES.schemas.path,
+                  search: `${IDENTIFIER_SEARCH_PARAM}=${identifier}`,
+                }}
+              />
+            }
+            path={ROOT_PATH}
+          />
 
           <Route element={<FullWidthLayout />}>{getLayoutRoutes("fullWidth")}</Route>
 

diff --git a/ui/src/contexts/Identity.tsx b/ui/src/contexts/Identity.tsx
@@ -6,6 +6,7 @@ import {
   useContext,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from "react";
 import { useNavigate, useSearchParams } from "react-router-dom";
@@ -48,6 +49,7 @@ export function IdentityProvider(props: PropsWithChildren) {
     status: "pending",
   });
   const [identifier, setIdentifier] = useState<Identifier>("");
+  const previousIdentifier = useRef<Identifier | null>(null);
   const [searchParams, setSearchParams] = useSearchParams();
 
   const identity =
@@ -108,15 +110,26 @@ export function IdentityProvider(props: PropsWithChildren) {
   );
 
   useEffect(() => {
-    if (identifier) {
-      setSearchParams((previousParams) => {
-        const params = new URLSearchParams(previousParams);
-        params.set(IDENTIFIER_SEARCH_PARAM, identifier);
-        return params;
-      });
+    if (
+      identifierParam &&
+      identifier !== identifierParam &&
+      isAsyncTaskDataAvailable(identitiesList) &&
+      identitiesList.data.some((identity) => identity.identifier === identifierParam)
+    ) {
+      setIdentifier(identifierParam);
+    } else if (identifier && identifier !== previousIdentifier.current) {
+      setSearchParams(
+        (previousParams) => {
+          const params = new URLSearchParams(previousParams);
+          params.set(IDENTIFIER_SEARCH_PARAM, identifier);
+          return params;
+        },
+        { replace: true }
+      );
       setStorageByKey({ key: IDENTIFIER_LOCAL_STORAGE_KEY, value: identifier });
+      previousIdentifier.current = identifier;
     }
-  }, [identifier, setSearchParams]);
+  }, [identifier, identifierParam, identitiesList, setSearchParams]);
 
   useEffect(() => {
     const { aborter } = makeRequestAbortable(fetchIdentities);