From f297bfec8eb05a776698801a67cf8eeab302ea18 Mon Sep 17 00:00:00 2001
From: Grigory Vodyanov <scratchx@gmx.com>
Date: Mon, 2 Mar 2026 22:54:55 +0100
Subject: [PATCH 1/2] feat(EditCalendarModal): add setting for default reminder
 per calendar

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>
---
 .../AppNavigation/EditCalendarModal.vue       | 147 +++++++++++++++++-
 src/env.d.ts                                  |   2 +
 src/models/calendar.js                        |   7 +
 src/store/calendarObjectInstance.js           |  16 +-
 src/store/calendars.js                        |  24 +++
 src/types/oc.ts                               |   8 +
 src/utils/nextcloudVersion.ts                 |  22 +++
 tests/javascript/unit/models/calendar.test.js |  13 ++
 8 files changed, 235 insertions(+), 4 deletions(-)
 create mode 100644 src/types/oc.ts
 create mode 100644 src/utils/nextcloudVersion.ts

diff --git a/src/components/AppNavigation/EditCalendarModal.vue b/src/components/AppNavigation/EditCalendarModal.vue
index 9bd7f3d3d8..6ed8870f9d 100644
--- a/src/components/AppNavigation/EditCalendarModal.vue
+++ b/src/components/AppNavigation/EditCalendarModal.vue
@@ -43,6 +43,24 @@
 					{{ $t('calendar', 'Never show me as busy (set this calendar to transparent)') }}
 				</NcCheckboxRadioSwitch>
 			</template>
+			<template v-if="!calendar.isSharedWithMe && supportsDefaultAlarm">
+				<div class="edit-calendar-modal__default-alarm">
+					<label for="default-alarm-select" class="edit-calendar-modal__default-alarm__label">
+						{{ $t('calendar', 'Default reminder') }}
+					</label>
+					<NcSelect
+						id="default-alarm-select"
+						v-model="selectedDefaultAlarm"
+						:options="defaultAlarmOptions"
+						:clearable="false"
+						:placeholder="$t('calendar', 'Select default reminder')"
+						class="edit-calendar-modal__default-alarm__select"
+						@update:modelValue="defaultAlarmChanged = true" />
+					<p class="edit-calendar-modal__default-alarm__hint">
+						{{ $t('calendar', 'This reminder will be automatically added to all new events created in this calendar') }}
+					</p>
+				</div>
+			</template>
 			<template v-if="canBeShared">
 				<h3 class="edit-calendar-modal__sharing-header">
 					{{ $t('calendar', 'Share calendar') }}
@@ -93,7 +111,7 @@
 <script>
 import { showError } from '@nextcloud/dialogs'
 import { getLanguage } from '@nextcloud/l10n'
-import { NcAppNavigationSpacer, NcButton, NcCheckboxRadioSwitch, NcColorPicker, NcModal, NcTextField } from '@nextcloud/vue'
+import { NcAppNavigationSpacer, NcButton, NcCheckboxRadioSwitch, NcColorPicker, NcModal, NcSelect, NcTextField } from '@nextcloud/vue'
 import { mapStores } from 'pinia'
 import CheckIcon from 'vue-material-design-icons/Check.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
@@ -103,8 +121,16 @@ import InternalLink from './EditCalendarModal/InternalLink.vue'
 import PublishCalendar from './EditCalendarModal/PublishCalendar.vue'
 import ShareItem from './EditCalendarModal/ShareItem.vue'
 import SharingSearch from './EditCalendarModal/SharingSearch.vue'
+import { getDefaultAlarms } from '../../defaults/defaultAlarmProvider.js'
+import alarmFormat from '../../filters/alarmFormat.js'
 import useCalendarsStore from '../../store/calendars.js'
+import useSettingsStore from '../../store/settings.js'
+import {
+	getAmountAndUnitForTimedEvents,
+	getAmountHoursMinutesAndUnitForAllDayEvents,
+} from '../../utils/alarms.js'
 import logger from '../../utils/logger.js'
