Merge pull request #7823 from max65482/fix/event_duplicate_glitch

fix: add duplicated event directly to the target calendar

Author: SebastianKrupinski

src/store/calendarObjectInstance.js

@@ -1521,6 +1521,7 @@ export default defineStore('calendarObjectInstance', {
 				end: endDate.unixTime,
 				timezoneId: oldEventComponent.startDate.timezoneId,
 				isAllDay: oldEventComponent.isAllDay(),
+				calendarId: this.calendarObject?.calendarId ?? null,
 			})
 			const eventComponent = getObjectAtRecurrenceId(calendarObject, startDate.jsDate)
 			copyCalendarObjectInstanceIntoEventComponent(oldCalendarObjectInstance, eventComponent, true)

src/store/calendarObjects.js

@@ -211,9 +211,10 @@ export default defineStore('calendarObjects', {
 		 * @param {number} data.end Timestamp for end of new event
 		 * @param {string} data.timezoneId asd
 		 * @param {boolean} data.isAllDay foo
+		 * @param {string} [data.calendarId] Optional calendar id to create the event in
 		 * @return {Promise<CalendarObject>}
 		 */
-		createNewEvent({ start, end, timezoneId, isAllDay }) {
+		createNewEvent({ start, end, timezoneId, isAllDay, calendarId = null }) {
 			const calendarsStore = useCalendarsStore()
 			const timezoneManager = getTimezoneManager()
 			const timezone = timezoneManager.getTimezoneForId(timezoneId)
@@ -238,8 +239,8 @@ export default defineStore('calendarObjects', {
 				vObject.undirtify()
 			}
 
-			const firstCalendar = calendarsStore.sortedCalendars[0].id
-			return Promise.resolve(mapCalendarJsToCalendarObject(calendar, firstCalendar))
+			const targetCalendar = calendarId || calendarsStore.sortedCalendars[0].id
+			return Promise.resolve(mapCalendarJsToCalendarObject(calendar, targetCalendar))
 		},
 
 		/**