fix: use proper view mode and object permissions

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

src/components/AppNavigation/CalendarList.vue

@@ -74,7 +74,7 @@ const delegatedGroups = computed<DelegatedGroup[]>(() => {
 			groups.set(delegatorUrl, {
 				delegatorUrl,
 				displayname: principal?.displayname || principal?.userId || '',
-				readOnly: !!calendar.readOnly,
+				readOnly: !calendar.canCreateObject && !calendar.canModifyObject,
 				calendars: [],
 			})
 		}

src/components/AppNavigation/Settings.vue

@@ -359,7 +359,7 @@ export default {
 
 		defaultCalendarOptions() {
 			return this.calendarsStore.calendars
-				.filter((calendar) => !calendar.readOnly
+				.filter((calendar) => (calendar.canCreateObject || calendar.canModifyObject)
 					&& !calendar.isSharedWithMe
 					&& calendar.supportsEvents)
 		},

src/fullcalendar/eventSources/eventSource.js

@@ -59,7 +59,7 @@ export default function() {
 			},
 		}
 
-		if (calendar.readOnly) {
+		if (!calendar.canCreateObject && !calendar.canModifyObject) {
 			source.editable = false
 		}
 

src/mixins/EditorMixin.js

@@ -317,10 +317,11 @@ export default {
 			if (!this.calendarObject) {
 				return false
 			}
-			if (this.isReadOnly) {
+			if (this.isLoading) {
 				return false
 			}
-			if (this.isLoading) {
+			const calendar = this.calendarsStore.getCalendarById(this.calendarObject.calendarId)
+			if (!calendar?.canDeleteObject) {
 				return false
 			}
 

src/models/calendar.js

@@ -39,8 +39,6 @@ function getDefaultCalendarObject(props = {}) {
 		publishURL: null,
 		// Internal CalDAV url of this calendar
 		url: '',
-		// Whether this calendar is read-only
-		readOnly: false,
 		// The order of this calendar in the calendar-list
 		order: 0,
 		// Whether or not the calendar is shared with me
@@ -99,7 +97,6 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
 	const supportsJournals = calendar.components.includes('VJOURNAL')
 	const supportsTasks = calendar.components.includes('VTODO')
 	const owner = calendar.owner
-	const readOnly = !calendar.isWriteable()
 	const canBeShared = calendar.isShareable()
 	const canBePublished = calendar.isPublishable()
 	const canCreateObject = calendar.currentUserPrivilegeSet.includes('{DAV:}bind') || calendar.currentUserPrivilegeSet.includes('{DAV:}write') || calendar.currentUserPrivilegeSet.includes('{DAV:}all') === true
@@ -160,7 +157,6 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
 		supportsTasks,
 		isSharedWithMe,
 		owner,
-		readOnly,
 		publishURL,
 		canBeShared,
 		canBePublished,

src/store/calendars.js

@@ -74,7 +74,7 @@ export default defineStore('calendars', {
 		sortedCalendars(state) {
 			return state.calendars
 				.filter((calendar) => calendar.supportsEvents)
-				.filter((calendar) => !calendar.readOnly)
+				.filter((calendar) => calendar.canCreateObject || calendar.canModifyObject)
 				.sort((a, b) => a.order - b.order)
 		},
 
@@ -101,7 +101,7 @@ export default defineStore('calendars', {
 		 */
 		sortedWritableCalendarsEvenWithoutSupportForEvents(state) {
 			return state.calendars
-				.filter((calendar) => !calendar.readOnly)
+				.filter((calendar) => calendar.canCreateObject || calendar.canModifyObject)
 				.sort((a, b) => a.order - b.order)
 		},
 
@@ -114,7 +114,7 @@ export default defineStore('calendars', {
 		ownSortedCalendars(state) {
 			return state.calendars
 				.filter((calendar) => calendar.supportsEvents)
-				.filter((calendar) => !calendar.readOnly)
+				.filter((calendar) => calendar.canCreateObject || calendar.canModifyObject)
 				.filter((calendar) => !calendar.isSharedWithMe)
 				.sort((a, b) => a.order - b.order)
 		},
@@ -186,7 +186,7 @@ export default defineStore('calendars', {
 		sortedSubscriptions(state) {
 			return state.calendars
 				.filter((calendar) => calendar.supportsEvents)
-				.filter((calendar) => calendar.readOnly)
+				.filter((calendar) => !(calendar.canCreateObject || calendar.canModifyObject))
 				.sort((a, b) => a.order - b.order)
 		},
 

src/store/delegation.ts

@@ -168,8 +168,9 @@ export default defineStore('delegation', () => {
 	 * The calendars are tagged with isDelegated=true so CalendarList can show them
 	 * in their own section.
 	 *
-	 * Read-only delegators' calendars are additionally marked readOnly=true so they
-	 * are excluded from the calendar picker (which only lists writable calendars).
+	 * Read-only delegators' calendars additionally have their write permissions
+	 * cleared so they are excluded from the calendar picker (which only lists
+	 * calendars with canCreateObject or canModifyObject).
 	 */
 	async function fetchDelegatedCalendars(): Promise<void> {
 		if (!delegators.value.length) {
@@ -200,7 +201,7 @@ export default defineStore('delegation', () => {
 						isDelegated: true,
 						delegatorUrl: canonicalDelegatorUrl,
 						// Read-only proxy access: prevent editing and hide from calendar picker
-						...(permission === 'read' ? { readOnly: true } : {}),
+						...(permission === 'read' ? { canCreateObject: false, canModifyObject: false, canDeleteObject: false } : {}),
 					}))
 
 				for (const calendar of mappedCalendars) {

src/types/calendar.ts

@@ -66,8 +66,6 @@ export interface CalendarInterface {
 	publishURL: string | null
 	/** Internal CalDAV url of this calendar */
 	url: string
-	/** Whether this calendar is read-only */
-	readOnly: boolean
 	/** The order of this calendar in the calendar-list */
 	order: number
 	/** Whether the calendar is shared with the current user */

src/views/Calendar.vue

@@ -375,7 +375,7 @@ export default {
 			})
 
 			const writeableCalendarIndex = calendars.findIndex((calendar) => {
-				return !calendar.readOnly
+				return calendar.canCreateObject || calendar.canModifyObject
 			})
 
 			// No writeable calendars? Create a new one!

tests/javascript/unit/fullcalendar/eventSources/eventSource.test.js

@@ -32,7 +32,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: false,
+			canCreateObject: true,
+			canModifyObject: true,
 		}
 
 		const eventSourceFunction = eventSource()
@@ -52,7 +53,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: true,
+			canCreateObject: false,
+			canModifyObject: false,
 		}
 
 		const eventSourceFunction = eventSource()
@@ -82,7 +84,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: true,
+			canCreateObject: false,
+			canModifyObject: false,
 		}
 
 		const getTimezoneForId = vi.fn()
@@ -151,7 +154,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: true,
+			canCreateObject: false,
+			canModifyObject: false,
 		}
 
 		const getTimezoneForId = vi.fn()
@@ -215,7 +219,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: true,
+			canCreateObject: false,
+			canModifyObject: false,
 		}
 
 		const getTimezoneForId = vi.fn()
@@ -282,7 +287,8 @@ describe('fullcalendar/eventSource test suite', () => {
 		const calendar = {
 			id: 'calendar-id-123',
 			color: '#ff00ff',
-			readOnly: true,
+			canCreateObject: false,
+			canModifyObject: false,
 		}
 
 		const getTimezoneForId = vi.fn()