commonscomputer/cal.diy
5
0 Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity
13,276 Commits 2 Branches 621 Tags
00aac89ed739e338c93046c652bcd61334d8f21c
Commit Graph
93 Commits
Author SHA1 Message Date
Benny Joo e27de47d9f perf: leverage DB index for user profile fetching (booking page & payment page) (#21814) 
* leverage DB index for findByUserIdAndOrgSlug method

* booking view

* payment view

* fix

* fix

* address comment
 2025-06-18 09:53:12 +03:00
devin-ai-integration[bot]benny@cal.comAnik Dhabal Babu
 		4920abdaf7 feat: optimize Prisma queries by replacing findFirst with findUnique where applicable (#21826) 
* 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>
 2025-06-17 09:52:02 +03:00
Lauris Skraucis 4a53ec0b74 feat: platform toggle calendar event creation (#21788) 
* feat: add areCalendarEventsEnabled to PlatformOAuthClient table

* feat: areCalendarEvents enabled in handleNewBooking and v2

* feat: v2 handle areCalendarEventsEnabled

* feat: toggle areCalendarEventsEnabled on frontend

* feat: enable areCalendarEventsEnabled for recurring,confirm,paid

* refactor: use placeholder calendar event

* remove merge conflicts

* chore: bump libraries

* chore: bump libraries
 2025-06-13 14:15:47 +00:00
devin-ai-integration[bot]andHariom Balhara 2fcb8a750d fix: cascade organization hideBranding setting to user and team events (#21703) 
- 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>
 2025-06-12 09:14:55 -03:00
Hariom Balhara df75df7008 fix: DelegationCredential - Duplicate GoogleMeet and unnecessary serviceAccount key access (#21269) 
* 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
 2025-05-14 09:49:47 +00:00
Benny Joo 75c79f76c8 perf: Remove ssrInit completely (#20439) 
* remove ssrInit completely

* remove instances of dehydratedState

* fix

* refactor

* fix type checks

* fix linting

* Refactor

* Refactor

* remove log
 2025-04-01 19:14:46 -04:00
sean-brydon 5cd2ba1362 perf: move stripe to billing service out of app store (#20376) 
* add more methods to billingService

* update profile handler

* stripe customer handler

* verify email

* move imports + move generic methods to billing service

* move to strip ebilling service class

* push changes to mocks

* fix enum

* fix typo

* correctly update customer metadata

* fix userId type to number

* fix types on billing services

* fix type errors due to return methods differing

* fix return types
 2025-03-31 09:20:27 +00:00
Benny Joo dcc079773b fix: type error in payment page (#20366) 2025-03-26 01:48:27 +00:00
Benny JooKeith WilliamsAnik Dhabal Babu
 		8ad442f2be feat: Upgrade to Next 15 (#18834) 
* wip

* update layoutHOC

* wip

* remove app router related code no longer used

* remove more

* await cookies, headers, params, serachparams

* update yarn.lock

* await cookies, headers, params, serachparams more

* update yarn lock again

* downgrade next-auth to 4.22.1

* update yarn lock

* fix

* update yarn lock

* fix type checks

* update yarn lock

* await headers and cookies

* restore pages folder

* restore yarn.lock

* update yarn.lock

* await headers and cookies

* remove

* await params in API routes

* updates

* restore next.config.js

* remove i18n from next.config.js

* Fixed tests

* Fixed types

* Removed duplicate favicon.ico

* Fixing more types

* ImageResponse moved to next/og

* Fixed prisma import issues

* dynamic import for @ewsjs/xhr

* remove deasync dep

* dynamic import for @tryvital/vital-node

* fix type checks

* add back turbopack command

* Type fix

* Removed unneeded file

* fix turbopack relative path errors

* add comments

* remove unneeded code

* Fixed build errors

* await apis

* use Promise<Params> type in defaultResponderForAppDir util

* refactor scim api route

* fix type checks

* separate app-routing.config into client-config and server-config

* wip

* refactor routing forms components

* revert unneeded changes for easier review

* fix

* fix

* use CustomTrans

* fix type

* fix unit tests

* fix type error

* fix build error

* fix build error

* fix build error

* fix warnings

* fix warnings

* upgrade @tremor/react and tailwindcss

* numCols -> numItems

* fix forgot-password e2e test

* fix 1 more e2e test

* fix login e2e test

* fix e2e tests

* fix e2e tests

* clean up

* remove error

* use tremor/react 2.11.0

* fix

* rename CustomTrans to ServerTrans

* address comment

* fix test

* fix ServerTrans

* fix

* fix type

* fix ServerTrans usages 1

* fix translations

* fix type checks

* fix type checks

* link styling

* fix

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
 2025-03-20 21:30:51 -03:00
Benny JooandKeith Williams 853f9bc436 perf: do not import from @calcom/ui barrel file (#20184) 
* Icon and IconName

* Button and ButtonGroup

* UserAvatar

* AvatarGroup

* Avatar

* WizardLayout

* Dialogs

* EmptyScreen

* showToast and TextField

* Editor

* Skeleton

* Skeleton

* TopBanner and showToast

* Button again

* more

* perf: Remove app-store reference from @calcom/ui

* more

* Fixing types

* Icon

* Fixed casing

* dropdown

* more

* Select

* more

* Badge

* List

* more

* Divider

* more

* fix

* fix type check

* refactor

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix type check

* fix

* fix

* fix

* fix

* more

* more

* more

* more

* add index file to components/command

* fix

* fix

* fix

* fix imports

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix build errors

* fix build errors

* fix

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
 2025-03-19 19:00:55 -03:00
Keith Williams 9d58d21e85 perf: Remove dayjs import from main constants.ts file (#19644) 2025-03-11 10:37:51 +00:00
Anik Dhabal Babu 2be9ff7622 fix: hubspot not working for team events (#19761) 2025-03-05 15:16:49 +00:00
Shivansh KumarandAnik Dhabal Babu 1b111c8add fix(payments): add return_url for Alipay PaymentIntent confirmation; fixes #19138 (#19153) 
* Update README.md

* fix(payments): add return_url for Alipay PaymentIntent confirmation; fixes #19138

* Fix: update confirmPayment to use confirmParams and resolve TS errors

* Update Payment.tsx

* Update

* fix build error

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
 2025-03-05 11:57:43 -03:00
Keith Williams 7180eb067a refactor: Move @calcom/core to @calcom/lib (#19655) 
* refactor: Move @calcom/core to @calcom/lib

* Merging imports

* Clean up

* Ignoreing type error for now
 2025-03-02 23:02:35 -03:00
Anik Dhabal Babu 468cd2a3af fix: hubSpot doesn't work for paid team events (#19609) 2025-02-28 11:04:08 +01:00
Benny Joo 828940b4d6 chore: app router - /payment pages (#18152) 
* remove Head from payment page comp

* remove route from pages router

* move out of future folder

* add to config.matcher

* remove unneeded code

* update middleware

* fix

* fix
 2025-01-25 13:23:41 -05:00
Muhammad Aiman Sulaimanandkutsaniuk 7131a1f015 feat: HitPay Payment App (#17213) 
* Build HitPay app

* Deleted a lint comment

* Add redirect for iframe

* Fix type check error

* Fixed issue of payment pending

* Update hitpay package.json

* fix: fix lint issue in KeyInput and update zod

* fix: fix issue of parsing string to number

* fix: add default hitpay API links

* fix: resolve atoms build error

---------

Co-authored-by: kutsaniuk <kutsaniuk@gmail.com>
 2025-01-20 15:36:23 +01:00
Amit SharmaandPeer Richelsen c1dbb7cffd feat: refund policies for payment apps (#18428) 
* feat: refund policies for payment apps

* tests for payment refund

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2025-01-06 11:36:37 +00:00
Anik Dhabal BabuandUdit Takkar 7a80a5f929 fix: localized date (#18388) 
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
 2024-12-27 20:59:53 +00:00
Carina WollendorferCarinaWollisean-brydonsean-brydonPeer RichelsenOmar López
 		cfb09a1b21 feat: virtual queues tab in insights (#18260) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: sean-brydon <sean@cal.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
 2024-12-23 19:16:38 +00:00
Anik Dhabal BabuandUdit Takkar 645985c783 fix: Invalid time zone specified: Etc/Unknown (#18121) 
* fix: Invalid time zone specified: Etc/Unknown

* update

* Update PaymentPage.tsx

* update

* update one more file

* address review

* update test

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
 2024-12-13 15:29:02 +00:00
Vincent Lam 382f00e178 - Set stripe payment element to accordion layout (#18056) 
- Removed hardcoded payment_method_types for checkouts and immediate payments
 2024-12-09 11:37:46 +01:00
Rajiv SahalMorganMorgan Vernay
 		fee3b73bda feat: payment card atom (#17203) 
* init stripe payment card atom

* cleanup

* update platform libraries

* fix import paths

* add function to get user payment info

* fixup

* resolve merge conflicts

* fixup fixup

* resolve merge conflicts

* fixup

* update payments page

* add props for event payment success and failure

* update props and fixup

* bump platform libraries

* fixup! bump platform libraries

* fixup! fixup! bump platform libraries

* resolve merge conflicts

* fix: add isActive to paymentsTab

---------

Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: Morgan Vernay <morgan@cal.com>
 2024-10-31 11:21:13 +02:00
Udit TakkarOmar LópezJoe Au-YeungJoe Au-Yeung
 		4a59841b02 feat: booking with phone number (#14461) 
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2024-09-11 17:56:04 -07:00
Joe Au-Yeung 95e2ad3007 fix: Disable all emails per event type w/o a workflow [CAL-4066] (#15902) 
* Create confirmation dialog for attendees

* Add disabling host emails option

* Fix DOM issues

* Allow updating disabling emails on backend

* Pass metadata to sendEmails functions

* Clean up

* Type fixes

* Fix test

* Allow for enterprise only

* Type fix

* Test fix

* Check for parentId

* Disable emails for sendScheduledEmails and sendScheduledSeatsEmails

* Remove unused variable

* Only update disable all emails if event type belongs to an org

* Disable scheduling mandatory reminder workflow if attendee emails are disabled

* Refactor disable email UI

* Update copy

* Type fixes

* Fix missing params
 2024-08-14 13:17:52 +02:00
Joe Au-Yeungandzomars 218f6d6eaf feat: Salesforce - Disable creating new contacts (#15780) 
Co-authored-by: zomars <zomars@me.com>
 2024-07-18 10:50:42 +00:00
Amit SharmaJoe Au-YeungUdit Takkar
 		b6a57381c7 feat: redirect after booking: option to forward parameters (#14235) 
* feat: redirect after booking: option to forward parameters

* fix: unit test

* fix: stripe passing its own params

* fix: manually add stripe params

---------

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
 2024-05-07 12:15:20 -04:00
Omar LópezJoe Au-Yeungsean-brydon
 		3f02de8214 chore: icon cleanup (#13770) 
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
 2024-04-03 23:23:57 +00:00
Udit Takkarandzomars e6cd016cad fix: usage of CAL_URL (#13326) 
Co-authored-by: zomars <zomars@me.com>
 2024-02-13 06:03:45 +00:00
Benny Joo 827d8995a1 chore: [app-router-migration 38]: Refactor migrated pages and fix generateMetadata functions (#13314) 
* refactor to keep consistencies in files

* manual: more refactors

* revert unnecessary changes

* fix type errors

* fix build error

* fix
 2024-01-22 17:32:15 -03:00
DmytroHryshynandBenny Joo a28b9cacd2 chore: [app-router-migration 17]: migrate payments page (#13039) 
* chore: migrate payments page

* migrate page to WithLayout HOC, replace new ssrInit

* fix type error

* fix

* revert version changes

* fix

---------

Co-authored-by: Benny Joo <sldisek783@gmail.com>
 2024-01-12 18:36:48 -03:00
Udit Takkarandsean-brydon 7dc6df2ad6 chore: improve logs (#12467) 
* chore: improve logs

* fix: import

* chore: use safe stringify

* chore: add more logs to google calendar

* chore: use this.log

---------

Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
 2023-11-29 19:39:25 +05:30
DmytroHryshynandzomars 28acbe549a chore: [app dir bootstrapping 9]: replace useSearchParams with useCompatSearchParams hook (#12056) 
Co-authored-by: zomars <zomars@me.com>
 2023-11-16 13:38:27 -07:00
Morgan 1f9880204e fix: payment cancel button redirects properly (#12254) 2023-11-08 12:34:50 +02:00
Siddharth Movaliya 79a6aef0e7 fix: text colour for no-show acknowledgment (#12132) 2023-10-31 16:41:25 +00:00
Greg PabianandOmar López a9535d3fd4 chore: [app dir bootstrapping 4.1] check nullability of navigation hook return values part 2 (#12065) 
Co-authored-by: Omar López <zomars@me.com>
 2023-10-24 20:52:59 +00:00
Greg Pabian 39cfe18ffe chore: [app dir bootstrapping 4] check nullability of navigation hook return values (#12005) 2023-10-20 16:47:05 -07:00
Benny Jooandzomars 63416d4f33 chore: update tslog from 3.2.1 to 4.9.2 (#11717) 
Co-authored-by: zomars <zomars@me.com>
 2023-10-17 19:00:48 +00:00
AldrinPeer Richelsenzomars
 		3e08c66888 refactor: Use template literal instead of '+' operator (#11444) 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
 2023-10-03 11:52:19 -07:00
Hariom Balharaandalannnc 20898e1505 fix: Handle payment flow webhooks in case of event requiring confirmation (#11458) 
Co-authored-by: alannnc <alannnc@gmail.com>
 2023-09-30 10:22:32 +05:30
RolandPeer RichelsenalannncHariom BalharaPeer Richelsen
 		2021b641ce feat: Alby integration (#11495) 
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-09-28 12:03:01 +00:00
Udit TakkarandAlex van Andel 13caf6f2cd fix: add a default timezone (#11475) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-09-25 15:08:41 +02:00
Keith Williamsandzomars bd21b2dfe1 fix: Import prisma (#11369) 
Co-authored-by: zomars <zomars@me.com>
 2023-09-14 19:47:25 +00:00
Joe Au-YeungShivam KalrazomarsAlan
 		197b435b6f fix: Duplicate calendar events (#11327) 
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Alan <alannnc@gmail.com>
 2023-09-14 09:53:58 -07:00
alannnc 75f9f045b8 fix: payments on round-robin events (#11248) 
* Fix condition when no users are found for event type

* fix for types
 2023-09-12 08:59:32 -07:00
VIneet PradhanVIneet PradhanUdit Takkar
 		f73d38b632 fix: color tokens are not used in payment form (#10806) 
Co-authored-by: VIneet Pradhan <138296762+vineetpradhan-dev@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
 2023-09-04 15:02:21 +02:00
alannnc c4e5d168a5 fix: handle collective multiple host on destinationCalendar (#10967) 2023-08-31 10:47:02 -07:00
Aswath SandHariom Balhara 16bb5c3384 feat: Added more query params to successRedirect page (#8271) 
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-08-22 12:18:36 +00:00
WesleyJoe Au-YeungJoe Au-Yeung
 		d66095bf9c test: adding confirmed payment test cases on Stripe (#10243) 
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2023-08-21 11:12:39 +02:00
zomars e148ee7823 chore: Removes all traces of ".prisma/client" 2023-08-14 17:28:43 -07:00