Skip to content

Comments

Update CalendarService.ts#3060

Merged
pumfleet merged 3 commits intocalcom:mainfrom
m4tze:main
Jun 15, 2022
Merged

Update CalendarService.ts#3060
pumfleet merged 3 commits intocalcom:mainfrom
m4tze:main

Conversation

@m4tze
Copy link
Contributor

@m4tze m4tze commented Jun 14, 2022

Fix timezone handling for recurring icalendar events

What does this PR do?

It fixes the default utc interpretation of recurring events, as the comment reg. caldav specs is not correct, because we are dealing with icalender, which allows timezone information.

Fixes #2864

-->

Environment: Staging(main branch) / Production

both!

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How should this be tested?

It should be tested with existing tests regarding recurring events (maybe the tests have to be fixed to correct the utc misunderstanding)

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't checked if my PR needs changes to the documentation
  • I haven't added tests that prove my fix is effective or that my feature works
  • I haven't checked if new and existing unit tests pass locally with my changes

Fix timezone handling for recurring icalendar events
@vercel
Copy link

vercel bot commented Jun 14, 2022

@m4tze is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@vercel
Copy link

vercel bot commented Jun 14, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ❌ Failed (Inspect) Jun 15, 2022 at 0:52AM (UTC)
3 Ignored Deployments
Name Status Preview Updated
docs ⬜️ Ignored (Inspect) Jun 15, 2022 at 0:52AM (UTC)
swagger ⬜️ Ignored (Inspect) Jun 15, 2022 at 0:52AM (UTC)
ui ⬜️ Ignored (Inspect) Jun 15, 2022 at 0:52AM (UTC)

@zomars
Copy link
Contributor

zomars commented Jun 14, 2022

Thank you for you contribution. Just to be clear. CalendarService is being used in both caldav and Apple calendar. Would this cause unexpected behavior in Apple calendars?

@m4tze
Copy link
Contributor Author

m4tze commented Jun 15, 2022

@zomars I cannot test this, as I do not have an apple calendar account. I guess not, as my fix does not convert the timestamps to an illegal timezone, it just applies the timezone that is stored in the event to the timestamps.

Besides this, I think the current implementation also calculates wrong dates for apple calendar (especially if the calendar timezone is not UTC and the server's timezone is not the same timezone as the calendar timezone). But this should better be confirmed by another user testing that setup.

@zomars zomars added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Jun 15, 2022
@m4tze
Copy link
Contributor Author

m4tze commented Jun 15, 2022

@zomars I cannot access the Vercel services. Thus, I cannot help you here right now.

@pumfleet pumfleet merged commit 3e777df into calcom:main Jun 15, 2022
@zomars zomars mentioned this pull request Jun 15, 2022
zomars added a commit that referenced this pull request Jun 15, 2022
* updates api submodule

* Fix credential creation flow for msteams app (#3029)

* Fix credential creation flow for msteams app

* Code review improve

* Fix preffer early returns

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Flicker on booking success page (#3063)

* The booker get’s the Ui option to reschedule but can’t reschedule (#3061)

* Update CalendarService.ts (#3060)

* Revert "The booker get’s the Ui option to reschedule but can’t reschedule (#3061)"

This reverts commit 8cfc91d.

* New Crowdin translations by Github Action (#3065)

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

* Missing calendar toggles fix (#3066)

* onboarding flag fix

* Adjusting text + adding into locales file

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fixed flickering of more event name variables (#3069)

* Feature/booking page refactor (#3035)

* Extracted UI related logic on the DatePicker, stripped out all logic

* wip

* fixed small regression due to merge

* Fix alignment of the chevrons

* Added isToday dot, added onMonthChange so we can fetch this month slots

* Added includedDates to inverse excludedDates

* removed trpcState

* Improvements to the state

* All params are now dynamic

* This builds the flat map so not all paths block on every new build

* Added requiresConfirmation

* Correctly take into account getFilteredTimes to make the calendar function

* Rewritten team availability, seems to work

* Circumvent i18n flicker by showing the loader instead

* 'You can remove this code. Its not being used now' - Hariom

* Nailed a persistent little bug, new Date() caused the current day to flicker on and off

* TS fixes

* Fix some eventType details in AvailableTimes

* '5 / 6 Seats Available' instead of '6 / Seats Available'

* More type fixes

* Removed unrelated merge artifact

* Use WEBAPP_URL instead of hardcoded

* Next round of TS fixes

* I believe this was mistyped

* Temporarily disabled rescheduling 'this is when you originally scheduled', so removed dep

* Sorting some dead code

* This page has a lot of red, not all related to this PR

* A PR to your PR (#3067)

* Cleanup

* Cleanup

* Uses zod to parse params

* Type fixes

* Fixes ISR

* E2E fixes

* Disabled dynamic bookings until post v1.7

* More test fixes

* Fixed border position (transparent border) to prevent dot from jumping - and possibly fix spacing

* Disabled style nitpicks

* Delete useSlots.ts

Removed early design artifact

* Unlock DatePicker locale

* Adds mini spinner to DatePicker

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>

* v1.7.0

Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
Co-authored-by: m4tze <m4tze@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Recurring events from caldav server not blocked

3 participants