+import { supportsDefaultAlarm } from '../../utils/nextcloudVersion.ts'
 
 export default {
 	name: 'EditCalendarModal',
@@ -113,6 +139,7 @@ export default {
 		NcColorPicker,
 		NcButton,
 		NcTextField,
+		NcSelect,
 		PublishCalendar,
 		SharingSearch,
 		ShareItem,
@@ -132,6 +159,8 @@ export default {
 			isTransparent: false,
 			calendarName: undefined,
 			calendarNameChanged: false,
+			selectedDefaultAlarm: null,
+			defaultAlarmChanged: false,
 		}
 	},
 
@@ -220,6 +249,45 @@ export default {
 				{ types: localizedTypes },
 			)
 		},
+
+		/**
+		 * Get the default alarm options for the select dropdown
+		 *
+		 * @return {Array}
+		 */
+		defaultAlarmOptions() {
+			const settingsStore = useSettingsStore()
+			const currentUserTimezone = settingsStore.getResolvedTimezone
+			const locale = settingsStore.momentLocale
+
+			const options = [
+				{
+					label: this.$t('calendar', 'None'),
+					value: null,
+				},
+			]
+
+			// Add standard alarm options for timed events
+			const alarms = getDefaultAlarms(false)
+			for (const alarm of alarms) {
+				const alarmObject = this.getAlarmObjectFromTriggerTime(alarm)
+				options.push({
+					label: alarmFormat(alarmObject, false, currentUserTimezone, locale),
+					value: alarm,
+				})
+			}
+
+			return options
+		},
+
+		/**
+		 * Whether the default alarm feature is supported (Nextcloud 34+)
+		 *
+		 * @return {boolean}
+		 */
+		supportsDefaultAlarm() {
+			return supportsDefaultAlarm()
+		},
 	},
 
 	watch: {
@@ -233,6 +301,16 @@ export default {
 			this.calendarNameChanged = false
 			this.calendarColorChanged = false
 			this.isTransparent = calendar.transparency === 'transparent'
+
+			// Initialize default alarm
+			if (calendar.defaultAlarm === null) {
+				this.selectedDefaultAlarm = this.defaultAlarmOptions[0]
+			} else {
+				const value = parseInt(calendar.defaultAlarm)
+				const option = this.defaultAlarmOptions.find((opt) => opt.value === value)
+				this.selectedDefaultAlarm = option || this.defaultAlarmOptions[0]
+			}
+			this.defaultAlarmChanged = false
 		},
 	},
 
@@ -298,6 +376,25 @@ export default {
 			}
 		},
 
+		/**
+		 * Save the calendar default alarm.
+		 */
+		async saveDefaultAlarm() {
+			try {
+				const defaultAlarmValue = this.selectedDefaultAlarm ? this.selectedDefaultAlarm.value : null
+				await this.calendarsStore.changeCalendarDefaultAlarm({
+					calendar: this.calendar,
+					defaultAlarm: defaultAlarmValue,
+				})
+			} catch (error) {
+				logger.error('Failed to save calendar default alarm', {
+					calendar: this.calendar,
+					defaultAlarm: this.selectedDefaultAlarm,
+				})
+				throw error
+			}
+		},
+
 		/**
 		 * Save unsaved changes and close the modal.
 		 *
@@ -315,6 +412,9 @@ export default {
 				if (this.calendarNameChanged) {
 					await this.saveName()
 				}
+				if (this.supportsDefaultAlarm && this.defaultAlarmChanged) {
+					await this.saveDefaultAlarm()
+				}
 			} catch (error) {
 				showError(this.$t('calendar', 'Failed to save calendar name and color'))
 			}
@@ -331,6 +431,32 @@ export default {
 			})
 			this.closeModal()
 		},
+
+		/**
+		 * Create alarm object from trigger time for formatting
+		 *
+		 * @param {number} time Total amount of seconds for the trigger
+		 * @return {object} The alarm object
+		 */
+		getAlarmObjectFromTriggerTime(time) {
+			const timedData = getAmountAndUnitForTimedEvents(time)
+			const allDayData = getAmountHoursMinutesAndUnitForAllDayEvents(time)
+
+			return {
+				isRelative: true,
+				absoluteDate: null,
+				absoluteTimezoneId: null,
+				relativeIsBefore: time < 0,
+				relativeIsRelatedToStart: true,
+				relativeUnitTimed: timedData.unit,
+				relativeAmountTimed: timedData.amount,
+				relativeUnitAllDay: allDayData.unit,
+				relativeAmountAllDay: allDayData.amount,
+				relativeHoursAllDay: allDayData.hours,
+				relativeMinutesAllDay: allDayData.minutes,
+				relativeTrigger: time,
+			}
+		},
 	},
 }
 </script>
