From a95ef9a477396bfc66aab243334bc26629567ba0 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Wed, 28 Sep 2022 15:06:56 +0800
Subject: [PATCH] fix: notification render error & remove SWR auto load on
 focus

---
 ui/src/pages/Layout/index.tsx        | 21 ++++++++++++++-------
 ui/src/pages/Notifications/index.tsx |  2 ++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ui/src/pages/Layout/index.tsx b/ui/src/pages/Layout/index.tsx
index d6e0238c..796c6eb6 100644
--- a/ui/src/pages/Layout/index.tsx
+++ b/ui/src/pages/Layout/index.tsx
@@ -3,6 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { Outlet } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 
+import { SWRConfig } from 'swr';
+
 import {
   userInfoStore,
   siteInfoStore,
@@ -51,13 +53,18 @@ const Layout: FC = () => {
           <meta name="description" content={siteInfo.description} />
         ) : null}
       </Helmet>
-      <Header />
-      <AdminHeader />
-      <div className="position-relative page-wrap">
-        <Outlet />
-      </div>
-      <Toast msg={toastMsg} variant={variant} onClose={closeToast} />
-      <Footer />
+      <SWRConfig
+        value={{
+          revalidateOnFocus: false,
+        }}>
+        <Header />
+        <AdminHeader />
+        <div className="position-relative page-wrap">
+          <Outlet />
+        </div>
+        <Toast msg={toastMsg} variant={variant} onClose={closeToast} />
+        <Footer />
+      </SWRConfig>
     </>
   );
 };
diff --git a/ui/src/pages/Notifications/index.tsx b/ui/src/pages/Notifications/index.tsx
index 7ae123df..7dd9f404 100644
--- a/ui/src/pages/Notifications/index.tsx
+++ b/ui/src/pages/Notifications/index.tsx
@@ -46,6 +46,8 @@ const Notifications = () => {
 
   const handleTypeChange = (evt, val) => {
     evt.preventDefault();
+    setPage(1);
+    setNotificationData([]);
     navigate(`/users/notifications/${val}`);
   };