From a18fd90731de0ae86c77ef6cf9031c33ed04b4e9 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 15 Oct 2021 17:33:11 -0400
Subject: [PATCH] Fix calendar layout filter (#8840)

---
 app/src/layouts/calendar/index.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/layouts/calendar/index.ts b/app/src/layouts/calendar/index.ts
index 1b040b0585..ada6c3ab23 100644
--- a/app/src/layouts/calendar/index.ts
+++ b/app/src/layouts/calendar/index.ts
@@ -58,9 +58,8 @@ export default defineLayout<LayoutOptions>({
 		const filterWithCalendarView = computed(() => {
 			if (!calendar.value || !startDateField.value) return filter.value;
 
-			return {
+			const calendarFilter: Filter = {
 				_and: [
-					filter.value,
 					{
 						[startDateField.value]: {
 							_gte: formatISO(calendar.value.view.currentStart),
@@ -72,7 +71,13 @@ export default defineLayout<LayoutOptions>({
 						},
 					},
 				],
-			} as Filter;
+			};
+
+			if (filter.value) {
+				calendarFilter._and.push(filter.value);
+			}
+
+			return calendarFilter;
 		});
 
 		const template = computed({