Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/components/AppNavigation/CalendarList/Trashbin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
</td>
<td>
<div class="item-actions">
<NcButton variant="secondary" @click="restore(item)">
<NcButton v-if="item.canRestore" variant="secondary" @click="restore(item)">
{{ t('calendar', 'Restore') }}
</NcButton>

<NcActions :forceMenu="true">
<NcActions v-if="item.canDelete" :forceMenu="item.canRestore">
<NcActionButton @click="onDeletePermanently(item)">
<template #icon>
<IconDelete :size="20" decorative />
Expand Down Expand Up @@ -164,6 +164,7 @@ export default {
url: calendar._url,
deletedAt: calendar._props['{http://nextcloud.com/ns}deleted-at'],
color: calendar.color ?? uidToHexColor(calendar.displayname),
readonly: false,
}))
const formattedCalendarObjects = this.objects.map((vobject) => {
let eventSummary = t('calendar', 'Untitled item')
Expand All @@ -185,6 +186,8 @@ export default {
const color = vobject.calendarComponent.getComponentIterator().next().value?.color
?? vobject.calendar?.color
?? uidToHexColor(subline)
const canDelete = vobject.calendar?.canDeleteObject
const canRestore = vobject.calendar?.canCreateObject && vobject.calendar?.canModifyObject
return {
vobject,
type: 'object',
Expand All @@ -194,6 +197,8 @@ export default {
url: vobject.uri,
deletedAt: vobject.dav._props['{http://nextcloud.com/ns}deleted-at'],
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is not really part of the scope, but when you are adding the access methods can you also add them for any other missing ones

vobject.dav._props['{http://nextcloud.com/ns}deleted-at']

color,
canDelete,
canRestore,
}
})

Expand Down Expand Up @@ -281,6 +286,9 @@ export default {
return
}
this.items.forEach((item) => {
if (!this.canModify(item)) {
return
}
this.onDeletePermanently(item)
})
},
Expand Down
39 changes: 31 additions & 8 deletions src/store/calendars.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,40 @@ export default defineStore('calendars', {
* @return {Array}
*/
allDeletedCalendarObjects(state) {
const calendarUriMap = {}
const lastSegment = (uri) => (uri ?? '').split('/').filter(Boolean).at(-1) ?? ''

const sourceUriOf = (calendar) => {
const tail = lastSegment(calendar.url)
const at = tail.lastIndexOf('_shared_by_')
if (at > 0) {
return tail.slice(0, at)
}
return tail
}

// Key calendars by `${ownerUserId}|${sourceUri}` so deleted objects
// match their origin calendar across owned/shared/delegated views.
const calendarBySource = new Map()
state.calendars.forEach((calendar) => {
const withoutTrail = calendar.url.replace(/\/$/, '')
const uri = withoutTrail.slice(withoutTrail.lastIndexOf('/') + 1)
calendarUriMap[uri] = calendar
let key = `${lastSegment(calendar.owner)}|${sourceUriOf(calendar)}`
if (calendar.isDelegated) {
key += lastSegment(calendar.delegatorUrl)
}
calendarBySource.set(key, calendar)
})

return state.deletedCalendarObjects.map((obj) => ({
calendar: calendarUriMap[obj.dav._props['{http://nextcloud.com/ns}calendar-uri']],
...obj,
}))
return state.deletedCalendarObjects.map((obj) => {
const owner = obj.dav.calendarOwnerPrincipalUri
const sourceUri = obj.dav.sourceCalendarUri
let key = `${lastSegment(owner)}|${sourceUri}`
if (obj.dav.delegator) {
key += lastSegment(obj.dav.delegator)
}
return {
calendar: calendarBySource.get(key),
...obj,
}
})
},

/**
Expand Down
Loading