From 5ba95c4b1ac44299b3c4004056265a21dec0af42 Mon Sep 17 00:00:00 2001 From: headlessdev Date: Mon, 28 Apr 2025 21:50:21 +0200 Subject: [PATCH] Add function if a server has no temp or gpu --- app/dashboard/servers/Servers.tsx | 46 ++++++++++++++------ app/dashboard/servers/[server_id]/Server.tsx | 43 +++++++++++------- 2 files changed, 60 insertions(+), 29 deletions(-) diff --git a/app/dashboard/servers/Servers.tsx b/app/dashboard/servers/Servers.tsx index cd33bbc..d02bba1 100644 --- a/app/dashboard/servers/Servers.tsx +++ b/app/dashboard/servers/Servers.tsx @@ -118,6 +118,8 @@ interface MonitoringData { ramUsage: number diskUsage: number uptime: number + gpuUsage?: number + temp?: number } export default function Dashboard() { @@ -239,7 +241,6 @@ export default function Dashboard() { console.log("ID:" + server.id) } setServers(response.data.servers) - console.log(response.data.servers) setMaxPage(response.data.maxPage) setTotalItems(response.data.totalItems) setLoading(false) @@ -437,7 +438,9 @@ export default function Dashboard() { online: serverMonitoring.online, cpuUsage: serverMonitoring.cpuUsage, ramUsage: serverMonitoring.ramUsage, - diskUsage: serverMonitoring.diskUsage + diskUsage: serverMonitoring.diskUsage, + gpuUsage: serverMonitoring.gpuUsage ? Number(serverMonitoring.gpuUsage) : 0, + temp: serverMonitoring.temp ? Number(serverMonitoring.temp) : 0 }; } return server; @@ -1169,13 +1172,21 @@ export default function Dashboard() {
-
-
- - GPU -
- {server.gpuUsage !== null && server.gpuUsage !== undefined && server.gpuUsage !== 0 ? `${server.gpuUsage}%` : "NO DATA"} +
+
+ + GPU
+ + {server.online && + server.gpuUsage && + server.gpuUsage !== null && + server.gpuUsage !== undefined && + server.gpuUsage.toString() !== "0" + ? `${server.gpuUsage}%` + : "NO DATA"} + +
80 ? "bg-destructive" : server.gpuUsage && server.gpuUsage > 60 ? "bg-amber-500" : "bg-emerald-500"}`} @@ -1186,13 +1197,20 @@ export default function Dashboard() {
-
-
- - Temp -
- {server.temp !== null && server.temp !== undefined && server.temp !== 0 ? `${server.temp}°C` : "NO DATA"} +
+
+ + Temp
+ + {server.online && + server.temp !== null && + server.temp !== undefined && + server.temp.toString() !== "0" + ? `${server.temp}°C` + : "NO DATA"} + +
80 ? "bg-destructive" : server.temp && server.temp > 60 ? "bg-amber-500" : "bg-emerald-500"}`} diff --git a/app/dashboard/servers/[server_id]/Server.tsx b/app/dashboard/servers/[server_id]/Server.tsx index 8cce38c..172b5f0 100644 --- a/app/dashboard/servers/[server_id]/Server.tsx +++ b/app/dashboard/servers/[server_id]/Server.tsx @@ -627,26 +627,35 @@ export default function ServerDetail() {
{server.diskUsage !== null && server.diskUsage !== undefined ? `${server.diskUsage}%` : "NO DATA"}
-
GPU Usage:
-
-
+ {server.gpuUsage && server.gpuUsage !== null && server.gpuUsage !== undefined && server.gpuUsage.toString() !== "0" && ( + <> +
GPU Usage:
+
+
80 ? "bg-destructive" : server.gpuUsage && server.gpuUsage > 60 ? "bg-amber-500" : "bg-emerald-500"}`} style={{ width: `${server.gpuUsage || 0}%` }} />
- {server.gpuUsage !== null && server.gpuUsage !== undefined && server.gpuUsage !== 0 ? `${server.gpuUsage}%` : "NO DATA"} -
-
Temperature:
-
-
+ + {server.gpuUsage && server.gpuUsage !== null && server.gpuUsage !== undefined ? `${server.gpuUsage}%` : "NO DATA"} +
+ + )} + {server.temp && server.temp !== null && server.temp !== undefined && server.temp.toString() !== "0" && ( + <> +
Temperature:
+
+
80 ? "bg-destructive" : server.temp && server.temp > 60 ? "bg-amber-500" : "bg-emerald-500"}`} style={{ width: `${Math.min(server.temp || 0, 100)}%` }} />
{server.temp !== null && server.temp !== undefined && server.temp !== 0 ? `${server.temp}°C` : "NO DATA"} -
+
+ + )}
)} @@ -699,12 +708,16 @@ export default function ServerDetail() {
-
- -
-
- -
+ {server.history?.datasets.gpu.some(value => value !== null && value !== 0) && ( +
+ +
+ )} + {server.history?.datasets.temp.some(value => value !== null && value !== 0) && ( +
+ +
+ )}