fix(frontend): added conditional fetch in useSWR to prevent request w…

…hen user is null
Agenta-AI · Sep 24, 2024 · 4b85af6 · 4b85af6
1 parent 467ccab
commit 4b85af6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/agenta-web/src/contexts/app.context.tsx b/agenta-web/src/contexts/app.context.tsx
@@ -7,6 +7,7 @@ import useSWR from "swr"
 import {dynamicContext} from "@/lib/helpers/dynamic"
 import {HookAPI} from "antd/es/modal/useModal"
 import {useLocalStorage} from "usehooks-ts"
+import {useProfileData} from "./profile.context"
 
 type AppContextType = {
     currentApp: ListAppsItem | null
@@ -31,6 +32,7 @@ const initialValues: AppContextType = {
 
 const useApps = () => {
     const [useOrgData, setUseOrgData] = useState<Function>(() => () => "")
+    const {user} = useProfileData()
 
     useEffect(() => {
         dynamicContext("org.context", {useOrgData}).then((context) => {
@@ -40,11 +42,13 @@ const useApps = () => {
 
     const {selectedOrg, loading} = useOrgData()
     const {data, error, isLoading, mutate} = useSWR(
-        `${getAgentaApiUrl()}/api/apps/` +
-            (isDemo()
-                ? `?org_id=${selectedOrg?.id}&workspace_id=${selectedOrg?.default_workspace.id}`
-                : ""),
-        isDemo() ? (selectedOrg?.id ? axiosFetcher : () => {}) : axiosFetcher,
+        !!user
+            ? `${getAgentaApiUrl()}/api/apps/` +
+                  (isDemo()
+                      ? `?org_id=${selectedOrg?.id}&workspace_id=${selectedOrg?.default_workspace.id}`
+                      : "")
+            : null,
+        !!user ? (isDemo() ? (selectedOrg?.id ? axiosFetcher : () => {}) : axiosFetcher) : null,
         {
             shouldRetryOnError: false,
         },

diff --git a/agenta-web/src/hooks/useSession.ts b/agenta-web/src/hooks/useSession.ts
@@ -20,7 +20,7 @@ export const useSession: () => {loading: boolean; doesSessionExist: boolean; log
                           .then(() => {
                               posthog.reset()
                               reset()
-                              router.push("/auth").then(() => router.reload())
+                              router.push("/auth")
                           })
                           .catch(console.error)
                   },