@@ -397,6 +523,25 @@ export default {
 		gap: 5px;
 	}
 
+	&__default-alarm {
+		margin-bottom: calc(var(--default-grid-baseline) * 2);
+
+		&__label {
+			display: block;
+			margin-bottom: var(--default-grid-baseline);
+			font-weight: bold;
+		}
+
+		&__select {
+			width: 100%;
+		}
+
+		&__hint {
+			margin-top: var(--default-grid-baseline);
+			color: var(--color-text-maxcontrast);
+		}
+	}
+
 	.checkbox-content {
 		margin-inline-start: 25px;
 	}
diff --git a/src/env.d.ts b/src/env.d.ts
index 6d2a59d4af..024d1231a5 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -4,10 +4,12 @@
  */
 
 import type { getCSPNonce } from '@nextcloud/auth'
+import type { OC } from './types/oc.ts'
 
 declare global {
 	let __webpack_nonce__: ReturnType<typeof getCSPNonce>
 	let __webpack_public_path__: string
+	const OC: OC
 }
 
 export {}
diff --git a/src/models/calendar.js b/src/models/calendar.js
index aec0ba750c..95af491c0f 100644
--- a/src/models/calendar.js
+++ b/src/models/calendar.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { detectColor, uidToHexColor } from '../utils/color.js'
+import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
 import { mapDavShareeToCalendarShareObject } from './calendarShare.js'
 
 /**
@@ -62,6 +63,8 @@ function getDefaultCalendarObject(props = {}) {
 		fetchedTimeRanges: [],
 		// Scheduling transparency
 		transparency: 'opaque',
+		// Default alarm/reminder for new events in seconds (null if disabled)
+		defaultAlarm: null,
 		...props,
 	}
 }
@@ -103,6 +106,9 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
 	// then the default value CALDAV:opaque MUST be assumed.
 	// https://datatracker.ietf.org/doc/html/rfc6638#section-9.1
 	const transparency = calendar.transparency || 'opaque'
+	// Default alarm for new events in this calendar (in seconds)
+	// The value can be null or a number of seconds
+	const defaultAlarm = supportsDefaultAlarm() && calendar.defaultAlarm !== undefined ? calendar.defaultAlarm : null
 
 	let isSharedWithMe = false
 	if (!currentUserPrincipal) {
@@ -161,6 +167,7 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
 		shares,
 		timezone,
 		transparency,
+		defaultAlarm,
 		dav: calendar,
 	})
 }
diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js
index c235f66eb6..c9e92b2465 100644
--- a/src/store/calendarObjectInstance.js
+++ b/src/store/calendarObjectInstance.js
@@ -28,6 +28,7 @@ import {
 	getDateFromDateTimeValue,
 } from '../utils/date.js'
 import logger from '../utils/logger.js'
+import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
 import { getBySetPositionAndBySetFromDate, getWeekDayFromDate } from '../utils/recurrence.js'
 import useCalendarObjectsStore from './calendarObjects.js'
 import useCalendarsStore from './calendars.js'
@@ -1391,9 +1392,18 @@ export default defineStore('calendarObjectInstance', {
 			const eventComponent = getObjectAtRecurrenceId(calendarObject, startDate)
 			const calendarObjectInstance = mapEventComponentToEventObject(eventComponent)
 
-			// Add an alarm if the user set a default one in the settings. If
-			// not, defaultReminder will not be a number (rather the string "none").
-			const defaultReminder = parseInt(settingsStore.defaultReminder)
+			// Add an alarm if set. First check for calendar-specific default alarm (Nextcloud 34+),
+			// then fall back to the global default reminder setting.
+			const calendarsStore = useCalendarsStore()
+			const calendar = calendarsStore.getCalendarById(calendarObject.calendarId)
+
+			let defaultReminder = null
+			if (supportsDefaultAlarm() && calendar && calendar.defaultAlarm !== null) {
+				defaultReminder = parseInt(calendar.defaultAlarm)
+			} else {
+				defaultReminder = parseInt(settingsStore.defaultReminder)
+			}
+
 			if (!isNaN(defaultReminder)) {
 				this.addAlarmToCalendarObjectInstance({
 					calendarObjectInstance,
diff --git a/src/store/calendars.js b/src/store/calendars.js
index c59bff8f42..21bc034dcc 100644
--- a/src/store/calendars.js
+++ b/src/store/calendars.js
@@ -27,6 +27,7 @@ import getTimezoneManager from '../services/timezoneDataProviderService.js'
 import { uidToHexColor } from '../utils/color.js'
 import { dateFactory, getUnixTimestampFromDate } from '../utils/date.js'
 import logger from '../utils/logger.js'
+import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
 import useCalendarObjectsStore from './calendarObjects.js'
 import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
 import useImportFilesStore from './importFiles.js'
@@ -586,6 +587,29 @@ export default defineStore('calendars', {
 			this.calendarsById[calendar.id].transparency = transparency
 		},
 
+		/**
+		 * Change a calendar's default alarm
+		 *
+		 * @param {object} data destructuring object
+		 * @param {object} data.calendar the calendar to modify
+		 * @param {string|null} data.defaultAlarm the new default alarm in seconds (or null to disable)
+		 * @return {Promise}
+		 */
+		async changeCalendarDefaultAlarm({ calendar, defaultAlarm }) {
+			if (!supportsDefaultAlarm()) {
+				return
+			}
+
+			if (calendar.dav.defaultAlarm === defaultAlarm) {
+				return
+			}
+
+			calendar.dav.defaultAlarm = defaultAlarm
+
+			await calendar.dav.update()
+			this.calendarsById[calendar.id].defaultAlarm = defaultAlarm
+		},
+
 		/**
 		 * Share calendar with User or Group
 		 *
diff --git a/src/types/oc.ts b/src/types/oc.ts
new file mode 100644
index 0000000000..c0e3160929
--- /dev/null
+++ b/src/types/oc.ts
@@ -0,0 +1,8 @@
+// SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+export type OC = {
+	config: {
+		version: string
+	}
+}
diff --git a/src/utils/nextcloudVersion.ts b/src/utils/nextcloudVersion.ts
new file mode 100644
index 0000000000..e157c270f5
--- /dev/null
+++ b/src/utils/nextcloudVersion.ts
@@ -0,0 +1,22 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+/**
+ * Get the current Nextcloud major version
+ *
+ * @return The major version number
+ */
+export function getNextcloudVersion(): number {
+	return parseInt(OC.config.version.split('.')[0])
+}
+
+/**
+ * Whether the current Nextcloud version supports per-calendar default alarms (v34+)
+ *
+ * @return True if supported
+ */
+export function supportsDefaultAlarm(): boolean {
+	return getNextcloudVersion() >= 34
+}
diff --git a/tests/javascript/unit/models/calendar.test.js b/tests/javascript/unit/models/calendar.test.js
index 8c25ba382f..164747461b 100644
--- a/tests/javascript/unit/models/calendar.test.js
+++ b/tests/javascript/unit/models/calendar.test.js
@@ -42,6 +42,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			transparency: 'opaque',
+			defaultAlarm: null,
 		})
 	})
 
