hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nodes page error, more cleanup is probably required for "undefined" hops away

Browse Source
This commit is contained in:
Hunter275
2025-03-03 20:33:14 -05:00
committed by Dan Ditomaso
parent 04ecdd55fe
commit 9ad6c049f2
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/Nodes.tsx
+14 -15
View File
@@ -1,7 +1,7 @@
import { LocationResponseDialog } from "../components/Dialog/LocationResponseDialog.tsx"; import { LocationResponseDialog } from "@components/Dialog/LocationResponseDialog.tsx";
import { NodeOptionsDialog } from "../components/Dialog/NodeOptionsDialog.tsx"; import { NodeOptionsDialog } from "@components/Dialog/NodeOptionsDialog.tsx";
import { TracerouteResponseDialog } from "../components/Dialog/TracerouteResponseDialog.tsx"; import { TracerouteResponseDialog } from "@components/Dialog/TracerouteResponseDialog.tsx";
import Footer from "../components/UI/Footer.tsx"; import Footer from "@components/UI/Footer.tsx";
import { Sidebar } from "@components/Sidebar.tsx"; import { Sidebar } from "@components/Sidebar.tsx";
import { Avatar } from "@components/UI/Avatar.tsx"; import { Avatar } from "@components/UI/Avatar.tsx";
import { Mono } from "@components/generic/Mono.tsx"; import { Mono } from "@components/generic/Mono.tsx";
@@ -107,8 +107,7 @@ const NodesPage = () => {
> >
{node.user?.shortName ?? {node.user?.shortName ??
(node.user?.macaddr (node.user?.macaddr
? `${ ? `${base16
base16
.stringify(node.user?.macaddr.subarray(4, 6) ?? []) .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
.toLowerCase() .toLowerCase()
}` }`
@@ -122,8 +121,7 @@ const NodesPage = () => {
> >
{node.user?.longName ?? {node.user?.longName ??
(node.user?.macaddr (node.user?.macaddr
? `Meshtastic ${ ? `Meshtastic ${base16
base16
.stringify(node.user?.macaddr.subarray(4, 6) ?? []) .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
.toLowerCase() .toLowerCase()
}` }`
@@ -150,16 +148,17 @@ const NodesPage = () => {
{(node.snr + 10) * 5}raw {(node.snr + 10) * 5}raw
</Mono>, </Mono>,
<Mono key="pki"> <Mono key="pki">
{node.user?.publicKey && node.user?.publicKey.length > 0 {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
? <LockIcon className="text-green-600" /> <LockIcon className="text-green-600 mx-auto" />
: <LockOpenIcon className="text-yellow-300 mx-auto" />} ) : (
<LockOpenIcon className="text-yellow-300 mx-auto" />
)}
</Mono>, </Mono>,
<Mono key="hops"> <Mono key="hops">
{node.lastHeard !== 0 {node?.lastHeard !== 0
? node.viaMqtt === false && node.hopsAway === 0 ? node?.viaMqtt === false && node?.hopsAway === 0
? "Direct" ? "Direct"
: `${node.hopsAway.toString()} ${ : `${node?.hopsAway?.toString()} ${node?.hopsAway > 1 ? "hops" : "hop"
node.hopsAway > 1 ? "hops" : "hop"
} away` } away`
: "-"} : "-"}
{node.viaMqtt === true ? ", via MQTT" : ""} {node.viaMqtt === true ? ", via MQTT" : ""}