Skip to content

Conversation

@st3iny
Copy link
Member

@st3iny st3iny commented Jul 23, 2021

Fix #3281
Fix #4225

Show a modal when dragging a recurrence to let the user decide whether to update this or all future instances.

TODO

  • Migrate to the new dialog creation code from within JS
  • Add a cancel button
  • Fix JavaScript unit tests

@st3iny st3iny added this to the v2.4.0 milestone Jul 23, 2021
@st3iny st3iny self-assigned this Jul 23, 2021
@codecov
Copy link

codecov bot commented Jul 23, 2021

Codecov Report

Merging #3356 (b72e6af) into main (90c7a33) will decrease coverage by 0.14%.
The diff coverage is 28.57%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #3356      +/-   ##
============================================
- Coverage     29.43%   29.28%   -0.15%     
  Complexity      322      322              
============================================
  Files           221      223       +2     
  Lines          7576     7617      +41     
  Branches       1001     1006       +5     
============================================
+ Hits           2230     2231       +1     
- Misses         5346     5386      +40     
Flag Coverage Δ
javascript 20.69% <28.57%> (-0.13%) ⬇️
php 67.35% <ø> (ø)

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

Impacted Files Coverage Δ
src/components/DragRecurrenceModal.vue 0.00% <0.00%> (ø)
src/store/calendarObjectInstance.js 0.00% <0.00%> (ø)
src/store/dragRecurrenceModal.js 0.00% <0.00%> (ø)
src/store/index.js 0.00% <ø> (ø)
src/views/Calendar.vue 0.00% <0.00%> (ø)
src/fullcalendar/interaction/eventDrop.js 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 90c7a33...b72e6af. Read the comment docs.

@st3iny st3iny added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 28, 2021
@st3iny st3iny marked this pull request as ready for review July 28, 2021 16:53
@ChristophWurst ChristophWurst requested a review from GretaD August 25, 2021 07:45
@GretaD
Copy link
Contributor

GretaD commented Aug 25, 2021

What im doing wrong? I cannot update all the future events

Kazam_screencast_00006.mp4

@st3iny
Copy link
Member Author

st3iny commented Aug 31, 2021

What im doing wrong? I cannot update all the future events
Kazam_screencast_00006.mp4

Very strange. I can reproduce this bug on master too. Using "update this and all future" won't actually move the event.

@st3iny st3iny force-pushed the fix/3281/add-drag-recurrence-modal branch 2 times, most recently from cf56890 to 23efd79 Compare October 15, 2021 17:01
@st3iny
Copy link
Member Author

st3iny commented Oct 15, 2021

I rebased, fixed the remaining issues and improved the affected tests. Please test it again.

@st3iny st3iny force-pushed the fix/3281/add-drag-recurrence-modal branch from 23efd79 to af6ea19 Compare October 19, 2021 08:37
@miaulalala miaulalala mentioned this pull request Nov 25, 2021
@ChristophWurst ChristophWurst modified the milestones: v2.4.0, v2.4.1 Nov 25, 2021
@tcitworld tcitworld removed this from the v2.4.1 milestone Dec 17, 2021
@miaulalala
Copy link
Contributor

/backport to stable3.0

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request A backport was requested for this pull request label Feb 16, 2022
@miaulalala miaulalala added this to the v3.0.6 milestone Feb 16, 2022
@miaulalala miaulalala force-pushed the fix/3281/add-drag-recurrence-modal branch from af6ea19 to c44edb0 Compare February 16, 2022 11:29
@miaulalala
Copy link
Contributor

This is still buggy for me (or is that a bug even?) If I drag a recurrence from the middle, it's cutting off elements. I presume it is because of the end date. If it is intentional, I find that very confusing as I would expect all recurrences to just be moved further down the calendar:

Screencast from 16 02 2022 14_47_34

@ChristophWurst
Copy link
Member

@miaulalala could you post the ics before/after?

@miaulalala
Copy link
Contributor

miaulalala commented Feb 16, 2022

@miaulalala could you post the ics before/after?

Sure:

First part:

BEGIN:VCALENDAR
PRODID:-//IDN nextcloud.com//Calendar app 3.1.0-alpha.2//EN
CALSCALE:GREGORIAN
VERSION:2.0
BEGIN:VEVENT
CREATED:20220216T141343Z
DTSTAMP:20220216T141511Z
LAST-MODIFIED:20220216T141511Z
SEQUENCE:5
UID:acebc626-ec53-4858-8c1a-6a52e9f34470
DTSTART;VALUE=DATE:20220217
DTEND;VALUE=DATE:20220218
STATUS:CONFIRMED
RRULE:FREQ=DAILY;UNTIL=20220220
RELATED-TO;RELTYPE=SIBLING:8db3f8f2-cd9b-4734-9a29-3cc23a963cc0
END:VEVENT
END:VCALENDAR

Second Part

BEGIN:VCALENDAR
PRODID:-//IDN nextcloud.com//Calendar app 3.1.0-alpha.2//EN
CALSCALE:GREGORIAN
VERSION:2.0
BEGIN:VEVENT
CREATED:20220216T141511Z
DTSTAMP:20220216T141511Z
LAST-MODIFIED:20220216T141511Z
SEQUENCE:0
UID:8db3f8f2-cd9b-4734-9a29-3cc23a963cc0
DTSTART;VALUE=DATE:20220223
DTEND;VALUE=DATE:20220224
STATUS:CONFIRMED
RRULE:FREQ=DAILY;UNTIL=20220223T230000Z
RELATED-TO;RELTYPE=SIBLING:acebc626-ec53-4858-8c1a-6a52e9f34470
END:VEVENT
END:VCALENDAR

ALso having this issue:
image

After a window reload the last recurrence has disappeared, presumably from the UNTIL in the RRULE

@miaulalala miaulalala removed this from the v3.0.6 milestone Feb 16, 2022
@miaulalala miaulalala added the nextcloud-gmbh Tickets with importance for Nextcloud Gmbh label Mar 21, 2022
@st3iny st3iny changed the title Show modal when dragging recurrences feat: show modal when dragging recurrences Oct 13, 2025
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@st3iny st3iny force-pushed the fix/3281/add-drag-recurrence-modal branch from b72e6af to 334b6f7 Compare October 23, 2025 08:54
@SebastianKrupinski
Copy link
Contributor

Tested. Works! Only one minor visual glitch.

  • Drag an instance after the first instance
  • Click the X in the dialog
  • A duplicate event shows up (but is not saved)
image

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 backport-request A backport was requested for this pull request bug nextcloud-gmbh Tickets with importance for Nextcloud Gmbh

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Treat repeated events as a single object Recurring events can be dragged & dropped and break the series in the web UI, not on caldav

7 participants