From b9c8b5503e63f93c9be4fcb13a279f5a5ce5fcaf Mon Sep 17 00:00:00 2001
From: Grigory V <scratchx@gmx.com>
Date: Thu, 12 Mar 2026 17:59:40 +0100
Subject: [PATCH] fix: default calendar alarm application

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>
---
 css/app-full.scss                             |  4 +++
 src/components/Editor/Alarm/AlarmList.vue     |  6 +++-
 src/components/Editor/Alarm/AlarmListItem.vue |  8 +++--
 src/mixins/EditorMixin.js                     |  3 ++
 src/store/calendarObjectInstance.js           | 14 ++++++--
 src/utils/alarms.js                           | 33 +++++++++++++++++++
 6 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/css/app-full.scss b/css/app-full.scss
index ced95bbaf3..d8e97b6934 100644
--- a/css/app-full.scss
+++ b/css/app-full.scss
@@ -119,6 +119,10 @@
 	.app-full &__front, &__edit {
 		margin-inline-start: calc(var(--default-grid-baseline) * 9);
 	}
+
+	&__label--default {
+		color: var(--color-text-maxcontrast);
+	}
 }
 
 .property-add-talk {
diff --git a/src/components/Editor/Alarm/AlarmList.vue b/src/components/Editor/Alarm/AlarmList.vue
index 695896bbee..fe55645f0e 100644
--- a/src/components/Editor/Alarm/AlarmList.vue
+++ b/src/components/Editor/Alarm/AlarmList.vue
@@ -52,7 +52,11 @@ export default {
 		...mapStores(useCalendarObjectInstanceStore),
 		...mapState(useSettingsStore, ['forceEventAlarmType']),
 		alarms() {
-			return this.calendarObjectInstance.alarms
+			return this.calendarObjectInstance.alarms.slice().sort((a, b) => {
+				const aIsDefault = a.alarmComponent.getFirstPropertyFirstValue('X-NC-DEFAULT-ALARM') ? 1 : 0
+				const bIsDefault = b.alarmComponent.getFirstPropertyFirstValue('X-NC-DEFAULT-ALARM') ? 1 : 0
+				return bIsDefault - aIsDefault
+			})
 		},
 	},
 
diff --git a/src/components/Editor/Alarm/AlarmListItem.vue b/src/components/Editor/Alarm/AlarmListItem.vue
index a271b46375..9259cf6ef3 100644
--- a/src/components/Editor/Alarm/AlarmListItem.vue
+++ b/src/components/Editor/Alarm/AlarmListItem.vue
@@ -5,9 +5,9 @@
 
 <template>
 	<!-- Yes, technically an alarm is a component, not a property, but for the matter of CSS names it really doesn't matter -->
-	<div class="property-alarm-item">
+	<div class="property-alarm-item" :title="isDefault ? $t('calendar', 'Default reminder of calendar') : ''">
 		<div v-if="!isEditing" class="property-alarm-item__front">
-			<div class="property-alarm-item__label">
+			<div class="property-alarm-item__label" :class="{ 'property-alarm-item__label--default': isDefault }">
 				{{ formatAlarm(alarm, isAllDay, currentUserTimezone, locale) }}
 			</div>
 		</div>
@@ -327,6 +327,10 @@ export default {
 			return moment.localeData().longDateFormat('LT')
 		},
 
+		isDefault() {
+			return this.alarm.alarmComponent.getFirstPropertyFirstValue('X-NC-DEFAULT-ALARM')
+		},
+
 		absoluteDateFormat() {
 			return [
 				'[',
diff --git a/src/mixins/EditorMixin.js b/src/mixins/EditorMixin.js
index 8bbc180e7e..6d325343f4 100644
--- a/src/mixins/EditorMixin.js
+++ b/src/mixins/EditorMixin.js
@@ -14,6 +14,7 @@ import useCalendarsStore from '../store/calendars.js'
 import usePrincipalsStore from '../store/principals.js'
 import useSettingsStore from '../store/settings.js'
 import useWidgetStore from '../store/widget.js'
+import { updateDefaultAlarm } from '../utils/alarms.js'
 import { removeMailtoPrefix } from '../utils/attendee.js'
 import { uidToHexColor } from '../utils/color.js'
 import { dateFactory } from '../utils/date.js'
@@ -491,6 +492,8 @@ export default {
 			if (this.calendarObject && !this.calendarObject.existsOnServer) {
 				this.calendarObject.calendarId = selectedCalendar.id
 			}
+
+			updateDefaultAlarm()
 		},
 		/**
 		 * This will force the user to update this and all future occurrences when saving
diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js
index b18d1a561c..7b69ae3e64 100644
--- a/src/store/calendarObjectInstance.js
+++ b/src/store/calendarObjectInstance.js
@@ -1139,6 +1139,7 @@ export default defineStore('calendarObjectInstance', {
 			calendarObjectInstance,
 			type,
 			totalSeconds,
+			isDefault = false,
 		}) {
 			if (calendarObjectInstance.eventComponent) {
 				const eventComponent = calendarObjectInstance.eventComponent
@@ -1146,6 +1147,10 @@ export default defineStore('calendarObjectInstance', {
 				const duration = DurationValue.fromSeconds(totalSeconds)
 				const alarmComponent = eventComponent.addRelativeAlarm(type, duration)
 
+				if (isDefault) {
+					alarmComponent.addProperty(new Property('X-NC-DEFAULT-ALARM', isDefault))
+				}
+
 				const alarmObject = mapAlarmComponentToAlarmObject(alarmComponent)
 
 				calendarObjectInstance.alarms.push(alarmObject)
@@ -1404,11 +1409,15 @@ export default defineStore('calendarObjectInstance', {
 				defaultReminder = parseInt(settingsStore.defaultReminder)
 			}
 
-			if (!isNaN(defaultReminder)) {
+			if (
+				!isNaN(defaultReminder)
+				&& !calendarObjectInstance.alarms.some((alarm) => alarm.alarmComponent.getFirstPropertyFirstValue('X-NC-DEFAULT-ALARM'))
+			) {
 				this.addAlarmToCalendarObjectInstance({
 					calendarObjectInstance,
 					type: 'DISPLAY',
 					totalSeconds: defaultReminder,
+					isDefault: true,
 				})
 				logger.debug(`Added defaultReminder (${defaultReminder}s) to newly created event`)
 			}
@@ -1880,8 +1889,8 @@ export default defineStore('calendarObjectInstance', {
 		/**
 		 *
 		 * @param {object} data The destructuring object for data
-		 * @param {object} data.calendarObjectInstance The calendarObjectInstance object
 		 * @param {object} data.recurrenceRule The recurrenceRule object to modify
+		 * @param {string} data.byDay The new until to set
 		 */
 		enableRecurrenceLimitByUntil({
 			calendarObjectInstance,
@@ -1939,6 +1948,7 @@ export default defineStore('calendarObjectInstance', {
 		 *
 		 * @param {object} data The destructuring object for data
 		 * @param {object} data.recurrenceRule The recurrenceRule object to modify
+		 * @param {number} data.count The new count to set
 		 */
 		enableRecurrenceLimitByCount({ recurrenceRule }) {
 			this.changeRecurrenceToInfinite({
diff --git a/src/utils/alarms.js b/src/utils/alarms.js
index dfdfac31c1..297696cdc6 100644
--- a/src/utils/alarms.js
+++ b/src/utils/alarms.js
@@ -5,6 +5,9 @@
 
 import { AttendeeProperty, Property } from '@nextcloud/calendar-js'
 import { translate as t } from '@nextcloud/l10n'
+import useCalendarObjectInstanceStore from '../store/calendarObjectInstance.js'
+import useCalendarsStore from '../store/calendars.js'
+import { isAfterVersion } from './nextcloudVersion.ts'
 
 /**
  * Get the factor for a given unit
@@ -199,6 +202,36 @@ export function getTotalSecondsFromAmountHourMinutesAndUnitForAllDayEvents(amoun
 	return amount
 }
 
+export function updateDefaultAlarm() {
+	const calendarObjectInstanceStore = useCalendarObjectInstanceStore()
+	const calendarObjectInstance = calendarObjectInstanceStore.calendarObjectInstance
+	const calendarsStore = useCalendarsStore()
+	const calendar = calendarsStore.getCalendarById(calendarObjectInstanceStore.calendarObject.calendarId)
+
+	let defaultReminder = null
+	if (isAfterVersion(34) && calendar && calendar.defaultAlarm !== null) {
+		defaultReminder = calendar.defaultAlarm
+	}
+
+	// Find the existing default alarm (if any)
+	const existingDefaultAlarm = calendarObjectInstance.alarms.find((alarm) => alarm.alarmComponent.getFirstPropertyFirstValue('X-NC-DEFAULT-ALARM'))
+	// Only update the default alarm if one already exists.
+	// If the user has manually removed the default alarm, don't re-add it.
+	if (!isNaN(defaultReminder) && existingDefaultAlarm) {
+		calendarObjectInstanceStore.removeAlarmFromCalendarObjectInstance({
+			calendarObjectInstance,
+			alarm: existingDefaultAlarm,
+		})
+
+		calendarObjectInstanceStore.addAlarmToCalendarObjectInstance({
+			calendarObjectInstance,
+			type: 'DISPLAY',
+			totalSeconds: defaultReminder,
+			isDefault: true,
+		})
+	}
+}
+
 /**
  * Propagate data from an event component to all EMAIL alarm components.
  * An alarm component must contain a description, summary and all attendees to be notified.