fix: fetching org profiles on mount

392-f24 · Dec 6, 2024 · 805e3f2 · 805e3f2
1 parent 032c128
commit 805e3f2
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 41 deletions.
diff --git a/src/components/Home/DonorDashboard/index.tsx b/src/components/Home/DonorDashboard/index.tsx
@@ -6,10 +6,13 @@ import OrganizationCard from './OrganizationCard';
 
 import { useOrganizationStore } from '@/stores';
 
-import SearchBar from '@/components/common/SearchBar';
+import { SearchBar, LoadingCircle } from '@/components/common';
 
 const DonorDashboard = () => {
   const [searchQuery, setSearchQuery] = useState('');
+  const loading = useOrganizationStore((state) => state.loading);
+  if (loading) return <LoadingCircle />;
+
   const organizationProfiles = useOrganizationStore(
     (state) => state.organizationProfiles
   );

diff --git a/src/components/common/ProtectedRoute.tsx b/src/components/common/ProtectedRoute.tsx
@@ -1,8 +1,7 @@
 import { Typography } from '@mui/material';
-import { useEffect, type ReactElement } from 'react';
-import { toast } from 'sonner';
+import { type ReactElement } from 'react';
 
-import { useOrganizationStore, useUserStore } from '@/stores';
+import { useUserStore, useOrganizationStore } from '@/stores';
 
 import LoadingCircle from '@/components/common/LoadingCircle';
 
@@ -13,8 +12,12 @@ type ProtectedRouteProps = {
 const ProtectedRoute = ({ element }: ProtectedRouteProps) => {
   const user = useUserStore((state) => state.user);
   const loading = useUserStore((state) => state.loading);
+  const orgLoading = useOrganizationStore((state) => state.loading);
+
+  if (loading || (user && user.role !== 'organization' && orgLoading)) {
+    return <LoadingCircle />;
+  }
 
-  if (loading) return <LoadingCircle />;
   if (!user) {
     return (
       <Typography
@@ -29,36 +32,6 @@ const ProtectedRoute = ({ element }: ProtectedRouteProps) => {
     );
   }
 
-  if (user.role !== 'organization') {
-    const orgLoading = useOrganizationStore((state) => state.loading);
-    const subscribeToProfiles = useOrganizationStore(
-      (state) => state.subscribeToProfiles
-    );
-    const error = useOrganizationStore((state) => state.error);
-
-    useEffect(() => {
-      const unsubscribe = subscribeToProfiles;
-
-      return () => unsubscribe && unsubscribe();
-    }, [subscribeToProfiles]);
-
-    if (orgLoading) return <LoadingCircle />;
-
-    if (error) {
-      toast.error(error);
-      return (
-        <Typography
-          variant='body1'
-          color='error'
-          align='center'
-          sx={{ mt: 4 }}
-        >
-          {error}
-        </Typography>
-      );
-    }
-  }
-
   return element;
 };
 

diff --git a/src/routes.tsx b/src/routes.tsx
@@ -1,4 +1,8 @@
 import { Routes, Route } from 'react-router-dom';
+import { useEffect } from 'react';
+import { toast } from 'sonner';
+
+import { useOrganizationStore, useUserStore } from './stores';
 
 import Home from '@/pages/Home';
 import Schedule from '@/pages/Schedule';
@@ -14,6 +18,27 @@ const AppRoutes = () => {
     { path: 'alerts', element: <Alerts /> },
   ];
 
+  const loading = useUserStore((state) => state.loading);
+  const user = useUserStore((state) => state.user);
+  const subscribeToProfiles = useOrganizationStore(
+    (state) => state.subscribeToProfiles
+  );
+  const error = useOrganizationStore((state) => state.error);
+
+  useEffect(() => {
+    if (!loading && (!user || user.role !== 'organization')) {
+      const unsubscribe = subscribeToProfiles;
+
+      return () => unsubscribe && unsubscribe();
+    }
+  }, [loading, user, subscribeToProfiles]);
+
+  useEffect(() => {
+    if (error) {
+      toast.error(error);
+    }
+  }, [error]);
+
   return (
     <Routes>
       <Route

diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
@@ -32,13 +32,18 @@ const useUserStore = create<UserState>()(
           async (firebaseUser) => {
             if (firebaseUser) {
               const currentUser = get().user;
-              if (currentUser) {
-                await fetchEventsByIds(currentUser.joinedEvents);
+
+              if (currentUser && currentUser.joinedEvents?.length > 0) {
+                try {
+                  await fetchEventsByIds(currentUser.joinedEvents);
+                } catch (error) {
+                  console.error('Error fetching events:', error);
+                }
               }
+              set({ user: currentUser || undefined });
             } else {
               set({ user: undefined });
-              const eventStore = useEventStore.getState();
-              eventStore.setEvents([]);
+              useEventStore.getState().setEvents([]);
             }
             set({ loading: false });
           }
@@ -69,8 +74,6 @@ const useUserStore = create<UserState>()(
         try {
           set({ loading: true });
           await logoutUser(navigate);
-          const eventStore = useEventStore.getState();
-          eventStore.setEvents([]);
 
           set({ user: undefined, error: null });
         } catch (error) {