From e13ac7553ceee8a981bffbad292a1bd1873a196f Mon Sep 17 00:00:00 2001
From: Michael Bauer <michael-bauer@posteo.de>
Date: Fri, 11 Apr 2025 15:55:49 +0200
Subject: [PATCH 1/3] Saveguard calendarSelectedFeedsMixin calendar-query
against no data
This threw an error on mount previously.
---
.../components/calendar/calendarSelectedFeedsMixin.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js b/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
index adadc0ae7..bb9587f50 100644
--- a/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
+++ b/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
@@ -17,9 +17,11 @@ const calendarSelectedFeedsMixin = {
calendar: {
query: gqlCalendarFeeds,
result({ data }) {
- this.selectedCalendarFeedNames = data.calendar.calendarFeeds
- .filter((c) => c.activated)
- .map((c) => c.name);
+ if (data) {
+ this.selectedCalendarFeedNames = data.calendar.calendarFeeds
+ .filter((c) => c.activated)
+ .map((c) => c.name);
+ }
},
},
},
--
GitLab
From 57bbc74a1fb783a576eaad365ab16b76fd7a9ae1 Mon Sep 17 00:00:00 2001
From: Michael Bauer <michael-bauer@posteo.de>
Date: Sat, 12 Apr 2025 16:03:51 +0200
Subject: [PATCH 2/3] Update changelog
---
CHANGELOG.rst | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da41b23b5..30cb4ece1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,6 +25,7 @@ Fixed
* The configured theme colors were not used by the frontend.
* Recurring events without until value weren't shown.
* It wasn't possible to change icons of OAuth applications in the frontend.
+* First fetching of calendar-feeds logged an error to console.
`4.0`_ - 2025-03-29
-------------------
--
GitLab
From 702f39974c5f7da38eb1b9e0f0d504a7add75507 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 15 Apr 2025 11:58:35 +0000
Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s)
---
CHANGELOG.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 30cb4ece1..e50474540 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,7 +25,7 @@ Fixed
* The configured theme colors were not used by the frontend.
* Recurring events without until value weren't shown.
* It wasn't possible to change icons of OAuth applications in the frontend.
-* First fetching of calendar-feeds logged an error to console.
+* First fetching of calendar feeds logged an error to console.
`4.0`_ - 2025-03-29
-------------------
--
GitLab