diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index fb6757b6f..67502a7a7 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -378,6 +378,7 @@ export function cleanServiceGroups(groups) {
// customapi
mappings,
+ display,
// diskstation
volume,
@@ -441,6 +442,9 @@ export function cleanServiceGroups(groups) {
// sonarr, radarr
enableQueue,
+ // truenas
+ enablePools,
+
// unifi
site,
} = cleanedService.widget;
@@ -510,6 +514,9 @@ export function cleanServiceGroups(groups) {
if (["sonarr", "radarr"].includes(type)) {
if (enableQueue !== undefined) cleanedService.widget.enableQueue = JSON.parse(enableQueue);
}
+ if (type === "truenas") {
+ if (enablePools !== undefined) cleanedService.widget.enablePools = JSON.parse(enablePools);
+ }
if (["diskstation", "qnap"].includes(type)) {
if (volume) cleanedService.widget.volume = volume;
}
@@ -539,6 +546,7 @@ export function cleanServiceGroups(groups) {
}
if (type === "customapi") {
if (mappings) cleanedService.widget.mappings = mappings;
+ if (display) cleanedService.widget.display = display;
if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval;
}
if (type === "calendar") {
diff --git a/src/utils/proxy/handlers/credentialed.js b/src/utils/proxy/handlers/credentialed.js
index 0795efd52..02338b828 100644
--- a/src/utils/proxy/handlers/credentialed.js
+++ b/src/utils/proxy/handlers/credentialed.js
@@ -29,11 +29,15 @@ export default async function credentialedProxyHandler(req, res, map) {
} else if (widget.type === "gotify") {
headers["X-gotify-Key"] = `${widget.key}`;
} else if (
- ["authentik", "cloudflared", "ghostfolio", "mealie", "tailscale", "truenas", "pterodactyl"].includes(
- widget.type,
- )
+ ["authentik", "cloudflared", "ghostfolio", "mealie", "tailscale", "pterodactyl"].includes(widget.type)
) {
headers.Authorization = `Bearer ${widget.key}`;
+ } else if (widget.type === "truenas") {
+ if (widget.key) {
+ headers.Authorization = `Bearer ${widget.key}`;
+ } else {
+ headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
+ }
} else if (widget.type === "proxmox") {
headers.Authorization = `PVEAPIToken=${widget.username}=${widget.password}`;
} else if (widget.type === "proxmoxbackupserver") {
@@ -61,6 +65,8 @@ export default async function credentialedProxyHandler(req, res, map) {
headers.Authorization = `Basic ${Buffer.from(`$:${widget.key}`).toString("base64")}`;
} else if (widget.type === "glances") {
headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
+ } else if (widget.type === "plantit") {
+ headers.Key = `${widget.key}`;
} else {
headers["X-API-Key"] = `${widget.key}`;
}
diff --git a/src/utils/proxy/handlers/generic.js b/src/utils/proxy/handlers/generic.js
index 8b91049fd..e4717469a 100644
--- a/src/utils/proxy/handlers/generic.js
+++ b/src/utils/proxy/handlers/generic.js
@@ -35,6 +35,12 @@ export default async function genericProxyHandler(req, res, map) {
};
if (req.body) {
params.body = req.body;
+ } else if (widget.requestBody) {
+ if (typeof widget.requestBody === "object") {
+ params.body = JSON.stringify(widget.requestBody);
+ } else {
+ params.body = widget.requestBody;
+ }
}
const [status, contentType, data] = await httpProxy(url, params);
diff --git a/src/widgets/components.js b/src/widgets/components.js
index bb9b00fe3..784f05b20 100644
--- a/src/widgets/components.js
+++ b/src/widgets/components.js
@@ -78,6 +78,7 @@ const components = {
proxmoxbackupserver: dynamic(() => import("./proxmoxbackupserver/component")),
pialert: dynamic(() => import("./pialert/component")),
pihole: dynamic(() => import("./pihole/component")),
+ plantit: dynamic(() => import("./plantit/component")),
plex: dynamic(() => import("./plex/component")),
portainer: dynamic(() => import("./portainer/component")),
prometheus: dynamic(() => import("./prometheus/component")),
diff --git a/src/widgets/customapi/component.jsx b/src/widgets/customapi/component.jsx
index 7e6ad4d73..726dcb602 100644
--- a/src/widgets/customapi/component.jsx
+++ b/src/widgets/customapi/component.jsx
@@ -90,6 +90,12 @@ function formatValue(t, mapping, rawValue) {
// nothing
}
+ // Apply fixed prefix.
+ const prefix = mapping?.prefix;
+ if (prefix) {
+ value = `${prefix} ${value}`;
+ }
+
// Apply fixed suffix.
const suffix = mapping?.suffix;
if (suffix) {
@@ -99,12 +105,35 @@ function formatValue(t, mapping, rawValue) {
return value;
}
+function getColor(mapping, customData) {
+ const value = getValue(mapping.additionalField.field, customData);
+ const { color } = mapping.additionalField;
+
+ switch (color) {
+ case "adaptive":
+ try {
+ const number = parseFloat(value);
+ return number > 0 ? "text-emerald-300" : "text-rose-300";
+ } catch (e) {
+ return "";
+ }
+ case "black":
+ return `text-black`;
+ case "white":
+ return `text-white`;
+ case "theme":
+ return `text-theme-500`;
+ default:
+ return "";
+ }
+}
+
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
- const { mappings = [], refreshInterval = 10000 } = widget;
+ const { mappings = [], refreshInterval = 10000, display = "block" } = widget;
const { data: customData, error: customError } = useWidgetAPI(widget, null, {
refreshInterval: Math.max(1000, refreshInterval),
});
@@ -114,24 +143,73 @@ export default function Component({ service }) {
}
if (!customData) {
- return (
-
- {mappings.slice(0, 4).map((item) => (
-
- ))}
-
- );
+ switch (display) {
+ case "list":
+ return (
+
+
+ {mappings.map((mapping) => (
+
+ ))}
+
+ );
+
+ default:
+ return (
+
+ {mappings.slice(0, 4).map((item) => (
+
+ ))}
+
+ );
+ }
}
- return (
-
- {mappings.slice(0, 4).map((mapping) => (
-
- ))}
-
- );
+ switch (display) {
+ case "list":
+ return (
+
+
+ {mappings.map((mapping) => (
+
+
{mapping.label}
+
+
{formatValue(t, mapping, getValue(mapping.field, customData))}
+ {mapping.additionalField && (
+
+ {formatValue(t, mapping.additionalField, getValue(mapping.additionalField.field, customData))}
+
+ )}
+
+
+ ))}
+
+ );
+
+ default:
+ return (
+
+ {mappings.slice(0, 4).map((mapping) => (
+
+ ))}
+
+ );
+ }
}
diff --git a/src/widgets/moonraker/widget.js b/src/widgets/moonraker/widget.js
index 314a8670e..d7673bed8 100644
--- a/src/widgets/moonraker/widget.js
+++ b/src/widgets/moonraker/widget.js
@@ -1,8 +1,8 @@
-import genericProxyHandler from "utils/proxy/handlers/generic";
+import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "{url}/printer/objects/query?{endpoint}",
- proxyHandler: genericProxyHandler,
+ proxyHandler: credentialedProxyHandler,
mappings: {
print_stats: {
diff --git a/src/widgets/plantit/component.jsx b/src/widgets/plantit/component.jsx
new file mode 100644
index 000000000..ea203b87b
--- /dev/null
+++ b/src/widgets/plantit/component.jsx
@@ -0,0 +1,37 @@
+import { useTranslation } from "next-i18next";
+
+import Container from "components/services/widget/container";
+import Block from "components/services/widget/block";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+export default function Component({ service }) {
+ const { t } = useTranslation();
+
+ const { widget } = service;
+
+ const { data: plantitData, error: plantitError } = useWidgetAPI(widget, "plantit");
+
+ if (plantitError) {
+ return
;
+ }
+
+ if (!plantitData) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+
+
+ );
+}
diff --git a/src/widgets/plantit/widget.js b/src/widgets/plantit/widget.js
new file mode 100644
index 000000000..5a4bebc15
--- /dev/null
+++ b/src/widgets/plantit/widget.js
@@ -0,0 +1,21 @@
+import { asJson } from "utils/proxy/api-helpers";
+import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
+
+const widget = {
+ api: "{url}/api/{endpoint}",
+ proxyHandler: credentialedProxyHandler,
+
+ mappings: {
+ plantit: {
+ endpoint: "stats",
+ },
+ map: (data) => ({
+ events: Object.values(asJson(data).diaryEntryCount).reduce((acc, i) => acc + i, 0),
+ plants: Object.values(asJson(data).plantCount).reduce((acc, i) => acc + i, 0),
+ photos: Object.values(asJson(data).imageCount).reduce((acc, i) => acc + i, 0),
+ species: Object.values(asJson(data).botanicalInfoCount).reduce((acc, i) => acc + i, 0),
+ }),
+ },
+};
+
+export default widget;
diff --git a/src/widgets/truenas/component.jsx b/src/widgets/truenas/component.jsx
index c1fc5c53a..872d8c647 100644
--- a/src/widgets/truenas/component.jsx
+++ b/src/widgets/truenas/component.jsx
@@ -3,6 +3,7 @@ import { useTranslation } from "next-i18next";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
+import Pool from "widgets/truenas/pool";
export default function Component({ service }) {
const { t } = useTranslation();
@@ -11,9 +12,10 @@ export default function Component({ service }) {
const { data: alertData, error: alertError } = useWidgetAPI(widget, "alerts");
const { data: statusData, error: statusError } = useWidgetAPI(widget, "status");
+ const { data: poolsData, error: poolsError } = useWidgetAPI(widget, "pools");
- if (alertError || statusError) {
- const finalError = alertError ?? statusError;
+ if (alertError || statusError || poolsError) {
+ const finalError = alertError ?? statusError ?? poolsError;
return
;
}
@@ -27,11 +29,19 @@ export default function Component({ service }) {
);
}
+ const enablePools = widget?.enablePools && Array.isArray(poolsData) && poolsData.length > 0;
+
return (
-
-
-
-
-
+ <>
+
+
+
+
+
+ {enablePools &&
+ poolsData.map((pool) => (
+
+ ))}
+
);
}
diff --git a/src/widgets/truenas/pool.jsx b/src/widgets/truenas/pool.jsx
new file mode 100644
index 000000000..8e9d04656
--- /dev/null
+++ b/src/widgets/truenas/pool.jsx
@@ -0,0 +1,31 @@
+import classNames from "classnames";
+import prettyBytes from "pretty-bytes";
+
+export default function Pool({ name, free, allocated, healthy }) {
+ const total = free + allocated;
+ const usedPercent = Math.round((allocated / total) * 100);
+ const statusColor = healthy ? "bg-green-500" : "bg-yellow-500";
+
+ return (
+
+
+
+
+
+
+
+
+ {prettyBytes(allocated)} / {prettyBytes(total)}
+
+ ({usedPercent}%)
+
+
+ );
+}
diff --git a/src/widgets/truenas/widget.js b/src/widgets/truenas/widget.js
index 6c0f3622c..7435b6e19 100644
--- a/src/widgets/truenas/widget.js
+++ b/src/widgets/truenas/widget.js
@@ -1,32 +1,9 @@
-import { jsonArrayFilter } from "utils/proxy/api-helpers";
import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
-import genericProxyHandler from "utils/proxy/handlers/generic";
-import getServiceWidget from "utils/config/service-helpers";
+import { asJson, jsonArrayFilter } from "utils/proxy/api-helpers";
const widget = {
api: "{url}/api/v2.0/{endpoint}",
- proxyHandler: async (req, res, map) => {
- // choose proxy handler based on widget settings
- const { group, service } = req.query;
-
- if (group && service) {
- const widgetOpts = await getServiceWidget(group, service);
- let handler;
- if (widgetOpts.username && widgetOpts.password) {
- handler = genericProxyHandler;
- } else if (widgetOpts.key) {
- handler = credentialedProxyHandler;
- }
-
- if (handler) {
- return handler(req, res, map);
- }
-
- return res.status(500).json({ error: "Username / password or API key required" });
- }
-
- return res.status(500).json({ error: "Error parsing widget request" });
- },
+ proxyHandler: credentialedProxyHandler,
mappings: {
alerts: {
@@ -39,6 +16,17 @@ const widget = {
endpoint: "system/info",
validate: ["loadavg", "uptime_seconds"],
},
+ pools: {
+ endpoint: "pool",
+ map: (data) =>
+ asJson(data).map((entry) => ({
+ id: entry.name,
+ name: entry.name,
+ healthy: entry.healthy,
+ allocated: entry.allocated,
+ free: entry.free,
+ })),
+ },
},
};
diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js
index fe474406c..6f50d9ef5 100644
--- a/src/widgets/widgets.js
+++ b/src/widgets/widgets.js
@@ -71,6 +71,7 @@ import photoprism from "./photoprism/widget";
import proxmoxbackupserver from "./proxmoxbackupserver/widget";
import pialert from "./pialert/widget";
import pihole from "./pihole/widget";
+import plantit from "./plantit/widget";
import plex from "./plex/widget";
import portainer from "./portainer/widget";
import prometheus from "./prometheus/widget";
@@ -180,6 +181,7 @@ const widgets = {
proxmoxbackupserver,
pialert,
pihole,
+ plantit,
plex,
portainer,
prometheus,