Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit a890978
Author: zomars <zomars@me.com>
Date:   Wed Sep 4 16:18:15 2024 -0700

    Update managed-event-types.e2e.ts

commit 0f6d3ab
Merge: 3dc385b 36e79bf
Author: zomars <zomars@me.com>
Date:   Wed Sep 4 14:48:28 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit 3dc385b
Author: zomars <zomars@me.com>
Date:   Wed Sep 4 11:48:24 2024 -0700

    Update users.ts

commit 52289d3
Merge: e04ecd9 e9c71ab
Author: zomars <zomars@me.com>
Date:   Wed Sep 4 11:38:38 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit e04ecd9
Author: zomars <zomars@me.com>
Date:   Tue Aug 6 23:25:45 2024 -0700

    refactor: allow managed event tests parallel runs

commit 96c2349
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Wed Sep 4 13:56:20 2024 -0400

    fix: meeting url missing in workflow email (#16434)

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

commit 03ef1ff
Author: Imamuzzaki Abu Salam <imamuzzaki@gmail.com>
Date:   Wed Sep 4 23:02:30 2024 +0700

    chore: Remove obsolete docker compose version (#16419)

commit 0b9962a
Author: Benny Joo <sldisek783@gmail.com>
Date:   Wed Sep 4 11:20:40 2024 -0400

    chore: App router migration - Add env variables for `auth/forgot-password/*`, `auth/login`, `auth/logout`, `auth/new`, `auth/saml-idp (#16488)

    * Add env variables for auth/forgot-password, auth/login, auth/logout

    * Add env variables for auth/new, auth/saml-idp

commit 91813b9
Author: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date:   Wed Sep 4 16:56:00 2024 +0300

    fix: api v2 booking controller handle error codes (#16486)

    * fix: api v2 booking controller handle error codes

    * fixup! fix: api v2 booking controller handle error codes

    * fixup! Merge branch 'main' into fix-booking-controller-errors-api-v2

commit 2ada394
Author: Benny Joo <sldisek783@gmail.com>
Date:   Wed Sep 4 09:15:19 2024 -0400

    chore: App-router-migration `/auth/error`, `/auth/platform`, `/auth/oauth2` (#16445)

    * preparePageMetadata: improve logic for title

    * add missing pages: oauth2 / platform

    * auth/error: add to app router and extract to /modules

commit b93b578
Author: Benny Joo <sldisek783@gmail.com>
Date:   Wed Sep 4 09:05:38 2024 -0400

    chore: App-router-migration `/auth/new` and `/auth/saml-idp` (#16447)

    * auth/new: add to app router

    * auth/saml-idp: add to app router

    * fix

commit f3b4776
Author: Lauris Skraucis <lauris.skraucis@gmail.com>
Date:   Wed Sep 4 13:17:13 2024 +0200

    fix: use dbWrite in OrganizationsTeamsRepository (#16485)

commit ab16968
Author: Lauris Skraucis <lauris.skraucis@gmail.com>
Date:   Wed Sep 4 13:14:05 2024 +0200

    chore: v2 bump platform libraries (#16473)

commit 234701d
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Wed Sep 4 08:09:10 2024 -0300

    chore: Remove unnecessary log (#16426)

commit d1361dc
Author: Peer Richelsen <peeroke@gmail.com>
Date:   Wed Sep 4 13:05:43 2024 +0200

    Update bug_report.yml (#16089)

commit 2098187
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Wed Sep 4 12:39:16 2024 +0200

    feat: update translations (#16477)

    Co-authored-by: Replexica <support@replexica.com>

commit 8603bff
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Tue Sep 3 19:58:15 2024 +0530

    feat: availability in instant meeting  (#16424)

    * chore: save progress

    * feat: add isAvailable functionality

    * fix: type error

    * chore: add in builder

    * tests: add unit tests

    * chore: improvements

    * chore: tests

    * chore

    * chore: remove log

    * fix: tets

    ---------

    Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

commit 90bf083
Author: Darshil Mharaur <109381405+darshil89@users.noreply.github.com>
Date:   Tue Sep 3 19:04:05 2024 +0530

    fix: Adding yearly title to preview page (#16441)

    * initial commit

    * added year tag to the occurences field

    * Revert yarn.lock

    ---------

    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

commit fcce329
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Tue Sep 3 15:20:21 2024 +0200

    feat: update translations (#16475)

    Co-authored-by: Replexica <support@replexica.com>

commit 022410c
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Tue Sep 3 18:28:34 2024 +0530

    test: Unit Tests for FormBuilderField and BookingFields components (#16162)

    * Remove use of location from FormBuilder

    * Add tests

    * FormBuilderField and BookingFields tests

    * More tests

    * Remove always true if condition

    * Fix ui import mockig that got broken after the last merge

commit cd3745d
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Sep 3 14:34:50 2024 +0200

    chore: Add 3 more languages to AI translations (#16469)

commit d96f17c
Author: Benny Joo <sldisek783@gmail.com>
Date:   Tue Sep 3 05:53:16 2024 -0400

    chore: App router migration - `/auth/forgot-password/*`, `/auth/login`, `/auth/logout` (#16467)

    * migrate auth/forgot-password/*, auth/login, auth/logout

    * revert

    * fix forgot password

    * fix folder structure

    * fix logout

    * fix middleware

    * remove TODO log

    * refactor logout

commit dda9111
Author: Benny Joo <sldisek783@gmail.com>
Date:   Tue Sep 3 05:53:02 2024 -0400

    chore: App router migration - Add method to `BookingRepository` & Extract `/videos/**/*` into `/modules` and `/lib` (#16466)

    * meeting-ended: refactor and extract client code into /modules

    * meeting-not-started: refactor and extract client code into /modules

    * meeting-not-found: fix getData

    * BookingRepository: add a new method

    * video: refactor and extract client code into /modules

    * refactor

    * refactor getServerSideProps

    * use findBookingByUid for more getServerSideProps functions

    * rename findBookingByUid -> findBookingByUidWithOptionalSelect

    * add safety

commit d1be02f
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Sep 3 08:54:12 2024 +0200

    chore: Log cold starts of /v1/slots (#16468)

commit b90e0de
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Tue Sep 3 08:43:44 2024 +0200

    feat: update translations (#16462)

    Co-authored-by: Replexica <support@replexica.com>

commit 1b9e345
Author: Benny Joo <sldisek783@gmail.com>
Date:   Mon Sep 2 13:30:48 2024 -0400

    chore: App router migration (`/workflows`) fix metadata and remove duplicate file for `getStaticProps` (#16452)

    * Fix metadata

    * add use client directive to workflow component

commit ec461f3
Author: Pradip Chaudhary <88336529+thepradipvc@users.noreply.github.com>
Date:   Mon Sep 2 20:09:51 2024 +0530

    feat: browser push notifications (#14888)

    * feat: web push notifications feature

    * Revert yarn.lock changes

    * added new env variables requirement in .env.example

    * moved useNotifications hook in packages/lib/hooks

    * fix: bug

    * use i18n

    * chore: move to new file

    * chore: add yarn.lock

    * Update .env.example

    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

    * chore: add instruction for brave browser

    * fix: tooltip

    * chore: use enum

    * chore

    * small update

    ---------

    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
    Co-authored-by: Udit Takkar <udit222001@gmail.com>
    Co-authored-by: Peer Richelsen <peer@cal.com>
    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
    Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
    Co-authored-by: unknown <adhabal2002@gmail.com>
    Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

commit 39ffe6b
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Mon Sep 2 16:12:11 2024 +0530

    Fix unconfirmed bookings blocking slots being fetched for all troubleshooters (#16439)

    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

commit 35b5dac
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Sat Aug 31 17:17:34 2024 +0200

    feat: update translations (#16436)

    Co-authored-by: Replexica <support@replexica.com>

commit 5fc8085
Author: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Date:   Sat Aug 31 02:08:09 2024 +0530

    feat: add "somewhere else" as a location option (#15108)

    * feat: add somewhere else as a location

    * update

    * update

    * Update BookingFields.tsx

    * update

    * update

    * chore: changes

    * fix

commit 33d1457
Author: Peer Richelsen <peeroke@gmail.com>
Date:   Fri Aug 30 18:38:01 2024 +0200

    feat: synthflow app (#16420)

commit 102c6a5
Author: Kacper <kacpietrzak@gmail.com>
Date:   Fri Aug 30 18:07:10 2024 +0200

    Fallback to next app default language (en) when user didn't specify locale. (#16425)

commit e0989c3
Author: Lauris Skraucis <lauris.skraucis@gmail.com>
Date:   Fri Aug 30 14:07:53 2024 +0200

    fix: recurring booking idempotency key after cancel (#16414)

    * fix: recurring booking idempotency key after cancel

    * refactor: move logic to updateMany of prisma middleware

commit b596922
Author: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date:   Fri Aug 30 13:41:37 2024 +0300

    chore: reorganize event type files (#16393)

    * chore: reorganize event type files

    * fixup! chore: reorganize event type files

    * fixup! Merge branch 'main' into refactor-event-types-components-folder

commit 51d210e
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Fri Aug 30 19:10:44 2024 +0900

    perf: Improve loading existing bookings via API (#16410)

commit 143ff40
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Fri Aug 30 01:26:01 2024 +0200

    feat: update translations (#16401)

    Co-authored-by: Replexica <support@replexica.com>

commit d54dd56
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Fri Aug 30 03:05:32 2024 +0530

    fix: Broken reschedule page for migrated user's booking through request-reschedule (#16068)

    Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
    Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
    Co-authored-by: zomars <zomars@me.com>

commit bbde6b1
Author: Omar López <zomars@me.com>
Date:   Thu Aug 29 14:26:05 2024 -0700

    chore: v4.4.5 (#16402)

commit af7347e
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date:   Thu Aug 29 17:16:48 2024 -0400

    fix: Set `teamMemberEmail` server side for CRM RR Skip (#16367)

    Co-authored-by: Keith Williams <keithwillcode@gmail.com>
    Co-authored-by: zomars <zomars@me.com>

commit 45c3724
Author: Benny Joo <sldisek783@gmail.com>
Date:   Thu Aug 29 17:03:02 2024 -0400

    chore: App Router Migration - Ensure `isBookingPage` is correctly flagged before being passed to `PageWrapper` (#16362)

    * Ensure adding isBookingPage is done in components in /modules, not in /pages

    * Detect isBookingPage prop coming from Page and add it to page wrapper app dir

    * fix build

    * fix

    ---------

    Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

commit add80d8
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Fri Aug 30 02:24:41 2024 +0530

    fix: Add version to embed.js and preview.js (#16182)

commit e81cc38
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Fri Aug 30 01:44:12 2024 +0530

    fix: Flicker b/w Dark and Light theme (#16042)

commit a0c55e7
Author: Souptik Datta <souptikdatta2001@gmail.com>
Date:   Thu Aug 29 22:58:35 2024 +0530

    feat: Implement editable OOO events feature (#15932)

    * feat: Implement edit ooo feature

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * refactor: Refactor button text and gap between buttons

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * fix: Fix entry create and edit edge cases

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * chore: Change "edit ooo event" modal title

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * chore: Add tooltips to entry eidt and delete buttons

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * feat: Reset form on form close event

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * refactor: Refactor reset-form function

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * chore: Rename create or edit OOO as suggested

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * refactor: Refactor component and function names

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * feat: Improve ooo events email notifications

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * fix: Fix email templates

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * feat: Add e2e test for ooo event edit functionality

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * refactor: Create separate test for edit ooo event

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * fix: Remove extra user from redirect user configuration test

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * chore: code refactor

    * remove log

    * chore: Update ooo-input-schema uuid data type

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * fix: Address feedbacks

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>

    * chore: code splitting and refactor

    ---------

    Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
    Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

commit ec98706
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Thu Aug 29 19:13:06 2024 +0200

    feat: update translations (#16400)

    Co-authored-by: Replexica <support@replexica.com>

commit a96075b
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Fri Aug 30 01:37:18 2024 +0900

    perf: run parallel bookings queries (#16398)

commit 056652e
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Fri Aug 30 01:18:48 2024 +0900

    feat: Add more AI translation languages (#16381)

    * feat: Add more AI translation languages

    * Removed pull-request: true

    * checking out the PRs i18n.json as well

    * Update i18n.json

    * Update i18n.json

commit 9ccff3b
Author: Calcom Bot <109866826+calcom-bot@users.noreply.github.com>
Date:   Thu Aug 29 17:58:25 2024 +0200

    feat: update translations (#16396)

    Co-authored-by: Replexica <support@replexica.com>

commit 230366c
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Fri Aug 30 00:02:05 2024 +0900

    fix: GitHub access token for Replexica (#16395)

commit 40c9330
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Thu Aug 29 23:22:42 2024 +0900

    chore: Move Replexica to run on pushes to main (#16394)

commit 37b7c7f
Author: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date:   Thu Aug 29 17:52:42 2024 +0400

    feat: Org Webhooks API V2 (#16274)

    * --init

    * add is webhook in org guard

    * --

    * doc

    * e2e

    * --feedback

    * --

    * fix typo

    * delete unnecessary file

    * fix v2 e2e

    * fix v2 e2e

    * fix e2e

    * fix v2 e2e

    ---------

    Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

commit 925558b
Author: Sy Sagar <93787385+SySagar@users.noreply.github.com>
Date:   Thu Aug 29 17:46:13 2024 +0530

    chore: Bulk update desc (#16343)

    * chore(locale-en): update bulk modal description

    * chore: schedule bulk-modal description

    ---------

    Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>

commit 981b017
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Thu Aug 29 13:32:54 2024 +0530

    refactor: improve team members page performance (#16155)

    * fix: simplify workflow page and improve load time

    * chore: use new endpoint

    * chore: save progress

    * refactor: code

    * refactor: remove not requried code

    * chore: remove schema

    * chore: fix typ

    * chore: improve

    * chore: change name

    * chore: remove unused

    * chore: remove page

    * refactor: teams page

    * feat: add auto scroll

    * chore: create validate unique invite

    * fix: auth check

    * fix: optimistic update

    * chore

    * fix: add loading

    * fix: improvements

    * chore: remove

    * chore

    * chore: fix teams page

    * fix: team profile page

    * fix: appearance page

    * fix: sso view

    * fix: type err

    * feat: defer loading connected Apps

    * fix: type err

    * fix: type error

    * fix: type err

    * fix: connectedApps type

    * chore: move

    * chore: missing export

    * feat: add search by name

    * fix: display role change

    * fix: use setInfiniteData

    * chore: save progress

    * test: add unit tests for loading members

    * fix: test

    * chore: update name

    * fix: bugs and improvements

    * chore: change variable name

    * test: add tests for checkCanAccessMembers

    * refactor: performance

    ---------

    Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

commit 3f7cc2e
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Thu Aug 29 14:13:48 2024 +0900

    perf: Removed unused attendees count (#16391)

commit 40a6116
Author: Max Prilutskiy <5614659+maxprilutskiy@users.noreply.github.com>
Date:   Thu Aug 29 03:32:03 2024 +0200

    chore: [skip i18n] switch pr's i18n job to in-branch mode (#16390)

commit 6eecbf0
Author: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Date:   Wed Aug 28 20:54:13 2024 +0530

    fix: allow all sign in methods when being invited (#13436)

    * allow all sign in methods

    * changes

    * update

    * add checks

    ---------

    Co-authored-by: Keith Williams <keithwillcode@gmail.com>
    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
    Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

commit 8c4779a
Author: Nicolaos Moscholios <nmoscholios@gmail.com>
Date:   Wed Aug 28 15:37:02 2024 +0200

    fix: use `userPhone` instead of `phone` for switch case (#16384)

    * fix: use `userPhone` instead of `phone` for switch case

    Currently this switch case never gets to the last case ("phone") as the type expected is wrong.

    Here the type may have value `userPhone` and not `phone`.

    * fix another case

    ---------

    Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

commit d315dfd
Author: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date:   Wed Aug 28 16:05:14 2024 +0300

    fix: api v2 booking controller with api key (#16358)

    * fix: api v2 booking controller with api key

    * add test

    * fixup! add test

    * fixup! Merge branch 'fix-booking-controller-api-key' of github.com:calcom/cal.com into fix-booking-controller-api-key

    * fixup! Merge branch 'fix-booking-controller-api-key' of github.com:calcom/cal.com into fix-booking-controller-api-key

commit d6ba391
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date:   Wed Aug 28 08:53:32 2024 -0400

    fix: Move `future/workflow/[workflow]` `getStaticProps` into separate file (#16124)

commit a0c9943
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Wed Aug 28 18:01:06 2024 +0530

    chore: display first 3 organizers photo in round robin event (#16331)

    * chore: display random organizer photo in round robin event

    * fix: avatar on instant booking

    ---------

    Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

commit 10c2c63
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Wed Aug 28 19:24:56 2024 +0900

    chore: Use pull-request feature from Replexica (#16383)

commit 989d5b3
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Wed Aug 28 17:16:47 2024 +0900

    chore: add replexica to ci (#16306)

    * chore: Add replexica for AI i18n

    * Add write permission

    * moved i18n to repo root

    * Added checkout to i18n job

    * Added contents:read

    * Added actions: write for testing

    * Updated contents: write

    * feat: add missing translations

    * Checking out the i18n files from PR head sha

    * Added the rest of the languages

    * Added i18n to list of required checks

    * Added a comment explaining the custom common.json checkout

    * Commented out languages to not crush Replexica usage

    * Add a fetch-depth: 2

    * Supporting fetch of external fork branch

    * Put back the dynamic sha

    * Added a check for null so this can run manually and not just on PRs

    * Removed comments

    * feat: update translations

    * Reverted de and fr to re-run with new settings

    * feat: update translations

    * Reverted de and fr to re-run with new settings

    * feat: update translations

    * Removed crowdin

    * Limited languages to major ones for 1st pass

    * feat: update translations

    * Fixing es test

    * Reverted yarn.lock changes

    ---------

    Co-authored-by: Replexica <support@replexica.com>

commit 73ecade
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Wed Aug 28 04:10:00 2024 +0530

    fix: require confirmation cal video bug (#16376)

    * fix: require confirmation cal video bug

    * chore: update location

    * fix: tests

    * chore

    * test: add confirm booking test

    * chore: add location in test

    * fix: types

commit c1fa295
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Tue Aug 27 23:30:18 2024 +0100

    use goblin url (#16370)

commit fa65b4d
Author: Benny Joo <sldisek783@gmail.com>
Date:   Tue Aug 27 13:28:09 2024 -0400

    chore: App Router Migration - Fix metadata util used in App Router and remove duplicate code (#16346)

commit fd2be02
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Aug 27 22:38:34 2024 +0900

    chore: v4.4.4 (#16372)

commit ca718ad
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Aug 27 21:25:53 2024 +0900

    fix: API v2 E2E Docker rate limiting (#16374)

commit f837e04
Author: Hariom Balhara <hariombalhara@gmail.com>
Date:   Tue Aug 27 17:44:19 2024 +0530

    fix: More Stability for FormBuilder by unit tests (#16129)

    * Remove use of location from FormBuilder

    * Add tests

    * Improve error message in test

    * Bust cache

commit 705898b
Author: Johannes Zellner <johannes@nebulon.de>
Date:   Tue Aug 27 09:46:55 2024 +0200

    fix: Avoid typescript error for Nextjs usePathname() (#16368)

    * Avoid typescript error for Nextjs usePathname()

    #fixes 16323

    * Update Shell.tsx

    ---------

    Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

commit 1dd7639
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Aug 27 09:43:04 2024 +0900

    fix: Undefined user in insights data (#16365)

    * fix: Null user in insights data

    * renaming

commit 1769227
Merge: edd299f 4caa095
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Tue Aug 27 08:02:57 2024 +0900

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit edd299f
Merge: e4e78d4 0b719ac
Author: Keith Williams <keithwillcode@gmail.com>
Date:   Wed Aug 21 11:38:49 2024 +0900

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit e4e78d4
Merge: e7c2c8b cb6553c
Author: Omar López <zomars@me.com>
Date:   Fri Aug 16 10:41:41 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit e7c2c8b
Merge: 55b0b90 08e1b0a
Author: Omar López <zomars@me.com>
Date:   Thu Aug 15 14:51:09 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit 55b0b90
Merge: 61889ab 5df14c3
Author: Omar López <zomars@me.com>
Date:   Thu Aug 15 13:26:28 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit 61889ab
Merge: 9ebbc03 cd311f0
Author: zomars <zomars@me.com>
Date:   Thu Aug 15 11:53:18 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

commit 9ebbc03
Merge: a4f482c f206b3d
Author: zomars <zomars@me.com>
Date:   Tue Aug 13 16:20:25 2024 -0700

    Merge branch 'main' into refactor_allow_managed_event_tests_parallel_runs

    Signed-off-by: zomars <zomars@me.com>

    # Conflicts:
    #	apps/web/playwright/fixtures/users.ts

commit a4f482c
Author: zomars <zomars@me.com>
Date:   Mon Aug 12 14:13:05 2024 -0700

    fix tests

    Signed-off-by: zomars <zomars@me.com>

commit e12f0f5
Author: zomars <zomars@me.com>
Date:   Tue Aug 6 23:33:59 2024 -0700

    type fix

commit 7c0ef77
Author: zomars <zomars@me.com>
Date:   Tue Aug 6 23:25:45 2024 -0700

    refactor: allow managed event tests parallel runs
  • Loading branch information
zomars committed Sep 4, 2024
1 parent 36e79bf commit 6a2b9f4
Show file tree
Hide file tree
Showing 2 changed files with 264 additions and 164 deletions.
46 changes: 45 additions & 1 deletion apps/web/playwright/fixtures/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { hashSync as hash } from "bcryptjs";
import { uuid } from "short-uuid";
import { v4 } from "uuid";

import updateChildrenEventTypes from "@calcom/features/ee/managed-event-types/lib/handleChildrenEventTypes";
import stripe from "@calcom/features/ee/payments/server/stripe";
import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
import { WEBAPP_URL } from "@calcom/lib/constants";
Expand Down Expand Up @@ -92,6 +93,7 @@ const createTeamEventType = async (
teamEventSlug?: string;
teamEventLength?: number;
seatsPerTimeSlot?: number;
managedEventUnlockedFields?: Record<string, boolean>;
}
) => {
return await prisma.eventType.create({
Expand Down Expand Up @@ -122,6 +124,20 @@ const createTeamEventType = async (
slug: scenario?.teamEventSlug ?? `${teamEventSlug}-team-id-${team.id}`,
length: scenario?.teamEventLength ?? 30,
seatsPerTimeSlot: scenario?.seatsPerTimeSlot,
locations: [{ type: "integrations:daily" }],
metadata:
scenario?.schedulingType === SchedulingType.MANAGED
? {
managedEventConfig: {
unlockedFields: {
locations: true,
scheduleId: true,
destinationCalendar: true,
...scenario?.managedEventUnlockedFields,
},
},
}
: undefined,
},
});
};
Expand Down Expand Up @@ -259,6 +275,8 @@ export const createUsersFixture = (
hasSubteam?: true;
isUnpublished?: true;
seatsPerTimeSlot?: number;
addManagedEventToTeamMates?: boolean;
managedEventUnlockedFields?: Record<string, boolean>;
orgRequestedSlug?: string;
} = {}
) => {
Expand Down Expand Up @@ -521,6 +539,31 @@ export const createUsersFixture = (
teamMates.push(teamUser);
store.users.push(teammateFixture);
}
// If the teamEvent is a managed one, we add the team mates to it.
if (scenario.schedulingType === SchedulingType.MANAGED && scenario.addManagedEventToTeamMates) {
await updateChildrenEventTypes({
eventTypeId: teamEvent.id,
currentUserId: user.id,
hashedLink: "",
connectedLink: null,
oldEventType: {
team: null,
},
updatedEventType: teamEvent,
children: teamMates.map((tm) => ({
hidden: false,
owner: {
id: tm.id,
name: tm.name || tm.username || "Nameless",
email: tm.email,
eventTypeSlugs: [],
},
})),
profileId: null,
prisma,
updatedValues: {},
});
}
// Add Teammates to OrgUsers
if (scenario.isOrg) {
const orgProfilesCreate = teamMates
Expand Down Expand Up @@ -730,10 +773,11 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
userId: user.id,
},
}),
getFirstTeamEvent: async (teamId: number) => {
getFirstTeamEvent: async (teamId: number, schedulingType?: SchedulingType) => {
return prisma.eventType.findFirstOrThrow({
where: {
teamId,
schedulingType,
},
});
},
Expand Down
Loading

0 comments on commit 6a2b9f4

Please sign in to comment.