chore: hide cal branding for platform bookings#22979
Merged
Conversation
Contributor
|
""" WalkthroughThe changes introduce new fields to user and team selection objects in database queries to retrieve Estimated code review effort🎯 2 (Simple) | ⏱️ ~7 minutes Assessment against linked issues
Assessment against linked issues: Out-of-scope changesNo out-of-scope changes were identified. All code modifications are directly related to hiding branding for platform-managed bookings as described in the linked issue. 📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
keithwillcode
added
core
dosubot
bot
added
the
bookings
Graphite Automations"Add consumer team as reviewer" took an action on this PR • (08/08/25)1 reviewer was added to this PR based on Keith Williams's automation. "Add platform team as reviewer" took an action on this PR • (08/08/25)1 reviewer was added to this PR based on Keith Williams's automation. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🔭 Outside diff range comments (1)
apps/web/lib/booking.ts (1)
166-175: Prisma guideline: replace include with selectOrg standard is “only select what you need; never use include”. This query can use select to fetch only data and attendee fields.
- seatAttendee = await prisma.bookingSeat.findUnique({ - where: { - referenceUid: seatReferenceUid, - }, - include: { - attendee: { - select: { - name: true, - email: true, - phoneNumber: true, - }, - }, - }, - }); + seatAttendee = await prisma.bookingSeat.findUnique({ + where: { referenceUid: seatReferenceUid }, + select: { + data: true, + attendee: { + select: { name: true, email: true, phoneNumber: true }, + }, + }, + });If you adopt the above, adjust the local type alias accordingly (outside the changed lines), e.g.:
type SeatAttendee = | { attendee: { email: string; name: string; phoneNumber: string | null }; data: Prisma.JsonValue; } | null; let seatAttendee: SeatAttendee = null;
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (4)
apps/web/lib/booking.ts(2 hunks)apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx(1 hunks)packages/lib/defaultEvents.ts(1 hunks)packages/prisma/selects/user.ts(1 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.ts
📄 CodeRabbit Inference Engine (.cursor/rules/review.mdc)
**/*.ts: For Prisma queries, only select data you need; never useinclude, always useselect
Ensure thecredential.keyfield is never returned from tRPC endpoints or APIs
Files:
packages/prisma/selects/user.tsapps/web/lib/booking.tspackages/lib/defaultEvents.ts
**/*.{ts,tsx}
📄 CodeRabbit Inference Engine (.cursor/rules/review.mdc)
Flag excessive Day.js use in performance-critical code; prefer native Date or Day.js
.utc()in hot paths like loops
Files:
packages/prisma/selects/user.tsapps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsxpackages/lib/defaultEvents.ts
**/*.tsx
📄 CodeRabbit Inference Engine (.cursor/rules/review.mdc)
Always use
t()for text localization in frontend code; direct text embedding should trigger a warning
Files:
apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
🧠 Learnings (11)
📓 Common learnings
Learnt from: Udit-takkar
PR: calcom/cal.com#22919
File: packages/features/calAIPhone/interfaces/AIPhoneService.interface.ts:118-143
Timestamp: 2025-08-08T09:29:11.665Z
Learning: In calcom/cal.com PR #22919, packages/features/calAIPhone/interfaces/AIPhoneService.interface.ts (TypeScript), the AIPhoneServiceAgentListItem is required to include user.email in listAgents responses (per maintainer Udit-takkar). Future reviews should not flag this as unnecessary PII unless requirements change.
📚 Learning: 2025-08-08T09:29:11.665Z
Learnt from: Udit-takkar
PR: calcom/cal.com#22919
File: packages/features/calAIPhone/interfaces/AIPhoneService.interface.ts:118-143
Timestamp: 2025-08-08T09:29:11.665Z
Learning: In calcom/cal.com PR #22919, packages/features/calAIPhone/interfaces/AIPhoneService.interface.ts (TypeScript), the AIPhoneServiceAgentListItem is required to include user.email in listAgents responses (per maintainer Udit-takkar). Future reviews should not flag this as unnecessary PII unless requirements change.
Applied to files:
packages/prisma/selects/user.tsapps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsxpackages/lib/defaultEvents.ts
📚 Learning: 2025-07-28T11:50:23.946Z
Learnt from: CR
PR: calcom/cal.com#0
File: .cursor/rules/review.mdc:0-0
Timestamp: 2025-07-28T11:50:23.946Z
Learning: Applies to **/*.ts : For Prisma queries, only select data you need; never use `include`, always use `select`
Applied to files:
packages/prisma/selects/user.ts
📚 Learning: 2025-08-05T07:42:06.335Z
Learnt from: sean-brydon
PR: calcom/cal.com#22618
File: packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts:113-113
Timestamp: 2025-08-05T07:42:06.335Z
Learning: In Cal.com's getUserEventGroups handler refactor (PR #22618), the membershipCount field for team event groups is intentionally set to 0 in the new createTeamEventGroup function, as confirmed by sean-brydon (PR author). This preserves the same behavior as the old implementation that was being refactored, maintaining backward compatibility. While other parts of the codebase may use actual member counts, this specific implementation maintains the previous behavior.
Applied to files:
apps/web/lib/booking.ts
📚 Learning: 2025-08-05T07:42:06.335Z
Learnt from: sean-brydon
PR: calcom/cal.com#22618
File: packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts:113-113
Timestamp: 2025-08-05T07:42:06.335Z
Learning: In Cal.com's event type system, the membershipCount field for team event groups is intentionally set to 0, as confirmed by sean-brydon (PR author). This behavior was preserved during the refactor from the old getUserEventGroups.handler.ts implementation to the new createTeamEventGroup function in transformUtils.ts. This is not a bug but the intended behavior that maintains consistency with the previous implementation.
Applied to files:
apps/web/lib/booking.ts
📚 Learning: 2025-08-05T12:04:29.037Z
Learnt from: din-prajapati
PR: calcom/cal.com#21854
File: packages/app-store/office365calendar/__tests__/unit_tests/SubscriptionManager.test.ts:0-0
Timestamp: 2025-08-05T12:04:29.037Z
Learning: In packages/app-store/office365calendar/lib/CalendarService.ts, the fetcher method in Office365CalendarService class is public, not private. It was specifically changed from private to public in this PR to support proper testing and external access patterns.
Applied to files:
apps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
📚 Learning: 2025-08-05T07:42:06.335Z
Learnt from: sean-brydon
PR: calcom/cal.com#22618
File: packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts:113-113
Timestamp: 2025-08-05T07:42:06.335Z
Learning: In Cal.com's event type system, the membershipCount field for team event groups is intentionally hard-coded to 0, as confirmed by sean-brydon. This behavior was preserved during the refactor from the old getUserEventGroups.handler.ts implementation to the new createTeamEventGroup function in transformUtils.ts. This is not a bug but the intended behavior.
Applied to files:
apps/web/lib/booking.ts
📚 Learning: 2025-07-15T12:59:34.389Z
Learnt from: eunjae-lee
PR: calcom/cal.com#22106
File: packages/features/insights/components/FailedBookingsByField.tsx:65-71
Timestamp: 2025-07-15T12:59:34.389Z
Learning: In the FailedBookingsByField component (packages/features/insights/components/FailedBookingsByField.tsx), although routingFormId is typed as optional in useInsightsParameters, the system automatically enforces a routing form filter, so routingFormId is always present in practice. This means the data always contains only one entry, making the single-entry destructuring approach safe.
Applied to files:
apps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
📚 Learning: 2025-07-24T08:39:06.185Z
Learnt from: eunjae-lee
PR: calcom/cal.com#22702
File: packages/lib/server/service/insightsBooking.ts:120-124
Timestamp: 2025-07-24T08:39:06.185Z
Learning: In the InsightsBookingService (packages/lib/server/service/insightsBooking.ts), the constructor stores null for invalid options or filters but this is handled safely through null checks in buildFilterConditions() and buildAuthorizationConditions() methods. The service uses defensive programming to return safe fallback conditions (null or NOTHING_CONDITION) rather than throwing errors on invalid inputs.
Applied to files:
apps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
📚 Learning: 2025-08-08T09:27:23.870Z
Learnt from: Udit-takkar
PR: calcom/cal.com#22919
File: packages/features/calAIPhone/providers/retellAI/services/AgentService.ts:195-216
Timestamp: 2025-08-08T09:27:23.870Z
Learning: In PR calcom/cal.com#22919, file packages/features/calAIPhone/providers/retellAI/services/AgentService.ts, the updateAgentConfiguration method intentionally does not persist the optional `name` parameter to the repository for now, per maintainer (Udit-takkar). Future reviews should not flag this unless requirements change.
Applied to files:
apps/web/lib/booking.tsapps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
📚 Learning: 2025-07-21T21:33:23.371Z
Learnt from: Anshumancanrock
PR: calcom/cal.com#22570
File: apps/web/modules/signup-view.tsx:253-253
Timestamp: 2025-07-21T21:33:23.371Z
Learning: In signup-view.tsx, when checking if redirectUrl contains certain strings, using explicit && checks (redirectUrl && redirectUrl.includes()) is preferred over optional chaining (redirectUrl?.includes()) to ensure the result is always a boolean rather than potentially undefined. This approach provides cleaner boolean contracts for downstream conditional logic.
Applied to files:
apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
🧬 Code Graph Analysis (1)
apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx (1)
packages/lib/hideBranding.ts (1)
shouldHideBrandingForEvent(76-113)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Detect changes
🔇 Additional comments (4)
packages/prisma/selects/user.ts (1)
13-13: Add isPlatformManaged to user selects — LGTMSelecting this boolean on availabilityUserSelect/baseUserSelect is consistent with the PR goals and low-risk.
packages/lib/defaultEvents.ts (1)
59-59: Default user now includes isPlatformManaged: false — LGTMKeeps getDefaultEvent paths type-safe and aligned with new UI logic.
apps/web/lib/booking.ts (2)
20-21: Selecting isPlatformManaged on users — LGTMRequired for platform-branding logic downstream.
68-81: Selecting createdByOAuthClientId on team — LGTM; confirm parent-team handlingThis enables platform detection for team events. If platform status can be inherited from a parent team, consider also selecting parent.createdByOAuthClientId.
Comment on lines
+231
to
+244
| const isPlatformBooking = eventType.users[0]?.isPlatformManaged || eventType.team?.createdByOAuthClientId; | ||
|
|
||
| return { | ||
| props: { | ||
| orgSlug: currentOrgDomain, | ||
| themeBasis: eventType.team ? eventType.team.slug : eventType.users[0]?.username, | ||
| hideBranding: await shouldHideBrandingForEvent({ | ||
| eventTypeId: eventType.id, | ||
| team: eventType.team, | ||
| owner: eventType.users[0] ?? null, | ||
| organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null, | ||
| }), | ||
| hideBranding: isPlatformBooking | ||
| ? true | ||
| : await shouldHideBrandingForEvent({ | ||
| eventTypeId: eventType.id, | ||
| team: eventType.team, | ||
| owner: eventType.users[0] ?? null, | ||
| organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null, | ||
| }), |
Contributor
There was a problem hiding this comment.
Use owner.isPlatformManaged (not users[0]) and coerce to boolean
Relying on users[0] can be incorrect for multi-host/team events where the “owner” differs from the first user. Also coerce to boolean for clarity.
- const isPlatformBooking = eventType.users[0]?.isPlatformManaged || eventType.team?.createdByOAuthClientId;
+ const isPlatformBooking = !!(
+ eventType.owner?.isPlatformManaged || eventType.team?.createdByOAuthClientId
+ );Optionally align the downstream call to use owner when available:
- owner: eventType.users[0] ?? null,
+ owner: eventType.owner ?? eventType.users[0] ?? null,📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| const isPlatformBooking = eventType.users[0]?.isPlatformManaged || eventType.team?.createdByOAuthClientId; | |
| return { | |
| props: { | |
| orgSlug: currentOrgDomain, | |
| themeBasis: eventType.team ? eventType.team.slug : eventType.users[0]?.username, | |
| hideBranding: await shouldHideBrandingForEvent({ | |
| eventTypeId: eventType.id, | |
| team: eventType.team, | |
| owner: eventType.users[0] ?? null, | |
| organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null, | |
| }), | |
| hideBranding: isPlatformBooking | |
| ? true | |
| : await shouldHideBrandingForEvent({ | |
| eventTypeId: eventType.id, | |
| team: eventType.team, | |
| owner: eventType.users[0] ?? null, | |
| organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null, | |
| }), | |
| const isPlatformBooking = !!( | |
| eventType.owner?.isPlatformManaged || eventType.team?.createdByOAuthClientId | |
| ); | |
| return { | |
| props: { | |
| orgSlug: currentOrgDomain, | |
| themeBasis: eventType.team ? eventType.team.slug : eventType.users[0]?.username, | |
| hideBranding: isPlatformBooking | |
| ? true | |
| : await shouldHideBrandingForEvent({ | |
| eventTypeId: eventType.id, | |
| team: eventType.team, | |
| - owner: eventType.users[0] ?? null, | |
| + owner: eventType.owner ?? eventType.users[0] ?? null, | |
| organizationId: | |
| session?.user?.profile?.organizationId ?? | |
| session?.user?.org?.id ?? | |
| null, | |
| }), |
🤖 Prompt for AI Agents
In apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
around lines 231 to 244, replace the usage of
eventType.users[0]?.isPlatformManaged with owner?.isPlatformManaged to correctly
reflect the event owner instead of the first user, and explicitly coerce this
value to a boolean. Also update the hideBranding call to use owner consistently
when available instead of users[0], ensuring the logic correctly handles
multi-host or team events.
hbjORbj
approved these changes
Aug 8, 2025
…-booking-page-for-platform
|
The latest updates on your projects. Learn more about Vercel for GitHub. |
3 tasks
…-booking-page-for-platform
github-actions
bot
added
the
🧹 Improvements
Contributor
E2E results are ready! |
Ryukemeister
approved these changes
Aug 12, 2025
…-booking-page-for-platform
…-booking-page-for-platform
keithwillcode
approved these changes
Aug 20, 2025
supalarry
deleted the
lauris/cal-6222-chore-remove-cal-branding-in-booking-page-for-platform
branch
12 tasks
3 tasks
This was referenced Oct 8, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Linear CAL-6222
Fixes #22978