Merge pull request #56 from iotum/jerry_hu/handle-session-expired

handle session expired
iotum · Sep 12, 2024 · c99f6b9 · c99f6b9
2 parents ea84b9a + 281699a
commit c99f6b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/LoadingWidget.jsx b/src/components/LoadingWidget.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 
-const LoadingWidget = ({ id = undefined, className = undefined, error = undefined, children = undefined }) => {
+const LoadingWidget = ({ id = undefined, className = undefined, error = undefined, isLoading = true, children = undefined }) => {
   const [time, setTime] = useState(1);
 
   useEffect(() => {
@@ -11,6 +11,10 @@ const LoadingWidget = ({ id = undefined, className = undefined, error = undefine
     return () => clearInterval(interval);
   }, [error]);
 
+  if (!isLoading && !error) {
+    return null;
+  }
+
   return (
     <div id={id} className={className}>
       {

diff --git a/src/pages/tabbed-dashboard/App.jsx b/src/pages/tabbed-dashboard/App.jsx
@@ -133,7 +133,13 @@ const App = () => {
         });
       });
 
+      widget.on('dashboard.SESSION_EXPIRED', () => {
+        console.error('Widget error:', 'Session expired');
+        setError('Session expired');
+      });
+
       widget.on('widget.ERROR', (error) => {
+        // e.g. when the user is not authorized to access the widget
         console.error('Widget error:', error);
         setError(JSON.stringify(error));
       });
@@ -245,7 +251,7 @@ const App = () => {
             </Tab>
           ))
         }
-        {!isWidgetInitialized && <LoadingWidget error={error} />}
+        <LoadingWidget error={error} isLoading={!isWidgetInitialized} />
       </div>
       {isYourAppVisible && (<div>Your app goes here</div>)}
       <TokenButton position='right' />