Update os icon to match existing one and hide serial if it does not e…

…xist
netbirdio · Jan 29, 2025 · 1c97224 · 1c97224
1 parent b3db19e
commit 1c97224
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/src/app/(dashboard)/peer/page.tsx b/src/app/(dashboard)/peer/page.tsx
@@ -30,8 +30,8 @@ import useFetchApi from "@utils/api";
 import dayjs from "dayjs";
 import { isEmpty, trim } from "lodash";
 import {
-  Cpu,
   Barcode,
+  Cpu,
   FlagIcon,
   Globe,
   History,
@@ -431,15 +431,17 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
           value={peer.os}
         />
 
-        <Card.ListItem
-          label={
-            <>
-              <Barcode size={16} />
-              Serial Number
-            </>
-          }
-          value={peer.serial_number}
-        />
+        {peer.serial_number && peer.serial_number !== "" && (
+          <Card.ListItem
+            label={
+              <>
+                <Barcode size={16} />
+                Serial Number
+              </>
+            }
+            value={peer.serial_number}
+          />
+        )}
 
         <Card.ListItem
           label={
@@ -477,7 +479,6 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
           }
           value={peer.ui_version?.replace("netbird-desktop-ui/", "")}
         />
-
       </Card.List>
     </Card>
   );

diff --git a/src/modules/peers/PeerOSCell.tsx b/src/modules/peers/PeerOSCell.tsx
@@ -4,7 +4,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@components/Tooltip";
-import { Barcode, Laptop } from "lucide-react";
+import { Barcode, CpuIcon } from "lucide-react";
 import Image from "next/image";
 import React, { useMemo } from "react";
 import { FaWindows } from "react-icons/fa6";
@@ -15,7 +15,11 @@ import FreeBSDLogo from "@/assets/os-icons/FreeBSD.png";
 import { getOperatingSystem } from "@/hooks/useOperatingSystem";
 import { OperatingSystem } from "@/interfaces/OperatingSystem";
 
-export function PeerOSCell({ os, serial }: { os: string, serial?: string }) {
+type Props = {
+  os: string;
+  serial?: string;
+};
+export function PeerOSCell({ os, serial }: Readonly<Props>) {
   return (
     <TooltipProvider>
       <Tooltip delayDuration={1}>
@@ -34,20 +38,17 @@ export function PeerOSCell({ os, serial }: { os: string, serial?: string }) {
             </div>
           </div>
         </TooltipTrigger>
-        <TooltipContent>
-          <ListItem
-            icon={<Laptop size={14} />}
-            label={"OS"}
-            value={os}
-          />
-          { (serial !== undefined) &&
-          <ListItem
-
-            icon={<Barcode size={14} />}
-            label={"Serial"}
-            value={serial}
-          />
-          }
+        <TooltipContent className={"!p-0"}>
+          <div>
+            <ListItem icon={<CpuIcon size={14} />} label={"OS"} value={os} />
+            {serial && serial !== "" && (
+              <ListItem
+                icon={<Barcode size={14} />}
+                label={"Serial Number"}
+                value={serial}
+              />
+            )}
+          </div>
         </TooltipContent>
       </Tooltip>
     </TooltipProvider>
@@ -78,7 +79,6 @@ const ListItem = ({
   );
 };
 
-
 export function OSLogo({ os }: { os: string }) {
   const icon = useMemo(() => {
     return getOperatingSystem(os);