fix(data): ⚡ change error revalidation time

BuildTheEarth · Oct 22, 2023 · 2a0dfe5 · 2a0dfe5
1 parent fdb66bb
commit 2a0dfe5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/components/SWRSetup.tsx b/src/components/SWRSetup.tsx
@@ -10,19 +10,23 @@ export default function SWRSetup({ content }: any) {
 		<SWRConfig
 			value={{
 				refreshInterval: 0,
-				fetcher: (resource: any, init: any) =>
-					!resource.includes('/undefined') &&
-					fetch(process.env.NEXT_PUBLIC_API_URL + resource, {
-						headers: {
-							'Access-Control-Allow-Origin': '*',
-							Authorization: 'Bearer ' + session.data?.accessToken,
-							...init?.headers,
-						},
-						...init,
-					})
-						.then((res) => res.json())
-						.then((d) => d),
+				fetcher: (resource: any, init: any) => {
+					if (!resource.includes('/undefined')) {
+						return fetch(process.env.NEXT_PUBLIC_API_URL + resource, {
+							headers: {
+								'Access-Control-Allow-Origin': '*',
+								Authorization: 'Bearer ' + session.data?.accessToken,
+								...init?.headers,
+							},
+							...init,
+						})
+							.then((res) => res.json())
+							.then((d) => d);
+					}
+				},
 				shouldRetryOnError: true,
+				errorRetryInterval: 2,
+				errorRetryCount: 2,
 				revalidateIfStale: false,
 				revalidateOnFocus: false,
 				revalidateOnReconnect: false,

diff --git a/src/hooks/useUser.ts b/src/hooks/useUser.ts
@@ -1,21 +1,15 @@
-import { useEffect, useState } from 'react';
 import useSWR, { mutate } from 'swr';
 
-import minimatch from 'minimatch';
 import { useSession } from 'next-auth/react';
 
 export const useUser = () => {
-	const { data } = useSWR('/account');
+	const { data, isLoading } = useSWR('/account');
 	const session = useSession();
-	const [loading, setLoading] = useState(true);
-	useEffect(() => {
-		if (data && session.status != 'loading') setLoading(false);
-	}, [data, session]);
 
 	const user = {
 		user: data,
 		token: session.data?.accessToken,
-		isLoading: loading,
+		isLoading: session.status === 'loading' && isLoading,
 		refresh: () => mutate('/account'),
 		hasPermission: (p: string, buildteam?: string) => {
 			return user.hasPermissions([p], buildteam);
@@ -26,7 +20,6 @@ export const useUser = () => {
 			if (permissions.filter((p: any) => (buildteam ? p.buildTeamId === buildteam : true)).find((p: any) => ps.includes(p.permission))) return true;
 			return false;
 		},
-		reload: () => mutate('/account'),
 	};
 	return user;
 };