* fix: ensure isBookingDryRun prop works for booking creation
- Add isBookingDryRun prop to useHandleBookEvent hook
- Pass prop through BookerPlatformWrapper and useBookings
- Override _isDryRun flag when prop is provided
- Fixes issue where dry run banner showed but booking creation ignored prop
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* fixup
* if dry run prop is pass we use that, otherwise we use params
* add changesets for PR
* replace minor with patch changeset
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: rajiv@cal.com <rajiv@cal.com>
Co-authored-by: Ryukemeister <sahalrajiv6900@gmail.com>
Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* fix: validate Round Robin host availability in handleNewBooking
- Add validation to ensure Round Robin events have at least one available non-fixed host
- Throw NoAvailableUsersFound error when no Round Robin hosts are available
- Add unit test to verify the fix works correctly
- Fixes issue where Round Robin events with fixed hosts could be booked without Round Robin hosts
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* test: fix host configuration in Round Robin test
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* test: improve Round Robin test to only make RR host busy
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* fix: correct Round Robin validation to only check when RR hosts assigned
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* fix: refine Round Robin validation to only apply when both fixed and RR hosts present
- Add fixedUserPool.length > 0 condition to validation
- Ensures validation only triggers for specific bug scenario: events with fixed hosts + RR hosts but no available RR hosts
- Prevents blocking normal Round Robin events that only have RR hosts
- Updates test description to reflect more precise validation logic
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* fix: simplify Round Robin validation to resolve E2E test failures
Remove overly restrictive fixedUserPool.length > 0 condition that was
blocking valid Round Robin booking scenarios in E2E tests. The validation
now only checks if Round Robin hosts are assigned but none are available,
which is the intended behavior for the bug fix.
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* fix: restore fixedUserPool condition to Round Robin validation
- Add back fixedUserPool.length > 0 condition to make validation specific to bug scenario
- Only triggers when Round Robin events have both fixed hosts AND Round Robin hosts but no available Round Robin hosts
- Prevents blocking normal Round Robin events that only have Round Robin hosts (like in organization settings E2E test)
- Updates test description to reflect more precise validation logic
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
Co-Authored-By: carina@cal.com <c.wollendorfer@me.com>
* throw error if no RR user is available
* add tests
* fix comments
* revert change
* remove comments
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* feat: expose AvailabilitySettingsProps type in @calcom/atoms
- Export AvailabilitySettingsPlatformWrapperProps as AvailabilitySettingsProps
- Add type export to main atoms package index for direct import
- Enables external consumers to import type directly from @calcom/atoms
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* feat: also export AtomScheduleType for atomSchedule data
- Export FindDetailedScheduleByIdReturnType as AtomScheduleType
- Enables direct import of atomSchedule type from @calcom/atoms
- Covers both AvailabilitySettingsProps and AtomScheduleType exports
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* fix: update AtomScheduleType to include null and undefined
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* refactor: move AtomScheduleType to AvailabilitySettingsPlatformWrapper for cleaner organization
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* feat: rename AtomScheduleType to AvailabilitySettingsAtomScheduleType for better clarity
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* feat: rename to AvailabilitySettingsScheduleType for better naming consistency
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* fix: use proper import from @calcom/platform-libraries/schedules instead of dynamic import
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* add changelogs
* feat: extract AvailabilitySettingsSchedule type from AvailabilitySettingsProps
- Extract schedule property structure into separate AvailabilitySettingsSchedule type
- Update AvailabilitySettingsProps to reuse the extracted schedule type
- Export AvailabilitySettingsSchedule from @calcom/atoms package index
- Enables direct import of schedule type for external consumers
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
* Revert "feat: extract AvailabilitySettingsSchedule type from AvailabilitySettingsProps"
This reverts commit 79239e4b18925db3fcc1d8df7e9f37770ec4f116.
* fixup: extract schedule for AvailabilitySettingsProps
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: rajiv@cal.com <rajiv@cal.com>
Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Co-authored-by: Ryukemeister <sahalrajiv6900@gmail.com>
* feat: inject all repositories into AvailableSlotsService using dependency injection
- Create DI modules for SelectedSlotsRepository, TeamRepository, UserRepository, BookingRepository, EventTypeRepository, RoutingFormResponseRepository
- Update available-slots DI module to bind all 6 repositories
- Update DI container to load all new repository modules
- Replace all 10 direct repository instantiations with injected dependencies
- Add missing DI tokens for repository modules
- Expand IAvailableSlotsService interface to include all repository dependencies
This follows the same dependency injection pattern established in previous repository refactoring PRs and enables better testability and modularity by making all dependencies explicit and configurable.
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: DI available slots repo on api v2
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
* refactor: convert RoutingFormResponseRepository to use dependency injection pattern
- Add constructor with PrismaClient dependency injection
- Convert all 5 static methods to instance methods using this.prismaClient
- Convert private static helper method generateCreateFormResponseData to instance method
- Update all usage sites to use two-step instantiation pattern:
const formResponseRepo = new RoutingFormResponseRepository(prisma); formResponseRepo.method(...)
- Update test files to use proper mock implementation with vi.mocked pattern
- Reuse repository instances within same function scope where multiple calls are made
- Follow same dependency injection pattern as UserRepository, TeamRepository, SelectedSlotsRepository, BookingRepository, and EventTypeRepository
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fix: resolve inconsistent dependency injection in AvailableSlotsService
- Use two-step instantiation pattern for UserRepository calls
- Continue fixing remaining repository instantiation inconsistencies
Co-Authored-By: morgan@cal.com <morgan@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
- Add constructor with PrismaClient dependency injection
- Convert all 14 static methods to instance methods using this.prismaClient
- Update all usage sites to use two-step instantiation pattern:
const eventTypeRepo = new EventTypeRepository(prisma); eventTypeRepo.method(...)
- Keep getSelectedCalendarsFromUser as static utility method
- Follow same pattern as UserRepository, TeamRepository, SelectedSlotsRepository, and BookingRepository
- Maintain all existing method signatures and functionality
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
* feat: remove unused x-cal-timezone header and middleware matcher
- Remove x-cal-timezone header setting from middleware.ts
- Remove x-cal-timezone header setting from createNextApiHandler.ts
- Remove /api/trpc/:path* from middleware matcher
- Eliminates ~50M edge requests per month for unused functionality
- All timezone handling uses browser detection and localStorage instead
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* update POST_METHODS_ALLOWED_API_ROUTES
* test: remove api/trpc POST validation test
- Remove test for /api/trpc/book/event POST requests since /api/trpc/:path* was removed from middleware matcher
- Keep test for /api/auth/signup which is still processed by middleware
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: hbjORbj <sldisek783@gmail.com>
* refactor: convert BookingRepository to use dependency injection pattern
- Add constructor injection for PrismaClient to BookingRepository
- Convert all static methods to instance methods using this.prismaClient
- Update all usage sites to use two-step instantiation pattern:
const bookingRepo = new BookingRepository(prisma); bookingRepo.method(...)
- Apply same dependency injection pattern as UserRepository, TeamRepository, and SelectedSlotsRepository
- Update test files to use correct prismaMock import paths
- Maintain all existing functionality and type safety
Files updated:
- BookingRepository class structure and all 15 static methods
- Video meeting pages and booking views
- Booking utilities and services (handleNewBooking, originalRescheduledBookingUtils)
- Round robin handlers and reassignment logic
- Interval limits and booking limits checking
- Test files with proper mocking setup
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
* refactor: convert TeamRepository to use dependency injection pattern
- Add constructor injection for PrismaClient in TeamRepository
- Convert all static methods to instance methods using this.prismaClient
- Update all usage sites to use two-step pattern: const teamRepo = new TeamRepository(prisma); teamRepo.method(...)
- Optimize instance reuse within same function scopes where possible
- Update test files to work with new instance pattern
- Preserve all existing functionality and method signatures
Follows the same dependency injection pattern as UserRepository refactoring
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* refactor: convert SelectedSlotsRepository to use dependency injection pattern
- Add constructor injection for PrismaClient/PrismaTransaction
- Convert all static methods to instance methods using this.prismaClient
- Update usage sites to use two-step instantiation pattern:
const slotsRepo = new SelectedSlotsRepository(prisma); slotsRepo.method(...)
- Optimize instance reuse in util.ts for multiple method calls
- Update test mocks to handle new constructor-based pattern
- Add explicit type annotations to resolve TypeScript inference issues
Follows same dependency injection pattern as UserRepository and TeamRepository refactorings.
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: bump platform libs
* fix: devin mistake prisma client
* fix: devin typing mistakes
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* refactor: convert TeamRepository to use dependency injection pattern
- Add constructor injection for PrismaClient in TeamRepository
- Convert all static methods to instance methods using this.prismaClient
- Update all usage sites to use two-step pattern: const teamRepo = new TeamRepository(prisma); teamRepo.method(...)
- Optimize instance reuse within same function scopes where possible
- Update test files to work with new instance pattern
- Preserve all existing functionality and method signatures
Follows the same dependency injection pattern as UserRepository refactoring
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
- Remove justify-between from checkbox labels to fix uneven padding
- Use CheckboxField with descriptionAsLabel for consistent spacing
- Add flex justify-end to button container for right alignment
- Maintain existing keyboard navigation functionality
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Bailey <bailey@pumfleet.co.uk>
* refactor: convert UserRepository to use dependency injection pattern
- Convert all static methods to public instance methods
- Add constructor that takes PrismaClient parameter
- Update all usage sites to use new instantiation pattern: new UserRepository(prisma).method()
- Follow same pattern as PrismaOOORepository for consistency
- Maintain all existing method logic and signatures unchanged
- Update 125+ files across the codebase to adapt to new pattern
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* optimize: reuse UserRepository instances within same function scope
- Create single UserRepository instance per function scope
- Reuse instance for multiple method calls within same function
- Reduces object instantiation overhead and improves performance
- Apply optimization pattern consistently across codebase
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fix: repository
* fixup! fix: repository
* fixup! fixup! fix: repository
* fixup! fixup! fixup! fix: repository
* fix: update test mocking strategies for UserRepository dependency injection
- Convert static method mocks to instance method mocks in userCreationService.test.ts
- Update vi.spyOn calls to work with constructor injection pattern in getAllCredentials.test.ts
- Fix UserRepository mocking in getRoutedUrl.test.ts to use constructor injection
- Ensure consistent mocking approach across all test files
- Fix 'UserRepository is not a constructor' errors in tests
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* feat: optimize UserRepository instance reuse and add SessionUser type
- Reuse UserRepository instance in OrganizationRepository.createWithNonExistentOwner
- Add comprehensive SessionUser type definition for type safety
- Improve type constraints in enrichUserWithTheProfile and enrichUserWithItsProfile
- Ensure proper return types with profile information
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fix: make UserRepository mocking strategy more robust for CI environments
- Add defensive checks for vi.mocked() to handle CI environment differences
- Ensure mockImplementation is available before calling it
- Maintain consistent mocking pattern across all test files
- Fix 'Cannot read properties of undefined' error in CI
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fixup! fix: make UserRepository mocking strategy more robust for CI environments
* refactor: convert direct UserRepository instantiations to two-step pattern
- Change await new UserRepository(prisma).method(...) to const userRepo = new UserRepository(prisma); await userRepo.method(...)
- Optimize instance reuse within same function scopes
- Apply pattern consistently across all modified files in PR
- Fix type errors in organization.ts and sessionMiddleware.ts
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* refactor: complete two-step UserRepository pattern for remaining files
- Apply two-step instantiation pattern to all remaining modified files in PR
- Ensure consistent UserRepository usage across entire codebase
- Maintain instance reuse optimization within function scopes
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* chore: DI available slots service repositories
* remove configService from worker module
* register scheduleRepo in availableSlotsModule
* chore: bump platform libs
* remove useless comment from prisma module
* fix: availableSlotsModule to class deps
* fix: repositoriesModule deps
* chore: container pattern
* refactor: move modules in DI folder
* fixup! refactor: move modules in DI folder
* chore: new auth strategy for third party access tokens
* chore: throw error earlier if Bearer token is invalid
* fix: check apikey and access token before third party token
* refactor: GetAvailableSlotsService
* chore: add todo comments where DI is needed
* chore: bump platform libs
* chore: fix unit tests
* fix: only instantiate AvailableSlotsService once per service
* Update packages/trpc/server/routers/viewer/slots/util.ts
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix: bind this on all functions with reporting
---------
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix: allow enter key to create new list items in editor
* remove: unnecessary priority set to low
* remove: unnecessary priority set to low
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
* intro work
* update wixard form to have content callback to remove preset navigation
* more fixes to deployment
* fix calling static service
* fix save license key text
* ensure default steps work as expected
* fix conditional for rendering step
* skip step
* add on next step for free license
* refactor wizard form to use nuqs
* fix styles
* merge base param with step config
* fix next stepo text
* use deployment Signature token
* decrypt signature token
* fix: resolve type errors and test failures from wizard form refactor
- Fix signatureToken field name to signatureTokenEncrypted in deployment repository
- Add missing getSignatureToken method to verifyApiKey test mock
- Fix WizardForm import from default to named export in test file
- Add missing nextStep prop to Steps component in WizardForm
Resolves TypeScript type check errors and unit test failures without changing functionality.
Co-Authored-By: sean@cal.com <Sean@brydon.io>
* fix: add missing getDeploymentSignatureToken mock in LicenseKeyService test
Co-Authored-By: sean@cal.com <Sean@brydon.io>
* fix: add nuqs library mock for WizardForm test
Co-Authored-By: sean@cal.com <Sean@brydon.io>
* fix: add missing nav prop to AdminAppsList component with eslint disable
Co-Authored-By: sean@cal.com <Sean@brydon.io>
* Apply suggestions from code review
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Update apps/web/modules/auth/setup-view.tsx
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix license schema changes
* revret schema generation
* fix eslint errors
* remove required nav type + add use client
* fix types
* Update packages/ui/components/form/wizard/useWizardState.ts
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix controller issue
* add checks for deployment key being null - add more tests
* fix tests
* add deployment key tests
* fix: resolve crypto mock to handle empty encryption keys gracefully
- Updated symmetricDecrypt mock to return null instead of throwing 'Invalid key' error when encryption key is empty
- All getDeploymentKey tests now pass including the previously failing 'should return null when decryption fails due to missing encryption key' test
- Fixes mocking issues in PR 22102 self-hosted onboarding wizard form refactor
Co-Authored-By: sean@cal.com <Sean@brydon.io>
* fix label
* add i18n to error
* use enum for steps
* add as const
* fix test env issues
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* feat: add dropdown submenu for Insights navigation
- Add dropdown functionality for desktop Insights menu to show submenu instead of immediate navigation
- Add expandable submenu for mobile Insights in More navigation
- Users can now select specific insights destination (Bookings, Routing, Router Position)
- Maintains existing navigation patterns and accessibility
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* fix: use expansion state instead of dropdown for insights navigation
- Remove dropdown components and use existing child rendering pattern
- Add state management for expansion tracking
- Change items with children to render as buttons instead of links
- Preserve existing behavior when currently on page
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* feat: keep parent expanded and hide chevron when sub-item is active
- Add hasActiveChild logic to detect when any child item is currently active
- Keep parent menu expanded when any sub-item is selected
- Hide chevron icon when any sub-item is active
- Maintain existing expansion behavior when no sub-item is active
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* feat: add localStorage persistence for navigation expansion state
- Replace useState with usePersistedExpansionState hook in both NavigationItem and MobileNavigationMoreItem
- Expansion state now persists across page navigations using localStorage
- Uses nav-expansion-{itemName} keys following existing localStorage patterns
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* chore: update yarn.lock from dev server startup
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* feat: change navigation expansion persistence from localStorage to sessionStorage
- Expansion state now persists within browser session but resets when tab closes
- Maintains same error handling and key naming patterns
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* Revert "chore: update yarn.lock from dev server startup"
This reverts commit 832f417da96f79979942c99400d2a7b26f889616.
* clean up
* add aria attributes
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* sort the availabilities based on start time for each day
* move the sorting outside the reduce
* add guard variable for safe access
---------
Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>
* migration plus feature flag
* show navigation route + inital roles migration
* add a check permission use case to take in the feature flags for a team
* bulk update script
* inital frontend work for displaying roles
* move to a more "anemic domain models" approach
* update test to match new DDD strutcture
* fix tests
* update transaction call back types to include trx
* align fe types after transaction to DDD
* move away from usecases to a more domain tailored approach
* get permissions per resource and map them to domain permission string
* update permision logic
* correctly get the logic for *.* permissions on owner
* wip sheet logic for ssr
* role list
* use nuqs for sheet parsing on handle change
* fox
* improve hook usage
* enable PBAC router
* delete modal etc
* i18n and inital rough layout of roles + permisions creating
* add color to migrations
* add colors and new method to tests
* move hooks out of infra into client with provider
* move hooks out of infra into client with provider
* memo features and ensure render once
* remove comment
* seed color
* use role colours
* match i18n
* add custom color picker to edit/create form
* fix advanced mode toggle
* more work on adv permission group
* update migrations
* abstract lots of core form logic to a custom hook
* improve UX for selecting all and toggling all
* improve code quality and use domain mappers in role repositoryu
* call server action to revalidate cache
* call invalidate cache on delete
* fix re-render + improves update logic wip
* fix txn for assinging role to member
* wip on assigning users custom roles
* fix repo
* update logic for checking if users can update roles
* remove member from permission check
* check users permission and assign roles
* move to factory approach
* move default rolesIDs to constant
* add facuted values to table
* display custom role in table
* fix type error
* fix role filter
* check pbac feature flag to see what column to filter on
* push repo mocks and other mocks to fix unit tests
* fix and add test for empty permissions when creating a role
* pass updates to repo so we actually update roles
* fix types
* fix types
* restore lock changes
* fix role service test for new updates section
* fix updated at types
* update mocks to use feature repository mock
* remove roletype from db in model
* prevent multiple queries
* fix typeof in role model
* fix and migrate i18n to one registery
* fix and update i18n to be in registery
* fix type error + fall back in service instead of repo for BL
* more type errors
* update members faceted values to bennys refactor
* fix types
* remove the _resource from type conditionally
* fix managment factory types to expose PBAC enbaled obol
* narrow down types
* wip fix for types
* more fix types
* cast role
* fix tests
* attempt of fixing _resoucre key access type
* attempt of fixing _resoucre key access type
* seperate migraations to batches
* add invalidate time to team features
* restore router to main
* push main lock
* Update packages/features/pbac/domain/types/permission-registry.ts
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Update packages/features/pbac/domain/mappers/PermissionMapper.ts
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Update packages/prisma/migrations/20250527091330_add_color_to_pbac_role/migration.sql
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Update packages/prisma/migrations/20250617070118_update_memberships_one_time/migration.sql
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Update apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/AdvancedPermissionGroup.tsx
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix mapped type
* restore migration
* skip _resource
* use partical
* fix type errors in tests and hooks
* Simplified the role field in the editSchema to use z.nativeEnum(MembershipRole)
* fix type errors for editsheet
* fix type errors for editsheet
* Apply suggestion from comment 2151515295
* remove footer since we dont have docs yet
* add i18n
* lock all toggle chevron
* use prisma
* tidy up old manage permission
* fix i18n
* remove can manage from role permission check
* auto select read
* address benny feedback
* fix type
* fix type
* update function name due to merge
* fix types
* update tests to match new membership method from merge
* address cubic feedback
---------
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* refactor: replace Prisma.validator<Select>() with satisfies syntax
- Convert all Prisma.validator<Prisma.SomeSelect>()({...}) patterns to {...} satisfies Prisma.SomeSelect
- Update import { Prisma } to import type { Prisma } where only used for types
- Maintain existing functionality while modernizing TypeScript syntax
- Covers 89+ files across packages/prisma/selects, repository classes, tRPC handlers, and API modules
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
* refactor: complete remaining Prisma.validator conversions
- Update test fixture files with satisfies syntax
- Apply lint-staged formatting fixes
- Complete refactoring of all remaining files
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
* revert: remove unintended platform library update
- Revert yarn.lock changes that updated @calcom/platform-libraries from 0.0.236 to 0.0.239
- This was an unintended side effect of the refactoring process
- Keep only the intended Prisma.validator → satisfies syntax changes
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
* fix: update ESLint plugin references to correct package name
- Change @calcom/eslint to @calcom/eslint-plugin-eslint in eslint-preset.js
- Resolves 'Failed to load plugin @calcom/eslint' error causing CI failures
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: alex@cal.com <me@alexvanandel.com>
* feat: Add routing-forms record response endpoint with available slots
* fix: resolve TypeScript error in handleResponse.test.ts
- Fix type mismatch where mockResponse was passed as identifierKeyedResponse
- identifierKeyedResponse expects Record<string, string | string[]> structure
- Updated test to pass correct data structure for type compatibility
Co-Authored-By: hariom@cal.com <hariom@cal.com>
* fix: correct POST endpoint parameter handling and request body parsing in routing forms responses controller
- Change @Query() to @Body() decorator for POST request data in controller
- Update service method to accept parsed body data directly
- Remove incorrect URLSearchParams parsing of request.body object
- Fix getRoutingUrl method to use form response data parameter
This resolves API v2 test failures by following proper NestJS patterns for POST request handling.
Co-Authored-By: hariom@cal.com <hariom@cal.com>
* Pass teamMemberEmail as well
* Devin fixes reverted
* Keep all routing related props together in both endpoints
* Remove newly added slots props from Slots documentation as they are used through internal fn call only
* fix test
* Pass skipContactOwner
* Pass crmAppSlug and crmOwnerRecordGType and add more tests
* handle external redirect case and form not found case
* hide props
* chore: bump platform libs
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: hariom@cal.com <hariom@cal.com>
Co-authored-by: cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* refactor: create team service
* refactor: finish
* tests: add unit test for team service
* Add alternative approach to testing
---------
Co-authored-by: Hariom <hariombalhara@gmail.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* docs: improve English naturalness in API v2 documentation
- Fix awkward API summary 'Find out when is an event type ready to be booked' to 'Get available time slots for an event type'
- Correct 'setup' vs 'set up' usage throughout documentation
- Fix OAuth capitalization consistency
- Improve 'api' to 'API' capitalization in v2 docs
- Enhance readability while preserving technical accuracy
Fixes unnatural English phrasing in titles, headers, descriptions, and summaries across API v2 documentation files.
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* docs: add missing articles 'the' in API v2 documentation
- Fix 'How to Set Up API' to 'How to Set Up the API' in titles
- Add 'the' before 'API' in descriptions and summaries
- Fix grammar error 'all you need to is' to 'all you need to do is'
- Improve naturalness while maintaining technical accuracy
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* docs: fix unnatural English in API v2 @ApiOperation summaries
- Fix grammatically incorrect 'conferencing apps oauths callback' to 'Conferencing app OAuth callback'
- Replace 'ooo' with 'out-of-office' in user-facing summaries for clarity
- Ensure consistent sentence case capitalization (only first letter capitalized)
- Remove trailing periods from summaries for consistency
- Fix awkward phrasing like 'Get by attribute id all of...' to more natural English
- Revert 'Introduction to the API v2' back to 'Introduction to API v2'
- Improve naturalness while maintaining technical accuracy
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* Update apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts
* Update docs/api-reference/v2/openapi.json
* docs: fix setup/set up usage - use 'backend setup' (noun) not 'backend set up' (verb)
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* docs: fix setup/set up verb usage - use 'set up' (verb) not 'setup' (verb)
- Fix 'You have to setup' → 'You have to set up' in quickstart.mdx
- Fix 'Setup environment variables' → 'Set up environment variables'
- Fix 'Setup root of your app' → 'Set up root of your app'
- Fix 'prompted to setup' → 'prompted to set up' in setup.mdx
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* Ran v2 locally to regen the doc json files
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* feat: optimize date range intersection algorithm from O(n²) to O(n log n)
- Replace nested forEach loops with two-pointer approach
- Sort arrays once and traverse efficiently
- Maintains exact same functionality and API
- Improves performance for team scheduling scenarios
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: add comprehensive stress test for intersect function performance
- Add performance comparison test showing 22x improvement from O(n²) to O(n log n)
- Include edge cases testing for correctness validation
- Test with realistic data sizes (50 date ranges per user)
- Demonstrate identical results between old and new algorithms
- Provide timing measurements and performance logging
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: update stress test to focus on optimized algorithm performance
- Remove old O(n²) algorithm comparison logic from test
- Focus stress test on current optimized intersect function performance
- Test with 400 total date ranges (4 users × 100 ranges each)
- Maintain realistic data sizes for team scheduling scenarios
- Execution time: 10.33ms for 400 ranges with 97 intersections found
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* docs: restore explanatory comment in intersect function
- Add back comment explaining intersection logic as requested in PR review
- Comment clarifies when intersected time ranges are added to results array
- Addresses GitHub feedback from hbjORbj to revert comment removal
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: remove unnecessary intersectNew variable in edge cases test
- Use intersect function directly instead of intersectNew variable assignment
- Addresses GitHub feedback from keithwillcode to clean up test code
- No functional changes to test logic or assertions
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* test: add comprehensive test coverage for intersect function
- Add 27 comprehensive test cases covering all edge cases and scenarios
- Test empty inputs, single arrays, overlapping ranges, containment
- Add team scheduling scenarios and performance testing
- Test unsorted input handling, cross-day scenarios, time precision
- Ensure comprehensive coverage without knowing algorithm implementation
- All tests pass with optimized O(n log n) algorithm
- Performance test shows 8.50ms execution time for 400 date ranges
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* perf: improve intersect function in slots (#22087)
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* refactor: optimize google's getAvailability with caching
Refactored the getAvailability method to improve readability and efficiency by extracting logic into helper methods for cache checking, calendar ID retrieval, and chunked API fetching. Added early cache lookup for selected calendar IDs, improved cache hit logging, and modularized the code for easier maintenance and future enhancements.
* Update CalendarService.test.ts
* Update CalendarService.ts
* Update CalendarService.test.ts
* Update CalendarService.ts
* Update CalendarService.test.ts
* Update CalendarService.ts
* Apply suggestion from @hbjORbj
Co-authored-by: Benny Joo <sldisek783@gmail.com>
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* Revert "fix: atoms for local development (#22178)"
This reverts commit d74d99dde7.
* chore: remove comment
* feat: local dev scripts
* feat: local dev scripts
* feat: add formatPeriodStraightforward method for comprehensive date formatting
- Add new formatPeriodStraightforward method that always shows full date information
- Update DateRange interface to include formattedDateStraightforward field
- Modify getDateRanges to generate both formatted versions
- Add comprehensive unit tests for the new straightforward formatting
- Maintain backward compatibility with existing formatPeriod method
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* refactor: rename formatPeriodStraightforward to formatPeriodFull
- Rename method from formatPeriodStraightforward to formatPeriodFull
- Rename interface field from formattedDateStraightforward to formattedDateFull
- Update all test cases to use new method name
- All tests continue to pass with new naming
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* test: add comprehensive getDateRanges formatting comparison tests
- Add 7 new test cases that call getDateRanges directly
- Demonstrate side-by-side comparison of formattedDate vs formattedDateFull
- Cover daily, weekly, and monthly view formatting differences
- Include real-world usage examples showing practical benefits
- All 65 tests pass including new formatting comparison tests
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* refactor: extract formattedDate arrays in getDateRanges comparison tests
- Refactor all 6 tests in 'getDateRanges - Formatting Comparison' suite
- Extract formattedDate and formattedDateFull arrays separately
- Use clean expect statements for easier visual review
- Remove startDate/endDate checks as requested
- Maintain all existing test scenarios and expected values
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* clean up
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* fix: Process base64 avatar image (#22165)
* fix: process base64 avatar image
* better name
* more
* fix import
* Attempt to fix sharp dependency issue by upgrading next
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* fix: add explicit type annotation to CalComAdapter function
Resolves TS7056 error where inferred type exceeded maximum length
the compiler will serialize. Added custom CalComAdapterType type
annotation to provide explicit typing while preserving existing
functionality of the authentication adapter.
The custom type annotation matches the actual implementation structure
and resolves the TypeScript compilation error without breaking the
existing NextAuth adapter functionality.
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
* fix: replace any types with proper NextAuth Adapter typing
- Import Awaitable type from next-auth for proper async typing
- Define CalComAdapter type using Cal.com's actual Prisma types
- Remove all any types following TypeScript best practices
- Maintain compatibility with NextAuth's expected interface
- Resolves TS7056 compilation error with explicit typing
Co-Authored-By: alex@cal.com <me@alexvanandel.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: alex@cal.com <me@alexvanandel.com>
* perf: optimize filterRedundantDateRanges from O(n²) to O(n log n)
- Replace nested loop with optimized algorithm that leverages sorted ranges
- Add valueOf caching to avoid repeated .valueOf() calls (similar to PR #22076)
- Implement early termination for ranges that start after current range ends
- Handle identical ranges correctly by keeping first occurrence
- Add comprehensive test coverage with 8 new test cases covering:
- Multiple nested containments
- Identical ranges
- Same start/end time edge cases
- Invalid ranges (end before start)
- Large dataset performance (100 ranges)
- Touching ranges (adjacent ranges)
All 11 tests pass, maintaining behavioral compatibility while improving performance.
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* revert: remove valueOf caching optimization, keep O(n log n) algorithm
- Remove cached valueOf() variables to address user feedback
- Keep algorithmic optimization with early termination logic
- Maintain O(n log n) complexity through sorted range leveraging
- All 11 tests continue to pass with identical functionality
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: correct identical range handling in O(n log n) optimization
- Remove complex conditional logic that caused incorrect filtering of identical ranges
- Revert to simple containment check while preserving O(n log n) performance
- All 10 comprehensive unit tests now pass
- Maintains early termination optimization for performance gains
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: correct identical range handling to keep first occurrence
- Update test expectation from 0 to 1 for three identical ranges
- Modify implementation to keep first occurrence of identical ranges
- Maintain O(n log n) performance optimization
- All 10 unit tests now pass
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace nested loop with interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Maintain identical range handling logic
- Preserve all existing test compatibility
- Performance improvements: 1.08x-2.46x speedup across scenarios
- Note: Enterprise pattern correctness issue requires investigation
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace segment tree with interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Maintain identical range handling logic
- All unit tests (10/10) and integration tests (5/5) pass
- Type checking passes with no errors
- Still investigating enterprise pattern correctness issue (499 vs 379 results)
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace nested loop with interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Maintain identical range handling logic
- Preserve all existing test compatibility
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: remove redundant sort in interval tree constructor
- Fix index misalignment issue causing correctness problems
- Remove duplicate sorting of nodes after mapping
- Maintain proper index references for containment queries
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace nested loop with interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Maintain identical range handling logic
- Preserve all existing test compatibility
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: simplify interval tree logic to match original behavior
- Remove complex identical range handling logic
- Filter out any range that has containing intervals
- Achieve O(n log n) worst-case complexity with correct behavior
- Fix 'should handle three identical ranges' test failure
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace hybrid algorithm with interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Fix identical range handling to keep first occurrence
- Maintain all existing test compatibility
- Update test expectation for three identical ranges to return 1 result
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: resolve TypeScript errors in interval tree implementation
- Add explicit type annotations for sort function parameters
- Use Array.from() for Map iteration to ensure TypeScript compatibility
- Maintain O(n log n) worst-case complexity with type safety
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* feat: implement interval tree for O(n log n) worst-case complexity
- Replace hybrid algorithm with pure interval tree data structure
- Achieve O(n log n) worst-case complexity vs previous O(n²)
- Maintain balanced tree structure for efficient containment queries
- Preserve all existing test compatibility
- Performance improvements: 1.12x-2.36x speedup depending on scenario
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: extract IntervalTree to generic reusable implementation
- Move IntervalTree and IntervalNode to separate packages/lib/intervalTree.ts
- Make IntervalTree generic with type parameter <T> and function parameters for start/end extraction
- Update filterRedundantDateRanges.ts to use generic IntervalTree implementation
- Maintain O(n log n) worst-case complexity and all existing functionality
- All unit tests (10/10) and integration tests (5/5) passing
Addresses GitHub comment from @keithwillcode requesting generic, reusable interval tree
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: correct containment logic in interval tree implementation
- Fix unconditional 'return false' that incorrectly filtered non-contained ranges
- Maintain O(n log n) complexity while ensuring correct containment behavior
- Add test case for overlapping but non-containing ranges
- Addresses cubic-dev-ai[bot] comment on PR #22093
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* test: add comprehensive test coverage for cubic-dev-ai bug scenario
- Add test for overlapping but non-containing ranges
- Add test for complex overlapping pattern that exposed the cubic-dev-ai bug
- These tests would have caught the unconditional 'return false;' logic error
- Addresses test coverage gap that allowed the bug to slip through
The original test suite focused on clear containment scenarios but missed
complex overlapping patterns where interval tree finds false positives
that need proper filtering logic.
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: separate IntervalTree structure from search algorithm
- Extract ContainmentSearchAlgorithm to separate class
- Make IntervalTree generic and reusable for different search patterns
- Maintain existing API compatibility for filterRedundantDateRanges
- Address GitHub feedback from @keithwillcode
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: make IntervalTree truly generic by moving node construction outside
- Extract createIntervalNodes helper function for date-specific node construction
- Remove start/end/maxEnd property handling from IntervalTree constructor
- Make IntervalTree accept pre-constructed nodes instead of raw items
- Move date-specific logic to filterRedundantDateRanges caller
- Addresses GitHub feedback from @keithwillcode about generic tree structure
- Maintains O(n log n) performance and all existing functionality
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* perf: eliminate redundant sorting in IntervalTree implementation
- Remove duplicate sort in IntervalTree constructor
- Sort interval nodes once in filterRedundantDateRanges after creation
- Addresses @Udit-takkar's performance feedback on PR #22093
- Maintains O(n log n) complexity while reducing constant factors
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* fix: remove redundant sorting of interval nodes
- Eliminates unnecessary .sort() operation on interval nodes
- Nodes are already sorted from initial sortedRanges sort
- Addresses @keithwillcode's performance feedback
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
- Simplify conditional logic in check-label job output
- Remove redundant condition that caused race condition
- Maintain event filtering to only run when ready-for-e2e label is added
- Fixes issue where workflow failed despite script finding the label correctly
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
- Import extractUserContext function from @/lib/extract-user-context
- Extract user context from request in intercept method
- Add user context to logger output using spread operator
- Follow same pattern as exception filters for consistency
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
* Revert "chore: add test for updateProfilePhotoGoogle (#22169)"
This reverts commit 67032ddaf1.
* Revert "fix: Process base64 avatar image (#22165)"
This reverts commit d8d8bc4d00.
* feat: adds timezone indicator on insights informing user that user settings timezone is used instead of browser timezone
* added i18 helper for translation
* chore: use entities.decodeHTML instead of custom decoder
* feat(insights): align TimezoneBadge with new timeZone prop flow
* chore
* chore: smaller icon
* do not escape value
---------
Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
* feat: enhance API v2 exception filters with user context for improved Axiom observability
- Add extractUserContext utility to safely extract user/org/team context from request
- Enhance all 5 exception filters (HTTP, TRPC, Prisma, Zod, Calendar) with user context
- Include userId, userEmail, organizationId, teamId in Axiom logs when available
- Improve observability for debugging and monitoring authenticated requests
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* chore: update yarn.lock from lint-staged hooks
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fix: use request.organization instead of request.organizationId
- Address GitHub comment feedback from ThyMinimalDev
- Extract organization ID from organization object for consistency
- Follows same pattern as user and team extraction
Co-Authored-By: morgan@cal.com <morgan@cal.com>
* fix: revert to using request.organizationId as requested in GitHub comment
- Change back from request.organization to request.organizationId
- This aligns with how auth strategies actually populate the request object
- Addresses GitHub comment from ThyMinimalDev
Co-Authored-By: morgan@cal.com <morgan@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: morgan@cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* fix: status code or router embed rate limiting
* fix: type err
* fix: handle api v2
* fix: status code
* chore: remove unused
* chore: update unit test
* chore: unit test
* refactor: make res required
* chore: remove unused
* chore: add a wrapper in getserversideprops
* chore: remlove log
* Add ratelLimiting unit test
---------
Co-authored-by: Hariom <hariombalhara@gmail.com>
* fix: Use WEBAPP_URL_FOR_OAUTH to be able to use http://localhost:3000
for local testing
* In case of JSON.parse crash that could happen if zoom reponsed with xml
* Fix cases where auto_recording and default_password_for_scheduled_meetings could be nullish
* perf: optimize slot conflict checking from O(n²) to O(n log n)
- Replace nested mapping with pre-sorted busy slots for faster lookups
- Use early termination when busy slots are sorted by start time
- Maintain exact same interface and behavior as original checkForConflicts
- All existing tests pass, preserving edge case handling
- Reduces complexity from O(available slots × busy slots) to O(n log n)
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* refactor: move O(n log n) optimization to checkForConflicts function
- Replace inline optimization with optimized checkForConflicts function
- Maintain same performance while improving code architecture
- Avoid duplication of conflict checking logic
- Keep all existing interfaces and behavior unchanged
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* test: add comprehensive unit tests for checkForConflicts function
- Add 20 additional test cases covering edge cases and boundary conditions
- Test multiple busy periods scenarios and complex overlaps
- Comprehensive currentSeats handling scenarios
- Timezone and cross-day boundary testing
- Performance testing with large datasets
- Fix invalid date generation in test data that was causing NaN conflicts
- Achieve near 100% coverage of all conflict scenarios documented in function comments
- Verify behavioral equivalence between original O(n²) and optimized O(n log n) implementations
Co-Authored-By: keith@cal.com <keithwillcode@gmail.com>
* Simple, safe performance tweak
* Explicitly define the input of busy to be either Date or Dayjs, not string
* EventBusyDate must ALWAYS be a type that supports valueOf
* Revert "EventBusyDate must ALWAYS be a type that supports valueOf"
This reverts commit 35b572266219d64c22db3c3e24b0cb6ca7a901a6.
* Revert "Explicitly define the input of busy to be either Date or Dayjs, not string"
This reverts commit 902f29708e4b7990a4e5e2865cab2f18ab3e44f0.
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* only check first slot
* skip test for second slot availability check
* fixing tests in handleNewRecurringBooking.test.ts
* skip test
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
* Add `rerouting` to `AssignmentReasonRecorder`
* Pass session email as `rescheduledBy`
* Write reassign reason
* Edit message
* Use `routingFormRoute` when rerouting
* Pass isRerouting & reroutedByEmail to `routingFormRoute` method
* Type fix
* Fix test
* Fix test
* Fix test
* Type fix
* Refactor to use UserRepository
* Show rerouted by email
* Replace isReroutingCase
* Fix rescheduledBy for new tab reschduling
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
* feat: add field type change warning dialog to routing forms
- Add FieldTypeChangeWarningDialog component to prevent field type changes
- Show informative dialog explaining data integrity concerns when users try to change field types
- Provide alternative suggestion to create new field instead of changing existing one
- Add i18n translations for dialog messages
- Integrate dialog into routing form edit page field type selector
- Bypass Teams plan restriction for testing routing forms functionality
- Fix ESLint error by properly handling scrollIntoView in embed mode with disable comment
Prevents data integrity issues by blocking field type changes (e.g. multiselect → text)
that could make existing form responses incompatible and cause data loss.
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* fix: make field type dialog more selective to allow legitimate changes during form creation
- Only show warning dialog when there's actual data integrity risk
- Allow field type changes for new fields or fields without meaningful labels
- Fixes E2E test timeout by not blocking legitimate field type changes
- Maintains data protection for existing fields with real data
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* fix: complete field type dialog implementation with translations and component
- Add FieldTypeChangeWarningDialog component with proper i18n support
- Add all required translation strings for dialog messages
- Ensure dialog only shows for actual data integrity risks
- Allow legitimate field type changes during form creation
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* simplify field type dialog: one button, button replaces SelectField, remove forms page changes
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* use Button component
* feat: restore SelectField with conditional dialog for field type changes
- Restore original SelectField dropdown to allow users to see available field types
- Add conditional logic to show dialog only when different type is selected AND form has responses
- Prevent field type changes by not calling onChange when dialog is shown
- Pass hasFormResponses prop from FormEdit to Field component
- Maintain data integrity while providing clear user guidance
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* controlled value
* convert dialog to tooltip
* Update common.json
* remove unused texts
* allow type changing for new field
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <hey@eunjae.dev>
* feat: allow setting DAILY VIDEO region via env
* add comments
* Cleaner approach to Daily video region type assertion
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Restart form if admin is not org admin
* Show pricing is admin and hosted
* Only show billing specific fields when enabled
* Create user onboarding only if valid valid license when self hosting
* Reset store when org creation is completed
* Create schema for trpc input when creating an org
* Add `organization.createSelfHosted` trpc endpoint
* `createOrganizationFromOnboarding` do not require stripe data
* Create organization without billing if self-hosted admin
* Update organizationOnboarding record as completed
* Handle updating subscription for self hosters
* Refactor `isBillingEnabled` to store
* Type fix
* Fix admin org creation for hosted
* Hide UI from admin
* Add tests
* fix: Fix LicenseKeySingleton mocking in organization tests
- Add proper vi.mock() module-level mocking for LicenseKeySingleton
- Replace incorrect casting syntax with vi.mocked() approach
- Add LicenseKeySingleton mock to hosted tests in intentToCreateOrg.handler.test.ts
- Fix IS_SELF_HOSTED mocking for hosted vs self-hosted test scenarios
- All organization creation tests now pass locally
Co-Authored-By: joe@cal.com <joe@cal.com>
* Fix tests
* Fix tests
* Test fixes
* Type fix
* Type fix
* Type fix
* Update packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts
Fix typo
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix: Add IS_SELF_HOSTED mocking for E2E organization creation tests
Co-Authored-By: joe@cal.com <joe@cal.com>
* Fix E2E test
* Address feedback
* Type fix
* Fix e2e tests
* Remove unused code
* Small fixes
* fix unit tests
* review fixes
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: joe@cal.com <joe@cal.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
* refactor(embed-core): update theme class names for consistency
Standardize theme class names to use 'cal-element-embed-dark' and 'cal-element-embed-light' to improve maintainability and clarity.
* refactor(embed-core): replace theme class strings with constants
* fix theme not changing
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
* fix creating user balance
* fix org check if teamId is given
* adjust hasAvailableCredits function
* improve comments
* fix creditBalance.create
* adjust test
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* feat: add integration test for RoutingFormResponseField triggers
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* refactor: remove changing field types test case
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <hey@eunjae.dev>
* [CAL-5926] Add 'onTimeslotsLoaded' prop to 'Booker' atom
* Added 'onTimeslotsLoaded' to BookerPlatformWrapperAtomProps
* fixed type error and added onTimeslotsLoaded prop to doc
---------
Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
* add smsSegments to creditExpenseLog
* add download button
* download only data from selected month
* improvements
* improve design
* use repository function
* add tests for credit repository
* fix type error
* fix unit test
* fix type error
* fix unit test
* code clean up
* fix skeleton loader
* remove empty mt
* code clean up
* move csv headers out of function
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* feat: add attendee data to CSV export with seated event support
- Add up to 3 attendees to CSV export in 'name (email)' format
- Use booking.seatsReferences for seated events, booking.attendees for regular events
- Maintain backward compatibility with existing bookerEmail/bookerName fields
- Add attendee1, attendee2, attendee3 columns to CSV output
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* fix: restore missing comment as requested in PR review
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* Update packages/features/insights/server/events.ts
* feat: remove duplicate booker columns from CSV export
- Remove bookerEmail and bookerName columns as they duplicate attendee data
- Remove noShowGuest field which was based on booker data
- Remove unused booker field from bookingMap
- Keep only attendee1, attendee2, attendee3 columns with name (email) format
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* feat: restore noShowGuest field to CSV export
- Add noShowGuest field mapping from first attendee's noShow property
- Maintain existing attendee1, attendee2, attendee3 columns
- Default to false when no attendees exist
- Works with both seated events and regular events
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* rename column
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <hey@eunjae.dev>
* Add unit tests to routing flow
* fix: resolve TypeScript errors in routing forms test files
- Fix mock form structure to match TargetRoutingFormForResponse type
- Add missing properties like selectText, deleted, updatedById to form fields
- Correct route action types to use valid RouteActionType enum values
- Fix response objects to include required label property
- Update mock return values for findTeamMembersMatchingAttributeLogic
- Use proper type assertions for complex route objects
Co-Authored-By: hariom@cal.com <hariom@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: hariom@cal.com <hariom@cal.com>
* Add queued booking response table
* Create `RoutingFormResponseRepository`
* Pass `queueFormResponse` param
* Queue up form response if param is passed
* Forward queued form response parma to booker
* Pass `queuedFormResponse` from booker to `handleNewBooking`
* Write queued routing form response
* Type fixes
* Clean up
* Allow dry run to work which wont have any QueuedFormResponse or FormResponse
* Support passing the time when the modal was actually shown to the user and consider that time as the time of form submission
* fix ts error
* Queue -> Response through separate endpoint that would be triggered by
embed
* Make queueResponseId a non-guessable uid
* Change queueFormResponse query param
* fix ts error
* Support useQueuedResponse to record new response data
* revert handleNewBooking
* Remove dead code formResponse
* Refactor use repository
* Unify migration files
* refactor: moved api endpoint to app dir
Signed-off-by: Omar López <zomars@me.com>
* Update formResponse.ts
* Refactor use-queued-response for test
* Add tests
* Fix ts error and unit test. recordFormResponse cant return nullish response
* fix schema
* feat: Support full reuse of preloaded iframe (#21803)
* feat: support updating cal video settings in API v2 (#21784)
* feat: support updating cal video settings in API v2
* chore: update descriptio
* feat: support create event type
* test: add test for updating event type
* test: add test for create event type
* chore: undo openapi
* chore: bump libraries
* Revert "chore: bump libraries"
This reverts commit bdf36d09b021fc531497a7b7ea66ab9c52b7d136.
* chore: bump libraries
---------
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
* fix tests and ts
* Fix tests
* wip-useQueuedResponseEndpoint
* Add one more test
* Change queueFormResponse query param
* wip
* Support useQueuedResponse to record new response data
* Use the update useQueuedResponse endpoint
* self-review addressed
* Use queuedResponse if available in slots/utils
* Add documentation
* Remove use-queued-response from critical-path
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
* Update schema.prisma
* refactor: renamed to avoid react hooks confusion
Signed-off-by: Omar López <zomars@me.com>
---------
Signed-off-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* feat: optimize Prisma queries by replacing findFirst with findUnique where applicable
- Replace findFirst/findFirstOrThrow with findUnique/findUniqueOrThrow for queries using unique constraints
- Maintain existing functionality and error handling behavior
- Focus on queries using primary keys and unique index fields from schema
- Revert problematic changes that caused test failures to maintain stability
Co-Authored-By: benny@cal.com <benny@cal.com>
* revert: exclude API files from Prisma query optimizations per user request
- Reverted all 55 API-related files to their original state
- Kept all non-API Prisma query optimizations intact
- API files include apps/api/v1, apps/api/v2, apps/web/app/api, and packages/app-store/*/api
- Non-API optimizations remain for packages/lib, packages/features, apps/web (non-api), etc.
Co-Authored-By: benny@cal.com <benny@cal.com>
* feat: optimize membership query in attributeUtils to use findUnique with userId_teamId constraint
Co-Authored-By: benny@cal.com <benny@cal.com>
* revert: exclude test files from Prisma query optimizations per user request
Co-Authored-By: benny@cal.com <benny@cal.com>
* revert: revert attributeUtils.ts to use findFirst for test compatibility
Co-Authored-By: benny@cal.com <benny@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: benny@cal.com <benny@cal.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
* fix: getBookings for team admins within orgs
* fixup! fix: getBookings for team admins within orgs
* chore: update getUserIdsAndEmailsWhereUserIsAdminOrOwner and remove unused orgId
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
* feat - Restrict same email to create more than 'n' active bookings at a time
* updated checkbookerbookinglimit function
* type fix
* minor change
* import fix
* minor fixes
* back to null on disable
* back
* type check
* managed edge cases
* chore: name changes
* name changes
* fix
* minor change
* changed name
* use default value for maxactivebookingsperbooker, and some minor changes
* disabling bookerbooking limit for recurring event
* disabling bookerbooking limit for recurring event
* type fix
* ui fix and backend eventtype update check
* Add `maxActiveBookingPerBookerOfferReschedule` to schema
* Create `MaxActiveBookingsPerBookerController` and offer reschedule option
* Add offer reschedule to event type form data
* Pass data through to HttpError
* When checking max bookings, return last booking info if applicable
* removed unused code
* minor changes
* update validation
* chore
* Do not check booking limits if rescheduling
* Add data for reschedule
* Add reschedule specific error code
* On maximum booking error, write to booker store reschedule params
* Add translations for error codes
* Write to error message previous booking time
* minor fix
* Write to error message previous booking time
* Type fixes
* Clean up comment
* Refactor eventType update errors
* Typo fix
* Type fix
* Type fix
* Type fix
* Fix test
* Fix test
* Add migration
* Addressed feedback and missed merges
---------
Co-authored-by: romit <romitgabani@icloud.com>
* feat - Restrict same email to create more than 'n' active bookings at a time
* updated checkbookerbookinglimit function
* type fix
* minor change
* import fix
* minor fixes
* back to null on disable
* back
* type check
* managed edge cases
* chore: name changes
* name changes
* fix
* minor change
* changed name
* use default value for maxactivebookingsperbooker, and some minor changes
* disabling bookerbooking limit for recurring event
* disabling bookerbooking limit for recurring event
* type fix
* ui fix and backend eventtype update check
* removed unused code
* minor changes
* update validation
* chore
* Do not check booking limits if rescheduling
* minor fix
* Refactor eventType update errors
* Typo fix
---------
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
* feat: add api v2 endpoints for cal video
* feat: add endpoint for fetching transcripts
* chore: fetch only references
* feat: add cal video and transcript
* chore: undp open api
* chore: move it to service
* chore: bump libraries
---------
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
* feat: support updating cal video settings in API v2
* chore: update descriptio
* feat: support create event type
* test: add test for updating event type
* test: add test for create event type
* chore: undo openapi
* chore: bump libraries
* Revert "chore: bump libraries"
This reverts commit bdf36d09b021fc531497a7b7ea66ab9c52b7d136.
* chore: bump libraries
---------
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
* feat: add API endpoint to fetch Google Calendar meeting details and metrics
* refactor: rename eventId to eventUid and update calendar event details endpoint
* feat: implement Google Calendar service account delegation for event details
* refactor: simplify Google Calendar event response
* refactor: simplify calendar event details endpoint
* feat: add calendar event details endpoint with schema and controller implementation
* chore: reset platform libraries package version to 0.0.0
* refactor: migrate calendar event details to unified calendars module
* Update gcal.service.ts
* refactor: update calendar event schema with title and locations fields replacing summary and conferenceData
* feat: update calendar event source to use enum type for better validation
* update api description
* refactor: make Google Calendar service methods private
* refactor: remove location field from unified calendar event output
* fix: update Google Calendar event location type property to match unified schema
* feat: add CalendarEventStatus enum and map Google Calendar statuses to standardized values
* docs: add property descriptions to calendar event schema and remove organizer field
* fix: change calendar event locations type from null to empty array in unified calendar API
* feat: make calendar source field required
* refactor: replace organizer field with hosts array in Google calendar event mapping
* feat: enhance calendar event location API documentation with detailed property descriptions
* feat: add calendar event details endpoint documentation
* fix: typo
* docs: update calendar event details API description to remove reschedule history reference
* refactor: rename uri to url in calendar event location interfaces and mappings
* refactor: improve calendar event response status handling and code organization
* Update get-unified-calendar-event.ts
* update docs
* chore: update @calcom/platform-libraries to version 0.0.215
* feat: split atoms endpoints and add public event type endpoint
* Update ConnectedDestinationCalendars import path across platform/atoms components
* refactor: update BookingResponse import path from platform-libraries to features/bookings
* Move AvailableSlotsType to util.ts and update imports to use GetAvailableSlotsResponse
* Refactor import path for RecurringBookingCreateBody type from libraries to types
* Fix import path for getBookingForReschedule type from platform-libraries to features
* Refactor PublicEventType export location and update import references
* Remove @calcom/platform-libraries dependency from atoms package.json
* chore(deps): update yarn.lock dependencies
* Remove console.log statements and fix indentation in event type hooks
* Migrate event type transformers from platform/libraries to api/v2 directory
* Remove console.log
* Update BookerPlatformWrapper.tsx
* Add script to populate empty team slugs with slugified team names
* Remove vitest imports
* reset platform libraries version
* Remove unused orgId comment from useAtomGetPublicEvent hook params
* Update useApiV2AvailableSlots.ts
* refactor: remove unused exports from lib package index file
* Undo: @SomayChauhan
Add script to populate empty team slugs with slugified team names
* Update booking.tsx
* chore: upgrade @calcom/platform-libraries from 0.0.202 to 0.0.205
* chore: bump @calcom/platform-libraries from 0.0.205 to 0.0.206
* chore: configure babel and jest for node module transpilation in api v2
* fix: type errors
* Revert "chore: configure babel and jest for node module transpilation in api v2"
This reverts commit b2cf172a84fe8953f9497bf6e43874f476fbc04b.
* Update calendars.service.ts
* chore: bump @calcom/platform-libraries from 0.0.208 to 0.0.209
* fix: add proper type definition for calendar busy times to resolve ts-expect-error
* refactor: deprecate v2 old availability endpoints (#21075)
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* chore: publish platform librareis
* feat: add delegation credential fields to calendar service mock
* chore: update @calcom/platform-libraries from 0.0.211 to 0.0.213
* fix: skip failing calendar integration test
* chore: bump @calcom/platform-libraries from 0.0.213 to 0.0.214
* fix: api/v2 build error
* fix: e2e tests
---------
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
- Add utility function for cascading hideBranding logic
- Update all getServerSideProps files to check organization hideBranding as fallback
- Ensure team queries include parent hideBranding data
- Fix hideBranding not working for organization members and teams
Fixes the issue where organization-level branding settings were not
being applied to user and team event pages when the direct entity
didn't have hideBranding enabled.
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
* Create `VerificationTokenRepository`
* Update the verification token expiry when resending the invite
* Handle error
* Fix import
* Get past unique constraint
* Update packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Update packages/lib/server/repository/verificationToken.ts
Update set expiry time
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Type fix
* Update how we're fetching the token
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* Adds onFormStateChange callback on EventTypeSettings atom
* updated docs for event-type
* added watch all form values
---------
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* feat: return team event type hosts username
* docs: team event types hosts username in return
* fix: ignore cancelled and rejected bookings from slot reservation
* fix: dont allow slot to overlap existing active booking
* refactor: remove log
* Add notes to `EventManager.create`
* Create `CalendarServiceEvent`
* Generate calendar description and remove attendees if event is private in `CalendarManager`
* Process event for reschedule method
* Refactor calendar services
* Clean up comment
* Type fixes
* Type fix
* Type fix
* add virta check for anonymizing host
* move to env var
* move env var to constants
* fix: filter empty string
* fix test
* fix test
---------
Co-authored-by: Udit Takkar <udit222001@gmail.com>
* fix(email): hide organizer info on rescheduled events
* hide organizer email on bookings-single-view
* replace organizer email with name
* sanitize previous booking only
* clean up code
* fix dumb error
* move away from merging twice
* move to use loggedIn Router directly
* fix router outputs types
* fix mocks in create button with teasm tests
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Fix: 'Hide from profile' toggle background not sized correctly on mobile
* fix: changed padding back to original
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* add route filter to inject script
* update middleware for pathname as Referer might not work all time
* move d to (booking-page-wrapper) instead of route filter and change in middleware
* add e2e tests
* feat: store cal video recording on s3
* feat: create new route to fetch download link
* tests: add unit test
* fix: unit test
* fix: type error
* chore: add env var
* fix: open in new tab
* fix: type err
* chore: update test
* fix: import
* chore: use cal video recording token secret
---------
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
* fix: Cannot read properties of undefined (reading 'id')
* docs: managed users dont have cal.com page
* docs: reassign works only for round robin bookings
* refactor: put OAuthClientWebhooksController behind ApiAuthGuard
* fix: tests
* fix: typo
* charge free users for SMS to CA an US
* allow custom template for free users
* fix backend + some UI fixes
* make text editable
* rename back to needsTeamsUpgrade
* add twilio webhook handler tests
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* fix google-meet being used instead of Default Cal Video preference if
set
* Review addressed
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* refactor(e2e): use filter helper methods instead of raw selectors
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* refactor(e2e): rename selectFilter to addFilter and update all usages
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <hey@eunjae.dev>
* fix: implement Airbnb-style date selection in DateRangePicker
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
* fix: add behavior for clicking on start/end date in DateRangePicker
Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <hey@eunjae.dev>
* test: Add unit tests for buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Export buildBaseWhereCondition function instead of copying it
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Remove implementation detail checks from tests
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Fix tests to match actual function behavior
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Fix test issues with buildBaseWhereCondition
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Update tests to match actual function behavior
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Address security issues in buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Simplify buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Simplify code and remove isEmptyResponse property
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Use array of conditions approach for buildBaseWhereCondition
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Make buildBaseWhereCondition implementation consistent and update tests
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Fix incorrect usage of buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* chore: Revert yarn.lock changes
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Comment out non-existent Sentry API method to fix type error
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* Revert "fix: Comment out non-existent Sentry API method to fix type error"
This reverts commit 44c21a7396a518c63047b33967cd8af7e6e4f268.
* remove unnecessary if-statement
* fix: replace bookingTimeStatus with bookingTimeStatusDenormalized
* change column
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
* fix deleting reminders
* schedule reminders if iffy is disabled
* fix unit test
* clean up code
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* don't schedule past reminders
* add test
* fix dates in tests
* add early return
* fix sms test
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* remove members page
* refactor to server fetch
* same for /members
* use server fetches for all queires
* fix
* add skeletons
* refactor
* fix loading page
* fix
* fix type checks
* fix details
* refactor platform members page
* inital pbac setup
* fix tests
* docs intro
* more docs
* add comments in docs
* revert pr_todo
* update to use action + custom as defaults
* use enums
* move to change user role + multi check
* add beforeEach import
* docs: add PERMISSIONS.md documenting team/organization role usages
Co-Authored-By: sean@cal.com <sean@cal.com>
* docs: add permission string alternatives for helper functions
Co-Authored-By: sean@cal.com <sean@cal.com>
* feat: enhance permission registry and default role permissions
Co-Authored-By: sean@cal.com <sean@cal.com>
* add routers
* add hooks + rsc. Also adjsuted test to use prismock
* make hooks type safe + add some tests
* add a permission context - trpc router to populate context
* update docs
* explore global and default roles member,admin,owner
* fix tests
* use kysley and abstract uril
* tidy up
* update trpc to use pbac route in endpoint + distinct on teamId
* make transform util
* remove role service dependancy from permission check class
* checkTeamId fall back to orgId if team is parent
* todos
* remove manual migrations to launch softly
* address feedback
* move permission checks to a repo
* move role service database calls to repo. improve mocks
* update tests to have describe import
* fix types
* remove router that is not used to pass build
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* feature eventType specific language or bookingPage language
* chore
* fix type checks
* chore
* chore: remove log
* improvement: this updates in DatePicker is not required with context provider method
* added e2e tests for InterfaceLanguage feature
* corrected prev merge conflict issues
* update to align with hooks usage pattern
* chore
* unrelated auto-formatting changes
* unrelated auto-formatting changes
* unrelated auto-formatting changes
* update to affect interfaceLanguage on success page
* undone prettier changes
* update test for success page translation
* chore
* return null from memo
* fix typecheck error due to atom imports in useLocale
* set default interfaceLanguage as null
* updated to use null instead of constant
* enhancements
* fix latest unit test, use prop instead of useSession hook
* fix build issue
* chore
* fix atom build issue
* fix unit test with reqd mock
* update to use server i18n rendering
* nit
* Move import localeOptions to EventSetupTabWebWrapper
* make sure we only display interface language option in web app
* using customI18nProvider
---------
Co-authored-by: amrit <iamamrit27@gmail.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Tushar <tusharbhatt0135@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Ryukemeister <sahalrajiv6900@gmail.com>
Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* fix: ensure button text remains visible on hover in forgot password page
Before: Button text turned black on hover, blending with the dark background.
After: Added 'enabled:hover:text-white' to maintain readability.
* Re-update forgot-password-view.tsx
* Update globals.css brand-text
* Update globals.css --cal-brand-text: white
* Reverted globals.css update
* Update forgot-password-view.tsx , change brand-text color
change "--cal-brand-text":
white to Black
* perf: Better perf by going event type first w/o booking
* minor fixup
* Use an IN with children instead of an OR with parent
* Turns out we already had a variable with the right values
* Make sure the right event type is used even for children
* few fixes
* Full select is needed to keep typings working
* Fix last remaining issue
* fix: reserving first seated booking slot
* fix: input type in useReserveSlot
* fix: handleReserveSlot submit bookingUid to api
* null -> undefined
* dont touch web app
* test: Add unit tests for buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Export buildBaseWhereCondition function instead of copying it
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Remove implementation detail checks from tests
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Fix tests to match actual function behavior
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Fix test issues with buildBaseWhereCondition
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* test: Update tests to match actual function behavior
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Address security issues in buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Simplify buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Simplify code and remove isEmptyResponse property
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Use array of conditions approach for buildBaseWhereCondition
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: Make buildBaseWhereCondition implementation consistent and update tests
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Fix incorrect usage of buildBaseWhereCondition function
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* chore: Revert yarn.lock changes
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: Comment out non-existent Sentry API method to fix type error
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* Revert "fix: Comment out non-existent Sentry API method to fix type error"
This reverts commit 44c21a7396a518c63047b33967cd8af7e6e4f268.
* remove unnecessary if-statement
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
* Allow zero routingFormResponseId
* fix: conditionally validate routingFormResponseId to allow 0 only for dry run operations
Co-Authored-By: hariom@cal.com <hariom@cal.com>
* fix: pass _isDryRun parameter to API v2 available endpoint
Co-Authored-By: hariom@cal.com <hariom@cal.com>
* fix runtime error and improve message
* Add e2e test to verify the constraint works
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: hariom@cal.com <hariom@cal.com>
* feat: add denormalized table for RoutingFormResponse
* WIP
* improve
* update schema
* update schema
* improvement
* fix type of bookingStatus
* cascading DELETE
* split update trigger
* denormalize fields into a separate table
* error handling
* address feedback
* fix
* fix constraints and relations
* delete rows when rows are deleted in the joined tables
* add tests and make booking nullable in RoutingFormResponseDenormalized
* add tests
* update test
* use e2e tests instead
* fix type error
* address feedback
* move e2e to integration test
* add missing tests
* move index migration to another file
* clean up migrations
* Remove unused return statement
* Fix return from fn instead of continuing the loop
* Ensure userId is set for existing records on update
* ensure that serviceAccountKey is only retrieved whenb assked
* fix: PATCH, POST event-types Address location must have an address
* fix: GET event-types Address location must have an address
* fix: POST /v2/bookings Address location must have an address
* refactor: GET /v2/slots Invalid time range given.
* fix: POST v2/event-types Cannot read properties of null (reading 'type')
* fix: POST /v2/bookings/:bookingUid/mark-absent Failed to update no-show status
* fix: use actual event duration mins for templated names
* fix: use actual event duration mins for templated event name
* fix: use actual event duration for calendar links
* fix: use actual event duration for round robin reassignment
* chore: rm console logs
* fix: use actual event duration for emails and rr reassignment
* chore: remove unnecessary dayjs calls
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* Add credits section to billing
* create seperate router for credits
* add stripe checkout session
* schema changes + code improvements
* rename to creditBalance
* custom quantify input with error message
* add checkout session completed webhook endpoint
* fix typo
* UI fixes
* add payCredits handler
* add error toast message
* allow scheduling sms up as close to 15 minutes in the future
* schedule at most 2 hours in advance
* webhook to pay for sent sms
* continued work on twilio callback
* code clean up
* further implementation for credit handling
* add migration
* object as param for scheduleSMS
* object as param for sendSMS
* fix TrpcSessionUser imports
* fix imports
* add db changes
* add cron job for price setting
* twilio status callback to create expense log
* remove unused code
* set up low credit balance email
* fixes for buying credits
* fixes in api/twilio/webhook
* add test to save credits to credits balance
* fix typos
* add new helper function chargeCredits
* expand twilioProvider
* fix type errors
* adjust tests
* type errors
* clean up
* clean up
* fix subscription active check
* remove some user/org related code
* more changes to remove user/org support
* send emails seperatly to admins
* fixes for team billing page
* fix stripe success url
* fixes to creating expense log
* email imrovements and more
* get monthly team price from stripe
* fix import
* fix monthly credits calculation
* finsih low credit balance warning email
* credit balance limit reached email
* create CreditService
* cancel SMS and send as email instead
* add messageDispatcher
* fix type error
* fix type error
* fix type error
* fix import
* fix unit test
* clean up twilioProvider
* clean up chckSmsPrices/route
* add missing translations
* add skeleton loader
* add admin check to get handler
* code clean up + fixes
* improve scheduling with fallback
* fix type error
* add bookingUid to handleSendingSMS
* add unit tests for creditService
* add more tests to credit-service.test.ts
* add test for cancelScheduledMessagesAndScheduleEmails
* fix test and type error
* add back resolve
* fix empty resolve
* adjust limitReachedAt logic
* address mrge comment on styling
* add getAdminMembership to repository
* twilio/webhook clean up (feedback)
* feedback - clean up
* remove todo comment
* clean up twilio/webhook
* code clean up
* add use client
* add createOneTimeCheckout to stripe service
* refactor repository pattern
* small fixes + clean up
* fix type error
* add missing import
* fix hasAvailableCredits for user
* force-dynamic
* rename credits to creditBalance
* fix stripe import
* remove not needed code
* fix e2e tests
* improve low balance warning email
* dynamic-import CreditService
* index.ts
* add user logic checkSmsPrices endpoint
* fix e2e tests
* remove dynamic import CreditService
* Revert "remove dynamic import CreditService"
This reverts commit e272978a7ff3fc5a04139e656c9f8d2c84a40dda.
* no need to dynamic-import credit service
* Revert "no need to dynamic-import credit service"
This reverts commit ba5ae488d08979a65fb47b5d0722cda9f45d6ea0.
* fix twilio webhook
* add userId support in checkout.session.completed
* clean up code
* only select id in getAdminMembership
* revert billing/package.json
* fix type checks
* fix type checks
* adjust hasAvailableCredits function
* fixes for checkout sessioned completed
* add UI for user
* fix type errors
* adds requires credits badge
* remove team check from update.handler
* clean up inlcude statements
* fix credit-service tests
* add tests
* fix type errors
* fix type errors
* fix and add tests
* imrove badge
* code clean up
* add reminderScheduler test
* add additional credits as title
* fixes for warningSentAt and limitReachedAt
* mock stripe
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: hbjORbj <sldisek783@gmail.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* refactor: rename office365-video to msteams across API and platform code
* Revert "refactor: rename office365-video to msteams across API and platform code"
This reverts commit 7a823ab6aa7ecd739da941d3b315735220bd99de.
* Fix: inconsistency in default location values for create and update event-types
* Add credits section to billing
* create seperate router for credits
* add stripe checkout session
* schema changes + code improvements
* rename to creditBalance
* custom quantify input with error message
* add checkout session completed webhook endpoint
* fix typo
* UI fixes
* add payCredits handler
* add error toast message
* allow scheduling sms up as close to 15 minutes in the future
* schedule at most 2 hours in advance
* webhook to pay for sent sms
* continued work on twilio callback
* code clean up
* further implementation for credit handling
* add migration
* object as param for scheduleSMS
* object as param for sendSMS
* fix TrpcSessionUser imports
* fix imports
* add db changes
* add cron job for price setting
* twilio status callback to create expense log
* remove unused code
* set up low credit balance email
* fixes for buying credits
* fixes in api/twilio/webhook
* add test to save credits to credits balance
* fix typos
* add new helper function chargeCredits
* expand twilioProvider
* fix type errors
* adjust tests
* type errors
* clean up
* clean up
* fix subscription active check
* remove some user/org related code
* more changes to remove user/org support
* send emails seperatly to admins
* fixes for team billing page
* fix stripe success url
* fixes to creating expense log
* email imrovements and more
* get monthly team price from stripe
* fix import
* fix monthly credits calculation
* finsih low credit balance warning email
* credit balance limit reached email
* create CreditService
* cancel SMS and send as email instead
* add messageDispatcher
* fix type error
* fix type error
* fix type error
* fix import
* fix unit test
* clean up twilioProvider
* clean up chckSmsPrices/route
* add missing translations
* add skeleton loader
* add admin check to get handler
* code clean up + fixes
* improve scheduling with fallback
* fix type error
* add bookingUid to handleSendingSMS
* add unit tests for creditService
* add more tests to credit-service.test.ts
* add test for cancelScheduledMessagesAndScheduleEmails
* fix test and type error
* add back resolve
* fix empty resolve
* adjust limitReachedAt logic
* address mrge comment on styling
* add getAdminMembership to repository
* twilio/webhook clean up (feedback)
* feedback - clean up
* remove todo comment
* clean up twilio/webhook
* code clean up
* add use client
* add createOneTimeCheckout to stripe service
* refactor repository pattern
* small fixes + clean up
* fix type error
* add missing import
* fix hasAvailableCredits for user
* force-dynamic
* rename credits to creditBalance
* fix stripe import
* remove not needed code
* fix e2e tests
* improve low balance warning email
* dynamic-import CreditService
* index.ts
* fix e2e tests
* remove dynamic import CreditService
* Revert "remove dynamic import CreditService"
This reverts commit e272978a7ff3fc5a04139e656c9f8d2c84a40dda.
* no need to dynamic-import credit service
* Revert "no need to dynamic-import credit service"
This reverts commit ba5ae488d08979a65fb47b5d0722cda9f45d6ea0.
* only select id in getAdminMembership
* revert billing/package.json
* fix type checks
* fix type checks
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: hbjORbj <sldisek783@gmail.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: sentry builds
* Update yarn.lock
* Upgrade Sentry
* Breaking changes
* Discard changes to apps/web/modules/connect-and-join/connect-and-join-view.tsx
* Discard changes to apps/web/modules/signup-view.tsx
* Discard changes to packages/app-store/make/pages/setup/index.tsx
* Discard changes to packages/app-store/zapier/pages/setup/index.tsx
* Discard changes to packages/emails/src/templates/AdminOrganizationNotificationEmail.tsx
* Discard changes to packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
* Discard changes to packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
* Discard changes to packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
* Discard changes to packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx
* Discard changes to packages/emails/src/templates/BrokenIntegrationEmail.tsx
* Discard changes to packages/emails/src/templates/OrganizationCreationEmail.tsx
* Discard changes to packages/emails/src/templates/SlugReplacementEmail.tsx
* Discard changes to packages/emails/src/templates/TeamInviteEmail.tsx
* Discard changes to packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
* Discard changes to packages/features/bookings/Booker/components/OutOfOfficeInSlots.tsx
* Discard changes to packages/features/ee/teams/components/MemberInvitationModal.tsx
* Discard changes to packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
* Discard changes to packages/features/eventtypes/components/Locations.tsx
* Discard changes to packages/features/eventtypes/components/dialogs/ManagedEventDialog.tsx
* Discard changes to packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx
* Discard changes to packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
* Discard changes to packages/features/settings/BookerLayoutSelector.tsx
* Discard changes to packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
* chore: upgrade dependencies and improve Sentry configuration
- Upgrade @sentry/nextjs to 9.13.0
- Upgrade next.js to 15.3.0
- Upgrade sharp to 0.34.1
- Update Sentry configuration files
- Add Sentry example files for testing
* chore: upgrade dependencies
- Upgrade next.js to 15.3.0
- Upgrade sharp to 0.34.1
* Update next.config.js
* Discard changes to packages/platform/atoms/connect/apple/AppleConnect.tsx
* build(apps/web): enabled Sentry source maps uploading.
* Create sentry-sourcemaps.yml
* fix: buggy skeleton rendering for month view (#20744)
* fix: trigger lingo.dev by removing duplicate value
* fix: buggy skeleton monthly view
* fix: Wrong schedule ID set for child managed event (#20745)
* fix: wrong schule id set for managed event
* Update handleChildrenEventTypes.ts
* feat: v2 book team events using teamSlug & eventTypeSlug (#20585)
* feat: v2 book team events using teamSlug & eventTypeSlug
* fix: tests
* fix: failing e2e test (#20751)
* feat: filter users by assigned attribute options (#20659)
* feat: assigned attributes options base
* feat: assigned attributes options base e2e
* feat: filter assigned options by other assigned options
* feat: filter assigned options by other assigned options
* fixup! feat: filter assigned options by other assigned options
* feat: get org users by assigned attributes
* adding missing input file
* push generated docs
* feat: add filter org users by teamIds
* feat: add filter assigned attribute options by teamIds
* chore; update doc
* chore: remove console log
* chore: minor e2e fix
* chore: minor e2e fix
* chore: improve docs
* fix: assigned options by teamIds + optionIds
* fix: Admin/owner unable to confirm managed bookings (#20743)
* fix: Admin/owner can't confirm managed booking
* Update confirm.handler.ts
* fix: v2 automatic round robin reassign error message (#20755)
* fix: return react fragment from all layout.tsx
* feat: add guards to stripe teams controller (#20540)
* feat: add guards to stripe teams controller
* remove logs and comments
* fix return type status
* refactor: move PlatformSubscription to a dedicated module
* reroute to `organizations/stripe/save` for teams
* fix: type errors
* feat: fixed it for conferencing apps
* feat: Add error handling and fallback URL support in Stripe callback
* Refactor OAuth callback handling and move token validation to service layer
* Add documentation for OAuth callback proxying in conferencing and stripe controllers
* Move OAuthCallbackState type from organizations to stripe service module
* chore: release v5.2.2
* perf: slim down middleware matcher (#20735)
* wip
* wip
* refactor
* add pathname
* fix
* fix: manually construct pathname for metadata functions
Co-Authored-By: benny@cal.com <benny@cal.com>
* fix: add pathname parameter to all metadata functions
Co-Authored-By: benny@cal.com <benny@cal.com>
* fix: add pathname parameter to remaining metadata functions
Co-Authored-By: benny@cal.com <benny@cal.com>
* fix
* fix
* fix type checks
* Refactor
* fix
* fix
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: benny@cal.com <benny@cal.com>
* Skip flakey tests (#20761)
* Write UTM params to Salesforce (#20759)
* chore: Add consent message when SMS workflows are related (#20741)
* Add consent message
* Add consent message if using SMS workflow
* Skip flakey tests
* Revert "Skip flakey tests"
This reverts commit 3bd6f3fd71469df4dbd67b69b8e17011657df9d8.
* chore: Remove verbose logging (#20732)
* fix: offer seats broken (#20758)
* Remove trailing } from utm param (#20763)
* fix: only managed users assignable to managed team event (#20754)
* fix: only managed users assignable to managed team event
* chore: bump platform libraries
* feat: make skeleton for booking embed accurate (#20765)
* fix: trigger lingo.dev by removing duplicate value
* feat: make skeleton for booking embed accurate
* fix: calendar connect atoms (#20766)
* fix: header overlaps in month view on short viewport (#20749)
* fix: header overlaps in month view on short viewport
* refactor: Merge classes into same condition
* fix: Remove booker margin top if isEmbed
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: amrit <iamamrit27@gmail.com>
* fx 404 for embed (#20120)
* Update rateLimit.ts (#20785)
* fix: v2 Sentry errors (#20788)
* fix: Only Team Event Types are supported for Instant Meeting
* refactor: Cannot read properties of undefined (reading 'timeZone')
* fix: Cannot read properties of undefined (reading 'map')
* refactor: rearrange function order
* refactor: booking_seats_full_error
* fix: invalid_round_robin_host
* refactor: booking_time_out_of_bounds_error
* refactor: Attempting to book a meeting in the past.
* fix: obj.phoneNumber.trim is not a function
* fix: Cannot use 'in' operator to search for 'disabled' in 1
* fix: Org onboarding handle error due to platform team being moved to regular org (#20786)
* Add better error logs and handle platform team
* Add better error logs and handle platform team
* fix: Wrong text EmbedTheme -> Theme (#20790)
* refactor: replace timeZone string validation with timeZoneSchema (#20719)
* refactor: replace timeZone string validation with timeZoneSchema - Replace all instances of timeZone: z.string() with timeZoneSchema - Preserve modifiers (.optional(), .default(), .nullish()) where present - Fix VideoApiAdapter to use organizer's timezone value - Remove redundant isSupportedTimeZone import from booking.ts - Add timeZoneSchema import where needed
* Update index.ts
* fix: conflicts
Signed-off-by: Omar López <zomars@me.com>
* Update yarn.lock
* Discard changes to yarn.lock
* Update booking.ts
* Discard changes to packages/platform/types/me.ts
* Discard changes to packages/platform/types/me/outputs/me.ts
* Discard changes to packages/platform/types/schedules/schedules-2024-04-15/schedules.ts
* Discard changes to packages/features/ee/cal-ai-phone/zod-utils.ts
---------
Signed-off-by: Omar López <zomars@me.com>
* fix: improved 'use-identity-login' error message for users trying to signInn using different provider (#20582)
* improved 'use-identity-login' error message for users trying to signin using different provider
* passing original identity provider as query parameter
* Update packages/features/auth/lib/next-auth-options.ts
* passed different error names for different types of error
---------
Co-authored-by: romit <romitgabani1@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* fix: Location not changing when rescheduling (#20404)
* fix: location not chnging
* update
* update
* Update EventManager.ts
* update
* update
* Update reschedule.test.ts
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: sms workflow api v2 (#20795)
* fix: sms workflow api v2
* fixup! fix: sms workflow api v2
* fix: semi-colon in the bottom of layout UI (#20799)
* chore: Add layout.tsx to Foundation team CODEOWNERS (#20802)
* chore: remove swagger app and its dependencies (#20798)
* chore: release v5.2.3
* fix: Convert an error in webhook to info (#20806)
* Convert error to info
* Convert error to info
* feat: add "React (Atom)" to embed generator and rename rest (#20618)
* fix: trigger lingo.dev by removing duplicate value
* feat: add support for React Atom embed options
* fix: update locator for React code tab in embed code generator E2E tests
* fix: update embed tab names to clarify iframe usage
* fix failing test
* fix: indentation and installation commands for atoms
* fix: add note about iframe usage in Preview tab
* refactor: replace Cal component with BookerEmbed in EmbedCodes
* fix: Add EmbedConfig type import in Embed.tsx
- Added missing EmbedConfig type to the existing types import
- Resolves TypeScript error "Cannot find name 'EmbedConfig'"
* fix: update BookerEmbed usage in EmbedCodes component
* fix: enhance BookerEmbed implementation and update installation instructions in EmbedTabs
* fix: improve comments in EmbedCodes for clarity on layout options and styling references
* fix: streamline BookerEmbed usage in EmbedCodes with improved class handling and layout options
* fix: embed type selection
* fix: update layout selection in EmbedCodes to use dynamic configuration
* fix: update embed configuration to use theme instead of layout
* fix: conditionally render embed options based on if we are selecting atom
* fix: use simple props instead of embed specific logic to fix the active embed bug
* Fix double tabs activeness
* Revert isCurrent change
---------
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
* refactor: remove iframe usage note from Preview tab in EmbedTabs component (#20810)
* fix: trigger lingo.dev by removing duplicate value
* refactor: remove iframe usage note from Preview tab in EmbedTabs component
* fix: api v2 license check (#20813)
* fix: api v2 license check
* update cache key to avoid conflicts
* chore: Add more Foundation and Consumer team CODEOWNERS configuration (#20816)
* refactor: forbidden 403 v2 guard messages (#20794)
* refactor: delete unused proxy guard
* refactor: roles.guard.ts
* refactor: is-org.guard.ts
* refactor: permissions.guard.ts
* refactor: oauth-client-guard.ts
* refactor: is-user-event-type-webhook-guard.ts
* refactor: platform-plan.guard.ts
* refactor: roles.guard.ts
* refactor: cache guard result if canAccess=true
* refactor: is-admin-api-enabled.guard.ts
* refactor: is-team-in-org.guard.ts
* refactor: platform-plan.guard.ts
* refactor: is-webhook-in-org.guard.ts
* refactor: is-user-in-org.guard.ts
* refactor: is-user-webhook-guard.ts
* refactor: is-user-in-org-team.guard.ts
* refactor: is-membership-in-org.guard.ts
* refactor: is-oauth-client-webhook-guard.ts
* refactor: is-routing-form-in-team.guard.ts
* refactor: is-managed-org-in-manager-org.guard.ts
* fill the gaps
* refactor: api-auth.strategy.ts
* fix: test
* implement feedback
* fix: tests
* fix: refactor
* fix: test
* feat: update DeleteSegmentDialog to use ConfirmationDialogContent CAL-5399 (#20820)
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
* feat: open dropdown right after adding a filter (#20819)
* feat: open dropdown right after adding a filter
* clean up timeout
* fix: remove window usage in not-found client (#20822)
* remove window usage in not-found client
* fix
* fix: user is already part of a team (#20774)
* better error message
* redirect to login if no user session
* fixup
* remove callback url since the same function is used by org and platform both
* remove extra exclamation mark
* implement PR feedback
* refactor: Remove kysely as its unused (#20817)
* perf: Fetch data server-side for Api Keys page (#20677)
* server-side fetching for api keys page
* refactor billing page
* fix
* simplify metadata in /availability/[schedule] route (#20827)
* feat: Optout of SMS workflows (#20769)
* Do not call dub if API key isn't present
* Add `WorkflowOptOutContact` table
* Add `sendTo` column to `WorkflowReminder`
* Add `workflowOptOutContactRepository`
* Add `WorkflowReminderRepository`
* Write `sendTo` number when scheduling SMS messages
* Add `p-limit` package
* Add `determineOptOutType` to `TwilioProvider`
* Add `deleteMultipleScheduledSMS`
* Create `WorkflowOptOutService`
* Add endpoint handler for Twilio SMS responses
* Add `isOptedOut` method to `workflowOptOutContactRepository`
* Verify phone number is not opted out before scheduling SMS
* Use `smsReminderNumber` instead of `sendTo`
* Type fix
* Add .env variable if opt out is available
* Add opt out message to SMS
* Import `pLimit` directly in method
* Address select comment
* Guard against undefined phone number from form
* Add early return to `deleteWorkflowReminders`
* Add request validation from Twilio
* Add fallback message as i18N string
* Only delete SMS attendee scheduled reminders
* chore: release v5.2.4
* fix: caching for sprite.svg (#20832)
* update cache-control header for sprite.svg
* updated regex
* fix: platform org members cannot access their public booking page (#20821)
* fix: platform member event pages
* chore: update slots docs
* refactor: user repository call
* refactor: remove newline
* refactor: Returns 400 error for ZodErrors (#20831)
* fix: eventType filter on /insights (#20823)
* fix: eventType filter on /insights
* remove log
* feat: custom reply To Email (#20771)
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
* feat(insights): add progress indicator to download button on /insights and /insights/routing (CAL-5408) (#20631)
* feat(insights): add progress indicator to routing form responses download button (CAL-5408)
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: address PR feedback - remove initial progress update and ensure no decimal parts in percentage
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* feat(insights): add progress indicator to Download component
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* feat: paginate rawData endpoint and implement batch fetching in Download component
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: simplify pagination logic in trpc-router.ts
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* show progress on tooltip
* fix download for /insights
* fix download when there is no data
* feat: replace tooltip progress indicator with toast notification
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: remove duplicate ProgressToast component from showToast.tsx
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: export ProgressToast component from index.ts
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: add missing translation for downloading_data
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* update progress toast implementation
* fix error
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
* perf: SSR for /teams (#20824)
* finish
* improve
* refactor
* add revalidations
* /settings/teams is not needed
* refactor
* rename
* redundant type casting
* perf: SSR - /availablilty/[schedule] (#20829)
* ssr for schedule page
* improve skeleton
* improve skeleton
* improve skeleton
* fix: getBookings max 1 month in the past when no date filters specified (#20911)
* fix: getBookings max 1 month in the past
* bump platform libraries
* Pass customReplyTo as a managed event type prop (#20909)
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
* chore: release v5.2.5
* fix: Docs for deleting reserved slot (#20922)
* feat: ability to hide organizer email (#20782)
* feat: hide orgainzer email
* fix type error
* update
* update
* Update schema.prisma
* perf: Slim down trpc queries in Settings Layout (#20918)
* slim down settings layout by removing server queries
* add check method
* fix type check
* refactor
* perf: remove next.redirect by going straight to event-types (#20920)
* perf: ssr for /settings/organizations/teams/other (#20927)
* refactor: v2 automatic team slugs (#20897)
* refactor: automatic team slugs
* refactor: automatic organizations team slugs
* refactor: automatic managed organizations slugs
* docs
* refactor: test
* feat: add loading component for /apps main page (#20924)
* perf: server-side fetching for /availability (#20804)
* availability
* refactor
* add loader
* improve
* update
* fix loader
* rename
* satisfying types
* refactor
* remove log
* add CTA to skeleton
* refactor
* fix revalidations
* refactor
* update
* finish
* fix: Include ordered attendees in booking select query (#20935)
* fix: correct ordering
* another
* docs: global platform event types and custom booking flows (#20940)
* docs: global event types
* docs: custom booking flow
* chore: release v5.2.6
* fix: v2 sentry errors (#20902)
* refactor: no_available_users_found_error for team event
* fix: hosts_unavailable_for_booking
* fix: Cannot read properties of undefined (reading 'replace')
* fix: Cannot read properties of undefined (reading 'phoneNumber')
* fix: No SelectedCalendar found.
* fix: Cannot read properties of undefined (reading 'length')
* refactor: add bookings errors service
* feat: add membership creation date to Organization Member List table (CAL-5406) (#20595)
* feat: add membership creation date to Organization Member List table (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* feat: add migration for membership creation date (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* feat: make createdAt and updatedAt nullable (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* feat: add updatedAt column to Organization Member List table (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: use type assertion to access createdAt and updatedAt fields (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: display N/A for null date values (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: use proper type assertions for createdAt and updatedAt fields (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: add createdAt and updatedAt to UserTableUser mock in test (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* feat: add PostgreSQL trigger for membership timestamps (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: use empty string instead of N/A and add translations for column headers (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* add i18n text
* clean up type issue
* feat: add translation keys for column headers (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* disable sort
* remove duplicated i18n texts
* feat: add filters for lastActiveAt, createdAt, and updatedAt (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* support date range filter
* fix date range for end date
* hide columns by default
* revert wrong change
* add missing selects
* fix e2e test
* fix: remove PostgreSQL trigger and let application handle timestamps (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* feat: add application-level timestamp handling for Membership model (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* add more timestamp handling
* refactor: use Prisma's built-in decorators for Membership timestamps (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* refactor: remove application-level timestamp handling in favor of Prisma decorators (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* refactor: remove more application-level timestamp handling in favor of Prisma decorators (CAL-5406)
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix e2e test
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
* fix: Offset is required but not passed everywhere, default to zero. (#20917)
* fix: exclude email from replyTo (#20953)
* fix: exclude email from replyTo
* update
* Update scheduleEmailReminders.ts
* fix: added order by (#20959)
* fix: double end-date parsing when saving availability (#20963)
* fix: double end-date parsing when saving availablity
Signed-off-by: Omar López <zomars@me.com>
* fix: cache hits in current and next month
* Update CalendarService.test.ts
---------
Signed-off-by: Omar López <zomars@me.com>
* fix: Don't delete Cal video room upon requesting reschedule (#20969)
* Update requestReschedule.handler.ts
* Update requestReschedule.handler.ts
* chore: leverage error.tsx in app router (#20955)
* chore: better code - migrate getServerSideProps file directly to RSC for /apps (#20926)
* migrate getServerSideProps file directly to RSC for /apps
* fix
* fix: dont persist last booking response, temporarily (#20975)
* dont persist last booking response
* remove dead code to fix ts error
* perf: Improve performance of period limits (#20974)
* perf: Improve performance of period limits
* Type fixes
* Fixed correct check for instanceof -> isDayjs
* revert: "feat: add membership creation date to Organization Member List table (CAL-5406) (#20595)" (#20978)
This reverts commit d21f7ccbc8.
* perf: Add credentialId index to selectedCalendar (#20979)
* docs: add JSDoc documentation to FeaturesRepository class and methods (#20980)
* chore: release v5.2.7
* Handle acme.cal.local root path (#20981)
* Update sms-manager.ts (#20985)
* Do not retrieve already persisted data as well (#20982)
* perf: workflows—remove data fetching for metadata (#20734)
* Remove 30 seats minimum text from organization setup page (#20983)
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: hariom@cal.com <hariom@cal.com>
* fix: few details not populate (#20987)
* fix: cancel platform subscription on dashboard (#20787)
* add new endpoint to cancel user subscription
* remove comments
* add delete button to frontend
* update correct request method
* fixup
* frontend for cancelling subscription
* better warning message
* better function name
* update locales
* better error handling in case stripe api call fails
* rename teamId to organizationId
---------
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* feat: added `hideOrganizerEmail` to api/v2/event-types (#21005)
* feat: added `hideOrganizerEmail` to api/v2/event-types
* updated docs
* fix: Skip already completed org onboarding, as webhook request can come when invoice is paid again next month (#20984)
* there is nothing to do for repeat invoice payment
* there is nothing to do for repeat invoice payment
* fix: wrong translation value (#17923)
* feat: ability to remove attendees from booking page
* update
* fix
* fix: unable to create meeting with ms teams (#20993)
* fix: few details not populate
* fix: unable to create meeting with ms teams
* Update CrmService.ts
* update
* fix: encoding bug (#21004)
* fix: encoding bug
* fix: use escapeValue
* perf: SSR - /event-types and /event-types/[type] (#20952)
* add revalidation
* ssr for event-types
* wip
* wip
* fix types
* fix skeleton
* better error component
* make skeleton better
* no need to export
* call revalidations early
* remove revalidations if not needed
* address comments
* address
* fix: schedule unscheduled emails with tasker in cron job (#20748)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* fix: hide orgnizer email in cal video sidebar (#21011)
* refactor: Use Salesforce GraphQL for account ownership routing (#20655)
Co-authored-by: Omar López <zomars@me.com>
* fix: Handle calendar-cache with Delegation Credentials
Fixes CAL-5372
# Delegation Credentials with CalendarCache.
Following content is a snapshot of the [internal document](https://calendso.slack.com/docs/T08B8KA2BNF/F08L5JYU3V3)
**Problem-1 :**
CalendarCache needs SelectedCalendar records to work but SelectedCalendar record is only created when a user connects their calendar and then enables some calendar for conflict checking. Because with Delegation, no manual connection is done by any of the members, we need a way to create SelectedCalendar records automatically.
**Problem-2**
CalendarCache connects to credential(regular credential) which doesn’t exist for Delegation Credential scenario. Also, DelegationCredential is common for all the members(different from Credential which is different for different members) of the organization and we need to identify to which user the CalendarCache belongs.
**Solution for both problems**
- Create credential records for Delegation Credentials as well - Through Cron(new - we could schedule it every 5mins)
- Now create SelectedCalendar records for those Credential records - Through another Cron(new - we could schedule it every 5mins)
- Now CalendarCache records will automatically be created for those SelectedCalendar records -existing cron
## Fixed some Delegation Credentials bugs unrelated to calendar-cache
- If DestinationCalendar wasn't set(which is possible only with Delegation Credentials), then Google Meet wasn't used as a conferencing app - [Added a test]
- If no SelectedCalendar is there but Google Calendar connection exists(possible only with Delegation Credential) then we were not doing conflict checking. It is expected to not do it for Regular Credentials, but for Delegation Credential we must check for conflict in that case too [Added a test]
- Earlier if a user has Regular Credential as well as Delegation Credential for the same external id which is the member email(say member1@acme.com) then availability were retrieved twice because we weren't deduplicating credentials as it wasn't a trivial thing to do. Now that is being done.
**Env Variables:**
Note this PR doesn't introduce any new env variable. The existing env variable has been added to .env.example. But if this env variable isn't already set, it must be set.
`CALCOM_SERVICE_ACCOUNT_ENCRYPTION_KEY={SAME_AS_SET_FOR_V2_API}`
**Deployment Plan:**
1. Add Observability for SelectedCalendar when _error_ field is set
2. Follow https://github.com/calcom/cal.com/blob/calendar-cache-dwd-support/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/delegation-credential/delegation-credential.md#setting-up-delegation-credential-for-google-calendar-api to enable Delegation Credential for i.cal.com
3. Note that to be able to see the option to enable Delegation Credential for an organization, you need to enable `teamFeature` and `feature` for `delegation-credential`
## Automation Tests
- Introduced tests for calendar-cache.repository.ts
- Tests all methods of the repository
- Added more tests for handleNewBooking/delegation-credential flow.
- Added test to verify the bug fix when no DestinationCalendar exists and Google Meet should be used still
- Added more tests for Google Calendar/CalendarService targeting DelegationCredential
- Added more tests for getCalendarsEvents.
- To test the new logic of calling getAvailability still if there are no selectedCalendars in case of Delegation Credential
- Also introduced tests for `getAvailabitlityWithTimezones` which was an existing function but now has some new changes.
- Added tests for deduplication logic in CalendarManager.ts
## How to Test
Enable Calendar Cache and Delegation Credential feature for acme org through `features` and `teamFeatures` tables.
- Enable Delegation Credential for acme org
- Enable atleast 1 calendar for conflict checking for one of the users(say owner1)
- Ensure GOOGLE_WEBHOOK_TOKEN is set in .env file
- Ensure GOOGLE_WEBHOOK_URL is set to ngrok url of webapp in .env file
- Hit cron endpoint `curl http://localhost:3000/api/calendar-cache/cron\?apiKey\={API_KEY}` that would cache the freebusy result for the selected calendars
Followup
- https://github.com/calcom/cal.com/pull/20698
- https://github.com/calcom/cal.com/pull/18619/files#r2046795643
* fix: UI Bug - ToggleGroup (#20997)
* fix#20986: UI Bug - ToggleGroup
* some changes
* some changes
* feat: /skip trial for teams (#20753)
* skip team trials
* add loading state
* update mocks
* cleanup
* add import oops
* fix tests files
---------
Co-authored-by: Sean Brydon <sean@Seans-Mac-mini.local>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
* fix: cleanup html reports when pr is merged/closed (#20089)
Co-authored-by: anik@cal.com <anik@cal.com>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* fix: allow only platform organisation or non-platform organisation (#20972)
* fix: platform customers cant subscribe to organizations plan
* fix: organization customers cant subscribe to platform plan
* chore: format calendar events to remove oauthClientIds (#21040)
* fix: meeting link fails when host requests to reschedule (#20999)
* fix: meeting link fails when host requests to reschedule
* Update EventManager.ts
* fixes
* Incorportate prisma integration
* Update package.json
* Delete apps/web/app/sentry-example-page/page.tsx
* Discard changes to packages/features/insights/server/trpc-router.ts
* Delete .github/workflows/sentry-sourcemaps.yml
* Delete apps/web/app/api/sentry-example-api/route.ts
* Update turbo.json
* Delete sentry.client.config.ts
* Delete sentry.client.config.ts
* fix
* Update package.json
* Update next.config.js
* Update package.json
* Update yarn.lock
* Discard changes to .env.example
* Discard changes to packages/embeds/embed-react/package.json
* Discard changes to packages/platform/atoms/package.json
* Discard changes to packages/features/ee/teams/components/TeamsListing.tsx
* Update instrumentation-client.ts
* Update instrumentation-client.ts
* Update sentry.edge.config.ts
* Update next.config.js
---------
Signed-off-by: Omar López <zomars@me.com>
Co-authored-by: Yadong Zhang <zhyd007@gmail.com>
Co-authored-by: amrit <iamamrit27@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
Co-authored-by: GitHub Actions <github-actions@github.com>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: benny@cal.com <benny@cal.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Evan Liu <evanliu.dev@gmail.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Ronit Raj <ronitrajofficial7@gmail.com>
Co-authored-by: Romit Gabani <85230081+romitg2@users.noreply.github.com>
Co-authored-by: romit <romitgabani1@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Vijay <vijayraghav22@gmail.com>
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: keith@cal.com <keith@cal.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: hariom@cal.com <hariom@cal.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Sean Brydon <sean@Seans-Mac-mini.local>
Co-authored-by: anik@cal.com <anik@cal.com>
* Show distribution option for RR scheduling type
* Add `includeNoShowInRRCalculation` to event type schema
* Add `includeNoShowInRRCalculation` initial event type data
* Add FE option for `includeNoShowInRRCalculation`
* Consider `includeNoShowInRRCalculation` when building `where` clause when getting bookings for RR
* Add `includeNoShowInRRCalculation` param to `getAllBookingsForRoundRobin`
* Add `includeNoShow...` param to `GetLuckyUserParams`
* Pass `includeNoShow...` param to `getBookingsOfInterval` calls
* Add FE option for `includeNoShow...` (actual commit)
* Type fixes
* Fix brackets
* Add booking repository test
* Remove unused method
* Add translation
* Type fix
* Type fix
* Test passing
* Fix tests
* Fix tests
* Fix test
* Type fixes
* fix: trigger lingo.dev by removing duplicate value
* feat: add filter dropdown item search tests for bookings list
* refactor: update page navigation to wait for DOM content in bookings list tests and add new filter item search test
* remove comments
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* Add Iffy API key variable
* WIP using Iffy to scan comments
* Use Iffy for workflow body scanning
* Update entity
* Clean up
* Update test
* Fix client id
* Fix test
* mvp done
* wip
* fix ts errors and other code improvements
* fix ts errors
* ensure mobile layout support
* Make skeleton responsive on screen resize
* refactor
* Add test for EmbedElement
* make skeleton closer to pixel perfect
* Address PR feedback
* Router-preloading
## What does this PR do?
<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
- Fixes #XXXX (GitHub issue number)
- Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)
## Visual Demo (For contributors especially)
A visual demonstration is strongly recommended, for both the original and new change **(video / image - any one)**.
#### Video Demo (if applicable):
- Show screen recordings of the issue or feature.
- Demonstrate how to reproduce the issue, the behavior before and after the change.
#### Image Demo (if applicable):
- Add side-by-side screenshots of the original and updated change.
- Highlight any significant change(s).
## Mandatory Tasks (DO NOT REMOVE)
- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
- [ ] I have updated the developer docs in /docs if this PR makes changes that would require a [documentation change](https://cal.com/docs). If N/A, write N/A here and check the checkbox.
- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
## How should this be tested?
<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. Write details that help to start the tests -->
- Are there environment variables that should be set?
- What are the minimal test data to have?
- What is expected (happy path) to have (input and output)?
- Any other important info that could help to test that PR
## Checklist
<!-- Remove bullet points below that don't apply to you -->
- I haven't read the [contributing guide](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
- My code doesn't follow the style guidelines of this project
- I haven't commented my code, particularly in hard-to-understand areas
- I haven't checked if my changes generate no new warnings
* wip\
* wip
* fix mrge.io feedback
* wip
* Add README and lifecycle
* Add README and lifecycle
* Update routing form-seed and some other fixes
* remove linkFailed fix from the branch
* self-review
* self-review-2
* self-review-3
* Handle soft connect\
* Update README and fix a bug with query parmas
* Add one more case in routing-html playground
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: amrit <iamamrit27@gmail.com>
* feat: add `type` filter for booking references API endpointa
* Update openapi.json
* feat: add enum validation for booking reference types in filter input
* refactor: rename externalUid to eventUid and add destinationCalendarId in booking references
* refactor: replace enum with const array for BookingReferenceType
* fix: type safety for booking references where clause using Prisma types
* refactor: rename BookingReferenceType to BookingReferences
* feat: Add `handleSlotSelect` prop for custom timeslot selection/reservation handling
* Update custom-slot-select-flow.mdx
* Update custom-slot-select-flow.mdx
* refactor: rename handleSlotSelect to handleSlotReservation for clearer intent
* docs: add API reference link for slot reservation api
* fix: hiding And connect with specific team members option for non org teams
* removed console logs
* added comment
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* perf: Refactor bookings queries for API
* fix syntax
* fixing vars
* Inverted the filter by attendees if
* fixed prisma filter issue
* Defaulting list of emails to empty array
* Only running 2 queries if we have data to filter by
* Reverted changes that have been separated out to other PR
* fix: ts build error
* adds tests + extracts logic for units
* fix integration tests
* fix tests expectes
* Fix test
* switching back
* attempt : fix tests
* test: add test for duplicate bookings (#21165)
* feat: Add tests for booking and duration limits (#21158)
* Add tests for booking and duration limits in getSchedule.test.ts
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: use SchedulingType enum instead of string for schedulingType
Co-Authored-By: keith@cal.com <keith@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
* test: add test to ensure no duplicate bookings when merging query results
Co-Authored-By: keith@cal.com <keith@cal.com>
---------
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>
* fix: deduplicate bookings when merging results from multiple queries
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: ensure pagination works correctly when merging results from multiple queries (#21167)
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Tushar <tusharbhatt0135@gmail.com>
Co-authored-by: sean-brydon <sean@cal.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
* Add tests for booking and duration limits in getSchedule.test.ts
Co-Authored-By: keith@cal.com <keith@cal.com>
* fix: use SchedulingType enum instead of string for schedulingType
Co-Authored-By: keith@cal.com <keith@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: keith@cal.com <keith@cal.com>
* feat: add 'View Responses' menu item to Routing Form dropdown
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: use nuqs createSerializer for URL generation
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: move serializer to data-table lib and use proper type constants
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: type errors in serializers and FormActions
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: use parseAsArrayOf with parseAsJson for proper nuqs serialization
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: update to use dataTableQueryParamsSerializer with proper nuqs pattern
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* refactor: extract parsers from DataTableProvider to be reused in serializers
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: remove deprecated activeFiltersSerializer and use empty array instead of null
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: only show View Responses menu when form id and teamId exist
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* remove teamId condition
* refactor: improve viewResponses URL generation with cleaner conditional
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* Update packages/features/data-table/lib/parsers.ts
* refactor: make constants in parsers.ts non-exported
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: add explicit type annotations to constants in parsers.ts
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: add explicit type annotations and export DEFAULT_PAGE_SIZE in parsers.ts
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
* fix: add explicit type assertions to DEFAULT_ACTIVE_FILTERS and DEFAULT_SORTING
Co-Authored-By: eunjae@cal.com <eunjae@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: eunjae@cal.com <eunjae@cal.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* feat: Add booking references API endpoints
* refactor: Implement booking-reference service and repositories
* Add description and reorder properties in BookingReference schema
* Refactor booking references service to separate output service
* feat: add denormalized table for BookingTimeStatus
* Update packages/prisma/migrations/20240320000001_add_booking_time_status_denormalized/migration.sql
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
* add more indexes
* improvement
* update schema
* improve indexes
* apply feedback from mrge
* split update trigger for better perf
* remove unnecessary checks
* split migration into two
* less logging
* address feedback
* add updatedAt and userUsername
* remove timeStatus
* add deletion trigger
* clean up denorm table on row deletion at EventType or users
* add timeStatus back as a part of a new view
* keep user and eventType nullable
* rename triggers
* add tests
* clean up migrations
* update tests
* update tests
* update test clean up
* one more try
* similar updates
* use e2e test instead
---------
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
* section component
* more section UI
* wip
* core components styled
* all components using sections
* match icons to figma
* small inputs
* fix select small to be the same as small text
* center flex rows
* enforce inputs to be full spanning grid
* tidy up section container for single inputs
* fix select and i18n
* wip
* install available apps
* raw heading
* app install card
* fix app logos width x height
* fix gap
* match design for other button
* fix prop name
* push i18n string
* fix doc snippets
* fix docs
* chore: remove yarn.lock changes
---------
Co-authored-by: Udit Takkar <udit222001@gmail.com>
* add back all data to router-position
* fix type error
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: trigger lingo.dev by removing duplicate value
* feat: allow urls without an explicit https://
* fixed the test that ensures malformed URLs like "http:/nope" are rejected
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Found via `codespell -q 3 -S "*.svg,./apps/web/public/static/locales,./packages/app-store/stripepayment/lib/currencyOptions.ts,./packages/lib/freeEmailDomainCheck/freeEmailDomains.ts" -L afterall,atleast,datea,fo,incase,ist,nam,notin,optionel,perview,reccuring`
Closes#21104
* Use userId instead of attendee email
* Only write if booking is accepted
* Create `getBookingRequest` function
* Return already requested booking
* Type fixes
* Type fix
* Type fix
* Pass empty seatReferenceId
* Handle no userId
* Update test
* restricting platform user from creating another regular org
* changed as suggested, additional check of membership is accepted
---------
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Fixes CAL-5372
# Delegation Credentials with CalendarCache.
Following content is a snapshot of the [internal document](https://calendso.slack.com/docs/T08B8KA2BNF/F08L5JYU3V3)
**Problem-1 :**
CalendarCache needs SelectedCalendar records to work but SelectedCalendar record is only created when a user connects their calendar and then enables some calendar for conflict checking. Because with Delegation, no manual connection is done by any of the members, we need a way to create SelectedCalendar records automatically.
**Problem-2**
CalendarCache connects to credential(regular credential) which doesn’t exist for Delegation Credential scenario. Also, DelegationCredential is common for all the members(different from Credential which is different for different members) of the organization and we need to identify to which user the CalendarCache belongs.
**Solution for both problems**
- Create credential records for Delegation Credentials as well - Through Cron(new - we could schedule it every 5mins)
- Now create SelectedCalendar records for those Credential records - Through another Cron(new - we could schedule it every 5mins)
- Now CalendarCache records will automatically be created for those SelectedCalendar records -existing cron
## Fixed some Delegation Credentials bugs unrelated to calendar-cache
- If DestinationCalendar wasn't set(which is possible only with Delegation Credentials), then Google Meet wasn't used as a conferencing app - [Added a test]
- If no SelectedCalendar is there but Google Calendar connection exists(possible only with Delegation Credential) then we were not doing conflict checking. It is expected to not do it for Regular Credentials, but for Delegation Credential we must check for conflict in that case too [Added a test]
- Earlier if a user has Regular Credential as well as Delegation Credential for the same external id which is the member email(say member1@acme.com) then availability were retrieved twice because we weren't deduplicating credentials as it wasn't a trivial thing to do. Now that is being done.
**Env Variables:**
Note this PR doesn't introduce any new env variable. The existing env variable has been added to .env.example. But if this env variable isn't already set, it must be set.
`CALCOM_SERVICE_ACCOUNT_ENCRYPTION_KEY={SAME_AS_SET_FOR_V2_API}`
**Deployment Plan:**
1. Add Observability for SelectedCalendar when _error_ field is set
2. Follow https://github.com/calcom/cal.com/blob/calendar-cache-dwd-support/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/delegation-credential/delegation-credential.md#setting-up-delegation-credential-for-google-calendar-api to enable Delegation Credential for i.cal.com
3. Note that to be able to see the option to enable Delegation Credential for an organization, you need to enable `teamFeature` and `feature` for `delegation-credential`
## Automation Tests
- Introduced tests for calendar-cache.repository.ts
- Tests all methods of the repository
- Added more tests for handleNewBooking/delegation-credential flow.
- Added test to verify the bug fix when no DestinationCalendar exists and Google Meet should be used still
- Added more tests for Google Calendar/CalendarService targeting DelegationCredential
- Added more tests for getCalendarsEvents.
- To test the new logic of calling getAvailability still if there are no selectedCalendars in case of Delegation Credential
- Also introduced tests for `getAvailabitlityWithTimezones` which was an existing function but now has some new changes.
- Added tests for deduplication logic in CalendarManager.ts
## How to Test
Enable Calendar Cache and Delegation Credential feature for acme org through `features` and `teamFeatures` tables.
- Enable Delegation Credential for acme org
- Enable atleast 1 calendar for conflict checking for one of the users(say owner1)
- Ensure GOOGLE_WEBHOOK_TOKEN is set in .env file
- Ensure GOOGLE_WEBHOOK_URL is set to ngrok url of webapp in .env file
- Hit cron endpoint `curl http://localhost:3000/api/calendar-cache/cron\?apiKey\={API_KEY}` that would cache the freebusy result for the selected calendars
Followup
- https://github.com/calcom/cal.com/pull/20698
- https://github.com/calcom/cal.com/pull/18619/files#r2046795643
* add revalidation
* ssr for event-types
* wip
* wip
* fix types
* fix skeleton
* better error component
* make skeleton better
* no need to export
* call revalidations early
* remove revalidations if not needed
* address comments
* address
* add new endpoint to cancel user subscription
* remove comments
* add delete button to frontend
* update correct request method
* fixup
* frontend for cancelling subscription
* better warning message
* better function name
* update locales
* better error handling in case stripe api call fails
* rename teamId to organizationId
---------
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
* Do not call dub if API key isn't present
* Add `WorkflowOptOutContact` table
* Add `sendTo` column to `WorkflowReminder`
* Add `workflowOptOutContactRepository`
* Add `WorkflowReminderRepository`
* Write `sendTo` number when scheduling SMS messages
* Add `p-limit` package
* Add `determineOptOutType` to `TwilioProvider`
* Add `deleteMultipleScheduledSMS`
* Create `WorkflowOptOutService`
* Add endpoint handler for Twilio SMS responses
* Add `isOptedOut` method to `workflowOptOutContactRepository`
* Verify phone number is not opted out before scheduling SMS
* Use `smsReminderNumber` instead of `sendTo`
* Type fix
* Add .env variable if opt out is available
* Add opt out message to SMS
* Import `pLimit` directly in method
* Address select comment
* Guard against undefined phone number from form
* Add early return to `deleteWorkflowReminders`
* Add request validation from Twilio
* Add fallback message as i18N string
* Only delete SMS attendee scheduled reminders
* better error message
* redirect to login if no user session
* fixup
* remove callback url since the same function is used by org and platform both
* remove extra exclamation mark
* implement PR feedback
* fix: trigger lingo.dev by removing duplicate value
* feat: add support for React Atom embed options
* fix: update locator for React code tab in embed code generator E2E tests
* fix: update embed tab names to clarify iframe usage
* fix failing test
* fix: indentation and installation commands for atoms
* fix: add note about iframe usage in Preview tab
* refactor: replace Cal component with BookerEmbed in EmbedCodes
* fix: Add EmbedConfig type import in Embed.tsx
- Added missing EmbedConfig type to the existing types import
- Resolves TypeScript error "Cannot find name 'EmbedConfig'"
* fix: update BookerEmbed usage in EmbedCodes component
* fix: enhance BookerEmbed implementation and update installation instructions in EmbedTabs
* fix: improve comments in EmbedCodes for clarity on layout options and styling references
* fix: streamline BookerEmbed usage in EmbedCodes with improved class handling and layout options
* fix: embed type selection
* fix: update layout selection in EmbedCodes to use dynamic configuration
* fix: update embed configuration to use theme instead of layout
* fix: conditionally render embed options based on if we are selecting atom
* fix: use simple props instead of embed specific logic to fix the active embed bug
* Fix double tabs activeness
* Revert isCurrent change
---------
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
* fix: Only Team Event Types are supported for Instant Meeting
* refactor: Cannot read properties of undefined (reading 'timeZone')
* fix: Cannot read properties of undefined (reading 'map')
* refactor: rearrange function order
* refactor: booking_seats_full_error
* fix: invalid_round_robin_host
* refactor: booking_time_out_of_bounds_error
* refactor: Attempting to book a meeting in the past.
* fix: obj.phoneNumber.trim is not a function
* fix: Cannot use 'in' operator to search for 'disabled' in 1
* feat: add guards to stripe teams controller
* remove logs and comments
* fix return type status
* refactor: move PlatformSubscription to a dedicated module
* reroute to `organizations/stripe/save` for teams
* fix: type errors
* feat: fixed it for conferencing apps
* feat: Add error handling and fallback URL support in Stripe callback
* Refactor OAuth callback handling and move token validation to service layer
* Add documentation for OAuth callback proxying in conferencing and stripe controllers
* Move OAuthCallbackState type from organizations to stripe service module
* Add whitelistWorkflows to user
* Do not autolock whitelisted users
* Add endpoint to whitelist a user
* Get users data - include whitelistWorkflows
* Whitelist a user on the user admin page
* Fix typo
* Add test
* Use translations
* Add `updateWhitelistWorkflows` to `UserRepository`
* Use i18 for strings
* Rename to whitelistWorkflows
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com>
* feat: allow teamSlug + eventTypeSlug + optional organizationSlug as input
* feat: return team event slots
* test: get slots using teamSlug + eventTypeSlug + optional organizationalSlug
* docs: how to get team event slots
* feat: routing form response slots
* fix
* test routing form slots
* chore: bump libraries
* docs
* docs
* chore: api docs from main to merge main
* chore: regenerate api docs
* fix: Don't allow seats for recurring events #19061
* update the commit with English
* Update common.json
* Update common.json
* Update common.json
* Add edge case when people have already enabled seats as well as recurring event
* fix type issue
* Handle case where seats and recurring is already enabled
* minor fix
* minor change
* typo
* Block backend functionality
* blocking new booking and other enhancements
* final-changes
* minor-changes
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Tushar <tusharbhatt0135@gmail.com>
* Add translations in respective files
* implement multilingual support for email templates
* fix: indentation in common.js & typos in common.js and update.handler.ts
* init
* updated typing, english localization text, used existing calculatePeriodLimits and isTimeViolatingFutureLimit to determine if go to next month button should be disabled
* improving copy
* semantic dialog heading tag, proper EN localization,
* reverting
* force local to origin
* Translations by LLM
* intit tests
* moving NoAvailability to its own file.
* refactor overlay component to encpsulate logic in hooks
* improved tests
* remove unintended change
* fix: period data type import. Providing default periodData values
* fix: type errors on event object
* fix: updates case in type import
* removing translations
* remove unnecessary import
* remove unnecessary import
* improving mocks for booker and logger
* moving tests to __tests__ folder
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* feat: redirect to original event link for rescheduling cancelled booking
* allow cancelled booking rescheduling when allowRescheduleForCancelledBooking is true
* chore
* fix test
* chore
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* add dry run prop for mocking actual behaviour without actual api calls
* fix e2e tests
* fixup
* remove await present twice
* fix: adjust success toast for apple connect dry run
Co-Authored-By: rajiv@cal.com <rajiv@cal.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: rajiv@cal.com <rajiv@cal.com>
* made text dependent on host's refund policy by conditionally rendering refund message
* add more conditions in case of no refund message
* made refund message more appropriate
* Update apps/web/public/static/locales/en/common.json
* Update apps/web/public/static/locales/en/common.json
* Update apps/web/modules/bookings/views/bookings-single-view.tsx
---------
Co-authored-by: romit <romitgabani1@gmail.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* fix: recalculate date range from filter segments
* clean up
* add unit tets for date-range utils
---------
Co-authored-by: Sean Brydon <sean@Seans-Mac-mini.local>
This document maps existing role-based permission checks to the new PBAC (Permission-Based Access Control) system's permission strings in the format `resource.action`.
| team.changeMemberRole | Change role of team members | [packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts](packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts) | 18-21 |
| team.remove | Remove members from team | [packages/trpc/server/routers/viewer/teams/removeMember.handler.ts](packages/trpc/server/routers/viewer/teams/removeMember.handler.ts) | 35-36, 51-55 |
| team.invite | Invite members to team | [packages/trpc/server/routers/viewer/teams/invite.handler.ts](packages/trpc/server/routers/viewer/teams/invite.handler.ts) | - |
| apiKey.findKeyOfType | Find API keys by type | [packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.handler.ts](packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.handler.ts) | 18-19 |
## Helper Functions and Utilities
The following helper functions are commonly used for permission checks:
| Function | Description | File Path |
|----------|-------------|-----------|
| isTeamAdmin | Checks if user is admin or owner of a team | [packages/lib/server/queries/teams/index.ts](packages/lib/server/queries/teams/index.ts#L385-L405) |
| isTeamOwner | Checks if user is owner of a team | [packages/lib/server/queries/teams/index.ts](packages/lib/server/queries/teams/index.ts#L407-L416) |
| isTeamMember | Checks if user is a member of a team | [packages/lib/server/queries/teams/index.ts](packages/lib/server/queries/teams/index.ts#L418-L426) |
| canEditEntity | Checks if user can edit an entity | [packages/lib/entityPermissionUtils.ts](packages/lib/entityPermissionUtils.ts#L13-L22) |
| canAccessEntity | Checks if user can access an entity | [packages/lib/entityPermissionUtils.ts](packages/lib/entityPermissionUtils.ts#L24-L34) |
| getEntityPermissionLevel | Gets permission level for an entity | [packages/lib/entityPermissionUtils.ts](packages/lib/entityPermissionUtils.ts#L36-L73) |
| canCreateEntity | Checks if user can create an entity | [packages/lib/entityPermissionUtils.ts](packages/lib/entityPermissionUtils.ts#L102-L115) |
| withRoleCanCreateEntity | Checks if role allows entity creation | [packages/lib/entityPermissionUtils.ts](packages/lib/entityPermissionUtils.ts#L119-L121) |
## Permission Level Enums
The codebase uses several enums to define permission levels:
### MembershipRole Enum
```typescript
enumMembershipRole{
OWNER="OWNER",
ADMIN="ADMIN",
MEMBER="MEMBER"
}
```
### Entity Permission Level Enum
```typescript
enumENTITY_PERMISSION_LEVEL{
NONE,
USER_ONLY_WRITE,
TEAM_READ_ONLY,
TEAM_WRITE
}
```
## Common Permission Patterns
1.**Team Admin/Owner Check**: Many operations require the user to be a team admin or owner.
```typescript
if (!(await isTeamAdmin(ctx.user?.id, input.teamId))) throw new TRPCError({ code: "UNAUTHORIZED" });
```
2. **Team Owner Check**: Some operations (like changing an owner's role) require the user to be a team owner.
```typescript
if (input.role === MembershipRole.OWNER && !(await isTeamOwner(ctx.user?.id, input.teamId)))
throw new TRPCError({ code: "UNAUTHORIZED" });
```
3. **Organization Admin Check**: Operations within an organization require the user to be an organization admin.
```typescript
if (user.profile?.organizationId && !user.organization.isOrgAdmin) {
throw new TRPCError({ code: "FORBIDDEN", message: "org_admins_can_create_new_teams" });
}
```
4. **Entity Permission Check**: Entity operations use permission level checks.
5. **Booking Access Control**: Complex permission checks for retrieving bookings based on user roles and team/organization membership.
```typescript
const membershipIdsWhereUserIsAdminOwner = (
await prisma.membership.findMany({
where: {
userId: user.id,
role: {
in: ["ADMIN", "OWNER"],
},
},
select: {
id: true,
},
})
).map((membership) => membership.id);
```
## Migration to PBAC
When migrating to the new PBAC system, these existing role-based checks should be replaced with permission string checks using the `permissionMatches` function:
```typescript
import { permissionMatches } from "@calcom/features/pbac/types/permission-registry";
// Instead of:
if (!(await isTeamAdmin(ctx.user?.id, input.teamId))) throw new TRPCError({ code: "UNAUTHORIZED" });
// Use:
if (!permissionMatches("team.update", userPermissions)) throw new TRPCError({ code: "UNAUTHORIZED" });
```
## Permission String Alternatives for Helper Functions
The following table provides permission string alternatives for common helper functions:
| Helper Function | Permission String Alternative | Description |
These functions can be used with any entity that has userId and teamId properties. When migrating to PBAC, replace these checks with appropriate permission string checks:
```typescript
// Instead of:
if (!(await canEditEntity(form, user.id))) throw new TRPCError({ code: "UNAUTHORIZED" });
// Use:
if (!permissionMatches("routingForm.update", userPermissions)) throw new TRPCError({ code: "UNAUTHORIZED" });
```
This allows for more granular permission control and the creation of custom roles with specific permissions.
- We won't be able to use already built calendar-cache when Delegation Credential is enabled because existing CalendarCache entries don't have userId set.
## Approach of always using SelectedCalendar.credentialId for CalendarCache even for DelegationCredentials
- Delete Credentials when DelegationCredential is disabled
@@ -488,13 +488,8 @@ Don't code but still want to contribute? Join our [Discussions](https://github.c
- Set CSP_POLICY="non-strict" env variable, which enables [Strict CSP](https://web.dev/strict-csp/) except for unsafe-inline in style-src . If you have some custom changes in your instance, you might have to make some code change to make your instance CSP compatible. Right now it enables strict CSP only on login page and on other SSR pages it is enabled in Report only mode to detect possible issues. On, SSG pages it is still not supported.
## Single Org Mode
If you want to have booker.yourcompany.com to be the domain used for both dashboard(e.g. https://booker.yourcompany.com/event-types) and booking pages(e.g. https://booker.yourcompany.com/john.joe/15min).
- Set the `NEXT_PUBLIC_SINGLE_ORG_SLUG` environment variable to the slug of the organization you want to use. `NEXT_PUBLIC_SINGLE_ORG_SLUG=booker`
- Set the `NEXT_PUBLIC_WEBAPP_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBAPP_URL=https://booker.yourcompany.com`.
- Set the `NEXT_PUBLIC_WEBSITE_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBSITE_URL=https://booker.yourcompany.com`.
- Set the `NEXTAUTH_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXTAUTH_URL=https://booker.yourcompany.com`.
Refer to docs [here](./docs/self-hosting/guides/organization/single-organization-setup) for a detailed documentation with screenshots.
Note: It causes root to serve the dashboard and not the organization profile page which shows all bookable users in the organization.
## Integrations
@@ -646,6 +641,14 @@ following
15. Create a verify service
16. Copy Verify Service SID to your `.env` file into the `TWILIO_VERIFY_SID` field
## Changesets
We use changesets to generate changelogs and publish public packages (packages with `private: true` are ignored).
An example of good readme is [atoms readme](https://github.com/calcom/cal.com/blob/main/packages/platform/atoms/README.md). Every public package must:
1. Follow semantic versioning when using changesets.
2. Mark breaking changes using `❗️Breaking change`
* Constructs the WHERE clause for Prisma booking findMany operation.
*
* @param userId - The ID of the user making the request. This is used to filter bookings where the user is either the host or an attendee.
* @param attendeeEmails - An array of emails provided in the request for filtering bookings by attendee emails, used in case of Admin calls.
* @param userIds - An array of user IDs to be included in the filter. Defaults to an empty array, and an array of user IDs in case of Admin call containing it.
* @param userEmails - An array of user emails to be included in the filter if it is an Admin call and contains userId in query parameter. Defaults to an empty array.
*
* @returns An object that represents the WHERE clause for the findMany/findUnique operation.
* Constructs the WHERE clause for Prisma booking findMany operation.
*
* @param userId - The ID of the user making the request. This is used to filter bookings where the user is either the host or an attendee.
* @param attendeeEmails - An array of emails provided in the request for filtering bookings by attendee emails, used in case of Admin calls.
* @param userIds - An array of user IDs to be included in the filter. Defaults to an empty array, and an array of user IDs in case of Admin call containing it.
* @param userEmails - An array of user emails to be included in the filter if it is an Admin call and contains userId in query parameter. Defaults to an empty array.
*
* @returns An object that represents the WHERE clause for the findMany/findUnique operation.
1. In case a guard would return "false" for "canActivate" instead throw ForbiddenException with an error message containing guard name and the error.
2. In case a guard would return "false" for "canActivate" DO NOT cache the result in redis, because we don't want that someone is forbidden, updates whatever was the problem, and then has to wait for cache to expire. We only cache in redis guard results where "canAccess" is "true".
3. If you use ApiAuthGuard but want that only specific auth method is allowed, for example, api key, then you also need to add `@ApiAuthGuardOnlyAllow(["API_KEY"])` under the `@UseGuards(ApiAuthGuard)`. Shortly, use `ApiAuthGuardOnlyAllow` to specify which auth methods are allowed by `ApiAuthGuard`. If `ApiAuthGuardOnlyAllow` is not used or nothing is passed to it or empty array it means that
all auth methods are allowed.
## Support
Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
Some files were not shown because too many files have changed in this diff
Show More
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
github-actions[bot]