connect improvements (#226)

Author: nikgraf

apps/connect/src/components/spaces.tsx

@@ -3,15 +3,14 @@ import { useSpaces } from '@/hooks/use-spaces';
 export function Spaces() {
   const { isPending, error, data } = useSpaces();
 
-  if (isPending) return 'Loading spaces …';
-
-  if (error) return `An error has occurred: ${error.message}`;
-
   return (
     <div>
       <h2 className="font-bold mb-2 mt-2">Spaces</h2>
       <ul className="space-y-4">
-        {data.map((space) => (
+        {!isPending && !error && data && data.length === 0 && <p>No spaces found</p>}
+        {isPending && <p>Loading spaces …</p>}
+        {error && <p>An error has occurred loading spaces: {error.message}</p>}
+        {data?.map((space) => (
           <li key={space.id}>
             <p>{space.name}</p>
             <p className="text-xs text-gray-500 mt-2 mb-1">Apps with access to this space</p>

apps/connect/src/routes/__root.tsx

@@ -14,6 +14,9 @@ export const Route = createRootRoute({
       }
 
       if (ready && !authenticated) {
+        if (router.state.location.href.startsWith('/authenticate')) {
+          localStorage.setItem('geo-connect-authenticate-redirect', router.state.location.href);
+        }
         router.navigate({
           to: '/login',
         });

apps/connect/src/routes/authenticate.tsx

@@ -135,11 +135,7 @@ function AuthenticateComponent() {
 
   const state = useSelector(componentStore, (state) => state.context);
 
-  const {
-    // isPending,
-    // error,
-    data: spacesData,
-  } = useSpaces();
+  const { isPending, error: spacesError, data: spacesData } = useSpaces();
 
   useEffect(() => {
     const run = async () => {
@@ -452,6 +448,9 @@ function AuthenticateComponent() {
             </div>
             <h2 className="font-bold mb-2 mt-2">Spaces</h2>
             <ul className="space-y-4">
+              {isPending && <p>Loading spaces …</p>}
+              {spacesError && <p>An error has occurred loading spaces: {spacesError.message}</p>}
+              {!isPending && !spacesError && spacesData?.length === 0 && <p>No spaces found</p>}
               {spacesData?.map((space) => (
                 <li key={space.id}>
                   <p>{space.name}</p>

apps/connect/src/routes/login.lazy.tsx

@@ -68,7 +68,15 @@ function Login() {
           };
 
           await hypergraphLogin(signer);
-          navigate({ to: '/' });
+
+          const redirect = localStorage.getItem('geo-connect-authenticate-redirect');
+          if (redirect) {
+            localStorage.removeItem('geo-connect-authenticate-redirect');
+            navigate({ to: redirect, replace: true });
+            return;
+          }
+
+          navigate({ to: '/', replace: true });
         } catch (error) {
           alert('Failed to login');
           console.error(error);