feat: Ability to render groups as attendees #5396

onny · 2023-08-04T14:26:39Z

Ability to render groups as attendees including their members, as defined in events like this:

BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//IDN nextcloud.com//Calendar app 4.5.0-alpha.1//EN
CALSCALE:GREGORIAN
BEGIN:VEVENT
CREATED:20230815T181232Z
DTSTAMP:20230815T181354Z
LAST-MODIFIED:20230815T181354Z
SEQUENCE:2
UID:f07f616f-5ab1-4b62-ba4a-72562dd212d8
DTSTART;VALUE=DATE:20230818
DTEND;VALUE=DATE:20230819
STATUS:CONFIRMED
SUMMARY:Group Meeting
ATTENDEE;CN=MyGroup;CUTYPE=GROUP;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANTRSVP=TRUE;SCHEDULE-STATUS1.1:mailto:mygroup@localhost
ATTENDEE;MEMBER="mailto:mygroup@localhost";CN=user1;CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;LANGUAGE=en;SCHEDULE-STATUS=1.1:mailto:user1@localhost
ATTENDEE;MEMBER="mailto:mygroup@localhost";CN=user2;CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;LANGUAGE=en;SCHEDULE-STATUS=1.1:mailto:user2@localhost
ORGANIZER;CN=admin:mailto:admin@localhost
END:VEVENT
END:VCALENDAR

Import event file event1.ics:

curl -X PUT -u admin:test123 --data-binary "@event1.ics" "http://localhost:8080/remote.php/dav/calendars/admin/personal/event1.ics"

Work done

Frontend: Render groups and their members
Frontend: Remove groups and their members

Partly fixes #2954

Work inspired by @tcitworld PR #4742

codecov · 2023-08-04T14:30:12Z

Codecov Report

Attention: 59 lines in your changes are missing coverage. Please review.

Comparison is base (ba79f11) 24.59% compared to head (33e236c) 24.43%.
Report is 2 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #5396      +/-   ##
============================================
- Coverage     24.59%   24.43%   -0.16%     
  Complexity      388      388              
============================================
  Files           240      240              
  Lines         10575    10643      +68     
  Branches       1710     1739      +29     
============================================
  Hits           2601     2601              
- Misses         7974     8042      +68

Flag	Coverage Δ
javascript	`15.67% <0.00%> (-0.13%)`	⬇️
php	`62.02% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
src/models/attendee.js	`100.00% <ø> (ø)`
src/store/calendarObjectInstance.js	`0.00% <0.00%> (ø)`
src/components/Editor/Invitees/InviteesList.vue	`0.00% <0.00%> (ø)`
...rc/components/Editor/AvatarParticipationStatus.vue	`0.00% <0.00%> (ø)`
...rc/components/Editor/Invitees/InviteesListItem.vue	`0.00% <0.00%> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/components/Editor/Invitees/InviteesListSearch.vue

onny · 2023-08-21T10:11:31Z

Before further polishing this PR I would like to know what you think of this approach. It already works quite good but I think it can be optimized in some aspects

onny · 2023-08-24T21:02:34Z

@miaulalala Maybe you can take a look at it if this could be a feasible approach, thank you :)

miaulalala · 2023-08-28T10:55:02Z

cc @jancborchardt @nimishavijay

I like it a lot, and the design to me looks really well thought through too.

tcitworld · 2023-08-28T11:42:23Z

I like it too. I'm not sure « invitation sent » (the attendee status) makes sense on the group itself though.

I also think we might need to tell the user some way or another that the member list might not be up-to-date with the upstream source (circles, NC groups, contact groups, …).

jancborchardt

Looks really nice and simple design-wise! The only suggestion I have is that instead of just "(2)" it could show "(2 members)" to be more clear, otherwise it looks like what is appended to a duplicate name or so. :)

Btw @onny will you come to the Nextcloud Conference which takes place in Berlin in September? https://nextcloud.com/conference-2023/

onny · 2023-08-28T14:25:09Z

Thank you all for the feedback :) Looking forward to fix remaining issues mid September after my holidays.

@jancborchardt Really would have liked to join the conference but unfortunately I can't take part on that day :(

