fix: prevent new workspace modal from being closed without an active workspace (#224)

apps/web/src/components/Dashboard.tsx

@@ -1,4 +1,5 @@
-import { useRef, useState } from "react";
+import { useTheme } from "next-themes";
+import { useEffect, useRef, useState } from "react";
 import {
   TbLayoutSidebarLeftCollapse,
   TbLayoutSidebarLeftExpand,
@@ -10,10 +11,7 @@ import { authClient } from "@kan/auth/client";
 
 import { useClickOutside } from "~/hooks/useClickOutside";
 import { useModal } from "~/providers/modal";
-import { useTheme } from "next-themes";
-import { WorkspaceProvider } from "~/providers/workspace";
-import FeedbackModal from "./FeedbackModal";
-import Modal from "./modal";
+import { useWorkspace, WorkspaceProvider } from "~/providers/workspace";
 import SideNavigation from "./SideNavigation";
 
 interface DashboardProps {
@@ -42,7 +40,8 @@ export default function Dashboard({
   hasRightPanel = false,
 }: DashboardProps) {
   const { theme } = useTheme();
-  const { modalContentType } = useModal();
+  const { openModal } = useModal();
+  const { availableWorkspaces, hasLoaded } = useWorkspace();
 
   const { data: session, isPending: sessionLoading } = authClient.useSession();
 
@@ -90,6 +89,12 @@ export default function Dashboard({
     }
   });
 
+  useEffect(() => {
+    if (hasLoaded && availableWorkspaces.length === 0) {
+      openModal("NEW_WORKSPACE", undefined, undefined, false);
+    }
+  }, [hasLoaded, availableWorkspaces.length, openModal]);
+
   const isDarkMode = theme === "dark";
 
   return (

apps/web/src/components/modal.tsx

@@ -8,6 +8,7 @@ interface Props {
   modalSize?: "sm" | "md" | "lg";
   positionFromTop?: "sm" | "md" | "lg";
   isVisible?: boolean;
+  closeOnClickOutside?: boolean;
 }
 
 const Modal: React.FC<Props> = ({
@@ -15,10 +16,17 @@ const Modal: React.FC<Props> = ({
   modalSize = "sm",
   positionFromTop = "md",
   isVisible,
+  closeOnClickOutside,
 }) => {
-  const { isOpen, closeModal } = useModal();
+  const {
+    isOpen,
+    closeModal,
+    closeOnClickOutside: modalCloseOnClickOutside,
+  } = useModal();
 
-  const shouldShow = isVisible !== undefined ? isVisible : isOpen;
+  const shouldShow = isVisible ?? isOpen;
+  const shouldCloseOnClickOutside =
+    closeOnClickOutside ?? modalCloseOnClickOutside;
 
   const modalSizeMap = {
     sm: "max-w-[400px]",
@@ -34,7 +42,11 @@ const Modal: React.FC<Props> = ({
 
   return (
     <Transition.Root show={shouldShow} as={Fragment}>
-      <Dialog as="div" className="relative z-50" onClose={closeModal}>
+      <Dialog
+        as="div"
+        className="relative z-50"
+        onClose={shouldCloseOnClickOutside ? closeModal : () => null}
+      >
         <Transition.Child
           as={Fragment}
           enter="ease-out duration-300"