From 5512d05f00026504d73f0230436b40788028eb4e Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 29 Oct 2023 20:14:06 -0700
Subject: [PATCH] Fix: Respect hideErrors for Calendar widget (#2259)
---
src/widgets/calendar/component.jsx | 5 ++++-
src/widgets/calendar/integrations/lidarr.jsx | 4 ++--
src/widgets/calendar/integrations/radarr.jsx | 4 ++--
src/widgets/calendar/integrations/readarr.jsx | 4 ++--
src/widgets/calendar/integrations/sonarr.jsx | 4 ++--
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/widgets/calendar/component.jsx b/src/widgets/calendar/component.jsx
index 688915e2..e99b97a7 100644
--- a/src/widgets/calendar/component.jsx
+++ b/src/widgets/calendar/component.jsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState, useContext } from "react";
import dynamic from "next/dynamic";
import { DateTime } from "luxon";
import { useTranslation } from "next-i18next";
@@ -7,6 +7,7 @@ import Monthly from "./monthly";
import Agenda from "./agenda";
import Container from "components/services/widget/container";
+import { SettingsContext } from "utils/contexts/settings";
const colorVariants = {
// https://tailwindcss.com/docs/content-configuration#dynamic-class-names
@@ -40,6 +41,7 @@ export default function Component({ service }) {
const { i18n } = useTranslation();
const [showDate, setShowDate] = useState(null);
const currentDate = DateTime.now().setLocale(i18n.language).startOf("day");
+ const { settings } = useContext(SettingsContext);
useEffect(() => {
if (!showDate) {
@@ -85,6 +87,7 @@ export default function Component({ service }) {
key={key}
config={integration.widget}
params={params}
+ hideErrors={settings.hideErrors}
className="fixed bottom-0 left-0 bg-red-500 w-screen h-12"
/>
);
diff --git a/src/widgets/calendar/integrations/lidarr.jsx b/src/widgets/calendar/integrations/lidarr.jsx
index 8e407b89..99ee77d7 100644
--- a/src/widgets/calendar/integrations/lidarr.jsx
+++ b/src/widgets/calendar/integrations/lidarr.jsx
@@ -5,7 +5,7 @@ import useWidgetAPI from "../../../utils/proxy/use-widget-api";
import { EventContext } from "../../../utils/contexts/calendar";
import Error from "../../../components/services/widget/error";
-export default function Integration({ config, params }) {
+export default function Integration({ config, params, hideErrors = false }) {
const { setEvents } = useContext(EventContext);
const { data: lidarrData, error: lidarrError } = useWidgetAPI(config, "calendar", {
...params,
@@ -36,5 +36,5 @@ export default function Integration({ config, params }) {
}, [lidarrData, lidarrError, config, setEvents]);
const error = lidarrError ?? lidarrData?.error;
- return error && ;
+ return error && !hideErrors && ;
}
diff --git a/src/widgets/calendar/integrations/radarr.jsx b/src/widgets/calendar/integrations/radarr.jsx
index 7fa01140..7ce21978 100644
--- a/src/widgets/calendar/integrations/radarr.jsx
+++ b/src/widgets/calendar/integrations/radarr.jsx
@@ -6,7 +6,7 @@ import useWidgetAPI from "../../../utils/proxy/use-widget-api";
import { EventContext } from "../../../utils/contexts/calendar";
import Error from "../../../components/services/widget/error";
-export default function Integration({ config, params }) {
+export default function Integration({ config, params, hideErrors = false }) {
const { t } = useTranslation();
const { setEvents } = useContext(EventContext);
const { data: radarrData, error: radarrError } = useWidgetAPI(config, "calendar", {
@@ -52,5 +52,5 @@ export default function Integration({ config, params }) {
}, [radarrData, radarrError, config, setEvents, t]);
const error = radarrError ?? radarrData?.error;
- return error && ;
+ return error && !hideErrors && ;
}
diff --git a/src/widgets/calendar/integrations/readarr.jsx b/src/widgets/calendar/integrations/readarr.jsx
index 98a5752b..8a9ba6b3 100644
--- a/src/widgets/calendar/integrations/readarr.jsx
+++ b/src/widgets/calendar/integrations/readarr.jsx
@@ -5,7 +5,7 @@ import useWidgetAPI from "../../../utils/proxy/use-widget-api";
import { EventContext } from "../../../utils/contexts/calendar";
import Error from "../../../components/services/widget/error";
-export default function Integration({ config, params }) {
+export default function Integration({ config, params, hideErrors = false }) {
const { setEvents } = useContext(EventContext);
const { data: readarrData, error: readarrError } = useWidgetAPI(config, "calendar", {
...params,
@@ -37,5 +37,5 @@ export default function Integration({ config, params }) {
}, [readarrData, readarrError, config, setEvents]);
const error = readarrError ?? readarrData?.error;
- return error && ;
+ return error && !hideErrors && ;
}
diff --git a/src/widgets/calendar/integrations/sonarr.jsx b/src/widgets/calendar/integrations/sonarr.jsx
index 0c46fa57..d308ec6f 100644
--- a/src/widgets/calendar/integrations/sonarr.jsx
+++ b/src/widgets/calendar/integrations/sonarr.jsx
@@ -5,7 +5,7 @@ import useWidgetAPI from "../../../utils/proxy/use-widget-api";
import { EventContext } from "../../../utils/contexts/calendar";
import Error from "../../../components/services/widget/error";
-export default function Integration({ config, params }) {
+export default function Integration({ config, params, hideErrors = false }) {
const { setEvents } = useContext(EventContext);
const { data: sonarrData, error: sonarrError } = useWidgetAPI(config, "calendar", {
...params,
@@ -38,5 +38,5 @@ export default function Integration({ config, params }) {
}, [sonarrData, sonarrError, config, setEvents]);
const error = sonarrError ?? sonarrData?.error;
- return error && ;
+ return error && !hideErrors && ;
}