Merge pull request #526 from bkimmel/bkimmel/reorder-nodes-columns

reorder columns in Nodes page

src/pages/Nodes.tsx

@@ -19,12 +19,17 @@ export interface DeleteNoteDialogProps {
   onOpenChange: (open: boolean) => void;
 }
 
-function shortNameFromNode(node: ReturnType<useDevice>["nodes"][number]): string {
+function shortNameFromNode(
-  const shortNameOfNode = node.user?.shortName ?? (node.user?.macaddr
+  node: ReturnType<useDevice>["nodes"][number],
-    ? `${base16
+): string {
-        .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+  const shortNameOfNode = node.user?.shortName ??
-        .toLowerCase()}`
+    (node.user?.macaddr
-    : `${numberToHexUnpadded(node.num).slice(-4)}`);
+      ? `${
+        base16
+          .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+          .toLowerCase()
+      }`
+      : `${numberToHexUnpadded(node.num).slice(-4)}`);
   return String(shortNameOfNode);
 }
 
@@ -70,7 +75,6 @@ const NodesPage = (): JSX.Element => {
     };
   }, [connection]);
 
-
   const handleLocation = useCallback(
     (location: Types.PacketMetadata<Protobuf.Mesh.Position>) => {
       if (location.to.valueOf() !== hardware.myNodeNum) return;
@@ -97,12 +101,12 @@ const NodesPage = (): JSX.Element => {
             headings={[
               { title: "", type: "blank", sortable: false },
               { title: "Long Name", type: "normal", sortable: true },
-              { title: "Model", type: "normal", sortable: true },
+              { title: "Connection", type: "normal", sortable: true },
-              { title: "MAC Address", type: "normal", sortable: true },
               { title: "Last Heard", type: "normal", sortable: true },
-              { title: "SNR", type: "normal", sortable: true },
               { title: "Encryption", type: "normal", sortable: false },
-              { title: "Connection", type: "normal", sortable: true },
+              { title: "SNR", type: "normal", sortable: true },
+              { title: "Model", type: "normal", sortable: true },
+              { title: "MAC Address", type: "normal", sortable: true },
             ]}
             rows={filteredNodes.map((node) => [
               <div key={node.num}>
@@ -111,55 +115,55 @@ const NodesPage = (): JSX.Element => {
               <h1
                 key="longName"
                 onMouseDown={() => setSelectedNode(node)}
-                onKeyUp={(evt)=>{ evt.key === "Enter" && setSelectedNode(node) }}
+                onKeyUp={(evt) => {
+                  evt.key === "Enter" && setSelectedNode(node);
+                }}
                 className="cursor-pointer underline"
                 tabIndex={0}
                 role="button"
               >
                 {node.user?.longName ??
                   (node.user?.macaddr
-                    ? `Meshtastic ${base16
+                    ? `Meshtastic ${
-                      .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+                      base16
-                      .toLowerCase()}`
+                        .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+                        .toLowerCase()
+                    }`
                     : `!${numberToHexUnpadded(node.num)}`)}
               </h1>,
-
+              <Mono key="hops">
-              <Mono key="model">
+                {node.lastHeard !== 0
-                {Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0]}
+                  ? node.viaMqtt === false && node.hopsAway === 0
-              </Mono>,
+                    ? "Direct"
-              <Mono key="addr">
+                    : `${node.hopsAway?.toString()} ${
-                {base16
+                      node.hopsAway > 1 ? "hops" : "hop"
-                  .stringify(node.user?.macaddr ?? [])
+                    } away`
-                  .match(/.{1,2}/g)
+                  : "-"}
-                  ?.join(":") ?? "UNK"}
+                {node.viaMqtt === true ? ", via MQTT" : ""}
               </Mono>,
               <Mono key="lastHeard">
-                {node.lastHeard === 0 ? (
+                {node.lastHeard === 0
-                  <p>Never</p>
+                  ? <p>Never</p>
-                ) : (
+                  : <TimeAgo timestamp={node.lastHeard * 1000} />}
-                  <TimeAgo timestamp={node.lastHeard * 1000} />
+              </Mono>,
-                )}
+              <Mono key="pki">
+                {node.user?.publicKey && node.user?.publicKey.length > 0
+                  ? <LockIcon className="text-green-600 mx-auto" />
+                  : <LockOpenIcon className="text-yellow-300 mx-auto" />}
               </Mono>,
               <Mono key="snr">
                 {node.snr}db/
                 {Math.min(Math.max((node.snr + 10) * 5, 0), 100)}%/
                 {(node.snr + 10) * 5}raw
               </Mono>,
-              <Mono key="pki">
+              <Mono key="model">
-                {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
+                {Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0]}
-                  <LockIcon className="text-green-600 mx-auto" />
-                ) : (
-                  <LockOpenIcon className="text-yellow-300 mx-auto" />
-                )}
               </Mono>,
-              <Mono key="hops">
+              <Mono key="addr">
-                {node.lastHeard !== 0
+                {base16
-                  ? node.viaMqtt === false && node.hopsAway === 0
+                  .stringify(node.user?.macaddr ?? [])
-                    ? "Direct"
+                  .match(/.{1,2}/g)
-                    : `${node.hopsAway?.toString()} ${node.hopsAway > 1 ? "hops" : "hop"
+                  ?.join(":") ?? "UNK"}
-                    } away`
-                  : "-"}
-                {node.viaMqtt === true ? ", via MQTT" : ""}
               </Mono>,
             ])}
           />