onny · 2023-09-25T18:54:56Z

Looks really nice and simple design-wise! The only suggestion I have is that instead of just "(2)" it could show "(2 members)" to be more clear, otherwise it looks like what is appended to a duplicate name or so. :)

Thanks this makes sense, fixed it

I like it too. I'm not sure « invitation sent » (the attendee status) makes sense on the group itself though.

fixed :)

I also think we might need to tell the user some way or another that the member list might not be up-to-date with the upstream source (circles, NC groups, contact groups, …).

I thought about displaying a note after adding a group or circle to the attendee list (which would be done in a separate PR)

This commit adds support for adding circles as attendees to a calendar event. The relationship between the imported group and members will be compliant with the iCal specification. A circle with the title "testcircle" will be added as an attendee with iCal attributes "CUTYPE=GROUP` and uri "mailto:circle+CIRCLEID@CIRCLE_INSTANCE". Members of the circle will be imported as standard attendees. Each member gets assigned to the circle group entry by assigning them to the group uri using the iCal member property: "MEMBER='mailto:circle+CIRCLEID@CIRCLE_INSTANCE'". Searching for circles is only enabled if the circles app is activated. Circles added to the list of attendees get imported only once and are not synced yet. While adding a circle, a notice about this is shown to the user. Only members of local circles which are local users get imported. Rendering groups in the frontend is done in a separate PR nextcloud#5396 Signed-off-by: Jonas Heinrich <heinrich@synyx.de>

miaulalala · 2023-11-02T12:17:02Z

Hi onny, this also needs a look over the tests and a run of the npm linter.

onny · 2023-11-02T14:38:07Z

JS tests fail because I was using calendar-js master for support of the attendee.member attribute :)

st3iny · 2023-11-06T09:44:32Z

@onny The calendar-js update is merged. Please rebase and we should be ready for the merge.

Ref #5562

Implement ability to render groups and group members as attendees of an calendar event. This is implemented by reading and interpreting the CUTYPE and MEMBER parameter of the iCal ATTENDEE attribute. For example attendee "user1" belongs to a group identified with the uri mygroup@localhost: "ATTENDEE;MEMBER="mailto:mygroup@localhost";CN=user1;[...]". The group entity is also a ATTENDEE entry but with "CUTYPE=GROUP" and with the corresponding uri mygroup@localhost: "ATTENDEE;CN=MyGroup;CUTYPE=GROUP;[...]:mailto:mygroup@localhost". In the frontend, groups will be displayed as a collapsible list whereas members of the group will be displayed with the same functionality as normal attendees. In case the group entry gets deleted, all of its members will get removed too. Empty groups with no members might be present in the iCal file but won't get rendered. According to the iCal specifications, groups can have more than one uri and attendees could have multiple membership addresses in one attribute. This is neither covered yet in calendar-js nor in this PR. Signed-off-by: Jonas Heinrich <heinrich@synyx.de>

onny · 2023-11-06T11:38:19Z

thank you @st3iny. Oh the tests "codecov/patch" and "codecov/project" seem to fail. Do I have to look into it?

miaulalala · 2023-11-06T15:17:18Z

That's fine, it's just the coverage. Let's get this merged!

miaulalala · 2023-11-06T15:18:01Z

TYSM onny!

This commit adds support for adding circles as attendees to a calendar event. The relationship between the imported group and members will be compliant with the iCal specification. A circle with the title "testcircle" will be added as an attendee with iCal attributes "CUTYPE=GROUP` and uri "mailto:circle+CIRCLEID@CIRCLE_INSTANCE". Members of the circle will be imported as standard attendees. Each member gets assigned to the circle group entry by assigning them to the group uri using the iCal member property: "MEMBER='mailto:circle+CIRCLEID@CIRCLE_INSTANCE'". Searching for circles is only enabled if the circles app is activated. Circles added to the list of attendees get imported only once and are not synced yet. While adding a circle, a notice about this is shown to the user. Only members of local circles which are local users get imported. Rendering groups in the frontend is done in a separate PR nextcloud#5396 Signed-off-by: Jonas Heinrich <heinrich@synyx.de>

