fix: prevent new workspace modal from getting stuck in an open state

apps/web/src/providers/modal.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useState } from "react";
+import { createContext, useCallback, useContext, useState } from "react";
 
 interface ModalState {
   contentType: string;
@@ -42,57 +42,59 @@ export const ModalProvider: React.FC<Props> = ({ children }) => {
   const entityId = currentModal?.entityId || "";
   const entityLabel = currentModal?.entityLabel || "";
 
-  const openModal = (
+  const openModal = useCallback(
-    contentType: string,
+    (contentType: string, entityId?: string, entityLabel?: string) => {
-    entityId?: string,
+      const newModal: ModalState = { contentType, entityId, entityLabel };
-    entityLabel?: string,
+      setModalStack((prev) => [...prev, newModal]);
-  ) => {
+    },
-    const newModal: ModalState = { contentType, entityId, entityLabel };
+    [],
-    setModalStack((prev) => [...prev, newModal]);
+  );
-  };
 
-  const closeModal = () => {
+  const closeModal = useCallback(() => {
     setModalStack((prev) => {
       if (prev.length <= 1) {
         return [];
       }
       return prev.slice(0, -1);
     });
-  };
+  }, []);
 
-  const closeModals = (count: number) => {
+  const closeModals = useCallback((count: number) => {
-    setModalStack(prev => {
+    setModalStack((prev) => {
       const newLength = Math.max(0, prev.length - count);
       return prev.slice(0, newLength);
     });
-  };
+  }, []);
 
-  const clearAllModals = () => {
+  const clearAllModals = useCallback(() => {
     setModalStack([]);
-  };
+  }, []);
 
-  const setModalState = (modalType: string, state: any) => {
+  const setModalState = useCallback((modalType: string, state: any) => {
     setModalStates((prev) => ({
       ...prev,
       [modalType]: state,
     }));
-  };
+  }, []);
 
-  const getModalState = (modalType: string) => {
+  const getModalState = useCallback(
-    return modalStates[modalType];
+    (modalType: string) => {
-  };
+      return modalStates[modalType];
+    },
+    [modalStates],
+  );
 
-  const clearModalState = (modalType: string) => {
+  const clearModalState = useCallback((modalType: string) => {
     setModalStates((prev) => {
       const newStates = { ...prev };
       delete newStates[modalType];
       return newStates;
     });
-  };
+  }, []);
 
-  const clearAllModalStates = () => {
+  const clearAllModalStates = useCallback(() => {
     setModalStates({});
-  };
+  }, []);
 
   return (
     <ModalContext.Provider

apps/web/src/providers/workspace.tsx

@@ -47,12 +47,16 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
   const [hasLoaded, setHasLoaded] = useState(false);
 
   const { data, isLoading } = api.workspace.all.useQuery();
+  const utils = api.useUtils();
 
   const switchWorkspace = (_workspace: Workspace) => {
     localStorage.setItem("workspacePublicId", _workspace.publicId);
 
     setWorkspace(_workspace);
 
+    // Refetch workspace data to ensure availableWorkspaces is up to date
+    void utils.workspace.all.refetch();
+
     router.push(`/boards`);
   };
 
@@ -66,21 +70,15 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
       localStorage.getItem("workspacePublicId");
 
     if (data.length) {
-      const workspaces = data
+      const workspaces = data.map(({ workspace, role }) => ({
-        .map(({ workspace, role }) => {
+        role,
-          if (!workspace) return;
+        publicId: workspace.publicId,
-
+        name: workspace.name,
-          return {
+        slug: workspace.slug,
-            role,
+        description: workspace.description,
-            publicId: workspace.publicId,
+        plan: workspace.plan,
-            name: workspace.name,
+        hasLoaded: true,
-            slug: workspace.slug,
+      })) as Workspace[];
-            description: workspace.description,
-            plan: workspace.plan,
-            hasLoaded: true,
-          };
-        })
-        .filter((workspace) => workspace !== null) as Workspace[];
 
       if (workspaces.length) setAvailableWorkspaces(workspaces);
     }
@@ -116,7 +114,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
         role: primaryWorkspaceRole,
       });
     }
-  }, [data]);
+  }, [data, isLoading]);
 
   return (
     <WorkspaceContext.Provider

apps/web/src/views/boards/index.tsx

@@ -1,4 +1,5 @@
 import { t } from "@lingui/core/macro";
+import { useEffect } from "react";
 import { HiArrowDownTray, HiOutlinePlusSmall } from "react-icons/hi2";
 
 import Button from "~/components/Button";
@@ -16,7 +17,11 @@ export default function BoardsPage() {
   const { openModal, modalContentType, isOpen } = useModal();
   const { availableWorkspaces, workspace, hasLoaded } = useWorkspace();
 
-  if (hasLoaded && availableWorkspaces.length === 0) openModal("NEW_WORKSPACE");
+  useEffect(() => {
+    if (hasLoaded && availableWorkspaces.length === 0) {
+      openModal("NEW_WORKSPACE");
+    }
+  }, [hasLoaded, availableWorkspaces.length, openModal]);
 
   return (
     <>