commit 9b5ee0a50a1cdcc261cfbf31a30e2ff44dc47583
author 青湛 <0x1304570@gmail.com> Wed Jun 21 14:05:02 2023 +0800
committer GitHub <noreply@github.com> Wed Jun 21 14:05:02 2023 +0800
tree 9ed3eb86f2fb3fa6da29f9cc7791284dba846772
parent 958d62fb0dbac0e6e4dfb965de69419200ffc30e

fix(config-ui): remove redirect offline when api throw a error (#5547)

config-ui/src/layouts/base/base.tsx

diff --git a/config-ui/src/layouts/base/base.tsx b/config-ui/src/layouts/base/base.tsx
index 5ee3cfa..9cfdc10 100644
--- a/config-ui/src/layouts/base/base.tsx
+++ b/config-ui/src/layouts/base/base.tsx
@@ -17,12 +17,11 @@
  */
 
 import React from 'react';
-import { useLocation } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { Menu, MenuItem, Tag, Navbar, Intent, Alignment, Button } from '@blueprintjs/core';
 
 import { PageLoading, Logo, ExternalLink } from '@/components';
 import { useRefreshData } from '@/hooks';
-import { history } from '@/utils/history';
 
 import DashboardIcon from '@/images/icons/dashborad.svg';
 import FileIcon from '@/images/icons/file.svg';
@@ -39,10 +38,11 @@
 }
 
 export const BaseLayout = ({ children }: Props) => {
-  const menu = useMenu();
+  const history = useHistory();
   const { pathname } = useLocation();
 
-  const { ready, data } = useRefreshData<{ version: string }>(() => API.getVersion(), []);
+  const menu = useMenu();
+  const { ready, data, error } = useRefreshData<{ version: string }>(() => API.getVersion(), []);
 
   const token = window.localStorage.getItem('accessToken');
 
@@ -66,6 +66,10 @@
     return import.meta.env.DEV ? `${protocol}//${hostname}:3002${suffix}` : `/grafana${suffix}`;
   };
 
+  if (error) {
+    history.push('/offline');
+  }
+
   if (!ready || !data) {
     return <PageLoading />;
   }

config-ui/src/utils/request.ts

diff --git a/config-ui/src/utils/request.ts b/config-ui/src/utils/request.ts
index 3882364..14afa85 100644
--- a/config-ui/src/utils/request.ts
+++ b/config-ui/src/utils/request.ts
@@ -43,10 +43,6 @@
       history.push('/db-migrate');
     }
 
-    if (status === 500) {
-      history.push('/offline');
-    }
-
     return Promise.reject(error);
   },
 );