@@ -76,6 +77,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			transparency: 'opaque',
+			defaultAlarm: null,
 		})
 	})
 
@@ -125,6 +127,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -176,6 +179,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -225,6 +229,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -274,6 +279,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -323,6 +329,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -372,6 +379,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -421,6 +429,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -470,6 +479,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -575,6 +585,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(4)
@@ -696,6 +707,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 
 		expect(mapDavShareeToCalendarShareObject).toHaveBeenCalledTimes(0)
@@ -746,6 +758,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
 			calendarObjects: [],
 			fetchedTimeRanges: [],
 			loading: false,
+			defaultAlarm: null,
 		})
 	})
 

From 9c2e7bdcc258153a52b53336345fcfdfaf00a571 Mon Sep 17 00:00:00 2001
From: Grigory V <scratchx@gmx.com>
Date: Tue, 10 Mar 2026 19:11:26 +0100
Subject: [PATCH 2/2] fixup! feat(EditCalendarModal): add setting for default
 reminder per calendar

Signed-off-by: Grigory V <scratchx@gmx.com>
---
 src/components/AppNavigation/EditCalendarModal.vue | 10 +++++-----
 src/components/AppNavigation/Settings.vue          |  6 +-----
 src/components/AppointmentConfigModal.vue          |  4 ++--
 src/models/calendar.js                             |  4 ++--
 src/store/calendarObjectInstance.js                |  4 ++--
 src/store/calendars.js                             |  4 ++--
 src/utils/nextcloudVersion.ts                      |  6 +++---
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal.vue b/src/components/AppNavigation/EditCalendarModal.vue
index 6ed8870f9d..dcd2da5a90 100644
--- a/src/components/AppNavigation/EditCalendarModal.vue
+++ b/src/components/AppNavigation/EditCalendarModal.vue
@@ -43,7 +43,7 @@
 					{{ $t('calendar', 'Never show me as busy (set this calendar to transparent)') }}
 				</NcCheckboxRadioSwitch>
 			</template>
