From 416073bc3bf8043d33c292ab6c1773582dfbfbdf Mon Sep 17 00:00:00 2001
From: Richard Steinmetz <richard@steinmetz.cloud>
Date: Mon, 13 May 2024 16:33:35 +0200
Subject: [PATCH] fix: create tasks from emails

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
---
 src/components/TaskModal.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/TaskModal.vue b/src/components/TaskModal.vue
index 65cad7122c..f14420fc25 100644
--- a/src/components/TaskModal.vue
+++ b/src/components/TaskModal.vue
@@ -35,13 +35,13 @@
 				</label>
 			</div>
 			<!-- FIXME: is broken due to upstream select component serializing options to JSON -->
-			<NcSelect v-model="selectedCalendar"
+			<NcSelect v-model="selectedCalendarChoice"
 				label="displayname"
 				input-id="url"
 				:placeholder="t('mail', 'Select calendar')"
 				:aria-label-combobox="t('mail', 'Select calendar')"
 				:allow-empty="false"
-				:options="calendars">
+				:options="calendarChoices">
 				<template #option="{ id }">
 					<CalendarPickerOption :color="getCalendarById(id).color"
 						:displayname="getCalendarById(id).displayname" />
@@ -102,7 +102,7 @@ export default {
 			startTimezoneId: defaultTimezoneId,
 			endTimezoneId: defaultTimezoneId,
 			saving: false,
-			selectedCalendar: undefined,
+			selectedCalendarChoice: undefined,
 			note: this.envelope.previewText,
 		}
 	},
@@ -120,7 +120,21 @@ export default {
 			return this.$store.getters.getAllTags
 		},
 		calendars() {
-			return this.$store.getters.getTaskCalendarsForCurrentUser.map(calendar => ({ id: calendar.id, color: calendar.color, displayname: calendar.displayname }))
+			return this.$store.getters.getTaskCalendarsForCurrentUser
+		},
+		calendarChoices() {
+			return this.calendars.map(calendar => ({
+				id: calendar.id,
+				color: calendar.color,
+				displayname: calendar.displayname,
+			}))
+		},
+		selectedCalendar() {
+			if (!this.selectedCalendarChoice) {
+				return undefined
+			}
+
+			return this.calendars.find((cal) => cal.id === this.selectedCalendarChoice.id)
 		},
 	},
 	created() {
@@ -129,9 +143,8 @@ export default {
 		})
 	},
 	async mounted() {
-
 		if (this.calendars.length) {
-			this.selectedCalendar = this.calendars[0]
+			this.selectedCalendarChoice = this.calendarChoices[0]
 		}
 	},
 	methods: {