arriej/homepage-Mirror
1
0
Fork 0
mirror of https://github.com/gethomepage/homepage.git synced 2025-12-06 21:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for portainer and kubernetes widget error messages, and error messages for services behind the reverse proxy

Browse Source 
Signed-off-by: Denis Papec <denis.papec@gmail.com>
This commit is contained in:
Denis Papec
2023-06-07 00:53:10 +01:00
parent 774ca4b3b2
commit 91e0ec2f83
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kubernetes/component.jsx
View File

@@ -16,7 +16,7 @@ export default function Component({ service }) {
`/api/kubernetes/stats/${widget.namespace}/${widget.app}?${podSelectorString}`);
if (statsError || statusError) {
return <Container service={service} error={t("widget.api_error")} />;
return <Container service={service} error={statsError ?? statusError} />;
}
if (statusData && statusData.status !== "running") {

9
src/widgets/portainer/component.jsx
View File

@@ -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 <Container service={service} error={t("widget.api_error")} />;
if (containersData.error || !Array.isArray(containersData)) {
// containersData can be itself an error object
return <Container service={service} error={ containersData?.error ?? containersData } />;
}
const running = containersData.filter((c) => c.State === "running").length;