Fix: Fix posting page

sevenc-nanashi · Aug 29, 2024 · 35c2886 · 35c2886
1 parent c2438ac
commit 35c2886
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/frontend/components/ChartForm.tsx b/frontend/components/ChartForm.tsx
@@ -426,8 +426,19 @@ const ChartForm: React.FC<
       onSubmit={(e) => {
         e.preventDefault();
         if (isEdit) {
-          updateChart();
-        } else {
+          if (
+            (visibility !== "private") !==
+            (chartData.visibility !== "private")
+          ) {
+            if (chartData.visibility !== "private") {
+              unpublishChart();
+            } else {
+              publishChart();
+            }
+          } else {
+            updateChart();
+          }
+        } else if (canPost) {
           submitChart();
         }
       }}
@@ -810,32 +821,21 @@ const ChartForm: React.FC<
             (visibility !== "private") !==
             (chartData.visibility !== "private") ? (
               chartData.visibility !== "private" ? (
-                <button
-                  className="p-2 w-full button-danger"
-                  onClick={unpublishChart}
-                >
+                <button className="p-2 w-full button-danger">
                   {t("unpublish")}
                 </button>
               ) : (
-                <button
-                  className="p-2 w-full button-primary"
-                  onClick={publishChart}
-                >
+                <button className="p-2 w-full button-primary">
                   {t("publish")}
                 </button>
               )
             ) : (
-              <button
-                className="p-2 w-full button-secondary"
-                onClick={updateChart}
-              >
+              <button className="p-2 w-full button-secondary">
                 {t("update")}
               </button>
             )
           ) : (
-            <button className="p-2 w-full button-primary" onClick={submitChart}>
-              {t("submit")}
-            </button>
+            <button className="p-2 w-full button-primary">{t("submit")}</button>
           )}
         </div>
       </div>

diff --git a/frontend/lib/requireLogin.tsx b/frontend/lib/requireLogin.tsx
@@ -1,5 +1,5 @@
 import { useNavigate } from "@remix-run/react";
-import { createElement } from "react";
+import { createElement, useEffect } from "react";
 import { useSession } from "./contexts.ts";
 
 const requireLogin = <T extends React.FC<never>>(component: T) => {
@@ -11,7 +11,7 @@ const requireLogin = <T extends React.FC<never>>(component: T) => {
       if (session?.loggedIn === false) {
         navigate("/login");
       }
-    }, [session]);
+    }, [session, navigate]);
     if (!session) return <div />;
     if (session.loggedIn) return createElement(component, props);
     return <div />;