Skip to content
Draft
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
26 changes: 26 additions & 0 deletions src/components/AppNavigation/EditCalendarModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
{{ $t('calendar', 'Never show me as busy (set this calendar to transparent)') }}
</NcCheckboxRadioSwitch>
</template>
<template v-if="canBeShared">
<NcCheckboxRadioSwitch :checked.sync="isOnlyAvailability">
{{ $t('calendar', 'Don’t show event details to others') }}
</NcCheckboxRadioSwitch>
</template>
<template v-if="canBeShared">
<h3 class="edit-calendar-modal__sharing-header">
{{ $t('calendar', 'Share calendar') }}
Expand Down Expand Up @@ -119,6 +124,7 @@ export default {
calendarColor: undefined,
calendarColorChanged: false,
isTransparent: false,
isOnlyAvailability: false,
calendarName: undefined,
calendarNameChanged: false,
}
Expand Down Expand Up @@ -180,6 +186,7 @@ export default {
this.calendarNameChanged = false
this.calendarColorChanged = false
this.isTransparent = calendar.transparency === 'transparent'
this.isOnlyAvailability = calendar.onlyAvailability
},
},

Expand Down Expand Up @@ -227,6 +234,24 @@ export default {
}
},

/**
* Save the calendar share property of only showing availability
*/
async saveShareOnlyAvailability() {
try {
await this.calendarsStore.changeCalendarShareOnlyAvailability({
calendar: this.calendar,
onlyAvailability: this.isOnlyAvailability,
})
} catch (error) {
logger.error('Failed to save calendar transparency', {
calendar: this.calendar,
onlyAvailability: this.isOnlyAvailability,
})
throw error
}
},

/**
* Save the calendar name.
*/
Expand Down Expand Up @@ -256,6 +281,7 @@ export default {
await this.saveColor()
}
await this.saveTransparency()
await this.saveShareOnlyAvailability()
if (this.calendarNameChanged) {
await this.saveName()
}
Expand Down
5 changes: 5 additions & 0 deletions src/models/calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ function getDefaultCalendarObject(props = {}) {
fetchedTimeRanges: [],
// Scheduling transparency
transparency: 'opaque',
// Shared option to only show free/busy
onlyAvailability: false,
...props,
}
}
Expand Down Expand Up @@ -130,6 +132,8 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
}
}

const onlyAvailability = false

return getDefaultCalendarObject({
id,
displayName,
Expand All @@ -149,6 +153,7 @@ function mapDavCollectionToCalendar(calendar, currentUserPrincipal) {
shares,
timezone,
transparency,
onlyAvailability,
dav: calendar,
})
}
Expand Down
19 changes: 19 additions & 0 deletions src/store/calendars.js
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,25 @@ export default defineStore('calendars', {
this.calendarsById[calendar.id].transparency = transparency
},

/**
* Change if a calendar share only shows availability (instead of full event details)
*
* @param {object} data destructuring object
* @param {object} data.calendar the calendar to modify
* @param {string} data.shareOnlyAvailability the new value for sharing only avaliability
* @return {Promise}
*/
async changeCalendarShareOnlyAvailability({ calendar, shareOnlyAvailability }) {
if (calendar.dav.onlyAvailability === shareOnlyAvailability) {
return
}

calendar.dav.onlyAvailability = shareOnlyAvailability

await calendar.dav.update()
this.calendarsById[calendar.id].onlyAvailability = shareOnlyAvailability
},

/**
* Share calendar with User or Group
*
Expand Down
15 changes: 15 additions & 0 deletions tests/javascript/unit/models/calendar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
calendarObjects: [],
fetchedTimeRanges: [],
transparency: 'opaque',
onlyAvailability: false,
})
})

Expand Down Expand Up @@ -70,6 +71,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
calendarObjects: [],
fetchedTimeRanges: [],
transparency: 'opaque',
onlyAvailability: false,
})
})

Expand All @@ -88,6 +90,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
enabled: true,
timezone: 'BEGIN:VCALENDAR...END:VCALENDAR',
transparency: 'opaque',
onlyAvailability: false,
}

expect(mapDavCollectionToCalendar(cdavObject, {
Expand All @@ -111,6 +114,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: 'BEGIN:VCALENDAR...END:VCALENDAR',
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand All @@ -134,6 +138,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
publishURL: undefined,
timezone: 'BEGIN:VCALENDAR...END:VCALENDAR',
transparency: 'transparent',
onlyAvailability: false,
enabled: false,
}

Expand All @@ -158,6 +163,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: 'BEGIN:VCALENDAR...END:VCALENDAR',
transparency: 'transparent',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -203,6 +209,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -248,6 +255,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: true,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -293,6 +301,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -338,6 +347,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -383,6 +393,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -428,6 +439,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -529,6 +541,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -646,6 +659,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: true,
timezone: null,
transparency: 'opaque',
onlyAvailability: false,
url: '/foo/bar',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down Expand Up @@ -692,6 +706,7 @@ describe('Test suite: Calendar model (models/calendar.js)', () => {
isSharedWithMe: false,
timezone: 'BEGIN:VCALENDAR...END:VCALENDAR',
transparency: 'opaque',
onlyAvailability: false,
url: '/remote.php/dav/calendars/admin/personal/',
calendarObjects: [],
fetchedTimeRanges: [],
Expand Down
Loading