diff --git a/src/widgets/glances/components/container.jsx b/src/widgets/glances/components/container.jsx index 8a72a1b31..920fb71b1 100644 --- a/src/widgets/glances/components/container.jsx +++ b/src/widgets/glances/components/container.jsx @@ -1,10 +1,20 @@ -export default function Container({ children, chart = true, className = "" }) { +import { useContext } from "react"; + +import Error from "./error"; + +import { SettingsContext } from "utils/contexts/settings"; + +export default function Container({ children, widget, error = null, chart = true, className = "" }) { + const { settings } = useContext(SettingsContext); + const hideErrors = settings.hideErrors || widget?.hideErrors; + return (
{children}
{chart &&
} {!chart &&
} + {error && !hideErrors && }
); } diff --git a/src/widgets/glances/components/error.jsx b/src/widgets/glances/components/error.jsx index 1ee1ebcb3..d88a17c0e 100644 --- a/src/widgets/glances/components/error.jsx +++ b/src/widgets/glances/components/error.jsx @@ -1,17 +1,7 @@ import { useTranslation } from "next-i18next"; -import { useContext } from "react"; -import { SettingsContext } from "utils/contexts/settings"; - -export default function Error({ service, error }) { +export default function Error() { const { t } = useTranslation(); - const { settings } = useContext(SettingsContext); - if (error) { - if (settings.hideErrors || service?.widget.hide_errors) { - return null; - } - - return
{t("widget.api_error")}
; - } + return
{t("widget.api_error")}
; } diff --git a/src/widgets/glances/metrics/cpu.jsx b/src/widgets/glances/metrics/cpu.jsx index 9c5bf6e61..e993fca91 100644 --- a/src/widgets/glances/metrics/cpu.jsx +++ b/src/widgets/glances/metrics/cpu.jsx @@ -4,7 +4,6 @@ import { useTranslation } from "next-i18next"; import Container from "../components/container"; import Block from "../components/block"; -import Error from "../components/error"; import useWidgetAPI from "utils/proxy/use-widget-api"; @@ -39,11 +38,7 @@ export default function Component({ service }) { }, [data, pointsLimit]); if (error) { - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/disk.jsx b/src/widgets/glances/metrics/disk.jsx index b2764eb48..0a459e07c 100644 --- a/src/widgets/glances/metrics/disk.jsx +++ b/src/widgets/glances/metrics/disk.jsx @@ -2,7 +2,6 @@ import dynamic from "next/dynamic"; import { useState, useEffect } from "react"; import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -54,11 +53,7 @@ export default function Component({ service }) { if (error || (data && data.error)) { const finalError = error || data.error; - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/fs.jsx b/src/widgets/glances/metrics/fs.jsx index ea7de8a0a..1fae58004 100644 --- a/src/widgets/glances/metrics/fs.jsx +++ b/src/widgets/glances/metrics/fs.jsx @@ -1,6 +1,5 @@ import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -20,11 +19,7 @@ export default function Component({ service }) { }); if (error) { - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/gpu.jsx b/src/widgets/glances/metrics/gpu.jsx index 158d03fde..37b06ce3e 100644 --- a/src/widgets/glances/metrics/gpu.jsx +++ b/src/widgets/glances/metrics/gpu.jsx @@ -2,7 +2,6 @@ import dynamic from "next/dynamic"; import { useState, useEffect } from "react"; import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -44,11 +43,7 @@ export default function Component({ service }) { if (error || (data && data.error)) { const finalError = error || data.error; - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/info.jsx b/src/widgets/glances/metrics/info.jsx index ee19716ac..3a4b565f4 100644 --- a/src/widgets/glances/metrics/info.jsx +++ b/src/widgets/glances/metrics/info.jsx @@ -1,6 +1,5 @@ import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -86,19 +85,11 @@ export default function Component({ service }) { if (quicklookError || (quicklookData && quicklookData.error)) { const qlError = quicklookError || quicklookData.error; - return ( - - - - ); + return ; } if (systemError) { - return ( - - - - ); + return ; } const dataCharts = []; diff --git a/src/widgets/glances/metrics/memory.jsx b/src/widgets/glances/metrics/memory.jsx index 877821200..8cfddb668 100644 --- a/src/widgets/glances/metrics/memory.jsx +++ b/src/widgets/glances/metrics/memory.jsx @@ -2,7 +2,6 @@ import dynamic from "next/dynamic"; import { useState, useEffect } from "react"; import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -38,11 +37,7 @@ export default function Component({ service }) { }, [data, pointsLimit]); if (error) { - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/net.jsx b/src/widgets/glances/metrics/net.jsx index 1ab492207..372c4ec61 100644 --- a/src/widgets/glances/metrics/net.jsx +++ b/src/widgets/glances/metrics/net.jsx @@ -2,7 +2,6 @@ import dynamic from "next/dynamic"; import { useState, useEffect } from "react"; import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -54,11 +53,7 @@ export default function Component({ service }) { if (error || (data && data.error)) { const finalError = error || data.error; - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx index b242535ee..b997a5689 100644 --- a/src/widgets/glances/metrics/process.jsx +++ b/src/widgets/glances/metrics/process.jsx @@ -1,6 +1,5 @@ import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -31,11 +30,7 @@ export default function Component({ service }) { }); if (error) { - return ( - - - - ); + return ; } if (!data) { diff --git a/src/widgets/glances/metrics/sensor.jsx b/src/widgets/glances/metrics/sensor.jsx index 0b42e3d64..f27afbadd 100644 --- a/src/widgets/glances/metrics/sensor.jsx +++ b/src/widgets/glances/metrics/sensor.jsx @@ -2,7 +2,6 @@ import dynamic from "next/dynamic"; import { useState, useEffect } from "react"; import { useTranslation } from "next-i18next"; -import Error from "../components/error"; import Container from "../components/container"; import Block from "../components/block"; @@ -40,11 +39,7 @@ export default function Component({ service }) { if (error || (data && data.error)) { const finalError = error || data.error; - return ( - - - - ); + return ; } if (!data) {