fix: modal intercept #15615
Draft
fix: modal intercept #15615
+31
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 3 Ignored Deployments
|
dosubot
bot
added
event-types
Graphite Automations"Add consumer team as reviewer" took an action on this PR • (06/28/24)1 reviewer was added to this PR based on Keith Williams's automation. |
sean-brydon
commented
Jun 28, 2024
There was a problem hiding this comment.
Lets prefer early returns here - easier to understand the logic of when we're skipping
sean-brydon
commented
Jun 28, 2024
Comment on lines
+426
to
428
| if (isInForm || url.includes("skipConfirmation=true")) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
Added a new query param when we leave to the destination route so we can easily know when to avoid calling this handler
Udit-takkar
reviewed
Jun 28, 2024
Comment on lines
+419
to
+423
| if (isRoundRobin) { | ||
| if (hosts.length > 0 || assignedUsers.length > 0) { | ||
| return; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (isRoundRobin) { | |
| if (hosts.length > 0 || assignedUsers.length > 0) { | |
| return; | |
| } | |
| } | |
| if (isRoundRobin && (hosts.length > 0 || assignedUsers.length > 0)) { | |
| return; | |
| } |
Udit-takkar
reviewed
Jun 28, 2024
| @@ -400,38 +400,47 @@ const EventTypePage = (props: EventTypeSetupProps) => { | |||
|
|
|||
| useEffect(() => { | |||
| const handleRouteChange = (url: string) => { | |||
There was a problem hiding this comment.
This is complex enough to be unit tested now. I think we can refactor out a function from it that accepts eventType and url and would give us boolean to inform if navigation should happen or not.
That function can be easily tested.
hariombalhara
requested changes
Jun 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes Managed event types:
https://github.com/calcom/cal.com/assets/55134778/7288a939-d5d2-470e-b9a6-e1eb4ed7d252
Fixes round robin:
https://github.com/calcom/cal.com/assets/55134778/51e4abcb-75e0-41a2-ab35-804bd40b6dc5