Merge pull request #1235 from memphisdev/memphis-function-ui

unsubscribe socket
superstreamlabs · Aug 9, 2023 · 76ecafe · 76ecafe
2 parents 39762da + f0a5d1b
commit 76ecafe
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/ui_src/src/components/partitionsFilter/index.js b/ui_src/src/components/partitionsFilter/index.js
@@ -54,10 +54,8 @@ const PartitionsFilter = ({ partitions_number }) => {
         <Popover placement="bottomLeft" content={getContent()} trigger="click" onOpenChange={handleOpenChange} open={isOpen}>
             <div className="filter-partition-btn">
                 <div className="filter-partition-container">
-                    <div>
-                        <img src={partitionIcon} alt="PartitionIcon" className="partition-icon" />
-                        {selectedPartition == -1 ? `All partitions` : `Partition ${selectedPartition}`}
-                    </div>
+                    <img src={partitionIcon} alt="PartitionIcon" className="partition-icon" />
+                    <div>{selectedPartition == -1 ? `All partitions` : `Partition ${selectedPartition}`}</div>
                     <img src={CollapseArrow} alt="CollapseArrow" />
                 </div>
             </div>

diff --git a/ui_src/src/components/partitionsFilter/style.scss b/ui_src/src/components/partitionsFilter/style.scss
@@ -5,7 +5,7 @@
 
 .partition-item {
     cursor: pointer;
-    width: 150px;
+    width: 140px;
     height: 40px;
     vertical-align: middle;
     display: flex;
@@ -33,7 +33,7 @@
     border-radius: 50px;
     color: rgb(29, 29, 29);
     background-color: rgb(255, 255, 255);
-    width: 150px;
+    width: 140px;
     height: 34px;
     border-color: rgb(255, 255, 255);
     font-size: 13px;
@@ -49,13 +49,10 @@
     .filter-partition-container {
         display: flex;
         justify-content: space-between;
-        width: 130px;
+        width: 120px;
         cursor: pointer;
         .filter-title {
             color: #737373;
         }
-        .partition-icon{
-            margin-right: 5px
-        }
     }
 }
diff --git a/ui_src/src/domain/stationOverview/index.js b/ui_src/src/domain/stationOverview/index.js
@@ -129,15 +129,24 @@ const StationOverview = () => {
             }
         };
 
-        subscribeAndListen();
+        const stopListenAndSubscribe = async (subscribe = false) => {
+            try {
+                await sub.unsubscribe();
+                subscribe && subscribeAndListen();
+            } catch (err) {
+                console.error('Error unsubscribing from station overview data:', err);
+            }
+        };
+
+        if (sub) {
+            stopListenAndSubscribe(true);
+        } else {
+            subscribeAndListen();
+        }
 
         return () => {
             if (sub) {
-                try {
-                    sub.unsubscribe();
-                } catch (err) {
-                    console.error('Error unsubscribing from station overview data:', err);
-                }
+                stopListenAndSubscribe();
             }
         };
     }, [state?.socket, stationState?.stationPartition]);

diff --git a/ui_static_files/build/asset-manifest.json b/ui_static_files/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.f11c122a.css",
-    "main.js": "/static/js/main.0e03d822.js",
+    "main.css": "/static/css/main.bb9a74d6.css",
+    "main.js": "/static/js/main.3096dbaf.js",
     "static/js/617.a5f8c4fc.chunk.js": "/static/js/617.a5f8c4fc.chunk.js",
     "static/js/2542.27de8743.chunk.js": "/static/js/2542.27de8743.chunk.js",
     "static/js/1737.e134cfd4.chunk.js": "/static/js/1737.e134cfd4.chunk.js",
@@ -297,7 +297,7 @@
     "static/media/closeNotification.svg": "/static/media/closeNotification.7551e8366682f9c6585bb1a694c4112a.svg"
   },
   "entrypoints": [
-    "static/css/main.f11c122a.css",
-    "static/js/main.0e03d822.js"
+    "static/css/main.bb9a74d6.css",
+    "static/js/main.3096dbaf.js"
   ]
 }
diff --git a/ui_static_files/build/index.html b/ui_static_files/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.0e03d822.js"></script><link href="/static/css/main.f11c122a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.3096dbaf.js"></script><link href="/static/css/main.bb9a74d6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/..._files/build/static/css/main.f11c122a.css → ..._files/build/static/css/main.bb9a74d6.css b/..._files/build/static/css/main.f11c122a.css → ..._files/build/static/css/main.bb9a74d6.css
diff --git a/...ic_files/build/static/js/main.0e03d822.js → ...ic_files/build/static/js/main.3096dbaf.js b/...ic_files/build/static/js/main.0e03d822.js → ...ic_files/build/static/js/main.3096dbaf.js
diff --git a/...ld/static/js/main.0e03d822.js.LICENSE.txt → ...ld/static/js/main.3096dbaf.js.LICENSE.txt b/...ld/static/js/main.0e03d822.js.LICENSE.txt → ...ld/static/js/main.3096dbaf.js.LICENSE.txt