Merge branch 'main' into pr/2376

docs/widgets/services/calendar.md

@@ -41,6 +41,7 @@ widget:
   view: agenda
   maxEvents: 10 # optional - defaults to 10
   showTime: true # optional - show time for event happening today - defaults to false
+  previousDays: 3 # optional - shows events since three days ago - defaults to 0
   integrations: # same as in Monthly view example
 ```
 

src/utils/config/service-helpers.js

@@ -352,6 +352,7 @@ export function cleanServiceGroups(groups) {
           integrations,
           maxEvents,
           showTime,
+          previousDays,
           view,
 
           // coinmarketcap
@@ -518,6 +519,7 @@ export function cleanServiceGroups(groups) {
           if (firstDayInWeek) cleanedService.widget.firstDayInWeek = firstDayInWeek;
           if (view) cleanedService.widget.view = view;
           if (maxEvents) cleanedService.widget.maxEvents = maxEvents;
+          if (previousDays) cleanedService.widget.previousDays = previousDays;
           if (showTime) cleanedService.widget.showTime = showTime;
         }
       }

src/widgets/calendar/agenda.jsx

@@ -14,7 +14,9 @@ export default function Agenda({ service, colorVariants, events, showDate }) {
 
   const eventsArray = Object.keys(events)
     .filter(
-      (eventKey) => showDate.startOf("day").toUnixInteger() <= events[eventKey].date?.startOf("day").toUnixInteger(),
+      (eventKey) =>
+        showDate.minus({ days: widget?.previousDays ?? 0 }).startOf("day").ts <=
+        events[eventKey].date?.startOf("day").ts,
     )
     .map((eventKey) => events[eventKey])
     .sort((a, b) => a.date - b.date)

src/widgets/calendar/integrations/radarr.jsx

@@ -23,27 +23,35 @@ export default function Integration({ config, params, setEvents, hideErrors = fa
       const physicalTitle = `${event.title} - ${t("calendar.physicalRelease")}`;
       const digitalTitle = `${event.title} - ${t("calendar.digitalRelease")}`;
 
-      eventsToAdd[cinemaTitle] = {
+      if (event.inCinemas) {
-        title: cinemaTitle,
+        eventsToAdd[cinemaTitle] = {
-        date: DateTime.fromISO(event.inCinemas),
+          title: cinemaTitle,
-        color: config?.color ?? "amber",
+          date: DateTime.fromISO(event.inCinemas),
-        isCompleted: event.isAvailable,
+          color: config?.color ?? "amber",
-        additional: "",
+          isCompleted: event.hasFile,
-      };
+          additional: "",
-      eventsToAdd[physicalTitle] = {
+        };
-        title: physicalTitle,
+      }
-        date: DateTime.fromISO(event.physicalRelease),
+
-        color: config?.color ?? "cyan",
+      if (event.physicalRelease) {
-        isCompleted: event.isAvailable,
+        eventsToAdd[physicalTitle] = {
-        additional: "",
+          title: physicalTitle,
-      };
+          date: DateTime.fromISO(event.physicalRelease),
-      eventsToAdd[digitalTitle] = {
+          color: config?.color ?? "cyan",
-        title: digitalTitle,
+          isCompleted: event.hasFile,
-        date: DateTime.fromISO(event.digitalRelease),
+          additional: "",
-        color: config?.color ?? "emerald",
+        };
-        isCompleted: event.isAvailable,
+      }
-        additional: "",
+
-      };
+      if (event.digitalRelease) {
+        eventsToAdd[digitalTitle] = {
+          title: digitalTitle,
+          date: DateTime.fromISO(event.digitalRelease),
+          color: config?.color ?? "emerald",
+          isCompleted: event.hasFile,
+          additional: "",
+        };
+      }
     });
 
     setEvents((prevEvents) => ({ ...prevEvents, ...eventsToAdd }));

src/widgets/kubernetes/component.jsx

@@ -21,7 +21,7 @@ export default function Component({ service }) {
     return <Container service={service} error={statsError ?? statusError} />;
   }
 
-  if (statusData && statusData.status !== "running") {
+  if (statusData && !(statusData.status.includes("running") || statusData.status.includes("partial"))) {
     return (
       <Container>
         <Block label={t("widget.status")} value={t("docker.offline")} />