0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1579 from denispapec/portainer-fix

Browse source 
Fixes for portainer and kubernetes and error component
This commit is contained in:
shamoon 2023-06-10 19:38:04 -07:00 • committed by GitHub
commit 2fabaa700b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/services/widget/error.jsx
View file

@ -9,10 +9,12 @@ function displayData(data) {
return (data.type === 'Buffer') ? Buffer.from(data).toString() : JSON.stringify(data, 4);
}
export default function Error({ error: err }) {
export default function Error({ error }) {
const { t } = useTranslation();
const { error } = err?.data ?? { error: err };
if (error?.data?.error) {
error = error.data.error; // eslint-disable-line no-param-reassign
}
return (
<details className="px-1 pb-1">

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 || containersData.message) {
// containersData can be itself an error object e.g. if environment fails
return <Container service={service} error={ containersData?.error ?? containersData } />;
}
const running = containersData.filter((c) => c.State === "running").length;