-			<template v-if="!calendar.isSharedWithMe && supportsDefaultAlarm">
+			<template v-if="!calendar.isSharedWithMe && isAfterVersion">
 				<div class="edit-calendar-modal__default-alarm">
 					<label for="default-alarm-select" class="edit-calendar-modal__default-alarm__label">
 						{{ $t('calendar', 'Default reminder') }}
@@ -130,7 +130,7 @@ import {
 	getAmountHoursMinutesAndUnitForAllDayEvents,
 } from '../../utils/alarms.js'
 import logger from '../../utils/logger.js'
-import { supportsDefaultAlarm } from '../../utils/nextcloudVersion.ts'
+import { isAfterVersion } from '../../utils/nextcloudVersion.ts'
 
 export default {
 	name: 'EditCalendarModal',
@@ -285,8 +285,8 @@ export default {
 		 *
 		 * @return {boolean}
 		 */
-		supportsDefaultAlarm() {
-			return supportsDefaultAlarm()
+		isAfterVersion() {
+			return isAfterVersion(34)
 		},
 	},
 
@@ -412,7 +412,7 @@ export default {
 				if (this.calendarNameChanged) {
 					await this.saveName()
 				}
-				if (this.supportsDefaultAlarm && this.defaultAlarmChanged) {
+				if (this.isAfterVersion && this.defaultAlarmChanged) {
 					await this.saveDefaultAlarm()
 				}
 			} catch (error) {
diff --git a/src/components/AppNavigation/Settings.vue b/src/components/AppNavigation/Settings.vue
index 876d894a23..fd92fa907b 100644
--- a/src/components/AppNavigation/Settings.vue
+++ b/src/components/AppNavigation/Settings.vue
@@ -338,10 +338,6 @@ export default {
 			return generateUrl('/settings/user/availability')
 		},
 
-		nextcloudVersion() {
-			return parseInt(OC.config.version.split('.')[0])
-		},
-
 		defaultCalendarOptions() {
 			return this.calendarsStore.calendars
 				.filter((calendar) => !calendar.readOnly
@@ -350,7 +346,7 @@ export default {
 		},
 
 		/**
-		 * The default calendarci for incoming inivitations
+		 * The default calendar for incoming inivitations
 		 *
 		 * @return {object|undefined} The default calendar or undefined if none is available
 		 */
diff --git a/src/components/AppointmentConfigModal.vue b/src/components/AppointmentConfigModal.vue
index 006fbf0d79..17e8fe08a7 100644
--- a/src/components/AppointmentConfigModal.vue
+++ b/src/components/AppointmentConfigModal.vue
@@ -172,6 +172,7 @@ import useAppointmentConfigsStore from '../store/appointmentConfigs.js'
 import useCalendarsStore from '../store/calendars.js'
 import useSettingsStore from '../store/settings.js'
 import logger from '../utils/logger.js'
+import { isAfterVersion } from '@/utils/nextcloudVersion'
 
 export default {
 	name: 'AppointmentConfigModal',
@@ -259,8 +260,7 @@ export default {
 
 		// TODO: Can be removed after NC version 30 support is dropped
 		availableCalendars() {
-			const nextcloudMajorVersion = parseInt(window.OC.config.version.split('.')[0])
-			if (nextcloudMajorVersion >= 31) {
+			if (isAfterVersion(31)) {
 				return this.sortedCalendars
 			}
 			return this.ownSortedCalendars
diff --git a/src/models/calendar.js b/src/models/calendar.js
index 95af491c0f..aaa34eeffa 100644
--- a/src/models/calendar.js
+++ b/src/models/calendar.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { detectColor, uidToHexColor } from '../utils/color.js'
-import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
+import { isAfterVersion } from '../utils/nextcloudVersion.ts'
 import { mapDavShareeToCalendarShareObject } from './calendarShare.js'
 
 /**
@@ -108,7 +108,7 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
 	const transparency = calendar.transparency || 'opaque'
 	// Default alarm for new events in this calendar (in seconds)
 	// The value can be null or a number of seconds
-	const defaultAlarm = supportsDefaultAlarm() && calendar.defaultAlarm !== undefined ? calendar.defaultAlarm : null
+	const defaultAlarm = isAfterVersion(34) && calendar.defaultAlarm !== undefined ? calendar.defaultAlarm : null
 
 	let isSharedWithMe = false
 	if (!currentUserPrincipal) {
diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js
index c9e92b2465..b18d1a561c 100644
--- a/src/store/calendarObjectInstance.js
+++ b/src/store/calendarObjectInstance.js
@@ -28,7 +28,7 @@ import {
 	getDateFromDateTimeValue,
 } from '../utils/date.js'
 import logger from '../utils/logger.js'
-import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
+import { isAfterVersion } from '../utils/nextcloudVersion.ts'
 import { getBySetPositionAndBySetFromDate, getWeekDayFromDate } from '../utils/recurrence.js'
 import useCalendarObjectsStore from './calendarObjects.js'
 import useCalendarsStore from './calendars.js'
@@ -1398,7 +1398,7 @@ export default defineStore('calendarObjectInstance', {
 			const calendar = calendarsStore.getCalendarById(calendarObject.calendarId)
 
 			let defaultReminder = null
-			if (supportsDefaultAlarm() && calendar && calendar.defaultAlarm !== null) {
+			if (isAfterVersion(34) && calendar && calendar.defaultAlarm !== null) {
 				defaultReminder = parseInt(calendar.defaultAlarm)
 			} else {
 				defaultReminder = parseInt(settingsStore.defaultReminder)
diff --git a/src/store/calendars.js b/src/store/calendars.js
index 21bc034dcc..4673a9c847 100644
--- a/src/store/calendars.js
+++ b/src/store/calendars.js
@@ -27,7 +27,7 @@ import getTimezoneManager from '../services/timezoneDataProviderService.js'
 import { uidToHexColor } from '../utils/color.js'
 import { dateFactory, getUnixTimestampFromDate } from '../utils/date.js'
 import logger from '../utils/logger.js'
-import { supportsDefaultAlarm } from '../utils/nextcloudVersion.ts'
+import { isAfterVersion } from '../utils/nextcloudVersion.ts'
 import useCalendarObjectsStore from './calendarObjects.js'
 import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
 import useImportFilesStore from './importFiles.js'
@@ -596,7 +596,7 @@ export default defineStore('calendars', {
 		 * @return {Promise}
 		 */
 		async changeCalendarDefaultAlarm({ calendar, defaultAlarm }) {
-			if (!supportsDefaultAlarm()) {
+			if (!isAfterVersion(34)) {
 				return
 			}
 
diff --git a/src/utils/nextcloudVersion.ts b/src/utils/nextcloudVersion.ts
index e157c270f5..b41ae10945 100644
--- a/src/utils/nextcloudVersion.ts
+++ b/src/utils/nextcloudVersion.ts
@@ -13,10 +13,10 @@ export function getNextcloudVersion(): number {
 }
 
 /**
- * Whether the current Nextcloud version supports per-calendar default alarms (v34+)
+ * Whether the current Nextcloud version is equal or higher than the given version
  *
  * @return True if supported
  */
-export function supportsDefaultAlarm(): boolean {
-	return getNextcloudVersion() >= 34
+export function isAfterVersion(version: number): boolean {
+	return getNextcloudVersion() >= version
 }