feat: atoms team booking #14525
Merged
feat: atoms team booking #14525
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
…name to not return empty users[]
|
Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link. |
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
5 Ignored Deployments
|
sean-brydon
reviewed
Apr 11, 2024
📦 Next.js Bundle Analysis for @calcom/webThis analysis was generated by the Next.js Bundle Analysis action. 🤖 This PR introduced no changes to the JavaScript bundle! 🙌 |
Current Playwright Test Results Summary✅ 37 Passing - Run may still be in progress, this comment will be updated as current testing workflow or job completes... (Last updated on 05/07/2024 12:49:40pm UTC) Run DetailsRunning Workflow PR Update on Github Actions Commit: 334811f Started: 05/07/2024 12:47:47pm UTC
|
|
|
2 Test Cases Affected |
Test Case Results
| Test Case | Last 7 days Failures | Last 7 days Flakes |
|---|---|---|
|
Update Profile Can update a users email (verification enabled)
Retry 2 • Retry 1 • Initial Attempt |
19.81% (63)63 / 318 runsfailed over last 7 days |
32.39% (103)103 / 318 runsflaked over last 7 days |
|
Update Profile Newly added secondary email should show as Unverified
Retry 1 • Initial Attempt |
0.94% (3)3 / 319 runsfailed over last 7 days |
11.29% (36)36 / 319 runsflaked over last 7 days |
Graphite Automations"Add consumer team as reviewer" took an action on this PR • (04/11/24)1 reviewer was added to this PR based on Keith Williams's automation. "Add platform team as reviewer" took an action on this PR • (04/11/24)1 reviewer was added to this PR based on Keith Williams's automation. |
Comment on lines
63
to
66
| entity={{ | ||
| orgSlug: "ecorp", | ||
| considerUnpublished: false, | ||
| }} |
There was a problem hiding this comment.
I am wondering what are the potential risk of enabling users to control their orgSlug
ThyMinimalDev
approved these changes
May 7, 2024
p6l-richard
pushed a commit
to p6l-richard/cal.com-fork
that referenced
this pull request
Jul 22, 2024
* feat: setup usePublicEvent with orgSlug and duration * feat: setup useAvailableSlots with eventTypeSlug and orgSlug * fix & feat: fix TS issues and allow passing multiple users to Booker * refactor: dont show [15min] [30min] [60min] [1h30min] picker * fix: pass orgSlug to handleNewBooking -> loadUsers -> findUsersByUsername to not return empty users[] * refactor: display attendees in booking confirmation screen * fix: getting slots get orgSlug from props not event * revert: Booker username use props instead of hardcoded values * refactor: setup BookerStore org and use it for selectedTime + isDynamic logic * refactor: hide 'what is this meeting about' input in final booking step * fix: TS error * revert: what is the meeting about field hiding * revert: make org as org? in booker store * revert: createNewBooking -> loadUsers -> get forced orgSlug from header not body * refactor: useHandleBookEvent get orgSlug from booker store not props * fix: if entity undefined dont access orgSlug * refactor: add isDynamic prop as queryKey for usePublicEvent * refactor: remove unused prop * re-add docs * fix: typescript error * fix: force platform orgSlug in handleNewBooking.ts * fix: remove duplicate setSelectedDuration declaration * refactor: destructure properies from body instead of req.body * fix: entity optional and hide event members --------- Co-authored-by: Morgan <[email protected]> Co-authored-by: Morgan Vernay <[email protected]>
3 tasks
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.
Use dynamic bookings logic to simulate a team event using atoms booker.
For PlatformBookerWrapper to act as a team booking we need:
❗ Forced slug - important to enable feature
When booking atom makes a booking, it calls v2 bookings.controller.ts which calls handleNewBooking.ts which calls loadUsers, which calls orgDomainConfig which returns orgSlug and if it's valid. The orgSlug is based on organization subdomain e.g. acme.cal.com, and is created so that someone booking acme organization does not book another organization.
Platform teams do not have subdomains, so we can enforce orgSlug that is necessary for handleNewBooking.ts to work by:
x-cal-client-idrequest header to note that request is coming from platform.x-cal-force-slugrequest header as a way to pass the enforced orgSlug, which is passed to Booker atom via "entity.orgSlug prop".Implemented in fix: force platform orgSlug in handleNewBooking.ts and confirmed with Hariom that approach of client ID + enforced slug as headers is fine.