github-actions · 2024-05-01T02:08:18Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

onny changed the title ~~Add ability to invite circles to events~~ feat: Ability to invite circles to events Aug 4, 2023

ChristophWurst reviewed Aug 4, 2023

View reviewed changes

src/components/Editor/Invitees/InviteesListSearch.vue Outdated Show resolved Hide resolved

onny force-pushed the circle-invite branch from 08c9ddd to f55edcc Compare August 4, 2023 16:54

onny force-pushed the circle-invite branch from b55077d to 2500efe Compare August 16, 2023 17:01

onny changed the title ~~feat: Ability to invite circles to events~~ feat: Ability to render groups as attendees Aug 18, 2023

onny force-pushed the circle-invite branch 9 times, most recently from 6eea65f to 9474ee0 Compare August 21, 2023 10:08

onny marked this pull request as ready for review August 21, 2023 10:09

onny requested a review from ChristophWurst August 21, 2023 10:09

jancborchardt reviewed Aug 28, 2023

View reviewed changes

onny force-pushed the circle-invite branch 3 times, most recently from 7a913bc to 9911167 Compare September 25, 2023 18:46

onny force-pushed the circle-invite branch 3 times, most recently from f31e263 to 099fe36 Compare September 27, 2023 10:42

onny force-pushed the circle-invite branch from 56467f0 to b132fcc Compare October 31, 2023 15:33

onny force-pushed the circle-invite branch from b132fcc to d8f3e42 Compare November 1, 2023 20:49

onny force-pushed the circle-invite branch from d8f3e42 to d3dc94a Compare November 2, 2023 13:48

onny requested review from ChristophWurst, nimishavijay and miaulalala November 2, 2023 14:38

onny force-pushed the circle-invite branch from d3dc94a to 33e236c Compare November 6, 2023 11:05

miaulalala approved these changes Nov 6, 2023

View reviewed changes

miaulalala merged commit 4d3196c into nextcloud:main Nov 6, 2023
39 of 41 checks passed

miaulalala mentioned this pull request Apr 19, 2024

Allow to select contact groups as attendees #4742

Draft

github-actions bot added the feedback-requested label May 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Ability to render groups as attendees #5396

feat: Ability to render groups as attendees #5396

onny commented Aug 4, 2023 •

edited

Loading

codecov bot commented Aug 4, 2023 •

edited

Loading

onny commented Aug 21, 2023

onny commented Aug 24, 2023

miaulalala commented Aug 28, 2023

tcitworld commented Aug 28, 2023 •

edited

Loading

jancborchardt left a comment

onny commented Aug 28, 2023 •

edited

Loading

onny commented Sep 25, 2023 •

edited

Loading

miaulalala commented Nov 2, 2023

onny commented Nov 2, 2023

st3iny commented Nov 6, 2023

onny commented Nov 6, 2023

miaulalala commented Nov 6, 2023

miaulalala commented Nov 6, 2023

github-actions bot commented May 1, 2024

feat: Ability to render groups as attendees #5396

feat: Ability to render groups as attendees #5396

Conversation

onny commented Aug 4, 2023 • edited Loading

codecov bot commented Aug 4, 2023 • edited Loading

Codecov Report

onny commented Aug 21, 2023

onny commented Aug 24, 2023

miaulalala commented Aug 28, 2023

tcitworld commented Aug 28, 2023 • edited Loading

jancborchardt left a comment

Choose a reason for hiding this comment

onny commented Aug 28, 2023 • edited Loading

onny commented Sep 25, 2023 • edited Loading

miaulalala commented Nov 2, 2023

onny commented Nov 2, 2023

st3iny commented Nov 6, 2023

onny commented Nov 6, 2023

miaulalala commented Nov 6, 2023

miaulalala commented Nov 6, 2023

github-actions bot commented May 1, 2024

onny commented Aug 4, 2023 •

edited

Loading

codecov bot commented Aug 4, 2023 •

edited

Loading

tcitworld commented Aug 28, 2023 •

edited

Loading

onny commented Aug 28, 2023 •

edited

Loading

onny commented Sep 25, 2023 •

edited

Loading