@@ -41,9 +47,16 @@ export default function CpuTemp({ expanded, units }) {
);
}
+ let minTemp = 0;
+ let mainTemp = data.cputemp.main;
+ if (data.cputemp.cores?.length) {
+ mainTemp = data.cputemp.cores.reduce((a, b) => a + b) / data.cputemp.cores.length;
+ minTemp = Math.min(...data.cputemp.cores);
+ }
const unit = units === "imperial" ? "fahrenheit" : "celsius";
- const mainTemp = (unit === "celsius") ? data.cputemp.main : data.cputemp.main * 5/9 + 32;
- const maxTemp = (unit === "celsius") ? data.cputemp.max : data.cputemp.max * 5/9 + 32;
+ mainTemp = (unit === "celsius") ? mainTemp : convertToFahrenheit(mainTemp);
+ const maxTemp = (unit === "celsius") ? data.cputemp.max : convertToFahrenheit(data.cputemp.max);
+ const percent = Math.round(((mainTemp - minTemp) / (maxTemp - minTemp)) * 100);
return (
@@ -73,6 +86,7 @@ export default function CpuTemp({ expanded, units }) {
{t("resources.max")}
)}
+
);
diff --git a/src/components/widgets/resources/disk.jsx b/src/components/widgets/resources/disk.jsx
index dbc41b1c..ca09c095 100644
--- a/src/components/widgets/resources/disk.jsx
+++ b/src/components/widgets/resources/disk.jsx
@@ -44,7 +44,8 @@ export default function Disk({ options, expanded }) {
);
}
- const percent = Math.round((data.drive.used / data.drive.size) * 100);
+ // data.drive.used not accurate?
+ const percent = Math.round(((data.drive.size - data.drive.available) / data.drive.size) * 100);
return (
diff --git a/src/components/widgets/resources/memory.jsx b/src/components/widgets/resources/memory.jsx
index 2ee0a15e..30b7c8eb 100644
--- a/src/components/widgets/resources/memory.jsx
+++ b/src/components/widgets/resources/memory.jsx
@@ -44,7 +44,7 @@ export default function Memory({ expanded }) {
);
}
- const percent = Math.round((data.memory.used / data.memory.total) * 100);
+ const percent = Math.round((data.memory.active / data.memory.total) * 100);
return (
@@ -52,7 +52,7 @@ export default function Memory({ expanded }) {
- {t("common.bytes", { value: data.memory.free, maximumFractionDigits: 1, binary: true })}
+ {t("common.bytes", { value: data.memory.available, maximumFractionDigits: 1, binary: true })}
{t("resources.free")}
diff --git a/src/components/widgets/resources/uptime.jsx b/src/components/widgets/resources/uptime.jsx
index 2624bef1..3bf785b1 100644
--- a/src/components/widgets/resources/uptime.jsx
+++ b/src/components/widgets/resources/uptime.jsx
@@ -3,6 +3,8 @@ import { FaRegClock } from "react-icons/fa";
import { BiError } from "react-icons/bi";
import { useTranslation } from "next-i18next";
+import UsageBar from "./usage-bar";
+
export default function Uptime() {
const { t } = useTranslation();
@@ -45,6 +47,8 @@ export default function Uptime() {
else if (d > 0) uptime = `${d}${t("resources.days")} ${h}${t("resources.hours")}`;
else uptime = `${h}${t("resources.hours")} ${m}${t("resources.minutes")}`;
+ const percent = Math.round((new Date().getSeconds() / 60) * 100);
+
return (
@@ -55,6 +59,7 @@ export default function Uptime() {
{t("resources.uptime")}
+
);
diff --git a/src/pages/api/docker/stats/[...service].js b/src/pages/api/docker/stats/[...service].js
index 0ca30f00..e27cd35c 100644
--- a/src/pages/api/docker/stats/[...service].js
+++ b/src/pages/api/docker/stats/[...service].js
@@ -30,7 +30,7 @@ export default async function handler(req, res) {
});
}
- const containerNames = containers.map((container) => container.Names[0].replace(/^\//, ""));
+ const containerNames = containers.map((container) => container.Names[0]?.replace(/^\//, ""));
const containerExists = containerNames.includes(containerName);
if (containerExists) {
@@ -75,7 +75,7 @@ export default async function handler(req, res) {
}
}
- return res.status(200).send({
+ return res.status(404).send({
error: "not found",
});
} catch (e) {
diff --git a/src/pages/api/docker/status/[...service].js b/src/pages/api/docker/status/[...service].js
index 2bcc0a8a..bb03a637 100644
--- a/src/pages/api/docker/status/[...service].js
+++ b/src/pages/api/docker/status/[...service].js
@@ -30,7 +30,7 @@ export default async function handler(req, res) {
});
}
- const containerNames = containers.map((container) => container.Names[0].replace(/^\//, ""));
+ const containerNames = containers.map((container) => container.Names[0]?.replace(/^\//, ""));
const containerExists = containerNames.includes(containerName);
if (containerExists) {
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 317c0f3c..f739f05f 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -249,7 +249,8 @@ export function cleanServiceGroups(groups) {
podSelector,
wan, // opnsense widget,
enableBlocks, // emby/jellyfin
- enableNowPlaying
+ enableNowPlaying,
+ volume // diskstation widget
} = cleanedService.widget;
const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields;
@@ -281,8 +282,11 @@ export function cleanServiceGroups(groups) {
if (wan) cleanedService.widget.wan = wan;
}
if (type === "emby" || type === "jellyfin") {
- if (enableBlocks) cleanedService.widget.enableBlocks = enableBlocks === 'true';
- if (enableNowPlaying) cleanedService.widget.enableNowPlaying = enableNowPlaying === 'true';
+ if (enableBlocks) cleanedService.widget.enableBlocks = enableBlocks;
+ if (enableNowPlaying) cleanedService.widget.enableNowPlaying = enableNowPlaying;
+ }
+ if (type === "diskstation") {
+ if (volume) cleanedService.widget.volume = volume;
}
}
diff --git a/src/widgets/diskstation/component.jsx b/src/widgets/diskstation/component.jsx
index 3195a62d..afc41ae4 100644
--- a/src/widgets/diskstation/component.jsx
+++ b/src/widgets/diskstation/component.jsx
@@ -33,8 +33,7 @@ export default function Component({ service }) {
const uptime = `${ t("common.number", { value: days }) } ${ t("diskstation.days") }`;
// storage info
- // TODO: figure out how to display info for more than one volume
- const volume = storageData.data.vol_info?.[0];
+ const volume = widget.volume ? storageData.data.vol_info?.find(vol => vol.name === widget.volume) : storageData.data.vol_info?.[0];
const usedBytes = parseFloat(volume?.used_size);
const totalBytes = parseFloat(volume?.total_size);
const freeBytes = totalBytes - usedBytes;