From bf3cb560111f3e2b23120321444a71b2301bee12 Mon Sep 17 00:00:00 2001
From: Lukas Boersma <mail@lukas-boersma.com>
Date: Sat, 13 Jun 2020 12:45:01 +0200
Subject: [PATCH 1/5] Add a setting for the default calendar when creating new
 events

Signed-off-by: Lukas Boersma <mail@lukas-boersma.com>
---
 css/app-settings.scss                     |  5 +-
 lib/Controller/PublicViewController.php   |  2 +
 lib/Controller/SettingsController.php     | 23 +++++++++
 lib/Controller/ViewController.php         |  3 ++
 src/components/AppNavigation/Settings.vue | 58 +++++++++++++++++++++++
 src/components/CalendarGrid.vue           |  2 +
 src/components/Shared/CalendarPicker.vue  | 10 ++--
 src/mixins/EditorMixin.js                 |  3 +-
 src/store/calendarObjectInstance.js       |  4 +-
 src/store/calendarObjects.js              |  5 +-
 src/store/settings.js                     | 31 ++++++++++++
 src/views/Calendar.vue                    |  2 +
 12 files changed, 137 insertions(+), 11 deletions(-)

diff --git a/css/app-settings.scss b/css/app-settings.scss
index cb36c2301d..b497441901 100644
--- a/css/app-settings.scss
+++ b/css/app-settings.scss
@@ -76,8 +76,9 @@
 				width: 50%;
 			}
 		}
