From 562e828182d041bfe25a5052679920119fc7f455 Mon Sep 17 00:00:00 2001
From: SebastianKrupinski <krupinskis05@gmail.com>
Date: Tue, 8 Oct 2024 17:16:24 -0400
Subject: [PATCH] feat: Allow shared calendars as appointment conflict
 calendars

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
---
 src/components/AppointmentConfigModal.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/AppointmentConfigModal.vue b/src/components/AppointmentConfigModal.vue
index 95b0c930c..19577b778 100644
--- a/src/components/AppointmentConfigModal.vue
+++ b/src/components/AppointmentConfigModal.vue
@@ -38,7 +38,7 @@
 								<label>{{ t('calendar', 'Calendar') }}</label>
 								<CalendarPicker v-if="calendar !== undefined"
 									:value="calendar"
-									:calendars="ownSortedCalendars"
+									:calendars="sortedCalendars"
 									:show-calendar-on-select="false"
 									@select-calendar="changeCalendar" />
 							</div>
@@ -195,7 +195,7 @@ export default {
 		...mapState(useSettingsStore, {
 			isTalkEnabled: 'talkEnabled',
 		}),
-		...mapState(useCalendarsStore, ['ownSortedCalendars']),
+		...mapState(useCalendarsStore, ['sortedCalendars']),
 		...mapStores(useAppointmentConfigsStore, useCalendarsStore, useSettingsStore),
 		formTitle() {
 			if (this.isNew) {
@@ -213,26 +213,26 @@ export default {
 		},
 		calendar() {
 			if (!this.editing.targetCalendarUri) {
-				return this.ownSortedCalendars[0]
+				return this.sortedCalendars[0]
 			}
 
 			const uri = this.editing.targetCalendarUri
-			const calendar = this.ownSortedCalendars.find(cal => this.calendarUrlToUri(cal.url) === uri)
-			return calendar || this.ownSortedCalendars[0]
+			const calendar = this.sortedCalendars.find(cal => this.calendarUrlToUri(cal.url) === uri)
+			return calendar || this.sortedCalendars[0]
 		},
 		selectableConflictCalendars() {
 			// The target calendar is always a conflict calendar, remove it from additional conflict calendars
-			return this.ownSortedCalendars.filter(calendar => calendar.url !== this.calendar.url)
+			return this.sortedCalendars.filter(calendar => calendar.url !== this.calendar.url)
 		},
 		conflictCalendars() {
 			const freebusyUris = this.editing.calendarFreeBusyUris ?? []
 			return freebusyUris.map(uri => {
-				return this.ownSortedCalendars.find(cal => this.calendarUrlToUri(cal.url) === uri)
+				return this.sortedCalendars.find(cal => this.calendarUrlToUri(cal.url) === uri)
 			})
 		},
 		defaultConfig() {
 			return AppointmentConfig.createDefault(
-				this.calendarUrlToUri(this.ownSortedCalendars[0].url),
+				this.calendarUrlToUri(this.sortedCalendars[0].url),
 				this.calendarsStore.scheduleInbox,
 				this.settingsStore.getResolvedTimezone,
 			)