0 && (
{services.map((group) => (
-
+
))}
)}
@@ -302,14 +302,16 @@ function Home({ initialSettings }) {
)}
-
- {!initialSettings?.color && }
-
- {!initialSettings?.theme && }
-
+
+
+ {!initialSettings?.color && }
+
+ {!initialSettings?.theme && }
+
-
- {!initialSettings?.hideVersion &&
}
+
+ {!initialSettings?.hideVersion && }
+
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index c63fa8f2..d4f7bc4e 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -328,16 +328,13 @@ export function cleanServiceGroups(groups) {
}));
}
-export default async function getServiceWidget(group, service) {
+export async function getServiceItem(group, service) {
const configuredServices = await servicesFromConfig();
const serviceGroup = configuredServices.find((g) => g.name === group);
if (serviceGroup) {
const serviceEntry = serviceGroup.services.find((s) => s.name === service);
- if (serviceEntry) {
- const { widget } = serviceEntry;
- return widget;
- }
+ if (serviceEntry) return serviceEntry;
}
const discoveredServices = await servicesFromDocker();
@@ -345,20 +342,24 @@ export default async function getServiceWidget(group, service) {
const dockerServiceGroup = discoveredServices.find((g) => g.name === group);
if (dockerServiceGroup) {
const dockerServiceEntry = dockerServiceGroup.services.find((s) => s.name === service);
- if (dockerServiceEntry) {
- const { widget } = dockerServiceEntry;
- return widget;
- }
+ if (dockerServiceEntry) return dockerServiceEntry;
}
const kubernetesServices = await servicesFromKubernetes();
const kubernetesServiceGroup = kubernetesServices.find((g) => g.name === group);
if (kubernetesServiceGroup) {
const kubernetesServiceEntry = kubernetesServiceGroup.services.find((s) => s.name === service);
- if (kubernetesServiceEntry) {
- const { widget } = kubernetesServiceEntry;
- return widget;
- }
+ if (kubernetesServiceEntry) return kubernetesServiceEntry;
+ }
+
+ return false;
+}
+
+export default async function getServiceWidget(group, service) {
+ const serviceItem = await getServiceItem(group, service);
+ if (serviceItem) {
+ const { widget } = serviceItem;
+ return widget;
}
return false;
diff --git a/src/widgets/kubernetes/component.jsx b/src/widgets/kubernetes/component.jsx
index c4d67553..e756e4be 100644
--- a/src/widgets/kubernetes/component.jsx
+++ b/src/widgets/kubernetes/component.jsx
@@ -16,7 +16,7 @@ export default function Component({ service }) {
`/api/kubernetes/stats/${widget.namespace}/${widget.app}?${podSelectorString}`);
if (statsError || statusError) {
- return
;
+ return
;
}
if (statusData && statusData.status !== "running") {
diff --git a/src/widgets/lidarr/component.jsx b/src/widgets/lidarr/component.jsx
index 77d831f8..68360d82 100644
--- a/src/widgets/lidarr/component.jsx
+++ b/src/widgets/lidarr/component.jsx
@@ -9,23 +9,21 @@ export default function Component({ service }) {
const { widget } = service;
- // album API endpoint can get massive, so we prevent calling if not included in fields see https://github.com/benphelps/homepage/discussions/1577
- const showAlbums = widget.fields?.includes('albums') || !widget.fields;
- const { data: albumsData, error: albumsError } = useWidgetAPI(widget, showAlbums ? "album" : "");
+ const { data: artistsData, error: artistsError } = useWidgetAPI(widget, "artist");
const { data: wantedData, error: wantedError } = useWidgetAPI(widget, "wanted/missing");
const { data: queueData, error: queueError } = useWidgetAPI(widget, "queue/status");
- if (albumsError || wantedError || queueError) {
- const finalError = albumsError ?? wantedError ?? queueError;
+ if (artistsError || wantedError || queueError) {
+ const finalError = artistsError ?? wantedError ?? queueError;
return
;
}
- if ((showAlbums && !albumsData) || !wantedData || !queueData) {
+ if (!artistsData || !wantedData || !queueData) {
return (
-
+
);
}
@@ -34,7 +32,7 @@ export default function Component({ service }) {
- {showAlbums && }
+
);
}
diff --git a/src/widgets/lidarr/widget.js b/src/widgets/lidarr/widget.js
index 6ff93254..2f036726 100644
--- a/src/widgets/lidarr/widget.js
+++ b/src/widgets/lidarr/widget.js
@@ -1,16 +1,12 @@
import genericProxyHandler from "utils/proxy/handlers/generic";
-import { jsonArrayFilter } from "utils/proxy/api-helpers";
const widget = {
api: "{url}/api/v1/{endpoint}?apikey={key}",
proxyHandler: genericProxyHandler,
mappings: {
- album: {
- endpoint: "album",
- map: (data) => ({
- have: jsonArrayFilter(data, (item) => item?.statistics?.percentOfTracks === 100).length,
- }),
+ artist: {
+ endpoint: "artist",
},
"wanted/missing": {
endpoint: "wanted/missing",
diff --git a/src/widgets/portainer/component.jsx b/src/widgets/portainer/component.jsx
index aab9eba1..53a6fd26 100644
--- a/src/widgets/portainer/component.jsx
+++ b/src/widgets/portainer/component.jsx
@@ -1,12 +1,8 @@
-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: containersData, error: containersError } = useWidgetAPI(widget, "docker/containers/json", {
@@ -27,8 +23,9 @@ export default function Component({ service }) {
);
}
- if (containersData.error) {
- return
;
+ if (containersData.error || containersData.message) {
+ // containersData can be itself an error object e.g. if environment fails
+ return
;
}
const running = containersData.filter((c) => c.State === "running").length;