Feat/add calendar delegation features by GVodyanov · Pull Request #8085 · nextcloud/calendar

GVodyanov · 2026-03-22T22:17:48Z

For #2706
Make sure you're on an updated server master the cherry-pick nextcloud/server#60648 to test

codecov · 2026-03-22T22:20:12Z

Codecov Report

❌ Patch coverage is 0% with 10 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/store/principals.js	0.00%	6 Missing and 1 partial ⚠️
src/services/caldavService.js	0.00%	3 Missing ⚠️

📢 Thoughts on this report? Let us know!

GVodyanov · 2026-05-04T10:20:07Z

Here's what everything looks like

kra-mo

From the design side:

"Select a user" and "Search for a user…" are redundant, it's fine to just have the second if it's baked into the component anyway, so without the title. The input field should also be full-width, and Add should be a primary button.

I wonder why delegation should be its own item in the sidebar instead of just a section in Settings? I'd rather have it just there. And at that point, have + Add delegate be full-width as well.

hamza221 · 2026-05-05T09:39:25Z

The pre-existing sharing logic doesn't work for delegation

A clear indication of Calendar "owner" should be visible

GVodyanov · 2026-05-05T17:18:55Z

From the design side:
"Select a user" and "Search for a user…" are redundant, it's fine to just have the second if it's baked into the component anyway, so without the title. The input field should also be full-width, and Add should be a primary button.
I wonder why delegation should be its own item in the sidebar instead of just a section in Settings? I'd rather have it just there. And at that point, have + Add delegate be full-width as well.

Thanks for the review! How does this look?

(I know that having delegates under delegation looks a little weird as title organization but that's the setting section with the form group component, and u can't not have titles for both)

GVodyanov · 2026-05-06T14:56:08Z

It took me a while to figure out but here is everything working

GVodyanov · 2026-05-06T14:58:59Z

You get the icon here to show its delegated

kra-mo

Looks good from the design side :)

SebastianKrupinski · 2026-05-07T13:18:03Z

Tested.

Found error when delegator has a shared calendar

{
"reqId": "axdoc6W1q46YCrgBbdrq",
"level": 0,
"time": "2026-05-07T13:00:21+00:00",
"remoteAddr": "127.0.0.1",
"user": "user2",
"app": "webdav",
"method": "PROPFIND",
"url": "/remote.php/dav/calendars/user1/",
"scriptName": "/remote.php",
"message": "Calendar with name 'company_shared_by_admin' could not be found",
"userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:150.0) Gecko/20100101 Firefox/150.0",
"version": "34.0.0.3",
"exception": {
"Exception": "Sabre\\DAV\\Exception\\NotFound",
"Message": "Calendar with name 'company_shared_by_admin' could not be found",
"Code": 0,
"Trace": [
{
"file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php",
"line": 86,
"function": "checkPrivileges",
"class": "OCA\\DAV\\Connector\\Sabre\\DavAclPlugin",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php",
"line": 163,
"function": "propFind",
"class": "OCA\\DAV\\Connector\\Sabre\\DavAclPlugin",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php",
"line": 89,
"function": "OCA\\DAV\\Connector\\Sabre\\{closure}",
"class": "OCA\\DAV\\Connector\\Sabre\\Server",
"type": "->",
"args": [
"*** sensitive parameters replaced ***"
]
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
"line": 1052,
"function": "emit",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
"line": 984,
"function": "getPropertiesByNode",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
"line": 1664,
"function": "getPropertiesIteratorForPath",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
"line": 1649,
"function": "writeMultiStatus",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/CorePlugin.php",
"line": 346,
"function": "generateMultiStatus",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php",
"line": 89,
"function": "httpPropFind",
"class": "Sabre\\DAV\\CorePlugin",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
"line": 472,
"function": "emit",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php",
"line": 215,
"function": "invokeMethod",
"class": "Sabre\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/apps/dav/lib/Server.php",
"line": 430,
"function": "start",
"class": "OCA\\DAV\\Connector\\Sabre\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php",
"line": 25,
"function": "exec",
"class": "OCA\\DAV\\Server",
"type": "->"
},
{
"file": "/var/www/nextcloud/master/remote.php",
"line": 152,
"args": [
"/var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php"
],
"function": "require_once"
}
],
"File": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php",
"Line": 58,
"message": "Calendar with name 'company_shared_by_admin' could not be found",
"exception": "{\"class\":\"Sabre\\DAV\\Exception\\NotFound\",\"message\":\"Calendar with name 'company_shared_by_admin' could not be found\",\"code\":0,\"file\":\"/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php:58\",\"trace\":\"#0 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php(86): OCA\\DAV\\Connector\\Sabre\\DavAclPlugin->checkPrivileges()\\n#1 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php(163): OCA\\DAV\\Connector\\Sabre\\DavAclPlugin->propFind()\\n#2 /var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php(89): OCA\\DAV\\Connector\\Sabre\\Server->OCA\\DAV\\Connector\\Sabre\\{closure}()\\n#3 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1052): Sabre\\DAV\\Server->emit()\\n#4 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(984): Sabre\\DAV\\Server->getPropertiesByNode()\\n#5 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1664): Sabre\\DAV\\Server->getPropertiesIteratorForPath()\\n#6 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1649): Sabre\\DAV\\Server->writeMultiStatus()\\n#7 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/CorePlugin.php(346): Sabre\\DAV\\Server->generateMultiStatus()\\n#8 /var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php(89): Sabre\\DAV\\CorePlugin->httpPropFind()\\n#9 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(472): Sabre\\DAV\\Server->emit()\\n#10 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php(215): Sabre\\DAV\\Server->invokeMethod()\\n#11 /var/www/nextcloud/master/apps/dav/lib/Server.php(430): OCA\\DAV\\Connector\\Sabre\\Server->start()\\n#12 /var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php(25): OCA\\DAV\\Server->exec()\\n#13 /var/www/nextcloud/master/remote.php(152): require_once('...')\\n#14 {main}\"}",
"CustomMessage": "Calendar with name 'company_shared_by_admin' could not be found"
}
}

