fix(dashboard): refresh too much (#1673)

SocialGouv · Sep 26, 2023 · 330b733 · 330b733
1 parent 1ba5942
commit 330b733
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/dashboard/src/app.js b/dashboard/src/app.js
@@ -33,7 +33,7 @@ import ScrollToTop from './components/ScrollToTop';
 import TopBar from './components/TopBar';
 import VersionOutdatedAlert from './components/VersionOutdatedAlert';
 import ModalConfirm from './components/ModalConfirm';
-import DataLoader, { useDataLoader } from './components/DataLoader';
+import DataLoader, { initialLoadingTextState, loadingTextState, useDataLoader } from './components/DataLoader';
 import { Bounce, cssTransition, ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import SentryRoute from './components/Sentryroute';
@@ -90,6 +90,7 @@ if (ENV === 'production') {
 const App = ({ resetRecoil }) => {
   const authToken = useRecoilValue(authTokenState);
   const user = useRecoilValue(userState);
+  const loadingText = useRecoilValue(loadingTextState);
 
   const recoilResetKey = useRecoilValue(recoilResetKeyState);
   useEffect(() => {
@@ -104,14 +105,22 @@ const App = ({ resetRecoil }) => {
     const onWindowFocus = (e) => {
       if (authToken && e.newState === 'active') {
         API.get({ path: '/check-auth' }) // will force logout if session is expired
-          .then(() => refresh()); // will refresh data if session is still valid
+          .then(() => {
+            if (loadingText !== initialLoadingTextState) {
+              // if the app is already loaded
+              // will refresh data if session is still valid
+              refresh();
+            } else {
+              console.log('initial load not done');
+            }
+          });
       }
     };
     lifecycle.addEventListener('statechange', onWindowFocus);
     return () => {
       lifecycle.removeEventListener('statechange', onWindowFocus);
     };
-  }, [authToken, refresh]);
+  }, [authToken, refresh, loadingText]);
 
   return (
     <div className="main-container">

diff --git a/dashboard/src/components/DataLoader.js b/dashboard/src/components/DataLoader.js
@@ -38,7 +38,8 @@ const isLoadingState = atom({ key: 'isLoadingState', default: false });
 const initialLoadState = atom({ key: 'isInitialLoadState', default: false });
 const fullScreenState = atom({ key: 'fullScreenState', default: true });
 export const lastLoadState = atom({ key: 'lastLoadState', default: null, effects: [cacheEffect] });
-export const loadingTextState = atom({ key: 'loadingTextState', default: 'Chargement des données' });
+export const initialLoadingTextState = 'En attente de chargement';
+export const loadingTextState = atom({ key: 'loadingTextState', default: initialLoadingTextState });
 
 export default function DataLoader() {
   const [user, setUser] = useRecoilState(userState);
@@ -377,6 +378,7 @@ export default function DataLoader() {
   function stopLoader() {
     setIsLoading(false);
     setLastLoad(serverDate.current);
+    setLoadingText('En attente de chargement');
     setProgressBuffer(null);
     setProgress(null);
     setTotal(null);