Fix develop lime app minor bugs (#406)

* fix(landing): fix first boot login error * fix(landing): fix most_active_iface Fix #378 * fix(landing): fix voucher list page * fix(landing): delete console.log
libremesh · Mar 12, 2024 · 3f76176 · 3f76176
1 parent 48f415b
commit 3f76176
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/plugins/lime-plugin-pirania/src/screens/voucherList.js b/plugins/lime-plugin-pirania/src/screens/voucherList.js
@@ -20,27 +20,31 @@ const VoucherList = () => {
 
     if (loadingBoardData || loadingVouchers) return <Loading />;
 
-    const filteredVoucher = vouchers
-        .sort((a, b) => {
-            return parseInt(a.creation_date, 10) < parseInt(b.creation_date, 10)
-                ? 1
-                : -1;
-        })
-        .filter((voucher) => {
-            if (filterSelection === "all-vouchers") return true;
-            if (filterSelection === "created-in-this-node") {
-                return voucher.author_node === boardData.hostname;
-            }
-            return voucher.status === filterSelection;
-        })
-        .filter((voucher) => {
-            if (!search || search === "") return true;
-            const withName = voucher.name.includes(search);
-            const withNode = voucher.author_node?.includes(search);
-            const withId = voucher.id.includes(search);
-            const withCode = voucher.code.includes(search);
-            if (withName || withNode || withId || withCode) return true;
-        });
+    let filteredVoucher = [];
+    if (vouchers) {
+        filteredVoucher = vouchers
+            .sort((a, b) => {
+                return parseInt(a.creation_date, 10) <
+                    parseInt(b.creation_date, 10)
+                    ? 1
+                    : -1;
+            })
+            .filter((voucher) => {
+                if (filterSelection === "all-vouchers") return true;
+                if (filterSelection === "created-in-this-node") {
+                    return voucher.author_node === boardData.hostname;
+                }
+                return voucher.status === filterSelection;
+            })
+            .filter((voucher) => {
+                if (!search || search === "") return true;
+                const withName = voucher.name.includes(search);
+                const withNode = voucher.author_node?.includes(search);
+                const withId = voucher.id.includes(search);
+                const withCode = voucher.code.includes(search);
+                if (withName || withNode || withId || withCode) return true;
+            });
+    }
 
     return (
         <div className="d-flex flex-column flex-grow-1">

diff --git a/plugins/lime-plugin-rx/src/rxPage.js b/plugins/lime-plugin-rx/src/rxPage.js
@@ -65,13 +65,14 @@ const SystemBox = ({ uptime, firmwareVersion, boardModel }) => {
 };
 
 const MostActiveBox = ({ node, changeNode }) => {
+    const use_most_active = !!node.most_active?.iface;
     const { data: bathost } = useBatHost(
-        node.most_active && node.most_active.station_mac,
-        node.most_active && node.most_active.iface,
+        node.most_active?.station_mac,
+        node.most_active?.iface,
         { enabled: !!node.most_active }
     );
 
-    if (node.most_active === undefined) {
+    if (!use_most_active) {
         return <span />;
     }
 

diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -75,7 +75,7 @@ const App = () => {
     const { data: session } = useSession();
     const { mutate: login } = useLogin();
     const { data: boardData } = useBoardData({
-        enabled: session && session.username !== undefined,
+        enabled: session?.username != null,
     });
 
     useEffect(() => {