bug fixes

ganymedelabs · Aug 4, 2024 · c26a470 · c26a470
1 parent c13b950
commit c26a470
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/.env.development b/.env.development
diff --git a/.env.production b/.env.production
diff --git a/src/pages/home/Home.jsx b/src/pages/home/Home.jsx
@@ -6,7 +6,6 @@ import * as citationEngine from "../../utils/citationEngine";
 import { addNewBib } from "../../data/store/slices/bibsSlice";
 import { useAuth } from "../../context/AuthContext";
 import { CoBibsSearchDialog } from "./HomeTools";
-import { useModal } from "../../context/ModalContext.tsx";
 import { useEnhancedDispatch } from "../../hooks/hooks.tsx";
 import { ChipSet, Fab, Icon, List, TopBar } from "../../components/ui/MaterialComponents";
 import { timeAgo } from "../../utils/utils.ts";
@@ -21,7 +20,6 @@ export default function Home() {
     const { currentUser } = useAuth();
     const navigate = useNavigate();
     const dispatch = useEnhancedDispatch();
-    const modal = useModal();
 
     useEffect(() => {
         if (tryingToJoinBib) {
@@ -36,17 +34,7 @@ export default function Home() {
     }
 
     function openCoBibsSearchDialog() {
-        if (currentUser) setCoBibsSearchDialogVisible(true);
-        else {
-            modal.open({
-                title: "Login required",
-                message: "You need to log in first to use this feature.",
-                actions: [
-                    ["Log in", () => navigate("/login"), { autoFocus: true }],
-                    ["Cancel", () => modal.close()],
-                ],
-            });
-        }
+        setCoBibsSearchDialogVisible(true);
     }
 
     const sortedBibliographies = Array.from(bibliographies).sort((a, b) => {

diff --git a/src/pages/home/HomeTools.jsx b/src/pages/home/HomeTools.jsx
@@ -6,6 +6,7 @@ import db from "../../data/db/firebase/firebase";
 import { useAuth } from "../../context/AuthContext";
 import { mergeWithCurrentBibs } from "../../data/store/slices/bibsSlice";
 import { useToast } from "../../context/ToastContext.tsx";
+import { useModal } from "../../context/ModalContext.tsx";
 
 export function CoBibsSearchDialog({ setIsVisible, tryingToJoinBib }) {
     const [searchResult, setSearchResult] = useState(null);
@@ -21,6 +22,30 @@ export function CoBibsSearchDialog({ setIsVisible, tryingToJoinBib }) {
     const dispatch = useDispatch();
     const toast = useToast();
     const navigate = useNavigate();
+    const modal = useModal();
+
+    useEffect(() => {
+        if (!currentUser) {
+            modal.open({
+                showCloseIcon: false,
+                title: "Login required",
+                message: "You need to log in first to use this feature.",
+                actions: [
+                    ["Log in", () => navigate("/login"), { autoFocus: true }],
+                    [
+                        "Cancel",
+                        () => {
+                            setIsVisible(false);
+                            modal.close();
+                        },
+                    ],
+                ],
+            });
+
+            return undefined;
+        }
+        return undefined;
+    }, []);
 
     async function searchForBib(bibId) {
         setSearchError(null);
@@ -41,7 +66,9 @@ export function CoBibsSearchDialog({ setIsVisible, tryingToJoinBib }) {
     }
 
     useEffect(() => {
-        searchForBib(tryingToJoinBib);
+        if (tryingToJoinBib) {
+            searchForBib(tryingToJoinBib);
+        }
     }, [tryingToJoinBib]);
 
     async function handleSearch(event) {