[pull] main from calendso:main #313
Open
+744,338
−46,541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* fix: replace filter implementations on /insights * add authorization for teamIds * replace all the implementations * provide eventTypeId * remove log * fix teamId for isAll * fix Download button * remove legacy implementations * clean up * nullish check * remove unusable filters * revert style * fix type error * fix e2e test * fix type error * fix type error * fix e2e * extract util method * fix type error * fix type error * fix type error --------- Co-authored-by: Benny Joo <[email protected]>
* fix the set as default apps issue with links * Allow (. _ -) in the Mirotalk link --------- Co-authored-by: Pavan <[email protected]>
* hide docs for old google connect endpoint * update docs for atoms * fix css styles for week view * update v2 reference * add dutch translations in cal provider * fix: add nl i18n in BaseCalProvider --------- Co-authored-by: Morgan Vernay <[email protected]>
* fix: make Booking.updatedAt update automatically * feat: return updatedAt by bookings endpoints * feat: GET bookings beforeUpdatedAt, afterUpdatedAt, sortUpdated params * docs: api * chore: bump platform-libraries * refactor: sortUpdated -> sortUpdatedAt query param * chore: delete wrong migration
Co-authored-by: Hariom Balhara <[email protected]>
…ng for new user creation (#19229)
…duled (#17820) * fix: bookings for guests added by organizer get cancelled when rescheduled * chore --------- Co-authored-by: Tushar Bhatt <[email protected]>
* perf: Avoid leading wildcard for Salesforce * use limit of 1 since we need 1 record * use LOWER to check exact website match * Revert the usage of LOWER since we need wider searches * Add limits to queries * Update packages/app-store/salesforce/lib/CrmService.ts * Remove unneeded LIMIT statements * Update packages/app-store/salesforce/lib/CrmService.ts * Apply suggestions from code review * Update packages/app-store/salesforce/lib/CrmService.ts --------- Co-authored-by: Joe Au-Yeung <[email protected]>
* wip: Open draft PR with passing test (should fail) * Fix aggregatedAvailability by not merging rr host availability * Added test for validating fixed host behaviour * Add test for combined rr and fixed hosts * Check date-ranges arent returned multiple times when offered by multiple rr hosts * Also sort date ranges * Adding failing test that should result in 5 slots, but returns 7 as it returns the same slots twice. * Slots returns duplicate slots for overlapping date ranges * As mergeOverlappingDateRanges enabled the unified start time, we need to reproduce this * Do not 'prettify' slots to the same degree if they fall on different days * Added test to prove an end date before start also works * Use a string instead of number as key * chore: Deprecate organizerTimeZone, effectively unused * Adjust all dateRanges similarly * Bring back eventTimeZone * Remove adjustDateRanges in favour of slot generation changes * Convert to tz after all logic is finished. * clearer code flow * Remove console.log + add failing test due to inverse order * Address issue with inversion when date ranges are given out of order
* fix: decode params used in query object in buildLegacyCtx * add tests * fix
* incompleteBooking only search for leads if contact is not found * Fix logic * Abstract to functions --------- Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
* fix: v2 slots not returning attendees and bookingUid info * rename file * finish merge main
…nization when he sign in via google. (#19633)
) * Add endpoints for testing the flow * Add MVP * new route * Fixes * Fixes * Remove enable toggle support from domainWideDelegation * Fixes * Revert "Remove enable toggle support from domainWideDelegation" This reverts commit c29e729. * Revert yarn.lock * More fixes * Fix new workspace platform add * refactor: improvements * refactor: bug fixes and improvements * fix: type errors * fix: conflicts * chore: update test * fix: logic * chore: improvements * fix: toglle * fix: bugs * fix: type err * chore: check number type * fix: after conflicts * chore: fix type err * fix: type errors and tests * fix: tets * test * chore: remove unused * fix: google meet url on booking page and secondary calendar * fix: add property * fix: type err * fix: re assingment bug * fix: use getAllCredentials * chore: fix import * fix: installed count * fix: pass event type * fix: import * fix: [Stacked PR] Review fixes (#17958) * Review fixes * fix: destination calendar bug --------- Co-authored-by: Udit Takkar <[email protected]> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <[email protected]> * fix ts error * Fix getSchedule not using dwd credentials (#17995) * fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015) * Remove fn rename to reduce number of files changed * chore: check feature globally * test: add unit tests * chore: move function * test: add booking test * wip * Remove domain-wide-delegation team feature flag * Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict * Fix tests and their ts errors * Fix more tests * Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes * fix: Multiple calendar connections from Google not showing up in apps/installed * DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used * Disable deletetion of DWD as it is destructive and prefer disabling instead * Show DWD credential calendars at the top * Fixed tests * Calendar Cache DWD support * Self-Review: Verify email required and add more selectedCalendar tests * Self Review: shorten names * Self ReviewL Dead code removal * Revert "Calendar Cache DWD support" This reverts commit 009f236. * Some misc fixes * fixes * Performance improvememt in slots loading and booking * More cases for handling dwd credentials * simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available * Fix tests * Fix installed/conferencing not showing gogole meet * Shorten name * Fix ApI v2 tests * Add some more tests * add getSchedule tests * Improve tests * Make Google Meet default when DWD for google is enabled * Enable feature flagging for DWD * chore: bump libraries * Encrypt serviceaccount private key * Fix ts errors * bump platform libraries * org add dwd * org add dwd * bump platform libraries * fix selected calendars * fix remove selected dwd calendar * remove oauthclient id aliad in authedCalendar * remove oauthclient id aliad in authedCalendar * refactor: OrganizationsDwdController * chore: export toggleDwdEnabled from platform-libraries * feat: v2 update (enable / disable) dwd * refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic * wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api * try fix set destination calendar api v2 * fixup! try fix set destination calendar api v2 * setting google meet as default location working for dwd * bump platform libraries version * allow office 365 workspace slug * allow office 365 workspace slug * chore: v2 create dwd MS and Google service keys input * fix: CreateDwdInput serviceAccountKey * fix: CredentialForCalendarService type * fix: check workspace slug * feat: update serviceAccessKey of DWD * testing * fixup! testing * fix: getAuthUtl bug * fix: unit tests * fix: type err and unit test * fix: e2e test * fix: credentials bug and failing unit tests * Update CalendarService.ts * chore: refactor office365 calendar service and add testDomainWideDelegationSetup * fix: office365Calendar use correct clientId/Secret for DWD * fix: office365Calendar dwd no need refresh token * test: add unit test for outlook dwd and setup * feat: added dwd support for office365 calendar * feat: added dwd support for office365 video * test: finish test for outlook dwd * fix: create dialog bug * chore: remove console logs * fix: refreshToken bug * bump version libraries * refactor: fetch dwd credentials only in findQualifiedHosts * fixup! refactor: fetch dwd credentials only in findQualifiedHosts * fix: type err * fix: type err * fix: getUserDisplayName * fix: unit test * chore: bump platform lib --------- Co-authored-by: Syed Ali Shahbaz <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Morgan Vernay <[email protected]> Co-authored-by: supalarry <[email protected]> Co-authored-by: Somay Chauhan <[email protected]> Co-authored-by: Morgan <[email protected]>
Co-authored-by: Lingo.dev <[email protected]>
) * fix: Re-instate new slot logic now it's well tested * Fixup getAggregatedAvailability * Changes to code-owners to reflect removed/moved code * Move more files around. * Fix failed type --------- Co-authored-by: Omar López <[email protected]>
* refactor: Move @calcom/core to @calcom/lib * Merging imports * Clean up * Ignoreing type error for now
…oking questions (#19649) * fix: remove ‘add guests’ from the dropdown if it’s disabled in the booking questions * fix: remove �dd guests' from the dropdown if it's disabled in the booking questions
…ocation in api/v2 (#19549) * feat: added Ability to set organizer's default app as a valid input location in api/v2 * only allow organizers default for team events * fixed for atoms and added unit and e2e tests * Update organizations-event-types.e2e-spec.ts * Update transformApiEventTypeForAtom.ts * published [email protected] --------- Co-authored-by: Peer Richelsen <[email protected]>
…ers (#19620) * fix: show selected filter values first in single- & multi-select filters * fix type errors * fix type error * fix type error --------- Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Udit Takkar <[email protected]>
* add custom hooks page
* refactor: import useIsPlatform directly * fixup! refactor: import useIsPlatform directly * fixup! fixup! refactor: import useIsPlatform directly * fixup! fixup! fixup! refactor: import useIsPlatform directly
…9522) * feat: booking redirect page is now w UID * refactor: use getBookingRedirectExtraParams * refactor: remove uncessary const result * uid isnt the first param anymore
* refactor: Move classNames from @calcom/lib to @calcom/ui * Import fix * Removed extra import of classNames * Removed tailwind-merge from @calcom/lib
…19668) Co-authored-by: Somay Chauhan <[email protected]>
* fix: some flaky e2e tests * update * update
#19546) Co-authored-by: amrit <[email protected]>
* fix: cancelledby to work on api v1 * fix: scheduleId to work with hosts in eventtype api v1 * Update event-type.ts --------- Co-authored-by: Anik Dhabal Babu <[email protected]>
* remove barrel export for client * fix more imports * remove server barrel * remove more barrel exporst and fix tssconfig * fix types * fix imports for removed barrels * fig ssg createserverside helpers * restore lock * new yarn lock * remove barel exports * remove barrel * replace client with react in tsconfig * fix yarn lock * Update exports for trpc to not be types * add ENDPOINTS export to the correct location * other exports fixes lost due to barrel * fix client error export * more imports --------- Co-authored-by: hbjORbj <[email protected]> Co-authored-by: Keith Williams <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )