fix(core): fix infinite retry when workspace not found

toeverything · Nov 5, 2024 · e8676c1 · e8676c1
1 parent 902635e
commit e8676c1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/packages/frontend/core/src/desktop/pages/workspace/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/index.tsx
@@ -10,7 +10,7 @@ import {
   WorkspacesService,
 } from '@toeverything/infra';
 import type { ReactElement } from 'react';
-import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { matchPath, useLocation, useParams } from 'react-router-dom';
 
 import { AffineErrorBoundary } from '../../../components/affine/affine-error-boundary';
@@ -84,13 +84,16 @@ export const Component = (): ReactElement => {
     }
   }, [listLoading, meta, workspacesService]);
 
-  // if workspace is not found, we should revalidate in interval
+  // if workspace is not found, we should retry
+  const retryTimesRef = useRef(3);
   useEffect(() => {
     if (listLoading === false && meta === undefined) {
-      const timer = setInterval(
-        () => workspacesService.list.revalidate(),
-        5000
-      );
+      const timer = setInterval(() => {
+        if (retryTimesRef.current > 0) {
+          workspacesService.list.revalidate();
+          retryTimesRef.current--;
+        }
+      }, 5000);
       return () => clearInterval(timer);
     }
     return;

diff --git a/packages/frontend/core/src/mobile/pages/workspace/index.tsx b/packages/frontend/core/src/mobile/pages/workspace/index.tsx
@@ -13,6 +13,7 @@ import {
   Suspense,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from 'react';
 import {
@@ -113,13 +114,16 @@ export const Component = () => {
     }
   }, [listLoading, meta, workspacesService]);
 
-  // if workspace is not found, we should revalidate in interval
+  // if workspace is not found, we should retry
+  const retryTimesRef = useRef(3);
   useEffect(() => {
     if (listLoading === false && meta === undefined) {
-      const timer = setInterval(
-        () => workspacesService.list.revalidate(),
-        5000
-      );
+      const timer = setInterval(() => {
+        if (retryTimesRef.current > 0) {
+          workspacesService.list.revalidate();
+          retryTimesRef.current--;
+        }
+      }, 5000);
       return () => clearInterval(timer);
     }
     return;