GVodyanov · 2026-05-11T07:59:23Z

I think it's related to nextcloud/server#59232 @hamza221

Tested.
Found error when delegator has a shared calendar
{
"reqId": "axdoc6W1q46YCrgBbdrq",
"level": 0,
"time": "2026-05-07T13:00:21+00:00",

SebastianKrupinski · 2026-05-21T01:00:29Z

Rebased to most recent head

GVodyanov · 2026-05-24T22:03:51Z

@hamza221 My bad, ignore my comments

hamza221 · 2026-05-25T09:50:59Z

Btw sorry for the co-authored commits, I told it to commit as Assisted but apparently it ignored my, will be fixed on squash.

SebastianKrupinski · 2026-05-26T12:31:09Z

+ const baseUrl = currentUser.url.replace(/\/?$/, '')
+ const proxyWriteGroupUrl = baseUrl + '/calendar-proxy-write'
+ const proxyReadGroupUrl = baseUrl + '/calendar-proxy-read'


The CDav library should be responsible for creating the specific urls the Calendar app should not need to know how to format a dav url

SebastianKrupinski · 2026-05-26T13:19:02Z

One last comment, this feature needs a version gate for 34 unless we are back porting all the server changes

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski · 2026-05-27T23:32:13Z

Looks good, I just fixed the linting errors.

This will need to wait until the cdav pr is merged, then the library version will need to be bumped in this pr

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

GVodyanov · 2026-05-29T13:43:39Z

One last comment, this feature needs a version gate for 34 unless we are back porting all the server changes

Feature gate added

GVodyanov · 2026-05-29T13:44:19Z

Thanks a lot for the help Sebastian!

hamza221 · 2026-05-29T13:47:44Z

One last comment, this feature needs a version gate for 34 unless we are back porting all the server changes
Feature gate added

No new features were adeed to server, all fixes, all to be backported to 32, no gating actually needed.
ps: just clarifying, I'm okay with the gating if that's the decision, but the feature can work for all Nextcloud versions with the frontend and cdav changes included >=32

Update: should be gated to >=34

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

hamza221 · 2026-06-02T15:39:52Z

time squash and rebase
CDAV updates are #8403 🚀

Copilot

Pull request overview

Adds front-end support for calendar delegation (proxy access) so delegated calendars can be discovered, displayed, and managed in the Calendar UI, gated by Nextcloud version support.

Changes:

Introduces a new Pinia delegation store to fetch delegators/delegates and load delegated calendars into the calendars store.
Updates Calendar list/pickers/headers to visually distinguish delegated calendars and group them by delegator.
Adds a Delegation section to Calendar settings for managing delegates.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 17 comments.

Show a summary per file

File	Description
tests/javascript/unit/models/calendar.test.js	Updates calendar model expectations for the new delegation-related fields.
src/views/Calendar.vue	Loads delegation state (delegators + delegated calendars) when supported.
src/store/principals.js	Makes `fetchPrincipalByUrl` return cached/mapped principals for reuse by delegation UI.
src/store/delegation.ts	New store to manage delegates/delegators and ingest delegated calendars.
src/services/caldavService.js	Exposes client + adds helper to fetch calendars from an arbitrary calendar-home URL.
src/models/calendar.js	Extends calendar model with `isDelegated` and `delegatorUrl`.
src/components/Shared/CalendarPickerOption.vue	Shows delegated-by label/avatar in calendar picker options.
src/components/Shared/CalendarPicker.vue	Passes delegation props through to picker option component.
src/components/Editor/CalendarPickerHeader.vue	Shows delegated-by label/avatar in the editor calendar switcher.
src/components/AppointmentConfigModal/DurationInput.vue	Removes now-unneeded eslint suppression near emits usage.
src/components/AppNavigation/Settings/SettingsDelegationSection.vue	New settings UI to add/revoke delegates with read/write permissions.
src/components/AppNavigation/Settings.vue	Adds Delegation settings section behind version gating.
src/components/AppNavigation/CalendarList/CalendarListItem.vue	Displays delegated-by details and treats delegated calendars as non-shareable.
src/components/AppNavigation/CalendarList.vue	Adds delegated calendars grouping/captions in the navigation list.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com> Signed-off-by: Hamza <hamzamahjoubi221@gmail.com> Assisted-by: claude:Opus 4.7 (1M context)

hamza221 · 2026-06-03T13:06:17Z

fixed ci/ copilot review / squashed and rebased

Jerome-Herbinet · 2026-06-23T13:24:30Z

From the design side:
"Select a user" and "Search for a user…" are redundant, it's fine to just have the second if it's baked into the component anyway, so without the title. The input field should also be full-width, and Add should be a primary button.
I wonder why delegation should be its own item in the sidebar instead of just a section in Settings? I'd rather have it just there. And at that point, have + Add delegate be full-width as well.
Thanks for the review! How does this look?
(I know that having delegates under delegation looks a little weird as title organization but that's the setting section with the form group component, and u can't not have titles for both)

@GVodyanov could you tell me what this feature actually looks like? I don't see the same user interface in my Calendar 6.5.0 app as the one shown in your screenshots. Thanks.

Cc @hamza221

GVodyanov self-assigned this Mar 22, 2026

GVodyanov added the 2. developing Work in progress label Mar 22, 2026

GVodyanov force-pushed the feat/add-calendar-delegation-features branch from da7ae86 to 654e770Compare March 22, 2026 22:22

tcitworld reviewed Mar 23, 2026
View reviewed changes

Comment threadsrc/services/delegationService.js Outdated

GVodyanov mentioned this pull request Mar 26, 2026
feat: add mailing notifications to calendar delegation nextcloud/server#59232
Closed
8 tasks

GVodyanov marked this pull request as ready for review May 4, 2026 08:17

GVodyanov requested a review from SebastianKrupinski as a code owner May 4, 2026 08:17

ChristophWurst mentioned this pull request May 4, 2026
Calendar delegation #2706
Closed
10 tasks

kra-mo requested changes May 4, 2026
View reviewed changes

hamza221 added enhancement New feature request Feature: Delegation labels May 5, 2026

GVodyanov requested a review from kra-mo May 5, 2026 17:20

GVodyanov force-pushed the feat/add-calendar-delegation-features branch 2 times, most recently from 0dd4839 to f50f37dCompare May 6, 2026 15:04

hamza221 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 6, 2026

kra-mo approved these changes May 7, 2026
View reviewed changes

GVodyanov mentioned this pull request May 18, 2026
feat: add calendar delegation nextcloud/cdav-library#1040
Merged

SebastianKrupinski force-pushed the feat/add-calendar-delegation-features branch from e8b2495 to d8f14d7Compare May 21, 2026 01:00

hamza221 mentioned this pull request May 21, 2026
fix(caldav): grant sharee Acls to the delegate nextcloud/server#60641
Merged
7 tasks

AndyScherzinger closed this in nextcloud/server#60641 May 21, 2026

hamza221 added the 2. developing Work in progress label May 24, 2026

GVodyanov added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 24, 2026

SebastianKrupinski reviewed May 26, 2026
View reviewed changes

GVodyanov added a commit that referenced this pull request May 27, 2026
fix:#8085 (comment)
0c53326
Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski pushed a commit that referenced this pull request May 27, 2026
fix:#8085 (comment)
74badc4
Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski force-pushed the feat/add-calendar-delegation-features branch from 0c53326 to 74badc4Compare May 27, 2026 23:30

SebastianKrupinski approved these changes May 27, 2026
View reviewed changes

SebastianKrupinski pushed a commit that referenced this pull request May 27, 2026
fix:#8085 (comment)
146302e
Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski force-pushed the feat/add-calendar-delegation-features branch from 74badc4 to 146302eCompare May 27, 2026 23:35

SebastianKrupinski approved these changes May 27, 2026
View reviewed changes

GVodyanov added a commit to nextcloud/cdav-library that referenced this pull request May 29, 2026
fix:nextcloud/calendar#8085 (comment)
85cbf28
Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

hamza221 requested a review from Copilot June 2, 2026 15:41

Copilotstarted reviewing on behalf of hamza221 June 2, 2026 15:41 View session

CopilotAI reviewed Jun 2, 2026
View reviewed changes

feat: add calendar delegation feature
3fa4240
Signed-off-by: Grigory Vodyanov <scratchx@gmx.com> Signed-off-by: Hamza <hamzamahjoubi221@gmail.com> Assisted-by: claude:Opus 4.7 (1M context)

hamza221 force-pushed the feat/add-calendar-delegation-features branch from 03bc7be to 3fa4240Compare June 3, 2026 13:05

Merge branch 'main' into feat/add-calendar-delegation-features
f4ac643

GVodyanov merged commit 330d4e9 into mainJun 4, 2026
40 of 41 checks passed

GVodyanov deleted the feat/add-calendar-delegation-features branch June 4, 2026 12:44

Uh oh!

Conversation

GVodyanov commented Mar 22, 2026• edited by hamza221 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecovBot commented Mar 22, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

GVodyanov commented May 4, 2026

Uh oh!

kra-mo left a comment

Choose a reason for hiding this comment

Uh oh!

hamza221 commented May 5, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GVodyanov commented May 5, 2026

Uh oh!

GVodyanov commented May 6, 2026

Uh oh!

GVodyanov commented May 6, 2026

Uh oh!

kra-mo left a comment

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski commented May 7, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GVodyanov commented May 11, 2026

Uh oh!

SebastianKrupinski commented May 21, 2026

Uh oh!

GVodyanov commented May 24, 2026

Uh oh!

hamza221 commented May 25, 2026

Uh oh!

Uh oh!

Uh oh!

SebastianKrupinskiMay 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SebastianKrupinski commented May 26, 2026

Uh oh!

SebastianKrupinski commented May 27, 2026

Uh oh!

GVodyanov commented May 29, 2026

Uh oh!

GVodyanov commented May 29, 2026

Uh oh!

hamza221 commented May 29, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hamza221 commented Jun 2, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hamza221 commented Jun 3, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Jerome-Herbinet commented Jun 23, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

GVodyanov commented Mar 22, 2026•
edited by hamza221
Loading

codecovBot commented Mar 22, 2026•
edited
Loading

hamza221 commented May 5, 2026•
edited
Loading

SebastianKrupinski commented May 7, 2026•
edited
Loading

hamza221 commented May 29, 2026•
edited
Loading

hamza221 commented Jun 2, 2026•
edited
Loading

hamza221 commented Jun 3, 2026•
edited
Loading

Jerome-Herbinet commented Jun 23, 2026•
edited
Loading