Merge pull request #10024 from nextcloud/perf/noid/improve-imip-calen…

…dar-integration

fix: wrong attendance status for imip events

src/App.vue

@@ -48,6 +48,7 @@ export default {
 		this.sync()
 		await this.$store.dispatch('fetchCurrentUserPrincipal')
 		await this.$store.dispatch('loadCollections')
+		this.$store.commit('hasCurrentUserPrincipalAndCollections', true)
 	},
 	methods: {
 		reload() {

src/components/Imip.vue

@@ -191,7 +191,7 @@ export default {
 	computed: {
 		...mapGetters({
 			currentUserPrincipalEmail: 'getCurrentUserPrincipalEmail',
-			clonedCalendars: 'getClonedCalendars',
+			clonedWriteableCalendars: 'getClonedWriteableCalendars',
 		}),
 
 		/**
@@ -362,7 +362,7 @@ export default {
 				}
 			}
 
-			return this.clonedCalendars
+			return this.clonedWriteableCalendars
 				.map(getCalendarData)
 				.filter(props => props.components.vevent && props.writable === true)
 		},
@@ -374,12 +374,6 @@ export default {
 				await this.fetchExistingEvent(this.attachedVEvent.uid)
 			},
 		},
-		clonedCalendars: {
-			immediate: true,
-			async handler() {
-				await this.fetchExistingEvent(this.attachedVEvent.uid)
-			},
-		},
 		calendarsForPicker: {
 			immediate: true,
 			handler(calendarsForPicker) {
@@ -476,7 +470,7 @@ export default {
 
 			// TODO: can this query be reduced to a single request?
 			const limit = pLimit(5)
-			const promises = this.clonedCalendars.map(async (calendar) => {
+			const promises = this.clonedWriteableCalendars.map(async (calendar) => {
 				// Query adapted from https://datatracker.ietf.org/doc/html/rfc4791#section-7.8.6
 				return limit(() => calendar.calendarQuery([{
 					name: [NS.IETF_CALDAV, 'comp-filter'],

src/components/Message.vue

@@ -20,7 +20,7 @@
 		<div v-if="itineraries.length > 0" class="message-itinerary">
 			<Itinerary :entries="itineraries" :message-id="message.messageId" />
 		</div>
-		<div v-if="message.scheduling.length > 0" class="message-imip">
+		<div v-if="hasCurrentUserPrincipalAndCollections && message.scheduling.length > 0" class="message-imip">
 			<Imip v-for="scheduling in message.scheduling"
 				:key="scheduling.id"
 				:scheduling="scheduling" />
@@ -131,6 +131,9 @@ export default {
 		itineraries() {
 			return this.message.itineraries ?? []
 		},
+		hasCurrentUserPrincipalAndCollections() {
+			return this.$store.getters.hasCurrentUserPrincipalAndCollections
+		},
 	},
 	methods: {
 		onReply(replyBody = '') {

src/store/getters.js

@@ -120,7 +120,9 @@ export const getters = {
 	getCurrentUserPrincipal: (state) => state.currentUserPrincipal,
 	getCurrentUserPrincipalEmail: (state) => state.currentUserPrincipal?.email,
 	getCalendars: (state) => state.calendars,
-	getClonedCalendars: (state) => state.calendars.map(calendar => {
+	getClonedWriteableCalendars: (state) => state.calendars.filter(calendar => {
+		return calendar.isWriteable()
+	}).map(calendar => {
 		// Hack: We need to clone all calendars because some methods (e.g. calendarQuery) are
 		// unnecessarily mutating the object and causing vue warnings (if used outside of
 		// mutations).
@@ -156,4 +158,5 @@ export const getters = {
 	hasFetchedInitialEnvelopes: (state) => state.hasFetchedInitialEnvelopes,
 	isFollowUpFeatureAvailable: (state) => state.followUpFeatureAvailable,
 	getInternalAddresses: (state) => state.internalAddress?.filter(internalAddress => internalAddress !== undefined),
+	hasCurrentUserPrincipalAndCollections: (state) => state.hasCurrentUserPrincipalAndCollections,
 }

src/store/index.js

@@ -107,6 +107,7 @@ export default new Store({
 				hasFetchedInitialEnvelopes: false,
 				followUpFeatureAvailable: false,
 				internalAddress: [],
+				hasCurrentUserPrincipalAndCollections: false,
 			},
 			getters,
 			mutations,

src/store/mutations.js

@@ -513,4 +513,7 @@ export default {
 	setFollowUpFeatureAvailable(state, followUpFeatureAvailable) {
 		state.followUpFeatureAvailable = followUpFeatureAvailable
 	},
+	hasCurrentUserPrincipalAndCollections(state, hasCurrentUserPrincipalAndCollections) {
+		state.hasCurrentUserPrincipalAndCollections = hasCurrentUserPrincipalAndCollections
+	},
 }