-		
-		&--timezone {
+
+		&--timezone,
+		&--default-calendar {
 			width: 100%;
 		
 			.multiselect {
diff --git a/lib/Controller/PublicViewController.php b/lib/Controller/PublicViewController.php
index 168625c483..b058f0f5a4 100644
--- a/lib/Controller/PublicViewController.php
+++ b/lib/Controller/PublicViewController.php
@@ -127,6 +127,7 @@ private function publicIndex(string $token,
 		$defaultTimezone = $this->config->getAppValue($this->appName, 'timezone', 'automatic');
 		$defaultSlotDuration = $this->config->getAppValue($this->appName, 'slotDuration', '00:30:00');
 		$defaultDefaultReminder = $this->config->getAppValue($this->appName, 'defaultReminder', 'none');
+		$defaultCalendarId = $this->config->getAppValue($this->appName, 'defaultCalendarId', 'none');
 		$defaultShowTasks = $this->config->getAppValue($this->appName, 'showTasks', 'yes');
 
 		$appVersion = $this->config->getAppValue($this->appName, 'installed_version', null);
@@ -143,6 +144,7 @@ private function publicIndex(string $token,
 		$this->initialStateService->provideInitialState($this->appName, 'timezone', $defaultTimezone);
 		$this->initialStateService->provideInitialState($this->appName, 'slot_duration', $defaultSlotDuration);
 		$this->initialStateService->provideInitialState($this->appName, 'default_reminder', $defaultDefaultReminder);
+		$this->initialStateService->provideInitialState($this->appName, 'default_calendar_id', $defaultCalendarId);
 		$this->initialStateService->provideInitialState($this->appName, 'show_tasks', $defaultShowTasks === 'yes');
 		$this->initialStateService->provideInitialState($this->appName, 'tasks_enabled', false);
 		$this->initialStateService->provideInitialState($this->appName, 'hide_event_export', false);
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 9d370a0011..f63e103079 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -89,6 +89,8 @@ public function setConfig(string $key,
 				return $this->setSlotDuration($value);
 			case 'defaultReminder':
 				return $this->setDefaultReminder($value);
+			case 'defaultCalendarId':
+				return $this->setDefaultCalendarId($value);
 			case 'showTasks':
 				return $this->setShowTasks($value);
 			default:
@@ -339,4 +341,25 @@ private function setDefaultReminder(string $value):JSONResponse {
 
 		return new JSONResponse();
 	}
+	
+	/**
+	 * sets defaultCalendarId for user
+	 *
+	 * @param string $value User-selected option for default calendar when creating new events
+	 * @return JSONResponse
+	 */
+	private function setDefaultCalendarId(string $value):JSONResponse {
+		try {
+			$this->config->setUserValue(
+				$this->userId,
+				$this->appName,
+				'defaultCalendarId',
+				$value
+			);
+		} catch (\Exception $e) {
+			return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+
+		return new JSONResponse();
+	}
 }
diff --git a/lib/Controller/ViewController.php b/lib/Controller/ViewController.php
index 2cbf8335c4..de19c50ae6 100644
--- a/lib/Controller/ViewController.php
+++ b/lib/Controller/ViewController.php
@@ -81,6 +81,7 @@ public function index():TemplateResponse {
 		$defaultTimezone = $this->config->getAppValue($this->appName, 'timezone', 'automatic');
 		$defaultSlotDuration = $this->config->getAppValue($this->appName, 'slotDuration', '00:30:00');
 		$defaultDefaultReminder = $this->config->getAppValue($this->appName, 'defaultReminder', 'none');
+		$defaultCalendarIdGlobal = $this->config->getAppValue($this->appName, 'defaultCalendarId', '');
 		$defaultShowTasks = $this->config->getAppValue($this->appName, 'showTasks', 'yes');
 
 		$appVersion = $this->config->getAppValue($this->appName, 'installed_version', null);
@@ -93,6 +94,7 @@ public function index():TemplateResponse {
 		$timezone = $this->config->getUserValue($this->userId, $this->appName, 'timezone', $defaultTimezone);
 		$slotDuration = $this->config->getUserValue($this->userId, $this->appName, 'slotDuration', $defaultSlotDuration);
 		$defaultReminder = $this->config->getUserValue($this->userId, $this->appName, 'defaultReminder', $defaultDefaultReminder);
+		$defaultCalendarIdUser = $this->config->getUserValue($this->userId, $this->appName, 'defaultCalendarId', $defaultCalendarId);
 		$showTasks = $this->config->getUserValue($this->userId, $this->appName, 'showTasks', $defaultShowTasks) === 'yes';
 		$hideEventExport = $this->config->getAppValue($this->appName, 'hideEventExport', 'no') === 'yes';
 		$disableAppointments = $this->config->getAppValue($this->appName, 'disableAppointments', 'no') === 'yes';
@@ -117,6 +119,7 @@ public function index():TemplateResponse {
 		$this->initialStateService->provideInitialState('timezone', $timezone);
 		$this->initialStateService->provideInitialState('slot_duration', $slotDuration);
 		$this->initialStateService->provideInitialState('default_reminder', $defaultReminder);
+		$this->initialStateService->provideInitialState($this->appName, 'default_calendar_id', $defaultCalendarIdUser);
 		$this->initialStateService->provideInitialState('show_tasks', $showTasks);
 		$this->initialStateService->provideInitialState('tasks_enabled', $tasksEnabled);
 		$this->initialStateService->provideInitialState('hide_event_export', $hideEventExport);
diff --git a/src/components/AppNavigation/Settings.vue b/src/components/AppNavigation/Settings.vue
index 52f7c9c223..fe9faddb86 100644
--- a/src/components/AppNavigation/Settings.vue
+++ b/src/components/AppNavigation/Settings.vue
@@ -82,6 +82,16 @@
 					@select="changeDefaultReminder" />
 			</li>
 			<SettingsTimezoneSelect :is-disabled="loadingCalendars" />
+			<li class="settings-fieldset-interior-item settings-fieldset-interior-item--default-calendar">
+				<label>
+					{{ $t('calendar', 'Default calendar for new events') }}
+					<CalendarPicker
+						:calendars="defaultCalendarOptions"
+						:calendar="defaultCalendar"
+						:disabled="savingDefaultCalendar"
+						@selectCalendar="changeDefaultCalendar" />
+				</label>
+			</li>
 			<ActionButton @click.prevent.stop="copyPrimaryCalDAV">
 				<template #icon>
 					<ClipboardArrowLeftOutline :size="20" decorative />
@@ -121,6 +131,8 @@ import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
 import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
 import AppNavigationSettings from '@nextcloud/vue/dist/Components/AppNavigationSettings'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import CalendarPicker from '../Shared/CalendarPicker.vue'
+
 import {
 	generateRemoteUrl,
 	generateUrl,
@@ -166,6 +178,7 @@ export default {
 		ClipboardArrowLeftOutline,
 		InformationVariant,
 		OpenInNewIcon,
+		CalendarPicker,
 	},
 	props: {
 		loadingCalendars: {
@@ -181,6 +194,7 @@ export default {
 			savingPopover: false,
 			savingSlotDuration: false,
 			savingDefaultReminder: false,
+			savingDefaultCalendarId: false,
 			savingWeekend: false,
 			savingWeekNumber: false,
 			displayKeyboardShortcuts: false,
@@ -200,6 +214,7 @@ export default {
 			defaultReminder: state => state.settings.defaultReminder,
 			timezone: state => state.settings.timezone,
 			locale: (state) => state.settings.momentLocale,
+			defaultCalendarId: state => state.settings.defaultCalendarId,
 		}),
 		isBirthdayCalendarDisabled() {
 			return this.savingBirthdayCalendar || this.loadingCalendars
@@ -266,6 +281,28 @@ export default {
 		availabilitySettingsUrl() {
 			return generateUrl('/settings/user/groupware')
 		},
+		defaultCalendarOptions() {
+			return this.$store.state.calendars.calendars.filter(o => !o.readOnly)
+		},
+		defaultCalendar() {
+			var calendar = this.defaultCalendarOptions.find(o => o.id === this.defaultCalendarId)
+			// If the default calendar is not or no longer available,
+			// pick the first calendar in the list of available calendars.
+			if(calendar === undefined) {
+				calendar = this.defaultCalendarOptions[0]
+			}
+			if(calendar === undefined) {
+				// Create a dummy calendar object  so that the calendarpicker
+				// will not complain when no calendar is available.
+				calendar = {
+					color: '#000',
+					displayName: 'No calendar',
+					owner: '',
+					isSharedWithMe: false,
+				}
+			}
+			return calendar
+		},
 	},
 	methods: {
 		async toggleBirthdayEnabled() {
@@ -390,6 +427,27 @@ export default {
 				showError(this.$t('calendar', 'New setting was not saved successfully.'))
 				this.savingDefaultReminder = false
 			}
+		},
+		 * Changes the default calendar for new events
+		 * @param {Object} selectedCalendar The new selected default calendar
+		 */
+		async changeDefaultCalendar(selectedCalendar) {
+			if (!selectedCalendar) {
+				return
+			}
+
+			this.savingDefaultCalendar = true
+
+			try {
+				await this.$store.dispatch('setDefaultCalendarId', {
+					calendarId: selectedCalendar.id,
+				})
+				this.savingDefaultCalendar = false
+			} catch (error) {
+				console.error(error)
+				showError(this.$t('calendar', 'New setting was not saved successfully.'))
+				this.savingDefaultCalendar = false
+			}
 		},
 		/**
 		 * Copies the primary CalDAV url to the user's clipboard.
diff --git a/src/components/CalendarGrid.vue b/src/components/CalendarGrid.vue
index a18c27b5bc..3710cd5b8f 100644
--- a/src/components/CalendarGrid.vue
+++ b/src/components/CalendarGrid.vue
@@ -104,6 +104,7 @@ export default {
 			showWeekends: state => state.settings.showWeekends,
 			showWeekNumbers: state => state.settings.showWeekNumbers,
 			slotDuration: state => state.settings.slotDuration,
+			defaultCalendarId: state => state.settings.defaultCalendarId,
 			showTasks: state => state.settings.showTasks,
 			timezone: state => state.settings.timezone,
 			modificationCount: state => state.calendarObjects.modificationCount,
@@ -141,6 +142,7 @@ export default {
 				headerToolbar: false,
 				height: '100%',
 				slotDuration: this.slotDuration,
+				defaultCalendarId: this.defaultCalendarId,
 				expandRows: true,
 				weekNumbers: this.showWeekNumbers,
 				weekends: this.showWeekends,
diff --git a/src/components/Shared/CalendarPicker.vue b/src/components/Shared/CalendarPicker.vue
index 80ea49fdd8..e2adf38dfd 100644
--- a/src/components/Shared/CalendarPicker.vue
+++ b/src/components/Shared/CalendarPicker.vue
@@ -1,7 +1,7 @@
 <template>
 	<Multiselect label="displayName"
 		track-by="url"
-		:disabled="isDisabled"
+		:disabled="isMultiselectDisabled"
 		:options="calendars"
 		:value="value"
 		:multiple="multiple"
@@ -47,10 +47,14 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	computed: {
-		isDisabled() {
-			return this.calendars.length < 2
+		isMultiselectDisabled() {
+			return this.disabled || this.calendars.length < 2
 		},
 	},
 	methods: {
diff --git a/src/mixins/EditorMixin.js b/src/mixins/EditorMixin.js
index 11a164a855..963ccca988 100644
--- a/src/mixins/EditorMixin.js
+++ b/src/mixins/EditorMixin.js
@@ -673,10 +673,11 @@ export default {
 				const start = parseInt(to.params.dtstart, 10)
 				const end = parseInt(to.params.dtend, 10)
 				const timezoneId = vm.$store.getters.getResolvedTimezone
+				const calendarId = vm.$store.state.settings.defaultCalendarId
 
 				try {
 					await vm.loadingCalendars()
-					await vm.$store.dispatch('getCalendarObjectInstanceForNewEvent', { isAllDay, start, end, timezoneId })
+					await vm.$store.dispatch('getCalendarObjectInstanceForNewEvent', { isAllDay, start, end, timezoneId, calendarId })
 					vm.calendarId = vm.calendarObject.calendarId
 				} catch (error) {
 					console.debug(error)
diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js
index d43260af09..eeaf571c0d 100644
--- a/src/store/calendarObjectInstance.js
+++ b/src/store/calendarObjectInstance.js
@@ -1445,7 +1445,7 @@ const actions = {
 	 * @param {string} data.timezoneId The timezoneId of the new event
 	 * @return {Promise<{calendarObject: object, calendarObjectInstance: object}>}
 	 */
-	async getCalendarObjectInstanceForNewEvent({ state, dispatch, commit }, { isAllDay, start, end, timezoneId }) {
+	async getCalendarObjectInstanceForNewEvent({ state, dispatch, commit }, { isAllDay, start, end, timezoneId, calendarId }) {
 		if (state.isNew === true) {
 			return Promise.resolve({
 				calendarObject: state.calendarObject,
@@ -1453,7 +1453,7 @@ const actions = {
 			})
 		}
 
-		const calendarObject = await dispatch('createNewEvent', { start, end, isAllDay, timezoneId })
+		const calendarObject = await dispatch('createNewEvent', { start, end, isAllDay, timezoneId, calendarId })
 		const startDate = new Date(start * 1000)
 		const eventComponent = getObjectAtRecurrenceId(calendarObject, startDate)
 		const calendarObjectInstance = mapEventComponentToEventObject(eventComponent)
diff --git a/src/store/calendarObjects.js b/src/store/calendarObjects.js
index 98a4886b80..0be0c59e46 100644
--- a/src/store/calendarObjects.js
+++ b/src/store/calendarObjects.js
@@ -315,7 +315,7 @@ const actions = {
 	 * @param {boolean} data.isAllDay foo
 	 * @return {Promise<CalendarObject>}
 	 */
-	createNewEvent(context, { start, end, timezoneId, isAllDay }) {
+	createNewEvent(context, { start, end, timezoneId, isAllDay, calendarId }) {
 		const timezoneManager = getTimezoneManager()
 		const timezone = timezoneManager.getTimezoneForId(timezoneId)
 
@@ -339,8 +339,7 @@ const actions = {
 			vObject.undirtify()
 		}
 
-		const firstCalendar = context.getters.sortedCalendars[0].id
-		return Promise.resolve(mapCalendarJsToCalendarObject(calendar, firstCalendar))
+		return Promise.resolve(mapCalendarJsToCalendarObject(calendar, calendarId || context.getters.sortedCalendars[0].id))
 	},
 
 	/**
diff --git a/src/store/settings.js b/src/store/settings.js
index 94fb0d69d1..e03758707c 100644
--- a/src/store/settings.js
+++ b/src/store/settings.js
@@ -47,6 +47,7 @@ const state = {
 	forceEventAlarmType: false,
 	// user-defined Nextcloud settings
 	momentLocale: 'en',
+	defaultCalendarId: null,
 }
 
 const mutations = {
@@ -129,6 +130,17 @@ const mutations = {
 		state.timezone = timezoneId
 	},
 
+	/**
+	 * Updates the user's default calendar
+	 *
+	 * @param {Object} state The Vuex state
+	 * @param {Object} data The destructuring object
+	 * @param {String} data.calendarId The new calendar id
+	 */
+	setDefaultCalendarId(state, { calendarId }) {
+		state.defaultCalendarId = calendarId
+	},
+
 	/**
 	 * Initialize settings
 	 *
@@ -185,6 +197,7 @@ Initial settings:
 		state.hideEventExport = hideEventExport
 		state.forceEventAlarmType = forceEventAlarmType
 		state.disableAppointments = disableAppointments
+		state.defaultCalendarId = settings.defaultCalendarId
 	},
 
 	/**
@@ -386,6 +399,24 @@ const actions = {
 		commit('setDefaultReminder', { defaultReminder })
 	},
 
+	/**
+	 * Updates the user's default calendar for new events
+	 *
+	 * @param {Object} context The Vuex context
+	 * @param {Object} data The destructuring object
+	 * @param {String} data.slotDuration The id of the new default calendar
+	 */
+	async setDefaultCalendarId(context, { calendarId }) {
+		if (context.state.defaultCalendarId === calendarId) {
+			return
+		}
+
+		await HttpClient.post(getLinkToConfig('defaultCalendarId'), {
+			value: calendarId,
+		})
+		context.commit('setDefaultCalendarId', { calendarId })
+	},
+
 	/**
 	 * Updates the user's timezone
 	 *
diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
index 3966f40f79..68d75239e4 100644
--- a/src/views/Calendar.vue
+++ b/src/views/Calendar.vue
@@ -138,6 +138,7 @@ export default {
 			showWeekNumbers: state => state.settings.showWeekNumbers,
 			slotDuration: state => state.settings.slotDuration,
 			defaultReminder: state => state.settings.defaultReminder,
+			defaultCalendarId: state => state.settings.defaultCalendarId,
 			showTasks: state => state.settings.showTasks,
 			timezone: state => state.settings.timezone,
 			modificationCount: state => state.calendarObjects.modificationCount,
@@ -211,6 +212,7 @@ export default {
 			skipPopover: loadState('calendar', 'skip_popover'),
 			slotDuration: loadState('calendar', 'slot_duration'),
 			defaultReminder: loadState('calendar', 'default_reminder'),
+			defaultCalendarId: loadState('calendar', 'default_calendar_id'),
 			talkEnabled: loadState('calendar', 'talk_enabled'),
 			tasksEnabled: loadState('calendar', 'tasks_enabled'),
 			timezone: loadState('calendar', 'timezone'),

From 34c5abf9aa53610c82fe3e8847ff5792b42844c8 Mon Sep 17 00:00:00 2001
From: Lukas Boersma <mail@lukas-boersma.com>
Date: Sat, 13 Jun 2020 13:22:21 +0200
Subject: [PATCH 2/5] Fix reference to savingDefaultCalendarId property in
 Settings component

Signed-off-by: Lukas Boersma <mail@lukas-boersma.com>
---
 src/components/AppNavigation/Settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/Settings.vue b/src/components/AppNavigation/Settings.vue
index fe9faddb86..bddfda6437 100644
--- a/src/components/AppNavigation/Settings.vue
+++ b/src/components/AppNavigation/Settings.vue
@@ -88,7 +88,7 @@
 					<CalendarPicker
 						:calendars="defaultCalendarOptions"
 						:calendar="defaultCalendar"
-						:disabled="savingDefaultCalendar"
+						:disabled="savingDefaultCalendarId"
 						@selectCalendar="changeDefaultCalendar" />
 				</label>
 			</li>

From 5549dde8443ad66086eefebb96fbb75be3dd34dd Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Tue, 21 Jun 2022 19:51:01 +0200
Subject: [PATCH 3/5] fix things

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 src/components/AppNavigation/Settings.vue | 1 +
 src/store/calendarObjectInstance.js       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/AppNavigation/Settings.vue b/src/components/AppNavigation/Settings.vue
index bddfda6437..036c288a27 100644
--- a/src/components/AppNavigation/Settings.vue
+++ b/src/components/AppNavigation/Settings.vue
@@ -428,6 +428,7 @@ export default {
 				this.savingDefaultReminder = false
 			}
 		},
+		/**
 		 * Changes the default calendar for new events
 		 * @param {Object} selectedCalendar The new selected default calendar
 		 */
diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js
index eeaf571c0d..96c25b95db 100644
--- a/src/store/calendarObjectInstance.js
+++ b/src/store/calendarObjectInstance.js
@@ -1587,6 +1587,7 @@ const actions = {
 			end: endDate.unixTime,
 			timezoneId: oldEventComponent.startDate.timezoneId,
 			isAllDay: oldEventComponent.isAllDay(),
+			calendarId: oldEventComponent.calendarId,
 		})
 		const eventComponent = getObjectAtRecurrenceId(calendarObject, startDate.jsDate)
 		copyCalendarObjectInstanceIntoEventComponent(oldCalendarObjectInstance, eventComponent)

From 0fbf20a5a336b2d24efc10f77b9cbfeb03b219fa Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Tue, 21 Jun 2022 20:11:16 +0200
Subject: [PATCH 4/5] fix tests

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 src/store/settings.js                                  | 9 ++++-----
 tests/javascript/unit/store/settings.test.js           | 7 +++++++
 tests/php/unit/Controller/PublicViewControllerTest.php | 4 ++++
 tests/php/unit/Controller/ViewControllerTest.php       | 4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/store/settings.js b/src/store/settings.js
index e03758707c..1fec0f3dc3 100644
--- a/src/store/settings.js
+++ b/src/store/settings.js
@@ -19,6 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 import { enableBirthdayCalendar } from '../services/caldavService.js'
 import { mapDavCollectionToCalendar } from '../models/calendar'
 import { detectTimezone } from '../services/timezoneDetectionService'
@@ -197,7 +198,7 @@ Initial settings:
 		state.hideEventExport = hideEventExport
 		state.forceEventAlarmType = forceEventAlarmType
 		state.disableAppointments = disableAppointments
-		state.defaultCalendarId = settings.defaultCalendarId
+		state.defaultCalendarId = defaultCalendarId
 	},
 
 	/**
@@ -411,10 +412,8 @@ const actions = {
 			return
 		}
 
-		await HttpClient.post(getLinkToConfig('defaultCalendarId'), {
-			value: calendarId,
-		})
-		context.commit('setDefaultCalendarId', { calendarId })
+		await setConfig('defaultCalendarId', calendarId)
+		commit('setDefaultCalendarId', { calendarId })
 	},
 
 	/**
diff --git a/tests/javascript/unit/store/settings.test.js b/tests/javascript/unit/store/settings.test.js
index 4cf12e0f19..b9f081a616 100644
--- a/tests/javascript/unit/store/settings.test.js
+++ b/tests/javascript/unit/store/settings.test.js
@@ -48,6 +48,7 @@ describe('store/settings test suite', () => {
 	it('should provide a default state', () => {
 		expect(settingsStore.state).toEqual({
 			appVersion: null,
+			defaultCalendarId: null,
 			firstRun: null,
 			forceEventAlarmType: false,
 			hideEventExport: false,
@@ -156,6 +157,7 @@ describe('store/settings test suite', () => {
 	it('should provide a mutation to set the settings initially', () => {
 		const state = {
 			appVersion: null,
+			defaultCalendarId: null,
 			firstRun: null,
 			talkEnabled: false,
 			eventLimit: null,
@@ -176,6 +178,7 @@ describe('store/settings test suite', () => {
 
 		const settings = {
 			appVersion: '2.1.0',
+			defaultCalendarId: null,
 			eventLimit: false,
 			firstRun: true,
 			showWeekNumbers: true,
@@ -199,6 +202,7 @@ describe('store/settings test suite', () => {
 		expect(logInfo).toHaveBeenNthCalledWith(1, `
 Initial settings:
 	- AppVersion: 2.1.0
+	- DefaultCalendarId: Personal
 	- EventLimit: false
 	- FirstRun: true
 	- ShowWeekNumbers: true
@@ -216,6 +220,7 @@ Initial settings:
 `)
 		expect(state).toEqual({
 			appVersion: '2.1.0',
+			defaultCalendarId: 'Personal',
 			eventLimit: false,
 			firstRun: true,
 			showWeekNumbers: true,
@@ -238,6 +243,7 @@ Initial settings:
 	it('should provide a mutation to set the resolved moment locale', () => {
 		const state = {
 			appVersion: null,
+			defaultCalendarId: null,
 			firstRun: null,
 			talkEnabled: false,
 			eventLimit: null,
@@ -258,6 +264,7 @@ Initial settings:
 
 		expect(state).toEqual({
 			appVersion: null,
+			defaultCalendarId: null,
 			firstRun: null,
 			talkEnabled: false,
 			eventLimit: null,
diff --git a/tests/php/unit/Controller/PublicViewControllerTest.php b/tests/php/unit/Controller/PublicViewControllerTest.php
index 4245a331c3..58db6254d6 100644
--- a/tests/php/unit/Controller/PublicViewControllerTest.php
+++ b/tests/php/unit/Controller/PublicViewControllerTest.php
@@ -75,6 +75,7 @@ public function testPublicIndexWithBranding():void {
 				['calendar', 'timezone', 'automatic', 'defaultTimezone'],
 				['calendar', 'slotDuration', '00:30:00', 'defaultSlotDuration'],
 				['calendar', 'defaultReminder', 'none', 'defaultDefaultReminder'],
+				['calendar', 'defaultCalendarId', 'none', 'defaultDefaultCalendarId'],
 				['calendar', 'showTasks', 'yes', 'yes'],
 				['calendar', 'installed_version', null, '1.0.0']
 			]);
@@ -116,6 +117,7 @@ public function testPublicIndexWithBranding():void {
 				['calendar', 'timezone', 'defaultTimezone'],
 				['calendar', 'slot_duration', 'defaultSlotDuration'],
 				['calendar', 'default_reminder', 'defaultDefaultReminder'],
+				['calendar', 'default_calendar_id', 'defaultDefaultCalendarId'],
 				['calendar', 'show_tasks', true],
 				['calendar', 'tasks_enabled', false]
 			);
@@ -153,6 +155,7 @@ public function testPublicIndexForEmbedding():void {
 				['calendar', 'timezone', 'automatic', 'defaultTimezone'],
 				['calendar', 'slotDuration', '00:30:00', 'defaultSlotDuration'],
 				['calendar', 'defaultReminder', 'none', 'defaultDefaultReminder'],
+				['calendar', 'defaultCalendarId', 'none', 'defaultDefaultCalendarId'],
 				['calendar', 'showTasks', 'yes', 'defaultShowTasks'],
 				['calendar', 'installed_version', null, '1.0.0']
 			]);
@@ -193,6 +196,7 @@ public function testPublicIndexForEmbedding():void {
 				['calendar', 'timezone', 'defaultTimezone'],
 				['calendar', 'slot_duration', 'defaultSlotDuration'],
 				['calendar', 'default_reminder', 'defaultDefaultReminder'],
+				['calendar', 'default_calendar_id', 'defaultDefaultCalendarId'],
 				['calendar', 'show_tasks', false],
 				['calendar', 'tasks_enabled', false]
 			);
diff --git a/tests/php/unit/Controller/ViewControllerTest.php b/tests/php/unit/Controller/ViewControllerTest.php
index 20a938329f..d1357b8005 100755
--- a/tests/php/unit/Controller/ViewControllerTest.php
+++ b/tests/php/unit/Controller/ViewControllerTest.php
@@ -93,6 +93,7 @@ public function testIndex(): void {
 				['calendar', 'timezone', 'automatic', 'defaultTimezone'],
 				['calendar', 'slotDuration', '00:30:00', 'defaultSlotDuration'],
 				['calendar', 'defaultReminder', 'none', 'defaultDefaultReminder'],
+				['calendar', 'defaultCalendarId', 'none', 'defaultDefaultCalendarId'],
 				['calendar', 'showTasks', 'yes', 'defaultShowTasks'],
 				['calendar', 'hideEventExport', 'no', 'yes'],
 				['calendar', 'forceEventAlarmType', '', ''],
@@ -110,6 +111,7 @@ public function testIndex(): void {
 				['user123', 'calendar', 'timezone', 'defaultTimezone', 'Europe/Berlin'],
 				['user123', 'calendar', 'slotDuration', 'defaultSlotDuration', '00:15:00'],
 				['user123', 'calendar', 'defaultReminder', 'defaultDefaultReminder', '00:10:00'],
+				['user123', 'calendar', 'defaultCalendarId', 'defaultDefaultCalendarId', 'Personal'],
 				['user123', 'calendar', 'showTasks', 'defaultShowTasks', '00:15:00'],
 			]);
 		$this->appManager
@@ -176,6 +178,7 @@ public function testIndexViewFix(string $savedView, string $expectedView): void
 				['calendar', 'timezone', 'automatic', 'defaultTimezone'],
 				['calendar', 'slotDuration', '00:30:00', 'defaultSlotDuration'],
 				['calendar', 'defaultReminder', 'none', 'defaultDefaultReminder'],
+				['calendar', 'defaultCalendarId', 'none', 'defaultDefaultCalendarId'],
 				['calendar', 'showTasks', 'yes', 'defaultShowTasks'],
 				['calendar', 'installed_version', null, '1.0.0'],
 			]);
@@ -191,6 +194,7 @@ public function testIndexViewFix(string $savedView, string $expectedView): void
 				['user123', 'calendar', 'timezone', 'defaultTimezone', 'Europe/Berlin'],
 				['user123', 'calendar', 'slotDuration', 'defaultSlotDuration', '00:15:00'],
 				['user123', 'calendar', 'defaultReminder', 'defaultDefaultReminder', '00:10:00'],
+				['user123', 'calendar', 'defaultCalendarId', 'defaultDefaultCalendarId', 'Personal'],
 				['user123', 'calendar', 'showTasks', 'defaultShowTasks', '00:15:00'],
 			]);
 		$this->appManager

From bec6f731094109629f4f67ead4fa3764394408fe Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Tue, 21 Jun 2022 20:15:31 +0200
Subject: [PATCH 5/5] fix tests

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 tests/javascript/unit/store/settings.test.js           | 2 +-
 tests/php/unit/Controller/PublicViewControllerTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/javascript/unit/store/settings.test.js b/tests/javascript/unit/store/settings.test.js
index b9f081a616..e1743d1fc5 100644
--- a/tests/javascript/unit/store/settings.test.js
+++ b/tests/javascript/unit/store/settings.test.js
@@ -178,7 +178,7 @@ describe('store/settings test suite', () => {
 
 		const settings = {
 			appVersion: '2.1.0',
-			defaultCalendarId: null,
+			defaultCalendarId: 'Personal',
 			eventLimit: false,
 			firstRun: true,
 			showWeekNumbers: true,
diff --git a/tests/php/unit/Controller/PublicViewControllerTest.php b/tests/php/unit/Controller/PublicViewControllerTest.php
index 58db6254d6..df01fbeb1b 100644
--- a/tests/php/unit/Controller/PublicViewControllerTest.php
+++ b/tests/php/unit/Controller/PublicViewControllerTest.php
@@ -64,7 +64,7 @@ protected function setUp():void {
 	}
 
 	public function testPublicIndexWithBranding():void {
-		$this->config->expects(self::exactly(10))
+		$this->config->expects(self::exactly(11))
 			->method('getAppValue')
 			->willReturnMap([
 				['calendar', 'eventLimit', 'yes', 'no'],