Skip to content

Conversation

@SebastianKrupinski
Copy link
Contributor

@SebastianKrupinski SebastianKrupinski commented Nov 9, 2025

Summary

  • modified the blocker event to include a prefix '[Proposed]' to identify the blockers better
  • modified event creation logic to use RDATE for dates
  • modified organizer calendar CUD logic to properly track meeting proposal actions
  • modified participant calendar CUD logic to properly track meeting proposal actions

Testing

  • create a proposal with multiple time dates
  • modify a proposal by changing one or more of the dates
  • delete a proposal
  • verify that the time blocks reflect that proposal dats

@codecov
Copy link

codecov bot commented Nov 9, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@SebastianKrupinski SebastianKrupinski force-pushed the fix/meeting-proposal-calendar-blockers branch 2 times, most recently from 1513837 to ac6803c Compare November 11, 2025 14:31
@SebastianKrupinski SebastianKrupinski force-pushed the fix/meeting-proposal-calendar-blockers branch from ac6803c to ccbeef2 Compare November 11, 2025 15:17
@SebastianKrupinski SebastianKrupinski marked this pull request as ready for review November 11, 2025 15:22
Copy link
Contributor

@GVodyanov GVodyanov left a comment

Choose a reason for hiding this comment

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

Currently testing and trying to make sense of this:

I have 4 meeting proposals

Image

Only 2 of these are showing up in my calendar.

Image

next week:

Image

In the availability view only the proposal on Tuesday shows up:

Image

Also when I open the meetings proposal modal, change times by dragging, click update, I get a "Succesfully saved proposal" toast but when I reopen the modal it actually didn't change anything.

@SebastianKrupinski
Copy link
Contributor Author

SebastianKrupinski commented Nov 12, 2025

I just tested again, it is working properly but!

In the availability view only the proposal on Tuesday shows up:

Ugh, you found a bug that is unrelated to this PR. If I make a "proposed" meeting on 3 separate weeks, it does not show up in "Week" view but shows correctly in "month" view. It's a "RDATE" handling bug, in the time span calculation we use to select events from the database.

image

See the first and last occurrence field are the same value. This PR will fix that.

nextcloud/server#48131

Download the event and check if your event has a RDATE with the correct selected proposal dates.

@SebastianKrupinski
Copy link
Contributor Author

Found the bug causing the events not to show properly.

3rdparty/sabre/vobject/lib/Component/VEvent.php::isInTimeRange() line 32 disregards RDATE.

image

@SebastianKrupinski
Copy link
Contributor Author

Fix for RDATES not showing properly

sabre-io/vobject#735

@SebastianKrupinski
Copy link
Contributor Author

@GVodyanov

Can you retest again, see the above comments on what you found last time

Copy link
Contributor

@GVodyanov GVodyanov left a comment

Choose a reason for hiding this comment

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

Yes! I did some testing and I managed to reproduce both the original bug and the fix. However I did have to actually delete and then recreate the proposal, being able to drag it would be a nice feature.

Also I only saw the first of the proposals as a blocking event, I'm not sure if this is a bug or a feature.

@SebastianKrupinski
Copy link
Contributor Author

However I did have to actually delete and then recreate the proposal, being able to drag it would be a nice feature

Re-saving the proposal would have updated the calendar blockers.

Also I only saw the first of the proposals as a blocking event, I'm not sure if this is a bug or a feature.

You would need to apply the sabredav patch from my comment above. then it will properly show all the blockers

@SebastianKrupinski SebastianKrupinski merged commit 6e7cac3 into main Nov 27, 2025
42 checks passed
@SebastianKrupinski SebastianKrupinski deleted the fix/meeting-proposal-calendar-blockers branch November 27, 2025 17:29
@github-project-automation github-project-automation bot moved this from 🏗️ In progress to ☑️ Done in 💌 📅 👥 Groupware team Nov 27, 2025
@SebastianKrupinski
Copy link
Contributor Author

/backport to stable6.1

@backportbot backportbot bot added the backport-request A backport was requested for this pull request label Nov 27, 2025
@backportbot backportbot bot removed the backport-request A backport was requested for this pull request label Nov 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

Status: ☑️ Done

Development

Successfully merging this pull request may close these issues.

3 participants