From fb9ebf18ba18a4511e7697be5df75909f6180f3f Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 24 Nov 2023 20:29:23 -0800
Subject: [PATCH 1/3] Fix: show mem / cpu stats for k8s partial health status
(#2378)
---
src/widgets/kubernetes/component.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/widgets/kubernetes/component.jsx b/src/widgets/kubernetes/component.jsx
index 154a277b..2454f2aa 100644
--- a/src/widgets/kubernetes/component.jsx
+++ b/src/widgets/kubernetes/component.jsx
@@ -21,7 +21,7 @@ export default function Component({ service }) {
return ;
}
- if (statusData && statusData.status !== "running") {
+ if (statusData && !(statusData.status.includes("running") || statusData.status.includes("partial"))) {
return (
From acafbb5100f0e4ccd29c14e504a77e9941b1e1c9 Mon Sep 17 00:00:00 2001
From: Denis Papec
Date: Sat, 25 Nov 2023 04:32:04 +0000
Subject: [PATCH 2/3] Enhancement: Improvements to calendar Radarr release
logic (#2374)
Signed-off-by: Denis Papec
---
src/widgets/calendar/integrations/radarr.jsx | 50 ++++++++++++--------
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/widgets/calendar/integrations/radarr.jsx b/src/widgets/calendar/integrations/radarr.jsx
index 7ce21978..22f6b1d3 100644
--- a/src/widgets/calendar/integrations/radarr.jsx
+++ b/src/widgets/calendar/integrations/radarr.jsx
@@ -25,27 +25,35 @@ export default function Integration({ config, params, hideErrors = false }) {
const physicalTitle = `${event.title} - ${t("calendar.physicalRelease")}`;
const digitalTitle = `${event.title} - ${t("calendar.digitalRelease")}`;
- eventsToAdd[cinemaTitle] = {
- title: cinemaTitle,
- date: DateTime.fromISO(event.inCinemas),
- color: config?.color ?? "amber",
- isCompleted: event.isAvailable,
- additional: "",
- };
- eventsToAdd[physicalTitle] = {
- title: physicalTitle,
- date: DateTime.fromISO(event.physicalRelease),
- color: config?.color ?? "cyan",
- isCompleted: event.isAvailable,
- additional: "",
- };
- eventsToAdd[digitalTitle] = {
- title: digitalTitle,
- date: DateTime.fromISO(event.digitalRelease),
- color: config?.color ?? "emerald",
- isCompleted: event.isAvailable,
- additional: "",
- };
+ if (event.inCinemas) {
+ eventsToAdd[cinemaTitle] = {
+ title: cinemaTitle,
+ date: DateTime.fromISO(event.inCinemas),
+ color: config?.color ?? "amber",
+ isCompleted: event.hasFile,
+ additional: "",
+ };
+ }
+
+ if (event.physicalRelease) {
+ eventsToAdd[physicalTitle] = {
+ title: physicalTitle,
+ date: DateTime.fromISO(event.physicalRelease),
+ color: config?.color ?? "cyan",
+ isCompleted: event.hasFile,
+ 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 }));
From 518ed7fc4e19d5e2df017021ed5a8094ab2f5925 Mon Sep 17 00:00:00 2001
From: Denis Papec
Date: Sat, 25 Nov 2023 04:32:38 +0000
Subject: [PATCH 3/3] Feature: Support previous days option in Calendar Agenda
(#2375)
Signed-off-by: Denis Papec
---
docs/widgets/services/calendar.md | 1 +
src/utils/config/service-helpers.js | 2 ++
src/widgets/calendar/agenda.jsx | 4 +++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/widgets/services/calendar.md b/docs/widgets/services/calendar.md
index 990c01c2..b1bc0ea4 100644
--- a/docs/widgets/services/calendar.md
+++ b/docs/widgets/services/calendar.md
@@ -33,6 +33,7 @@ widget:
type: calendar
view: agenda
maxEvents: 10 # optional - defaults to 10
+ previousDays: 3 # optional - shows events since three days ago - defaults to 0
integrations: # same as in Monthly view example
```
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 3a11954a..b054fb96 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -351,6 +351,7 @@ export function cleanServiceGroups(groups) {
firstDayInWeek,
integrations,
maxEvents,
+ previousDays,
view,
// coinmarketcap
@@ -517,6 +518,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;
}
}
diff --git a/src/widgets/calendar/agenda.jsx b/src/widgets/calendar/agenda.jsx
index a854d277..1ec4bb2e 100644
--- a/src/widgets/calendar/agenda.jsx
+++ b/src/widgets/calendar/agenda.jsx
@@ -48,7 +48,9 @@ export default function Agenda({ service, colorVariants, 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)