From 61f436be2a451c664fbdece2a79e534f157ab4ea Mon Sep 17 00:00:00 2001 From: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:17:52 +0530 Subject: [PATCH 01/40] fix: wrong reschedule link for an org member for a booking on event outside the org (#15260) * fix: wrong reschedule link * test * fix * test * test * refactor: get org id of booking * fix: redirect URL to handle movedToProfile username based on domain context * Revert not needed changes * Revert unnecessary changes now --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Hariom --- apps/web/components/booking/BookingListItem.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx index 9f2a98a55018c7..0e8fb2a1a117af 100644 --- a/apps/web/components/booking/BookingListItem.tsx +++ b/apps/web/components/booking/BookingListItem.tsx @@ -15,7 +15,6 @@ import ViewRecordingsDialog from "@calcom/features/ee/video/ViewRecordingsDialog import classNames from "@calcom/lib/classNames"; import { formatTime } from "@calcom/lib/date-fns"; import getPaymentAppData from "@calcom/lib/getPaymentAppData"; -import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl"; import { useCopy } from "@calcom/lib/hooks/useCopy"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useGetTheme } from "@calcom/lib/hooks/useTheme"; @@ -70,7 +69,6 @@ type BookingItemProps = BookingItem & { }; function BookingListItem(booking: BookingItemProps) { - const bookerUrl = useBookerUrl(); const { userId, userTimeZone, userTimeFormat, userEmail } = booking.loggedInUser; const { @@ -183,7 +181,7 @@ function BookingListItem(booking: BookingItemProps) { id: "reschedule", icon: "clock" as const, label: t("reschedule_booking"), - href: `${bookerUrl}/reschedule/${booking.uid}${ + href: `/reschedule/${booking.uid}${ booking.seatsReferences.length ? `?seatReferenceUid=${getSeatReferenceUid()}` : "" }`, }, From 4d53f327d9c1afb99189b0970ed10a731220d6b2 Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:41:54 +0530 Subject: [PATCH 02/40] feat: V2 API endpoint create phone call (#16528) * refactor: V2 API endpoint create phone call * fix: type err * fix: type and build err * chore: change default value * chore: move it to another route * test: for create phone call * chore: undo constant * chore: remove test * fix: make begin_message optional * chore: improvements * chore: begin message * chore: remove unused import * chore: bump platform libraries with handleCreatePhoneCall * chore: improvement --------- Co-authored-by: Keith Williams Co-authored-by: Benny Joo Co-authored-by: Morgan Vernay Co-authored-by: Peer Richelsen --- apps/api/v2/package.json | 2 +- .../inputs/create-phone-call.input.ts | 71 ++++++++ .../outputs/create-phone-call.output.ts | 28 +++ .../organizations-event-types.controller.ts | 29 ++- apps/api/v2/swagger/documentation.json | 167 +++++++++++++++++- .../ee/cal-ai-phone/retellAIService.ts | 2 +- .../features/ee/cal-ai-phone/zod-utils.ts | 2 +- .../components/tabs/ai/AIEventController.tsx | 3 +- packages/features/handleCreatePhoneCall.ts | 126 +++++++++++++ packages/lib/constants.ts | 1 + packages/platform/libraries/index.ts | 2 + .../server/routers/viewer/eventTypes/util.ts | 17 +- .../routers/viewer/organizations/_router.tsx | 3 +- .../organizations/createPhoneCall.handler.ts | 114 +----------- 14 files changed, 443 insertions(+), 124 deletions(-) create mode 100644 apps/api/v2/src/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input.ts create mode 100644 apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output.ts create mode 100644 packages/features/handleCreatePhoneCall.ts diff --git a/apps/api/v2/package.json b/apps/api/v2/package.json index 10f4c71ecca3ec..5eda351e7920cc 100644 --- a/apps/api/v2/package.json +++ b/apps/api/v2/package.json @@ -28,7 +28,7 @@ "dependencies": { "@calcom/platform-constants": "*", "@calcom/platform-enums": "*", - "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.33", + "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.34", "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2", "@calcom/platform-types": "*", "@calcom/platform-utils": "*", diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input.ts new file mode 100644 index 00000000000000..8fa63319d22a01 --- /dev/null +++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input.ts @@ -0,0 +1,71 @@ +import { ApiProperty as DocsProperty } from "@nestjs/swagger"; +import { Transform } from "class-transformer"; +import { IsString, IsBoolean, IsOptional, IsEnum, Matches } from "class-validator"; + +export enum TemplateType { + CHECK_IN_APPOINTMENT = "CHECK_IN_APPOINTMENT", + CUSTOM_TEMPLATE = "CUSTOM_TEMPLATE", +} + +export class CreatePhoneCallInput { + @IsString() + @Matches(/^\+[1-9]\d{1,14}$/, { + message: + "Invalid phone number format. Expected format: + with no spaces or separators.", + }) + @DocsProperty({ description: "Your phone number" }) + yourPhoneNumber!: string; + + @IsString() + @Matches(/^\+[1-9]\d{1,14}$/, { + message: + "Invalid phone number format. Expected format: + with no spaces or separators.", + }) + @DocsProperty({ description: "Number to call" }) + numberToCall!: string; + + @IsString() + @DocsProperty({ description: "CAL API Key" }) + calApiKey!: string; + + @IsBoolean() + @DocsProperty({ description: "Enabled status", default: true }) + enabled = true; + + @IsEnum(TemplateType) + @DocsProperty({ description: "Template type", enum: TemplateType }) + templateType: TemplateType = TemplateType.CUSTOM_TEMPLATE; + + @IsOptional() + @IsString() + @DocsProperty({ description: "Scheduler name" }) + schedulerName?: string; + + @IsOptional() + @IsString() + @Transform(({ value }) => (value ? value : undefined)) + @DocsProperty({ description: "Guest name" }) + guestName?: string; + + @IsOptional() + @IsString() + @Transform(({ value }) => (value ? value : undefined)) + @DocsProperty({ description: "Guest email" }) + guestEmail?: string; + + @IsOptional() + @IsString() + @Transform(({ value }) => (value ? value : undefined)) + @DocsProperty({ description: "Guest company" }) + guestCompany?: string; + + @IsOptional() + @IsString() + @DocsProperty({ description: "Begin message" }) + beginMessage?: string; + + @IsOptional() + @IsString() + @DocsProperty({ description: "General prompt" }) + generalPrompt?: string; +} diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output.ts new file mode 100644 index 00000000000000..ac4c2dd965176f --- /dev/null +++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output.ts @@ -0,0 +1,28 @@ +import { ApiProperty } from "@nestjs/swagger"; +import { Type } from "class-transformer"; +import { IsEnum, IsString, ValidateNested } from "class-validator"; + +import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants"; + +class Data { + @IsString() + @ApiProperty() + callId!: string; + + @IsString() + @ApiProperty() + agentId!: string; +} + +export class CreatePhoneCallOutput { + @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] }) + @IsEnum([SUCCESS_STATUS, ERROR_STATUS]) + status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS; + + @ApiProperty({ + type: Data, + }) + @ValidateNested() + @Type(() => Data) + data!: Data; +} diff --git a/apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.controller.ts b/apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.controller.ts index fa1c41df66508b..6ba6caf3d204f6 100644 --- a/apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.controller.ts +++ b/apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.controller.ts @@ -1,3 +1,5 @@ +import { CreatePhoneCallInput } from "@/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input"; +import { CreatePhoneCallOutput } from "@/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output"; import { API_VERSIONS_VALUES } from "@/lib/api-versions"; import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator"; import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator"; @@ -33,6 +35,7 @@ import { import { ApiTags as DocsTags } from "@nestjs/swagger"; import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { handleCreatePhoneCall } from "@calcom/platform-libraries"; import { CreateTeamEventTypeInput_2024_06_14, GetTeamEventTypesQuery_2024_06_14, @@ -91,6 +94,30 @@ export class OrganizationsEventTypesController { }; } + @Roles("TEAM_ADMIN") + @Post("/teams/:teamId/event-types/:eventTypeId/create-phone-call") + @UseGuards(ApiAuthGuard, IsOrgGuard, IsTeamInOrg, RolesGuard) + async createPhoneCall( + @Param("eventTypeId") eventTypeId: number, + @Param("orgId", ParseIntPipe) orgId: number, + @Body() body: CreatePhoneCallInput, + @GetUser() user: UserWithProfile + ): Promise { + const data = await handleCreatePhoneCall({ + user: { + id: user.id, + timeZone: user.timeZone, + profile: { organization: { id: orgId } }, + }, + input: { ...body, eventTypeId }, + }); + + return { + status: SUCCESS_STATUS, + data, + }; + } + @UseGuards(IsOrgGuard, IsTeamInOrg, IsAdminAPIEnabledGuard) @Get("/teams/:teamId/event-types") async getTeamEventTypes( @@ -138,7 +165,7 @@ export class OrganizationsEventTypesController { @Patch("/teams/:teamId/event-types/:eventTypeId") async updateTeamEventType( @Param("teamId", ParseIntPipe) teamId: number, - @Param("eventTypeId") eventTypeId: number, + @Param("eventTypeId", ParseIntPipe) eventTypeId: number, @GetUser() user: UserWithProfile, @Body() bodyEventType: UpdateTeamEventTypeInput_2024_06_14 ): Promise { diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json index 219408b271a8da..f9f0083a6096a7 100644 --- a/apps/api/v2/swagger/documentation.json +++ b/apps/api/v2/swagger/documentation.json @@ -1982,6 +1982,54 @@ ] } }, + "/v2/organizations/{orgId}/teams/{teamId}/event-types/{eventTypeId}/create-phone-call": { + "post": { + "operationId": "OrganizationsEventTypesController_createPhoneCall", + "parameters": [ + { + "name": "eventTypeId", + "required": true, + "in": "path", + "schema": { + "type": "number" + } + }, + { + "name": "orgId", + "required": true, + "in": "path", + "schema": { + "type": "number" + } + } + ], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreatePhoneCallInput" + } + } + } + }, + "responses": { + "201": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreatePhoneCallOutput" + } + } + } + } + }, + "tags": [ + "Organizations Event Types" + ] + } + }, "/v2/organizations/{orgId}/teams/event-types": { "get": { "operationId": "OrganizationsEventTypesController_getTeamsEventTypes", @@ -3324,7 +3372,31 @@ "/v2/calendars/busy-times": { "get": { "operationId": "CalendarsController_getBusyTimes", - "parameters": [], + "parameters": [ + { + "name": "loggedInUsersTz", + "required": true, + "in": "query", + "description": "The timezone of the logged in user represented as a string", + "example": "America/New_York", + "schema": { + "type": "string" + } + }, + { + "name": "calendarsToLoad", + "required": true, + "in": "query", + "description": "An array of Calendar objects representing the calendars to be loaded", + "example": "[{ credentialId: \"1\", externalId: \"AQgtJE7RnHEeyisVq2ENs2gAAAgEGAAAACgtJE7RnHEeyisVq2ENs2gAAAhSDAAAA\" }, { credentialId: \"2\", externalId: \"AQM7RnHEeyisVq2ENs2gAAAhFDBBBBB\" }]", + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + } + ], "responses": { "200": { "description": "", @@ -7794,6 +7866,90 @@ "data" ] }, + "CreatePhoneCallInput": { + "type": "object", + "properties": { + "yourPhoneNumber": { + "type": "string", + "pattern": "/^\\+[1-9]\\d{1,14}$/", + "description": "Your phone number" + }, + "numberToCall": { + "type": "string", + "pattern": "/^\\+[1-9]\\d{1,14}$/", + "description": "Number to call" + }, + "calApiKey": { + "type": "string", + "description": "CAL API Key" + }, + "enabled": { + "type": "object", + "default": true, + "description": "Enabled status" + }, + "templateType": { + "default": "CUSTOM_TEMPLATE", + "enum": [ + "CHECK_IN_APPOINTMENT", + "CUSTOM_TEMPLATE" + ], + "type": "string", + "description": "Template type" + }, + "schedulerName": { + "type": "string", + "description": "Scheduler name" + }, + "guestName": { + "type": "string", + "description": "Guest name" + }, + "guestEmail": { + "type": "string", + "description": "Guest email" + }, + "guestCompany": { + "type": "string", + "description": "Guest company" + }, + "beginMessage": { + "type": "string", + "description": "Begin message" + }, + "generalPrompt": { + "type": "string", + "description": "General prompt" + } + }, + "required": [ + "yourPhoneNumber", + "numberToCall", + "calApiKey", + "enabled", + "templateType" + ] + }, + "CreatePhoneCallOutput": { + "type": "object", + "properties": { + "status": { + "type": "string", + "example": "success", + "enum": [ + "success", + "error" + ] + }, + "data": { + "$ref": "#/components/schemas/Data" + } + }, + "required": [ + "status", + "data" + ] + }, "GetTeamEventTypesOutput": { "type": "object", "properties": { @@ -8636,7 +8792,8 @@ "MEETING_STARTED", "RECORDING_READY", "INSTANT_MEETING", - "RECORDING_TRANSCRIPTION_GENERATED" + "RECORDING_TRANSCRIPTION_GENERATED", + "OOO_CREATED" ] }, "active": { @@ -8709,7 +8866,8 @@ "MEETING_STARTED", "RECORDING_READY", "INSTANT_MEETING", - "RECORDING_TRANSCRIPTION_GENERATED" + "RECORDING_TRANSCRIPTION_GENERATED", + "OOO_CREATED" ] }, "active": { @@ -10304,9 +10462,6 @@ "rescheduleUid": { "type": "string" }, - "recurringEventId": { - "type": "string" - }, "timeZone": { "type": "string" }, diff --git a/packages/features/ee/cal-ai-phone/retellAIService.ts b/packages/features/ee/cal-ai-phone/retellAIService.ts index ed911c6949e9f0..b903c8883f49d4 100644 --- a/packages/features/ee/cal-ai-phone/retellAIService.ts +++ b/packages/features/ee/cal-ai-phone/retellAIService.ts @@ -31,7 +31,7 @@ type initProps = { eventTypeId: number; calApiKey: string; loggedInUserTimeZone: string; - beginMessage?: string; + beginMessage?: string | null; dynamicVariables: DynamicVariables; generalPrompt: string; }; diff --git a/packages/features/ee/cal-ai-phone/zod-utils.ts b/packages/features/ee/cal-ai-phone/zod-utils.ts index 994484f75273ac..16452a296e1b41 100644 --- a/packages/features/ee/cal-ai-phone/zod-utils.ts +++ b/packages/features/ee/cal-ai-phone/zod-utils.ts @@ -130,7 +130,7 @@ export type TCreateRetellLLMSchema = z.infer; export const ZGetRetellLLMSchema = z .object({ general_prompt: z.string(), - begin_message: z.string().nullable(), + begin_message: z.string().nullable().optional(), llm_id: z.string(), llm_websocket_url: z.string(), general_tools: z.array( diff --git a/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx b/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx index b7cf8df83e299f..632e6f28ee9e9c 100644 --- a/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx +++ b/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx @@ -150,7 +150,7 @@ const AISettings = ({ eventType }: { eventType: EventTypeSetup }) => { const createCallMutation = trpc.viewer.organizations.createPhoneCall.useMutation({ onSuccess: (data) => { - if (!!data?.call_id) { + if (!!data?.callId) { showToast("Phone Call Created successfully", "success"); } }, @@ -175,6 +175,7 @@ const AISettings = ({ eventType }: { eventType: EventTypeSetup }) => { guestName: values.guestName && values.guestName.trim().length ? values.guestName : undefined, eventTypeId: eventType.id, calApiKey, + id: eventType.id, }); createCallMutation.mutate(data); diff --git a/packages/features/handleCreatePhoneCall.ts b/packages/features/handleCreatePhoneCall.ts new file mode 100644 index 00000000000000..c9b084fd610be5 --- /dev/null +++ b/packages/features/handleCreatePhoneCall.ts @@ -0,0 +1,126 @@ +import { PROMPT_TEMPLATES } from "@calcom/features/ee/cal-ai-phone/promptTemplates"; +import { RetellAIService, validatePhoneNumber } from "@calcom/features/ee/cal-ai-phone/retellAIService"; +import { templateTypeEnum } from "@calcom/features/ee/cal-ai-phone/zod-utils"; +import type { TCreatePhoneCallSchema } from "@calcom/features/ee/cal-ai-phone/zod-utils"; +import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; +import logger from "@calcom/lib/logger"; +import prisma from "@calcom/prisma"; + +import { TRPCError } from "@trpc/server"; + +export const handleCreatePhoneCall = async ({ + user, + input, +}: { + user: { timeZone: string; id: number; profile?: { organization?: { id?: number } } }; + input: TCreatePhoneCallSchema; +}) => { + if (!user?.profile?.organization) { + throw new TRPCError({ code: "UNAUTHORIZED", message: "User is not part of an organization" }); + } + + await checkRateLimitAndThrowError({ + rateLimitingType: "core", + identifier: `createPhoneCall:${user.id}`, + }); + + await validatePhoneNumber(input.yourPhoneNumber); + + const { + yourPhoneNumber, + numberToCall, + guestName, + guestEmail, + guestCompany, + eventTypeId, + beginMessage, + calApiKey, + templateType, + schedulerName, + generalPrompt: userCustomPrompt, + } = input; + + const generalPrompt = + templateType === templateTypeEnum.enum.CUSTOM_TEMPLATE + ? userCustomPrompt + : PROMPT_TEMPLATES[templateType]?.generalPrompt; + + const retellAI = new RetellAIService({ + templateType, + generalPrompt: generalPrompt ?? "", + beginMessage: beginMessage ?? null, + yourPhoneNumber, + loggedInUserTimeZone: user.timeZone, + eventTypeId, + calApiKey, + dynamicVariables: { + guestName, + guestEmail, + guestCompany, + schedulerName, + }, + }); + + const aiPhoneCallConfig = await prisma.aIPhoneCallConfiguration.upsert({ + where: { + eventTypeId, + }, + update: { + beginMessage, + enabled: true, + guestName, + guestEmail, + guestCompany, + numberToCall, + yourPhoneNumber, + schedulerName, + templateType, + generalPrompt, + }, + create: { + eventTypeId, + beginMessage, + enabled: true, + guestName, + guestEmail, + guestCompany, + numberToCall, + yourPhoneNumber, + schedulerName, + templateType, + generalPrompt, + }, + }); + + // If no retell LLM is associated with the event type, create one + if (!aiPhoneCallConfig.llmId) { + const createdRetellLLM = await retellAI.createRetellLLMAndUpdateWebsocketUrl(); + + await prisma.aIPhoneCallConfiguration.update({ + where: { + eventTypeId, + }, + data: { + llmId: createdRetellLLM.llm_id, + }, + }); + } else { + // aiPhoneCallConfig.llmId would be set here in the else block + const retellLLM = await retellAI.getRetellLLM(aiPhoneCallConfig.llmId as string); + + const shouldUpdateLLM = + retellLLM.general_prompt !== generalPrompt || retellLLM.begin_message !== beginMessage; + + if (shouldUpdateLLM) { + const updatedRetellLLM = await retellAI.updatedRetellLLMAndUpdateWebsocketUrl( + aiPhoneCallConfig.llmId as string + ); + logger.debug("updated Retell LLM", updatedRetellLLM); + } + } + + const createPhoneCallRes = await retellAI.createRetellPhoneCall(numberToCall); + logger.debug("Create Call Response", createPhoneCallRes); + + return { callId: createPhoneCallRes.call_id, agentId: createPhoneCallRes.agent_id }; +}; diff --git a/packages/lib/constants.ts b/packages/lib/constants.ts index 1ce361a791193a..35802b7ddbbc14 100644 --- a/packages/lib/constants.ts +++ b/packages/lib/constants.ts @@ -94,6 +94,7 @@ export const IS_STRIPE_ENABLED = !!( ); /** This has correct value only server side. When you want to use client side, go for IS_TEAM_BILLING_ENABLED_CLIENT. I think we should use the _CLIENT one only everywhere so that it works reliably everywhere on client as well as server */ export const IS_TEAM_BILLING_ENABLED = IS_STRIPE_ENABLED && HOSTED_CAL_FEATURES; + export const IS_TEAM_BILLING_ENABLED_CLIENT = !!process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY && HOSTED_CAL_FEATURES; diff --git a/packages/platform/libraries/index.ts b/packages/platform/libraries/index.ts index 77f74c1001674c..c3c7f802e9eb14 100644 --- a/packages/platform/libraries/index.ts +++ b/packages/platform/libraries/index.ts @@ -5,6 +5,7 @@ import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo"; import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking"; import * as newBookingMethods from "@calcom/features/bookings/lib/handleNewBooking"; import { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent"; +import { handleCreatePhoneCall } from "@calcom/features/handleCreatePhoneCall"; import handleMarkNoShow from "@calcom/features/handleMarkNoShow"; import * as instantMeetingMethods from "@calcom/features/instant-meeting/handleInstantMeeting"; import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings"; @@ -48,6 +49,7 @@ const handleInstantMeeting = instantMeetingMethods.default; export { handleInstantMeeting }; export { handleMarkNoShow }; +export { handleCreatePhoneCall }; export { getAvailableSlots }; export type AvailableSlotsType = Awaited>; diff --git a/packages/trpc/server/routers/viewer/eventTypes/util.ts b/packages/trpc/server/routers/viewer/eventTypes/util.ts index a4891c05a75aee..b464229f517078 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/util.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/util.ts @@ -18,15 +18,22 @@ type EventType = Awaited>[n export const eventOwnerProcedure = authedProcedure .input( - z.object({ - id: z.number(), - users: z.array(z.number()).optional().default([]), - }) + z + .object({ + id: z.number().optional(), + eventTypeId: z.number().optional(), + users: z.array(z.number()).optional().default([]), + }) + .refine((data) => data.id !== undefined || data.eventTypeId !== undefined, { + message: "At least one of 'id' or 'eventTypeId' must be present", + path: ["id", "eventTypeId"], + }) ) .use(async ({ ctx, input, next }) => { + const id = input.eventTypeId ?? input.id; // Prevent non-owners to update/delete a team event const event = await ctx.prisma.eventType.findUnique({ - where: { id: input.id }, + where: { id }, include: { users: { select: { diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx index 4392508ff39b23..4761600aede8b9 100644 --- a/packages/trpc/server/routers/viewer/organizations/_router.tsx +++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx @@ -6,6 +6,7 @@ import authedProcedure, { authedOrgAdminProcedure, } from "../../../procedures/authedProcedure"; import { importHandler, router } from "../../../trpc"; +import { eventOwnerProcedure } from "../eventTypes/util"; import { ZAddMembersToEventTypes } from "./addMembersToEventTypes.schema"; import { ZAddMembersToTeams } from "./addMembersToTeams.schema"; import { ZAdminDeleteInput } from "./adminDelete.schema"; @@ -161,7 +162,7 @@ export const viewerOrganizationsRouter = router({ const handler = await importHandler(namespaced("adminDelete"), () => import("./adminDelete.handler")); return handler(opts); }), - createPhoneCall: authedProcedure.input(createPhoneCallSchema).mutation(async (opts) => { + createPhoneCall: eventOwnerProcedure.input(createPhoneCallSchema).mutation(async (opts) => { const handler = await importHandler( namespaced("createPhoneCall"), () => import("./createPhoneCall.handler") diff --git a/packages/trpc/server/routers/viewer/organizations/createPhoneCall.handler.ts b/packages/trpc/server/routers/viewer/organizations/createPhoneCall.handler.ts index 9bec06ad2caf93..5d73b0b43c9c11 100644 --- a/packages/trpc/server/routers/viewer/organizations/createPhoneCall.handler.ts +++ b/packages/trpc/server/routers/viewer/organizations/createPhoneCall.handler.ts @@ -1,13 +1,8 @@ import type { z } from "zod"; -import { PROMPT_TEMPLATES } from "@calcom/features/ee/cal-ai-phone/promptTemplates"; -import { RetellAIService, validatePhoneNumber } from "@calcom/features/ee/cal-ai-phone/retellAIService"; import type { createPhoneCallSchema } from "@calcom/features/ee/cal-ai-phone/zod-utils"; -import { templateTypeEnum } from "@calcom/features/ee/cal-ai-phone/zod-utils"; -import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; -import logger from "@calcom/lib/logger"; +import { handleCreatePhoneCall } from "@calcom/features/handleCreatePhoneCall"; import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; type CreatePhoneCallProps = { @@ -19,109 +14,14 @@ type CreatePhoneCallProps = { }; const createPhoneCallHandler = async ({ input, ctx }: CreatePhoneCallProps) => { - if (!!!ctx.user.profile.organization) { - throw new TRPCError({ code: "UNAUTHORIZED" }); - } - - await checkRateLimitAndThrowError({ - rateLimitingType: "core", - identifier: `createPhoneCall:${ctx.user.id}`, - }); - - await validatePhoneNumber(input.yourPhoneNumber); - - const { - yourPhoneNumber, - numberToCall, - guestName, - guestEmail, - guestCompany, - eventTypeId, - beginMessage, - calApiKey, - templateType, - schedulerName, - generalPrompt: userCustomPrompt, - } = input; - - const generalPrompt = - templateType === templateTypeEnum.enum.CUSTOM_TEMPLATE - ? userCustomPrompt - : PROMPT_TEMPLATES[templateType]?.generalPrompt; - - const retellAI = new RetellAIService({ - templateType, - generalPrompt: generalPrompt ?? "", - yourPhoneNumber, - loggedInUserTimeZone: ctx.user.timeZone, - eventTypeId, - calApiKey, - dynamicVariables: { - guestName, - guestEmail, - guestCompany, - schedulerName, - }, - }); - - const aiPhoneCallConfig = await ctx.prisma.aIPhoneCallConfiguration.upsert({ - where: { - eventTypeId, - }, - update: { - beginMessage, - enabled: true, - guestName, - guestEmail, - guestCompany, - numberToCall, - yourPhoneNumber, - schedulerName, - templateType, - generalPrompt, - }, - create: { - eventTypeId, - beginMessage, - enabled: true, - guestName, - guestEmail, - guestCompany, - numberToCall, - yourPhoneNumber, - schedulerName, - templateType, - generalPrompt, + return await handleCreatePhoneCall({ + user: { + id: ctx.user.id, + timeZone: ctx.user.timeZone, + profile: { organization: { id: ctx.user.profile.organization?.id } }, }, + input, }); - - // If no retell LLM is associated with the event type, create one - if (!aiPhoneCallConfig.llmId) { - const createdRetellLLM = await retellAI.createRetellLLMAndUpdateWebsocketUrl(); - - await ctx.prisma.aIPhoneCallConfiguration.update({ - where: { - eventTypeId, - }, - data: { - llmId: createdRetellLLM.llm_id, - }, - }); - } else { - const retellLLM = await retellAI.getRetellLLM(aiPhoneCallConfig.llmId); - - const doWeNeedToUpdateLLM = - retellLLM.general_prompt !== generalPrompt || retellLLM.begin_message !== beginMessage; - if (doWeNeedToUpdateLLM) { - const updatedRetellLLM = await retellAI.updatedRetellLLMAndUpdateWebsocketUrl(aiPhoneCallConfig.llmId); - logger.debug("updated Retell LLM", updatedRetellLLM); - } - } - - const createPhoneCallRes = await retellAI.createRetellPhoneCall(numberToCall); - logger.debug("Create Call Response", createPhoneCallRes); - - return createPhoneCallRes; }; export default createPhoneCallHandler; From e362c37ff37a1704d532410c0aaa3716f8d1759a Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Wed, 11 Sep 2024 18:01:53 +0530 Subject: [PATCH 03/40] fix: Location Change to Organizer Default Conferencing App (#16379) * Fix * Dont include test files * Fix location change * Self review fixes * Add unit test * Add more test * Add a bookingScenario as well --- apps/web/components/apps/AppList.tsx | 4 +- .../components/booking/BookingListItem.tsx | 46 ++- .../components/dialog/EditLocationDialog.tsx | 182 ++++----- .../__tests__/EditLocationDialog.test.tsx | 225 +++++++++++ apps/web/public/static/locales/en/common.json | 5 +- .../web/test/utils/bookingScenario/expects.ts | 27 ++ packages/app-store/locations.ts | 38 +- packages/core/EventManager.ts | 4 +- .../features/bookings/lib/handleNewBooking.ts | 14 +- .../buildCalEventFromBooking.test.ts | 208 ++++++++++ packages/lib/buildCalEventFromBooking.ts | 106 ++++++ packages/lib/server/repository/booking.ts | 25 ++ packages/lib/server/repository/credential.ts | 18 + packages/lib/server/repository/user.ts | 12 + .../__tests__/editLocation.handler.test.ts | 264 +++++++++++++ .../viewer/bookings/editLocation.handler.ts | 358 ++++++++++++------ .../viewer/bookings/editLocation.schema.ts | 2 +- .../server/routers/viewer/bookings/util.ts | 72 ++-- packages/ui/components/test-setup.ts | 4 + vitest.workspace.ts | 9 + 20 files changed, 1335 insertions(+), 288 deletions(-) create mode 100644 apps/web/components/dialog/__tests__/EditLocationDialog.test.tsx create mode 100644 packages/lib/__tests__/buildCalEventFromBooking.test.ts create mode 100644 packages/lib/buildCalEventFromBooking.ts create mode 100644 packages/trpc/server/routers/viewer/bookings/__tests__/editLocation.handler.test.ts diff --git a/apps/web/components/apps/AppList.tsx b/apps/web/components/apps/AppList.tsx index 2b73559cf3f7a7..0c514d460995b7 100644 --- a/apps/web/components/apps/AppList.tsx +++ b/apps/web/components/apps/AppList.tsx @@ -2,7 +2,7 @@ import { useCallback, useState } from "react"; import { AppSettings } from "@calcom/app-store/_components/AppSettings"; import { InstallAppButton } from "@calcom/app-store/components"; -import { getEventLocationTypeFromApp, type EventLocationType } from "@calcom/app-store/locations"; +import { getLocationFromApp, type EventLocationType } from "@calcom/app-store/locations"; import type { CredentialOwner } from "@calcom/app-store/types"; import { AppSetDefaultLinkDialog } from "@calcom/features/apps/components/AppSetDefaultLinkDialog"; import { BulkEditDefaultForEventsModal } from "@calcom/features/eventtypes/components/BulkEditDefaultForEventsModal"; @@ -92,7 +92,7 @@ export const AppList = ({ data, handleDisconnect, variant, listClassName }: AppL color="secondary" StartIcon="video" onClick={() => { - const locationType = getEventLocationTypeFromApp(item?.locationOption?.value ?? ""); + const locationType = getLocationFromApp(item?.locationOption?.value ?? ""); if (locationType?.linkType === "static") { setLocationType({ ...locationType, slug: appSlug }); } else { diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx index 0e8fb2a1a117af..69c61e2cbd6539 100644 --- a/apps/web/components/booking/BookingListItem.tsx +++ b/apps/web/components/booking/BookingListItem.tsx @@ -2,12 +2,8 @@ import Link from "next/link"; import { useState } from "react"; import { Controller, useFieldArray, useForm } from "react-hook-form"; -import type { EventLocationType, getEventLocationValue } from "@calcom/app-store/locations"; -import { - getEventLocationType, - getSuccessPageLocationMessage, - guessEventLocationType, -} from "@calcom/app-store/locations"; +import type { getEventLocationValue } from "@calcom/app-store/locations"; +import { getSuccessPageLocationMessage, guessEventLocationType } from "@calcom/app-store/locations"; import dayjs from "@calcom/dayjs"; // TODO: Use browser locale, implement Intl in Dayjs maybe? import "@calcom/dayjs/locales"; @@ -284,20 +280,36 @@ function BookingListItem(booking: BookingItemProps) { setIsOpenLocationDialog(false); utils.viewer.bookings.invalidate(); }, + onError: (e) => { + const errorMessages: Record = { + UNAUTHORIZED: t("you_are_unauthorized_to_make_this_change_to_the_booking"), + BAD_REQUEST: e.message, + }; + + const message = errorMessages[e.data?.code as string] || t("location_update_failed"); + showToast(message, "error"); + }, }); - const saveLocation = ( - newLocationType: EventLocationType["type"], - details: { - [key: string]: string; - } - ) => { - let newLocation = newLocationType as string; - const eventLocationType = getEventLocationType(newLocationType); - if (eventLocationType?.organizerInputType) { - newLocation = details[Object.keys(details)[0]]; + const saveLocation = async ({ + newLocation, + credentialId, + }: { + newLocation: string; + /** + * It could be set for conferencing locations that support team level installations. + */ + credentialId: number | null; + }) => { + try { + await setLocationMutation.mutateAsync({ + bookingId: booking.id, + newLocation, + credentialId, + }); + } catch { + // Errors are shown through the mutation onError handler } - setLocationMutation.mutate({ bookingId: booking.id, newLocation, details }); }; // Getting accepted recurring dates to show diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx index c07bd7154f8adf..279dc5202a4ee5 100644 --- a/apps/web/components/dialog/EditLocationDialog.tsx +++ b/apps/web/components/dialog/EditLocationDialog.tsx @@ -1,9 +1,7 @@ import { ErrorMessage } from "@hookform/error-message"; import { zodResolver } from "@hookform/resolvers/zod"; import { isValidPhoneNumber } from "libphonenumber-js"; -import { Trans } from "next-i18next"; -import Link from "next/link"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import { Controller, useForm, useWatch, useFormContext } from "react-hook-form"; import { z } from "zod"; @@ -12,25 +10,30 @@ import { getEventLocationType, getHumanReadableLocationValue, getMessageForOrganizer, + isAttendeeInputRequired, LocationType, OrganizerDefaultConferencingAppType, } from "@calcom/app-store/locations"; -import CheckboxField from "@calcom/features/form/components/CheckboxField"; import type { LocationOption } from "@calcom/features/form/components/LocationSelect"; import LocationSelect from "@calcom/features/form/components/LocationSelect"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import { Button, Icon, Input, Dialog, DialogContent, DialogFooter, Form, PhoneInput } from "@calcom/ui"; -import { QueryCell } from "@lib/QueryCell"; - -type BookingItem = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][number]; +import { QueryCell } from "../../lib/QueryCell"; interface ISetLocationDialog { - saveLocation: (newLocationType: EventLocationType["type"], details: { [key: string]: string }) => void; + saveLocation: ({ + newLocation, + credentialId, + }: { + newLocation: string; + credentialId: number | null; + }) => Promise; selection?: LocationOption; - booking?: BookingItem; + booking: { + location: string | null; + }; defaultValues?: LocationObject[]; setShowLocationModal: React.Dispatch>; isOpenDialog: boolean; @@ -100,8 +103,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { locationType: z.string(), phone: z.string().optional().nullable(), locationAddress: z.string().optional(), - credentialId: z.number().optional(), - teamName: z.string().optional(), + credentialId: z.number().nullable().optional(), locationLink: z .string() .optional() @@ -134,7 +136,6 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { } return; }), - displayLocationPublicly: z.boolean().optional(), locationPhoneNumber: z .string() .nullable() @@ -145,6 +146,8 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { .optional(), }); + const [isLocationUpdating, setIsLocationUpdating] = useState(false); + const locationFormMethods = useForm({ mode: "onSubmit", resolver: zodResolver(locationFormSchema), @@ -172,7 +175,10 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { } ); - const LocationOptions = (() => { + /** + * Depending on the location type that is selected, we show different input types or no input at all. + */ + const SelectedLocationInput = (() => { if (eventLocationType && eventLocationType.organizerInputType && LocationInput) { if (!eventLocationType.variable) { console.error("eventLocationType.variable can't be undefined"); @@ -203,25 +209,6 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { as="p" /> - {!booking && ( -
- ( - - locationFormMethods.setValue("displayLocationPublicly", e.target.checked) - } - informationIconText={t("display_location_info_badge")} - /> - )} - /> -
- )} ); } else { @@ -241,91 +228,51 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { - {!booking && ( -

- - Can't find the right conferencing app? Visit our - - App Store - - . - -

- )}
- {booking && ( - <> -

{t("current_location")}:

-

- {getHumanReadableLocationValue(booking.location, t)} -

- - )} +

{t("current_location")}:

+

+ {getHumanReadableLocationValue(booking.location, t)} +

{ - const { locationType: newLocation, displayLocationPublicly } = values; - - let details = {}; - if (newLocation === LocationType.InPerson) { - details = { - address: values.locationAddress, - }; - } - const eventLocationType = getEventLocationType(newLocation); - - // TODO: There can be a property that tells if it is to be saved in `link` - if ( - newLocation === LocationType.Link || - (!eventLocationType?.default && eventLocationType?.linkType === "static") - ) { - details = { link: values.locationLink }; - } - - if (newLocation === LocationType.UserPhone) { - details = { hostPhoneNumber: values.locationPhoneNumber }; - } - + const { locationType: newLocationType } = values; + let newLocation; + // For the locations that require organizer to type-in some values, we need the value if (eventLocationType?.organizerInputType) { - details = { - ...details, - displayLocationPublicly, - }; - } - - if (values.credentialId) { - details = { - ...details, - credentialId: values.credentialId, - }; + newLocation = values[eventLocationType.variable]; + } else { + // locationType itself can be used here e.g. For zoom we use the type itself which is "integrations:zoom". For Organizer's Default Conferencing App, it is OrganizerDefaultConferencingAppType constant + newLocation = newLocationType; } - if (values.teamName) { - details = { - ...details, - teamName: values.teamName, - }; + setIsLocationUpdating(true); + try { + await saveLocation({ + newLocation, + credentialId: values.credentialId ?? null, + }); + setIsLocationUpdating(false); + setShowLocationModal(false); + setSelectedLocation?.(undefined); + locationFormMethods.unregister([ + "locationType", + "locationLink", + "locationAddress", + "locationPhoneNumber", + ]); + } catch (error) { + // Let the user retry + setIsLocationUpdating(false); } - - saveLocation(newLocation, details); - setShowLocationModal(false); - setSelectedLocation?.(undefined); - locationFormMethods.unregister([ - "locationType", - "locationLink", - "locationAddress", - "locationPhoneNumber", - ]); }}> { if (!data.length) return null; - const locationOptions = [...data].map((option) => { + let locationOptions = [...data].map((option) => { if (teamId) { // Let host's Default conferencing App option show for Team Event return option; @@ -335,13 +282,11 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { options: option.options.filter((o) => o.value !== OrganizerDefaultConferencingAppType), }; }); - if (booking) { - locationOptions.map((location) => - location.options.filter( - (l) => !["phone", "attendeeInPerson", "somewhereElse"].includes(l.value) - ) - ); - } + + locationOptions = locationOptions.map((locationOption) => + filterLocationOptionsForBooking(locationOption) + ); + return ( { onChange={(val) => { if (val) { locationFormMethods.setValue("locationType", val.value); - if (typeof val.credentialId === "number" && val.credentialId >= 0) { - locationFormMethods.setValue("credentialId", val.credentialId); - locationFormMethods.setValue("teamName", val.teamName ?? ""); - } - + locationFormMethods.setValue("credentialId", val.credentialId); locationFormMethods.unregister([ "locationLink", "locationAddress", @@ -382,7 +323,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { ); }} /> - {selectedLocation && LocationOptions} + {selectedLocation && SelectedLocationInput} - @@ -407,3 +348,10 @@ export const EditLocationDialog = (props: ISetLocationDialog) => { ); }; + +function filterLocationOptionsForBooking(locationOption: T) { + return { + ...locationOption, + options: locationOption.options.filter((o) => !isAttendeeInputRequired(o.value)), + }; +} diff --git a/apps/web/components/dialog/__tests__/EditLocationDialog.test.tsx b/apps/web/components/dialog/__tests__/EditLocationDialog.test.tsx new file mode 100644 index 00000000000000..41578855364f60 --- /dev/null +++ b/apps/web/components/dialog/__tests__/EditLocationDialog.test.tsx @@ -0,0 +1,225 @@ +import { render, screen, fireEvent, waitFor } from "@testing-library/react"; +import * as React from "react"; +import { vi } from "vitest"; + +import LocationSelect from "@calcom/features/form/components/LocationSelect"; + +import { QueryCell } from "../../../lib/QueryCell"; +import { EditLocationDialog } from "../EditLocationDialog"; + +// // Mock the trpc hook +vi.mock("@calcom/trpc/react", () => ({ + trpc: { + viewer: { + locationOptions: { + useQuery: vi.fn(), + }, + }, + }, +})); + +vi.mock("@calcom/lib/hooks/useLocale", () => ({ + useLocale: () => ({ t: (key: string) => key }), +})); + +vi.mock("../../../lib/QueryCell", () => ({ + QueryCell: vi.fn(), +})); + +vi.mock("@calcom/features/form/components/LocationSelect", () => { + return { + default: vi.fn(), + }; +}); + +const AttendeePhoneNumberLabel = "Attendee Phone Number"; +const OrganizerPhoneLabel = "Organizer Phone Number"; +const CampfireLabel = "Campfire"; +const ZoomVideoLabel = "Zoom Video"; +const OrganizerDefaultConferencingAppLabel = "Organizer's default app"; + +describe("EditLocationDialog", () => { + const mockProps = { + saveLocation: vi.fn(), + setShowLocationModal: vi.fn(), + isOpenDialog: true, + }; + + beforeEach(() => { + vi.clearAllMocks(); + + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + QueryCell.mockImplementation(({ success }) => { + return success({ + data: [ + { + label: "Conferencing", + options: [ + { + value: "integrations:campfire_video", + label: CampfireLabel, + disabled: false, + icon: "/app-store/campfire/icon.svg", + slug: "campfire", + credentialId: 2, + teamName: null, + }, + { + value: "integrations:daily", + label: "Cal Video (Global)", + disabled: false, + icon: "/app-store/dailyvideo/icon.svg", + slug: "daily-video", + credentialId: 0, + teamName: "Global", + }, + { + value: "integrations:zoom", + label: ZoomVideoLabel, + disabled: false, + icon: "/app-store/zoomvideo/icon.svg", + slug: "zoom", + credentialId: 1, + teamName: null, + }, + { + label: "Organizer's default app", + value: "conferencing", + icon: "/link.svg", + }, + ], + }, + { + label: "in person", + options: [ + { + label: "In Person (Attendee Address)", + value: "attendeeInPerson", + icon: "/map-pin-dark.svg", + }, + { + label: "In Person (Organizer Address)", + value: "inPerson", + icon: "/map-pin-dark.svg", + }, + ], + }, + { + label: "Other", + options: [ + { + label: "Custom attendee location", + value: "somewhereElse", + icon: "/message-pin.svg", + }, + { + label: "Link meeting", + value: "link", + icon: "/link.svg", + }, + ], + }, + { + label: "phone", + options: [ + { + label: AttendeePhoneNumberLabel, + value: "phone", + icon: "/phone.svg", + }, + { + label: OrganizerPhoneLabel, + value: "userPhone", + icon: "/phone.svg", + }, + ], + }, + ], + }); + }); + + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + LocationSelect.mockImplementation( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + ({ options, defaultValue, onChange }: { options: any; defaultValue: any; onChange: any }) => { + return ( + + ); + } + ); + }); + + it("renders the dialog when open", () => { + // It shows whatever the location even if it isn't in the options list + render(); + expect(screen.getByText("edit_location")).toBeInTheDocument(); + expect(screen.getByText("current_location:")).toBeInTheDocument(); + expect(screen.getByText("Office")).toBeInTheDocument(); + }); + + it("closes the dialog when cancel is clicked", async () => { + render(); + fireEvent.click(screen.getByText("cancel")); + expect(mockProps.setShowLocationModal).toHaveBeenCalledWith(false); + }); + + describe("Team Booking Case", () => { + it("should not show Attendee Phone Number but show Organizer Phone Number and dynamic link Conferencing apps", async () => { + render(); + + expect(screen.queryByText(AttendeePhoneNumberLabel)).not.toBeInTheDocument(); + expect(screen.queryByText(OrganizerPhoneLabel)).toBeInTheDocument(); + expect(screen.queryByText(CampfireLabel)).toBeInTheDocument(); + expect(screen.queryByText(ZoomVideoLabel)).toBeInTheDocument(); + }); + + it("should update location to Organizer Default App", async () => { + render(); + + const select = screen.getByRole("combobox"); + fireEvent.change(select, { target: { value: "conferencing" } }); + // Submit the form + fireEvent.click(screen.getByText("update")); + + await waitFor(() => { + expect(mockProps.saveLocation).toHaveBeenCalledWith({ + newLocation: "conferencing", + credentialId: null, + }); + expect(mockProps.setShowLocationModal).toHaveBeenCalledWith(false); + }); + }); + }); + + describe("Non Team Booking Case", () => { + it("should not show Organizer's default app", async () => { + render(); + + expect(screen.queryByText(OrganizerDefaultConferencingAppLabel)).not.toBeInTheDocument(); + }); + }); +}); diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 57177a75218c54..0834ae22939b5b 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -1147,6 +1147,7 @@ "set_location": "Set Location", "update_location": "Update Location", "location_updated": "Location updated", + "location_update_failed": "Location update failed", "guests_added": "Guests added", "unable_to_add_guests": "Unable to add guests", "email_validation_error": "That doesn't look like an email address", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Set a default app link", "default_app_link_description": "Setting a default app link allows all newly created event types to use the app link you set.", "organizer_default_conferencing_app": "Organizer's default app", + "organizer_default_conferencing_app_not_found": "{{organizer}} has no default conferencing app", "under_maintenance": "Down for maintenance", "under_maintenance_description": "The {{appName}} team are performing scheduled maintenance. If you have any questions, please contact support.", "event_type_seats": "{{numberOfSeats}} seats", @@ -2596,6 +2598,7 @@ "number_of_options":"{{count}} options", "reschedule_with_same_round_robin_host_title": "Reschedule with same Round-Robin host", "reschedule_with_same_round_robin_host_description": "Rescheduled events will be assigned to the same host as initially scheduled", - "disable_input_if_prefilled": "Disable input if the URL identifier is prefilled", + "disable_input_if_prefilled": "Disable input if the URL identifier is prefilled", + "you_are_unauthorized_to_make_this_change_to_the_booking": "You are unauthorized to make this change to the booking", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/test/utils/bookingScenario/expects.ts b/apps/web/test/utils/bookingScenario/expects.ts index 61568a76fe7f01..48f6f818e09eca 100644 --- a/apps/web/test/utils/bookingScenario/expects.ts +++ b/apps/web/test/utils/bookingScenario/expects.ts @@ -763,6 +763,33 @@ export function expectSuccessfulBookingRescheduledEmails({ ); } +export function expectSuccesfulLocationChangeEmails({ + emails, + organizer, + location, +}: { + emails: Fixtures["emails"]; + organizer: { email: string; name: string }; + location: { + href: string; + linkText: string; + }; +}) { + expect(emails).toHaveEmail( + { + titleTag: "location_changed_event_type_subject", + links: [ + { + href: location.href, + text: location.linkText, + }, + ], + to: `${organizer.email}`, + }, + `${organizer.email}` + ); +} + export function expectAwaitingPaymentEmails({ emails, booker, diff --git a/packages/app-store/locations.ts b/packages/app-store/locations.ts index fd40c1240a187b..52255bb2735793 100644 --- a/packages/app-store/locations.ts +++ b/packages/app-store/locations.ts @@ -14,6 +14,7 @@ export type DefaultEventLocationType = { label: string; messageForOrganizer: string; category: "in person" | "conferencing" | "other" | "phone"; + linkType: "static"; iconUrl: string; urlRegExp?: string; @@ -101,6 +102,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "attendeeAddress", iconUrl: "/map-pin-dark.svg", category: "in person", + linkType: "static", }, { default: true, @@ -114,6 +116,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "somewhereElse", iconUrl: "/message-pin.svg", category: "other", + linkType: "static", }, { default: true, @@ -126,6 +129,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "address", iconUrl: "/map-pin-dark.svg", category: "in person", + linkType: "static", }, { default: true, @@ -137,6 +141,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "hostDefault", category: "conferencing", messageForOrganizer: "", + linkType: "static", }, { default: true, @@ -148,6 +153,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "link", iconUrl: "/link.svg", category: "other", + linkType: "static", }, { default: true, @@ -163,6 +169,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ // inputType: "phone" iconUrl: "/phone.svg", category: "phone", + linkType: "static", }, { default: true, @@ -174,6 +181,7 @@ export const defaultLocations: DefaultEventLocationType[] = [ defaultValueVariable: "hostPhoneNumber", iconUrl: "/phone.svg", category: "phone", + linkType: "static", }, ]; @@ -247,21 +255,20 @@ for (const [appName, meta] of Object.entries(appStoreMetadata)) { } } -const locationsTypes = [...defaultLocations, ...locationsFromApps]; -export const getStaticLinkBasedLocation = (locationType: string) => - locationsFromApps.find((l) => l.linkType === "static" && l.type === locationType); +const locations = [...defaultLocations, ...locationsFromApps]; -export const getEventLocationTypeFromApp = (locationType: string) => +export const getLocationFromApp = (locationType: string) => locationsFromApps.find((l) => l.type === locationType); +// TODO: Rename this to getLocationByType() export const getEventLocationType = (locationType: string | undefined | null) => - locationsTypes.find((l) => l.type === locationType); + locations.find((l) => l.type === locationType); -export const getEventLocationTypeFromValue = (value: string | undefined | null) => { +const getStaticLinkLocationByValue = (value: string | undefined | null) => { if (!value) { return null; } - return locationsTypes.find((l) => { + return locations.find((l) => { if (l.default || l.linkType == "dynamic" || !l.urlRegExp) { return; } @@ -270,7 +277,7 @@ export const getEventLocationTypeFromValue = (value: string | undefined | null) }; export const guessEventLocationType = (locationTypeOrValue: string | undefined | null) => - getEventLocationType(locationTypeOrValue) || getEventLocationTypeFromValue(locationTypeOrValue); + getEventLocationType(locationTypeOrValue) || getStaticLinkLocationByValue(locationTypeOrValue); export const LocationType = { ...DefaultEventLocationTypeEnum, ...AppStoreLocationType }; @@ -303,7 +310,7 @@ export const privacyFilteredLocations = (locations: LocationObject[]): PrivacyFi * @returns string */ export const getMessageForOrganizer = (location: string, t: TFunction) => { - const videoLocation = getEventLocationTypeFromApp(location); + const videoLocation = getLocationFromApp(location); const defaultLocation = defaultLocations.find((l) => l.type === location); if (defaultLocation) { return t(defaultLocation.messageForOrganizer); @@ -464,8 +471,17 @@ export const getTranslatedLocation = ( export const getOrganizerInputLocationTypes = () => { const result: DefaultEventLocationType["type"] | EventLocationTypeFromApp["type"][] = []; - const locations = locationsTypes.filter((location) => !!location.organizerInputType); - locations?.forEach((l) => result.push(l.type)); + const organizerInputTypeLocations = locations.filter((location) => !!location.organizerInputType); + organizerInputTypeLocations?.forEach((l) => result.push(l.type)); return result; }; + +export const isAttendeeInputRequired = (locationType: string) => { + const location = locations.find((l) => l.type === locationType); + if (!location) { + // Consider throwing an error here. This shouldn't happen normally. + return false; + } + return location.attendeeInputType; +}; diff --git a/packages/core/EventManager.ts b/packages/core/EventManager.ts index 700b1c52d2b943..40799a2c308247 100644 --- a/packages/core/EventManager.ts +++ b/packages/core/EventManager.ts @@ -7,7 +7,7 @@ import type { z } from "zod"; import { getCalendar } from "@calcom/app-store/_utils/getCalendar"; import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApiAdapter"; import { appKeysSchema as calVideoKeysSchema } from "@calcom/app-store/dailyvideo/zod"; -import { getEventLocationTypeFromApp, MeetLocationType } from "@calcom/app-store/locations"; +import { getLocationFromApp, MeetLocationType } from "@calcom/app-store/locations"; import getApps from "@calcom/app-store/utils"; import { getUid } from "@calcom/lib/CalEventParser"; import logger from "@calcom/lib/logger"; @@ -57,7 +57,7 @@ const latestCredentialFirst = (a: T, b: T) => { }; export const getLocationRequestFromIntegration = (location: string) => { - const eventLocationType = getEventLocationTypeFromApp(location); + const eventLocationType = getLocationFromApp(location); if (eventLocationType) { const requestId = uuidv5(location, uuidv5.URL); diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index dc99444a7064eb..a7ab6b65bd1d14 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -1396,7 +1396,7 @@ async function handler( safeStringify({ error, results }) ); } else { - const metadata: AdditionalInformation = {}; + const additionalInformation: AdditionalInformation = {}; if (results.length) { // Handle Google Meet results @@ -1451,12 +1451,14 @@ async function handler( } } // TODO: Handle created event metadata more elegantly - metadata.hangoutLink = results[0].createdEvent?.hangoutLink; - metadata.conferenceData = results[0].createdEvent?.conferenceData; - metadata.entryPoints = results[0].createdEvent?.entryPoints; + additionalInformation.hangoutLink = results[0].createdEvent?.hangoutLink; + additionalInformation.conferenceData = results[0].createdEvent?.conferenceData; + additionalInformation.entryPoints = results[0].createdEvent?.entryPoints; evt.appsStatus = handleAppsStatus(results, booking, reqAppsStatus); videoCallUrl = - metadata.hangoutLink || organizerOrFirstDynamicGroupMemberDefaultLocationUrl || videoCallUrl; + additionalInformation.hangoutLink || + organizerOrFirstDynamicGroupMemberDefaultLocationUrl || + videoCallUrl; if (evt.iCalUID !== booking.iCalUID) { // The eventManager could change the iCalUID. At this point we can update the DB record @@ -1497,7 +1499,7 @@ async function handler( await sendScheduledEmails( { ...evt, - additionalInformation: metadata, + additionalInformation, additionalNotes, customInputs, }, diff --git a/packages/lib/__tests__/buildCalEventFromBooking.test.ts b/packages/lib/__tests__/buildCalEventFromBooking.test.ts new file mode 100644 index 00000000000000..d88a07c6df99e5 --- /dev/null +++ b/packages/lib/__tests__/buildCalEventFromBooking.test.ts @@ -0,0 +1,208 @@ +import { describe, it, expect, vi, beforeEach } from "vitest"; + +import dayjs from "@calcom/dayjs"; + +import { buildCalEventFromBooking } from "../buildCalEventFromBooking"; +import { parseRecurringEvent } from "../isRecurringEvent"; +import { getTranslation } from "../server"; + +// Mock dependencies +vi.mock("../isRecurringEvent", () => ({ + parseRecurringEvent: vi.fn(), +})); + +vi.mock("../server", () => ({ + getTranslation: vi.fn(), +})); + +// Helper functions +const createOrganizer = (overrides = {}) => ({ + email: "organizer@example.com", + name: "Organizer", + timeZone: "UTC", + locale: "en", + ...overrides, +}); + +const createAttendee = (overrides = {}) => ({ + name: "Attendee 1", + email: "attendee1@example.com", + timeZone: "UTC", + locale: "en", + ...overrides, +}); + +const createBooking = (overrides = {}) => ({ + title: "Test Booking", + description: "Test Description", + startTime: new Date("2023-04-01T10:00:00Z"), + endTime: new Date("2023-04-01T11:00:00Z"), + userPrimaryEmail: "user@example.com", + uid: "test-uid", + attendees: [createAttendee()], + eventType: { + title: "Test Event Type", + seatsPerTimeSlot: 5, + seatsShowAttendees: true, + recurringEvent: { + frequency: "daily", + interval: 1, + endDate: new Date("2023-04-01T11:00:00Z"), + }, + }, + destinationCalendar: null, + user: null, + ...overrides, +}); + +describe("buildCalEventFromBooking", () => { + beforeEach(() => { + // vi.resetAllMocks(); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + getTranslation.mockImplementation((locale: string, namespace: string) => { + // eslint-disable-next-line @typescript-eslint/no-empty-function + const translate = () => {}; + translate.locale = locale; + translate.namespace = namespace; + return translate; + }); + + parseRecurringEvent.mockImplementation((recurringEvent) => { + if (!recurringEvent) { + return { parsed: true }; + } + return { ...recurringEvent, parsed: true }; + }); + }); + + it("should build a calendar event from a booking", async () => { + const booking = createBooking({ + title: "Booking Title", + }); + const organizer = createOrganizer(); + const location = "Test Location"; + const conferenceCredentialId = 123; + + const result = await buildCalEventFromBooking({ + booking, + organizer, + location, + conferenceCredentialId, + }); + + expect(result).toEqual({ + title: booking.title, + type: booking.eventType.title, + description: booking.description, + startTime: dayjs(booking.startTime).format(), + endTime: dayjs(booking.endTime).format(), + organizer: { + email: booking.userPrimaryEmail, + name: organizer.name, + timeZone: organizer.timeZone, + language: { translate: expect.any(Function), locale: "en" }, + }, + attendees: [ + { + name: booking.attendees[0].name, + email: booking.attendees[0].email, + timeZone: booking.attendees[0].timeZone, + language: { translate: expect.any(Function), locale: "en" }, + }, + ], + uid: booking.uid, + recurringEvent: { + ...booking.eventType?.recurringEvent, + parsed: true, + }, + location, + conferenceCredentialId: conferenceCredentialId, + destinationCalendar: [], + seatsPerTimeSlot: booking.eventType?.seatsPerTimeSlot, + seatsShowAttendees: true, + }); + + expect(parseRecurringEvent).toHaveBeenCalledWith(booking.eventType?.recurringEvent); + }); + + it("should handle missing optional fields", async () => { + const booking = createBooking({ + title: "", + description: null, + startTime: null, + endTime: null, + userPrimaryEmail: null, + attendees: [], + eventType: null, + }); + + const organizer = createOrganizer({ name: null, locale: null }); + const location = ""; + const conferenceCredentialId = null; + + const result = await buildCalEventFromBooking({ + booking, + organizer, + location, + conferenceCredentialId, + }); + + expect(result).toEqual({ + title: booking.title, + type: "", + description: "", + startTime: "", + endTime: "", + organizer: { + email: organizer.email, + name: "Nameless", + timeZone: organizer.timeZone, + language: { translate: expect.any(Function), locale: "en" }, + }, + attendees: [], + uid: "test-uid", + recurringEvent: { + parsed: true, + }, + location: "", + conferenceCredentialId: undefined, + destinationCalendar: [], + seatsPerTimeSlot: undefined, + seatsShowAttendees: undefined, + }); + + // @ts-expect-error - locale is set in mock + expect(result.organizer.language.translate.locale).toBe("en"); + // @ts-expect-error - namespace is set in mock + expect(result.organizer.language.translate.namespace).toBe("common"); + }); + + it("should use user destination calendar when booking destination calendar is null", async () => { + const booking = createBooking({ + destinationCalendar: null, + user: { + destinationCalendar: { + id: 1, + integration: "test-integration", + externalId: "external-id", + primaryEmail: "user@example.com", + userId: 1, + eventTypeId: 1, + credentialId: 1, + }, + }, + }); + + const organizer = createOrganizer(); + + const result = await buildCalEventFromBooking({ + booking, + organizer, + location: "", + conferenceCredentialId: null, + }); + + expect(result.destinationCalendar).toEqual([booking.user.destinationCalendar]); + }); +}); diff --git a/packages/lib/buildCalEventFromBooking.ts b/packages/lib/buildCalEventFromBooking.ts new file mode 100644 index 00000000000000..ede1d436f18561 --- /dev/null +++ b/packages/lib/buildCalEventFromBooking.ts @@ -0,0 +1,106 @@ +import type { Prisma } from "@prisma/client"; + +import dayjs from "@calcom/dayjs"; + +import { parseRecurringEvent } from "./isRecurringEvent"; +import { getTranslation } from "./server"; + +type DestinationCalendar = { + id: number; + integration: string; + externalId: string; + primaryEmail: string | null; + userId: number | null; + eventTypeId: number | null; + credentialId: number | null; +} | null; + +type Attendee = { + email: string; + name: string; + timeZone: string; + locale: string | null; +}; + +type Organizer = { + email: string; + name: string | null; + timeZone: string; + locale: string | null; +}; + +type EventType = { + title: string; + recurringEvent: Prisma.JsonValue | null; + seatsPerTimeSlot: number | null; + seatsShowAttendees: boolean | null; +}; + +type Booking = { + title: string; + description: string | null; + startTime: Date | null; + endTime: Date | null; + userPrimaryEmail: string | null; + uid: string; + destinationCalendar: DestinationCalendar; + user: { + destinationCalendar: DestinationCalendar; + } | null; + attendees: Attendee[]; + eventType: EventType | null; +}; + +export const buildCalEventFromBooking = async ({ + booking, + organizer, + location, + conferenceCredentialId, +}: { + booking: Booking; + organizer: Organizer; + location: string; + conferenceCredentialId: number | null; +}) => { + const attendeesList = await Promise.all( + booking.attendees.map(async (attendee) => { + return { + name: attendee.name, + email: attendee.email, + timeZone: attendee.timeZone, + language: { + translate: await getTranslation(attendee.locale ?? "en", "common"), + locale: attendee.locale ?? "en", + }, + }; + }) + ); + + const tOrganizer = await getTranslation(organizer.locale ?? "en", "common"); + + return { + title: booking.title || "", + type: (booking.eventType?.title as string) || booking.title || "", + description: booking.description || "", + startTime: booking.startTime ? dayjs(booking.startTime).format() : "", + endTime: booking.endTime ? dayjs(booking.endTime).format() : "", + organizer: { + email: booking.userPrimaryEmail ?? organizer.email, + name: organizer.name ?? "Nameless", + timeZone: organizer.timeZone, + language: { translate: tOrganizer, locale: organizer.locale ?? "en" }, + }, + attendees: attendeesList, + uid: booking.uid, + recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent), + location, + conferenceCredentialId: conferenceCredentialId ?? undefined, + destinationCalendar: booking.destinationCalendar + ? [booking.destinationCalendar] + : booking.user?.destinationCalendar + ? [booking.user?.destinationCalendar] + : [], + seatsPerTimeSlot: booking.eventType?.seatsPerTimeSlot, + seatsShowAttendees: booking.eventType?.seatsShowAttendees, + }; +}; diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts index b5d85a31f092e4..87581b3856d07e 100644 --- a/packages/lib/server/repository/booking.ts +++ b/packages/lib/server/repository/booking.ts @@ -171,4 +171,29 @@ export class BookingRepository { }, }); } + + static async updateLocationById({ + where: { id }, + data: { location, metadata, referencesToCreate }, + }: { + where: { id: number }; + data: { + location: string; + metadata: Record; + referencesToCreate: Prisma.BookingReferenceCreateInput[]; + }; + }) { + await prisma.booking.update({ + where: { + id, + }, + data: { + location, + metadata, + references: { + create: referencesToCreate, + }, + }, + }); + } } diff --git a/packages/lib/server/repository/credential.ts b/packages/lib/server/repository/credential.ts index b5a81f36a3d4f9..8f2d50a2874006 100644 --- a/packages/lib/server/repository/credential.ts +++ b/packages/lib/server/repository/credential.ts @@ -1,9 +1,27 @@ import type { Prisma } from "@prisma/client"; import { prisma } from "@calcom/prisma"; +import { safeCredentialSelect } from "@calcom/prisma/selects/credential"; export class CredentialRepository { static async create(data: Prisma.CredentialCreateInput) { return await prisma.credential.create({ data }); } + + /** + * Doesn't retrieve key field as that has credentials + */ + static async findFirstByIdWithUser({ id }: { id: number }) { + return await prisma.credential.findFirst({ where: { id }, select: safeCredentialSelect }); + } + + /** + * Includes 'key' field which is sensitive data. + */ + static async findFirstByIdWithKeyAndUser({ id }: { id: number }) { + return await prisma.credential.findFirst({ + where: { id }, + select: { ...safeCredentialSelect, key: true }, + }); + } } diff --git a/packages/lib/server/repository/user.ts b/packages/lib/server/repository/user.ts index 91c7a29f6c14b7..e67f3415995b93 100644 --- a/packages/lib/server/repository/user.ts +++ b/packages/lib/server/repository/user.ts @@ -9,6 +9,7 @@ import prisma from "@calcom/prisma"; import { Prisma } from "@calcom/prisma/client"; import type { User as UserType } from "@calcom/prisma/client"; import { MembershipRole } from "@calcom/prisma/enums"; +import { userMetadata } from "@calcom/prisma/zod-utils"; import type { UpId, UserProfile } from "@calcom/types/UserProfile"; import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "../../availability"; @@ -249,6 +250,17 @@ export class UserRepository { if (!user) { return null; } + return { + ...user, + metadata: userMetadata.parse(user.metadata), + }; + } + + static async findByIdOrThrow({ id }: { id: number }) { + const user = await UserRepository.findById({ id }); + if (!user) { + throw new Error(`User with id ${id} not found`); + } return user; } diff --git a/packages/trpc/server/routers/viewer/bookings/__tests__/editLocation.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/__tests__/editLocation.handler.test.ts new file mode 100644 index 00000000000000..0b6c1e0425dfaa --- /dev/null +++ b/packages/trpc/server/routers/viewer/bookings/__tests__/editLocation.handler.test.ts @@ -0,0 +1,264 @@ +import { + createBookingScenario, + getOrganizer, + TestData, + getScenarioData, +} from "@calcom/web/test/utils/bookingScenario/bookingScenario"; +import { getZoomAppCredential } from "@calcom/web/test/utils/bookingScenario/bookingScenario"; +import { expectSuccesfulLocationChangeEmails } from "@calcom/web/test/utils/bookingScenario/expects"; +import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown"; + +import { describe, expect, vi, beforeEach } from "vitest"; + +import { prisma } from "@calcom/prisma"; +import { BookingStatus } from "@calcom/prisma/enums"; +import { test } from "@calcom/web/test/fixtures/fixtures"; + +import { + editLocationHandler, + getLocationForOrganizerDefaultConferencingAppInEvtFormat, + SystemError, + UserError, +} from "../editLocation.handler"; + +describe("getLocationForOrganizerDefaultConferencingAppInEvtFormat", () => { + const mockTranslate = vi.fn((key: string) => key); + + beforeEach(() => { + vi.resetAllMocks(); + }); + + describe("Dynamic link apps", () => { + test("should return the app type for Zoom", () => { + const organizer = { + name: "Test Organizer", + metadata: { + defaultConferencingApp: { + appSlug: "zoom", + }, + }, + }; + + const result = getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }); + + expect(result).toBe("integrations:zoom"); + }); + + test("should return the app type for Google Meet", () => { + const organizer = { + name: "Test Organizer", + metadata: { + defaultConferencingApp: { + appSlug: "google-meet", + }, + }, + }; + + const result = getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }); + + expect(result).toBe("integrations:google:meet"); + }); + }); + + describe("Static link apps", () => { + test("should return the app type for Campfire", () => { + const organizer = { + name: "Test Organizer", + metadata: { + defaultConferencingApp: { + appSlug: "campfire", + appLink: "https://campfire.com", + }, + }, + }; + const result = getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }); + expect(result).toBe("https://campfire.com"); + }); + }); + + describe("Error handling", () => { + test("should throw a UserError if defaultConferencingApp is not set", () => { + const organizer = { + name: "Test Organizer", + metadata: null, + }; + + expect(() => + getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }) + ).toThrow(UserError); + expect(mockTranslate).toHaveBeenCalledWith("organizer_default_conferencing_app_not_found", { + organizer: "Test Organizer", + }); + }); + + test("should throw a SystemError if the app is not found", () => { + const organizer = { + name: "Test Organizer", + metadata: { + defaultConferencingApp: { + appSlug: "invalid-app", + }, + }, + }; + + expect(() => + getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }) + ).toThrow(SystemError); + }); + + test("should throw a SystemError for static link apps if appLink is missing", () => { + const organizer = { + name: "Test Organizer", + metadata: { + defaultConferencingApp: { + appSlug: "no-link-app", + }, + }, + }; + + expect(() => + getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: mockTranslate, + }) + ).toThrow(SystemError); + }); + }); +}); + +describe("editLocation.handler", () => { + setupAndTeardown(); + + describe("Changing organizer default conferencing app", () => { + test("should update the booking location when organizer's default conferencing app changes", async ({ + emails, + }) => { + const scenarioData = { + organizer: getOrganizer({ + name: "Organizer", + email: "organizer@example.com", + id: 101, + schedules: [TestData.schedules.IstWorkHours], + credentials: [getZoomAppCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: "google_calendar", + externalId: "organizer@google-calendar.com", + }, + metadata: { + defaultConferencingApp: { + appSlug: "campfire", + appLink: "https://campfire.com", + }, + }, + }), + eventTypes: [ + { + id: 1, + slotInterval: 45, + length: 45, + users: [{ id: 101 }], + }, + ], + bookings: [ + { + id: 1, + uid: "booking-1", + eventTypeId: 1, + status: BookingStatus.ACCEPTED, + startTime: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString(), + endTime: new Date(Date.now() + 25 * 60 * 60 * 1000).toISOString(), + userId: 101, + attendees: [ + { + id: 102, + name: "Attendee 1", + email: "attendee1@example.com", + timeZone: "Asia/Kolkata", + }, + ], + }, + ], + apps: [TestData.apps["zoom"], TestData.apps["google-meet"]], + }; + + await createBookingScenario(getScenarioData(scenarioData)); + + const booking = await prisma.booking.findFirst({ + where: { + uid: scenarioData.bookings[0].uid, + }, + include: { + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true + user: true, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true + attendees: true, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true + references: true, + }, + }); + + const organizerUser = await prisma.user.findFirst({ + where: { + id: scenarioData.organizer.id, + }, + }); + + expect(booking).not.toBeNull(); + + // Simulate changing the organizer's default conferencing app to Google Meet + const updatedOrganizer = { + ...booking.user, + metadata: { + ...booking.user.metadata, + defaultConferencingApp: { + appSlug: "google-meet", + }, + }, + }; + + await editLocationHandler({ + ctx: { + booking, + user: organizerUser, + }, + input: { + newLocation: "conferencing", + }, + currentUserId: updatedOrganizer.id, + }); + + const updatedBooking = await prisma.booking.findFirstOrThrow({ + where: { + uid: scenarioData.bookings[0].uid, + }, + }); + + expect(updatedBooking.location).toBe("https://campfire.com"); + + expectSuccesfulLocationChangeEmails({ + emails, + organizer: organizerUser, + location: { + href: "https://campfire.com", + linkText: "Link", + }, + }); + }); + }); +}); diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts index f8fcd4bd540ad8..cb6ae567387774 100644 --- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts @@ -1,15 +1,25 @@ +import type { z } from "zod"; + +import { getEventLocationType, OrganizerDefaultConferencingAppType } from "@calcom/app-store/locations"; +import { getAppFromSlug } from "@calcom/app-store/utils"; import EventManager from "@calcom/core/EventManager"; -import dayjs from "@calcom/dayjs"; import { sendLocationChangeEmails } from "@calcom/emails"; -import { parseRecurringEvent } from "@calcom/lib"; +import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; +import { buildCalEventFromBooking } from "@calcom/lib/buildCalEventFromBooking"; import logger from "@calcom/lib/logger"; +import { safeStringify } from "@calcom/lib/safeStringify"; import { getTranslation } from "@calcom/lib/server"; import { getUsersCredentials } from "@calcom/lib/server/getUsersCredentials"; +import { BookingRepository } from "@calcom/lib/server/repository/booking"; +import { CredentialRepository } from "@calcom/lib/server/repository/credential"; +import { UserRepository } from "@calcom/lib/server/repository/user"; import { prisma } from "@calcom/prisma"; -import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; +import type { Prisma, Booking, BookingReference } from "@calcom/prisma/client"; +import type { userMetadata } from "@calcom/prisma/zod-utils"; import type { EventTypeMetadata } from "@calcom/prisma/zod-utils"; import type { AdditionalInformation, CalendarEvent } from "@calcom/types/Calendar"; import type { CredentialPayload } from "@calcom/types/Credential"; +import type { Ensure } from "@calcom/types/utils"; import { TRPCError } from "@trpc/server"; @@ -17,6 +27,7 @@ import type { TrpcSessionUser } from "../../../trpc"; import type { TEditLocationInputSchema } from "./editLocation.schema"; import type { BookingsProcedureContext } from "./util"; +// #region EditLocation Types and Helpers type EditLocationOptions = { ctx: { user: NonNullable; @@ -24,124 +35,255 @@ type EditLocationOptions = { input: TEditLocationInputSchema; }; -export const editLocationHandler = async ({ ctx, input }: EditLocationOptions) => { - const { bookingId, newLocation: location, details } = input; - const { booking } = ctx; +type UserMetadata = z.infer; - try { - const organizer = await prisma.user.findFirstOrThrow({ - where: { - id: booking.userId || 0, +async function updateLocationInConnectedAppForBooking({ + evt, + eventManager, + booking, +}: { + evt: CalendarEvent; + eventManager: EventManager; + booking: Booking & { + references: BookingReference[]; + }; +}) { + const updatedResult = await eventManager.updateLocation(evt, booking); + const results = updatedResult.results; + if (results.length > 0 && results.every((res) => !res.success)) { + const error = { + errorCode: "BookingUpdateLocationFailed", + message: "Updating location failed", + }; + logger.error(`Updating location failed`, safeStringify(error), safeStringify(results)); + throw new SystemError("Updating location failed"); + } + logger.info(`Got results from updateLocationInConnectedApp`, safeStringify(updatedResult.results)); + return updatedResult; +} + +function extractAdditionalInformation(result: { + updatedEvent: AdditionalInformation; +}): AdditionalInformation { + const additionalInformation: AdditionalInformation = {}; + if (result) { + additionalInformation.hangoutLink = result.updatedEvent?.hangoutLink; + additionalInformation.conferenceData = result.updatedEvent?.conferenceData; + additionalInformation.entryPoints = result.updatedEvent?.entryPoints; + } + return additionalInformation; +} + +async function updateBookingLocationInDb({ + booking, + evt, + referencesToCreate, +}: { + booking: { + id: number; + metadata: Booking["metadata"]; + }; + evt: Ensure; + referencesToCreate: Prisma.BookingReferenceCreateInput[]; +}) { + const bookingMetadataUpdate = { + videoCallUrl: getVideoCallUrlFromCalEvent(evt), + }; + + await BookingRepository.updateLocationById({ + data: { + location: evt.location, + metadata: { + ...(typeof booking.metadata === "object" && booking.metadata), + ...bookingMetadataUpdate, }, - select: { - name: true, - email: true, - timeZone: true, - locale: true, + referencesToCreate, + }, + where: { + id: booking.id, + }, + }); + + await prisma.booking.update({ + where: { + id: booking.id, + }, + data: { + location: evt.location, + metadata: { + ...(typeof booking.metadata === "object" && booking.metadata), + ...bookingMetadataUpdate, }, - }); + references: { + create: referencesToCreate, + }, + }, + }); +} - let conferenceCredential: CredentialPayload | null = null; +async function getAllCredentials({ + user, + conferenceCredentialId, +}: { + user: { id: number }; + conferenceCredentialId: number | null; +}) { + const credentials = await getUsersCredentials(user); - if (details?.credentialId) { - conferenceCredential = await prisma.credential.findFirst({ - where: { - id: details.credentialId, - }, - select: credentialForCalendarServiceSelect, - }); - } + let conferenceCredential: CredentialPayload | null = null; - const tOrganizer = await getTranslation(organizer.locale ?? "en", "common"); - - const attendeesListPromises = booking.attendees.map(async (attendee) => { - return { - name: attendee.name, - email: attendee.email, - timeZone: attendee.timeZone, - language: { - translate: await getTranslation(attendee.locale ?? "en", "common"), - locale: attendee.locale ?? "en", - }, - }; + if (conferenceCredentialId) { + conferenceCredential = await CredentialRepository.findFirstByIdWithKeyAndUser({ + id: conferenceCredentialId, }); + } + return [...(credentials ? credentials : []), ...(conferenceCredential ? [conferenceCredential] : [])]; +} - const attendeesList = await Promise.all(attendeesListPromises); +async function getLocationInEvtFormatOrThrow({ + location, + organizer, + loggedInUserTranslate, +}: { + location: string; + organizer: { + name: string | null; + metadata: UserMetadata; + }; + loggedInUserTranslate: Awaited>; +}) { + if (location !== OrganizerDefaultConferencingAppType) { + return location; + } - const evt: CalendarEvent = { - title: booking.title || "", - type: (booking.eventType?.title as string) || booking?.title || "", - description: booking.description || "", - startTime: booking.startTime ? dayjs(booking.startTime).format() : "", - endTime: booking.endTime ? dayjs(booking.endTime).format() : "", + try { + return getLocationForOrganizerDefaultConferencingAppInEvtFormat({ organizer: { - email: booking?.userPrimaryEmail ?? organizer.email, - name: organizer.name ?? "Nameless", - timeZone: organizer.timeZone, - language: { translate: tOrganizer, locale: organizer.locale ?? "en" }, + name: organizer.name ?? "Organizer", + metadata: organizer.metadata, }, - attendees: attendeesList, - uid: booking.uid, - recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent), - location, - conferenceCredentialId: details?.credentialId, - destinationCalendar: booking?.destinationCalendar - ? [booking?.destinationCalendar] - : booking?.user?.destinationCalendar - ? [booking?.user?.destinationCalendar] - : [], - seatsPerTimeSlot: booking.eventType?.seatsPerTimeSlot, - seatsShowAttendees: booking.eventType?.seatsShowAttendees, - }; + loggedInUserTranslate, + }); + } catch (e) { + if (e instanceof UserError) { + throw new TRPCError({ code: "BAD_REQUEST", message: e.message }); + } + logger.error(safeStringify(e)); + throw e; + } +} +// #endregion - const credentials = await getUsersCredentials(ctx.user); +/** + * An error that should be shown to the user + */ +export class UserError extends Error { + constructor(message: string) { + super(message); + this.name = "LocationError"; + } +} - const eventManager = new EventManager({ - ...ctx.user, - credentials: [ - ...(credentials ? credentials : []), - ...(conferenceCredential ? [conferenceCredential] : []), - ], - }); +/** + * An error that should not be shown to the user + */ +export class SystemError extends Error { + constructor(message: string) { + super(message); + this.name = "SystemError"; + } +} - const updatedResult = await eventManager.updateLocation(evt, booking); - const results = updatedResult.results; - if (results.length > 0 && results.every((res) => !res.success)) { - const error = { - errorCode: "BookingUpdateLocationFailed", - message: "Updating location failed", - }; - logger.error(`Booking ${ctx.user.username} failed`, error, results); - } else { - await prisma.booking.update({ - where: { - id: bookingId, - }, - data: { - location, - references: { - create: updatedResult.referencesToCreate, - }, - }, - }); - - const metadata: AdditionalInformation = {}; - if (results.length) { - metadata.hangoutLink = results[0].updatedEvent?.hangoutLink; - metadata.conferenceData = results[0].updatedEvent?.conferenceData; - metadata.entryPoints = results[0].updatedEvent?.entryPoints; - } - try { - await sendLocationChangeEmails( - { ...evt, additionalInformation: metadata }, - booking?.eventType?.metadata as EventTypeMetadata - ); - } catch (error) { - console.log("Error sending LocationChangeEmails"); - } - } - } catch { - throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" }); +export function getLocationForOrganizerDefaultConferencingAppInEvtFormat({ + organizer, + loggedInUserTranslate: translate, +}: { + organizer: { + name: string; + metadata: { + defaultConferencingApp?: NonNullable["defaultConferencingApp"]; + } | null; + }; + /** + * translate is used to translate if any error is thrown + */ + loggedInUserTranslate: Awaited>; +}) { + const organizerMetadata = organizer.metadata; + const defaultConferencingApp = organizerMetadata?.defaultConferencingApp; + if (!defaultConferencingApp) { + throw new UserError( + translate("organizer_default_conferencing_app_not_found", { organizer: organizer.name }) + ); + } + const defaultConferencingAppSlug = defaultConferencingApp.appSlug; + const app = getAppFromSlug(defaultConferencingAppSlug); + if (!app) { + throw new SystemError(`Default conferencing app ${defaultConferencingAppSlug} not found`); + } + const defaultConferencingAppLocationType = app.appData?.location?.type; + if (!defaultConferencingAppLocationType) { + throw new SystemError("Default conferencing app has no location type"); } + + const location = defaultConferencingAppLocationType; + const locationType = getEventLocationType(location); + if (!locationType) { + throw new SystemError(`Location type not found: ${location}`); + } + + if (locationType.linkType === "dynamic") { + // Dynamic location type need to return the location as it is e.g. integrations:zoom_video + return location; + } + + const appLink = defaultConferencingApp.appLink; + if (!appLink) { + throw new SystemError(`Default conferencing app ${defaultConferencingAppSlug} has no app link`); + } + return appLink; +} + +export async function editLocationHandler({ ctx, input }: EditLocationOptions) { + const { newLocation, credentialId: conferenceCredentialId } = input; + const { booking, user: loggedInUser } = ctx; + + const organizer = await UserRepository.findByIdOrThrow({ id: booking.userId || 0 }); + + const newLocationInEvtFormat = await getLocationInEvtFormatOrThrow({ + location: newLocation, + organizer, + loggedInUserTranslate: await getTranslation(loggedInUser.locale ?? "en", "common"), + }); + + const evt = await buildCalEventFromBooking({ + booking, + organizer, + location: newLocationInEvtFormat, + conferenceCredentialId, + }); + + const eventManager = new EventManager({ + ...ctx.user, + credentials: await getAllCredentials({ user: ctx.user, conferenceCredentialId }), + }); + + const updatedResult = await updateLocationInConnectedAppForBooking({ + booking, + eventManager, + evt, + }); + + await updateBookingLocationInDb({ booking, evt, referencesToCreate: updatedResult.referencesToCreate }); + + try { + await sendLocationChangeEmails( + { ...evt, additionalInformation: extractAdditionalInformation(updatedResult.results[0]) }, + booking?.eventType?.metadata as EventTypeMetadata + ); + } catch (error) { + console.log("Error sending LocationChangeEmails", safeStringify(error)); + } + return { message: "Location updated" }; -}; +} diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts index fb6e67b90fea8b..2fbf0e8a4e5d00 100644 --- a/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts +++ b/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts @@ -6,7 +6,7 @@ import { commonBookingSchema } from "./types"; export const ZEditLocationInputSchema = commonBookingSchema.extend({ newLocation: z.string().transform((val) => val || DailyLocationType), - details: z.object({ credentialId: z.number().optional() }).optional(), + credentialId: z.number().nullable(), }); export type TEditLocationInputSchema = z.infer; diff --git a/packages/trpc/server/routers/viewer/bookings/util.ts b/packages/trpc/server/routers/viewer/bookings/util.ts index ae8668987c46d4..fdf5ad7b887ca1 100644 --- a/packages/trpc/server/routers/viewer/bookings/util.ts +++ b/packages/trpc/server/routers/viewer/bookings/util.ts @@ -1,11 +1,12 @@ -import type { - Attendee, - Booking, - BookingReference, - Credential, - DestinationCalendar, - EventType, - User, +import { + MembershipRole, + type Attendee, + type Booking, + type BookingReference, + type Credential, + type DestinationCalendar, + type EventType, + type User, } from "@prisma/client"; import { prisma } from "@calcom/prisma"; @@ -21,8 +22,44 @@ export const bookingsProcedure = authedProcedure .use(async ({ ctx, input, next }) => { // Endpoints that just read the logged in user's data - like 'list' don't necessary have any input const { bookingId } = input; + const loggedInUser = ctx.user; + const bookingInclude = { + attendees: true, + eventType: true, + destinationCalendar: true, + references: true, + user: { + include: { + destinationCalendar: true, + credentials: true, + }, + }, + }; - const booking = await prisma.booking.findFirst({ + const bookingByBeingAdmin = await prisma.booking.findFirst({ + where: { + id: bookingId, + eventType: { + team: { + members: { + some: { + userId: loggedInUser.id, + role: { + in: [MembershipRole.ADMIN, MembershipRole.OWNER], + }, + }, + }, + }, + }, + }, + include: bookingInclude, + }); + + if (!!bookingByBeingAdmin) { + return next({ ctx: { booking: bookingByBeingAdmin } }); + } + + const bookingByBeingOrganizerOrCollectiveEventMember = await prisma.booking.findFirst({ where: { id: bookingId, AND: [ @@ -45,23 +82,12 @@ export const bookingsProcedure = authedProcedure }, ], }, - include: { - attendees: true, - eventType: true, - destinationCalendar: true, - references: true, - user: { - include: { - destinationCalendar: true, - credentials: true, - }, - }, - }, + include: bookingInclude, }); - if (!booking) throw new TRPCError({ code: "UNAUTHORIZED" }); + if (!bookingByBeingOrganizerOrCollectiveEventMember) throw new TRPCError({ code: "UNAUTHORIZED" }); - return next({ ctx: { booking } }); + return next({ ctx: { booking: bookingByBeingOrganizerOrCollectiveEventMember } }); }); export type BookingsProcedureContext = { diff --git a/packages/ui/components/test-setup.ts b/packages/ui/components/test-setup.ts index 36cbce484274b8..0650038897f602 100644 --- a/packages/ui/components/test-setup.ts +++ b/packages/ui/components/test-setup.ts @@ -1,7 +1,11 @@ import matchers from "@testing-library/jest-dom/matchers"; import { cleanup } from "@testing-library/react"; +import React from "react"; import { afterEach, expect, vi } from "vitest"; +// For next.js webapp compponent that use "preserve" for jsx in tsconfig.json +global.React = React; + vi.mock("next-auth/react", () => ({ useSession() { return {}; diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 3e2c5791552608..befcacc264a4b2 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -168,6 +168,15 @@ const workspaces = packagedEmbedTestsOnly setupFiles: ["packages/ui/components/test-setup.ts"], }, }, + { + test: { + globals: true, + name: "@calcom/web/components", + include: ["apps/web/components/**/*.{test,spec}.[jt]sx"], + environment: "jsdom", + setupFiles: ["packages/ui/components/test-setup.ts"], + }, + }, { test: { globals: true, From 5bc0e1265ddb5c3e485234f9f0f90a43f51407a1 Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Wed, 11 Sep 2024 18:35:56 +0530 Subject: [PATCH 04/40] fix: use meeting id to get transcripts (#16320) * fix: use meeting id to get transcripts * chore --------- Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> --- apps/web/pages/api/recorded-daily-video.ts | 10 ++++---- .../dailyvideo/lib/VideoApiAdapter.ts | 18 ++++++++++++++ packages/core/videoClient.ts | 24 +++++++++++++++++++ packages/types/VideoApiAdapter.d.ts | 2 ++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/apps/web/pages/api/recorded-daily-video.ts b/apps/web/pages/api/recorded-daily-video.ts index ceab1c5ffcbe55..54e8d5adf65d36 100644 --- a/apps/web/pages/api/recorded-daily-video.ts +++ b/apps/web/pages/api/recorded-daily-video.ts @@ -6,7 +6,7 @@ import { getDownloadLinkOfCalVideoByRecordingId, submitBatchProcessorTranscriptionJob, } from "@calcom/core/videoClient"; -import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/core/videoClient"; +import { getAllTranscriptsAccessLinkFromMeetingId } from "@calcom/core/videoClient"; import { sendDailyVideoRecordingEmails } from "@calcom/emails"; import { sendDailyVideoTranscriptEmails } from "@calcom/emails"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; @@ -153,15 +153,17 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { }); } - const { room } = meetingEndedResponse.data.payload; + const { room, meeting_id } = meetingEndedResponse.data.payload; const bookingReference = await getBookingReference(room); const booking = await getBooking(bookingReference.bookingId as number); - const transcripts = await getAllTranscriptsAccessLinkFromRoomName(room); + const transcripts = await getAllTranscriptsAccessLinkFromMeetingId(meeting_id); if (!transcripts || !transcripts.length) - return res.status(200).json({ message: `No Transcripts found for room name ${room}` }); + return res + .status(200) + .json({ message: `No Transcripts found for room name ${room} and meeting id ${meeting_id}` }); const evt = await getCalendarEvent(booking); await sendDailyVideoTranscriptEmails(evt, transcripts); diff --git a/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts b/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts index f9b3cef1df6c9a..05ea6422479c93 100644 --- a/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts +++ b/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts @@ -314,6 +314,24 @@ const DailyVideoApiAdapter = (): VideoApiAdapter => { throw new Error("Something went wrong! Unable to get transcription access link"); } }, + getAllTranscriptsAccessLinkFromMeetingId: async (meetingId: string): Promise> => { + try { + const allTranscripts = await fetcher(`/transcript?mtgSessionId=${meetingId}`).then( + getTranscripts.parse + ); + + if (!allTranscripts.data.length) return []; + + const allTranscriptsIds = allTranscripts.data.map((transcript) => transcript.transcriptId); + const allTranscriptsAccessLink = await processTranscriptsInBatches(allTranscriptsIds); + const accessLinks = await Promise.all(allTranscriptsAccessLink); + + return Promise.resolve(accessLinks); + } catch (err) { + console.log("err", err); + throw new Error("Something went wrong! Unable to get transcription access link"); + } + }, submitBatchProcessorJob: async (body: batchProcessorBody): Promise => { try { const batchProcessorJob = await postToDailyAPI("/batch-processor", body).then( diff --git a/packages/core/videoClient.ts b/packages/core/videoClient.ts index 8cfba66aee717f..acb7aeecfce3ea 100644 --- a/packages/core/videoClient.ts +++ b/packages/core/videoClient.ts @@ -301,6 +301,29 @@ const getAllTranscriptsAccessLinkFromRoomName = async (roomName: string) => { return videoAdapter?.getAllTranscriptsAccessLinkFromRoomName?.(roomName); }; +const getAllTranscriptsAccessLinkFromMeetingId = async (meetingId: string) => { + let dailyAppKeys: Awaited>; + try { + dailyAppKeys = await getDailyAppKeys(); + } catch (e) { + console.error("Error: Cal video provider is not installed."); + return; + } + const [videoAdapter] = await getVideoAdapters([ + { + id: 0, + appId: "daily-video", + type: "daily_video", + userId: null, + user: { email: "" }, + teamId: null, + key: dailyAppKeys, + invalid: false, + }, + ]); + return videoAdapter?.getAllTranscriptsAccessLinkFromMeetingId?.(meetingId); +}; + const submitBatchProcessorTranscriptionJob = async (recordingId: string) => { let dailyAppKeys: Awaited>; try { @@ -392,6 +415,7 @@ export { getRecordingsOfCalVideoByRoomName, getDownloadLinkOfCalVideoByRecordingId, getAllTranscriptsAccessLinkFromRoomName, + getAllTranscriptsAccessLinkFromMeetingId, submitBatchProcessorTranscriptionJob, getTranscriptsAccessLinkFromRecordingId, checkIfRoomNameMatchesInRecording, diff --git a/packages/types/VideoApiAdapter.d.ts b/packages/types/VideoApiAdapter.d.ts index 136a4fdf9d3be7..96331d2ccfdf8d 100644 --- a/packages/types/VideoApiAdapter.d.ts +++ b/packages/types/VideoApiAdapter.d.ts @@ -34,6 +34,8 @@ export type VideoApiAdapter = getAllTranscriptsAccessLinkFromRoomName?(roomName: string): Promise>; + getAllTranscriptsAccessLinkFromMeetingId?(meetingId: string): Promise>; + submitBatchProcessorJob?(body: batchProcessorBody): Promise; getTranscriptsAccessLinkFromRecordingId?( From 860d173f0ad45d342b5dffced540ffac4db50bde Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Wed, 11 Sep 2024 19:32:14 +0530 Subject: [PATCH 05/40] feat: instant meeting browser notifcations (#16480) * feat: instant meeting browser notifcations * chore: support multiple notifications * chore: save progress * fix: add test notification and move file * fix: type err * chore: feedback improvements * chore: undo DENY --- .../bookings/views/bookings-listing-view.tsx | 25 +----- apps/web/public/service-worker.js | 68 ++++++++++++++-- .../instant-meeting/handleInstantMeeting.ts | 77 +++++++++++++++++++ packages/features/instant-meeting/schema.ts | 10 +++ .../notifications/sendNotification.ts | 11 +++ packages/features/shell/Shell.tsx | 22 +++++- packages/lib/hooks/useNotifications.tsx | 1 + .../addNotificationsSubscription.handler.ts | 39 +++++++++- ...removeNotificationsSubscription.handler.ts | 4 +- 9 files changed, 220 insertions(+), 37 deletions(-) create mode 100644 packages/features/instant-meeting/schema.ts diff --git a/apps/web/modules/bookings/views/bookings-listing-view.tsx b/apps/web/modules/bookings/views/bookings-listing-view.tsx index 5ecef7c6de77ca..952592f69b4052 100644 --- a/apps/web/modules/bookings/views/bookings-listing-view.tsx +++ b/apps/web/modules/bookings/views/bookings-listing-view.tsx @@ -12,7 +12,6 @@ import type { filterQuerySchema } from "@calcom/features/bookings/lib/useFilterQ import { useFilterQuery } from "@calcom/features/bookings/lib/useFilterQuery"; import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { useNotifications, ButtonState } from "@calcom/lib/hooks/useNotifications"; import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; @@ -145,27 +144,6 @@ export default function Bookings() { )[0] || []; const [animationParentRef] = useAutoAnimate(); - const { buttonToShow, isLoading, enableNotifications, disableNotifications } = useNotifications(); - - const actions = ( -
- {buttonToShow && ( - - )} -
- ); return ( + description="Create events to share for people to book on your calendar.">
diff --git a/apps/web/public/service-worker.js b/apps/web/public/service-worker.js index 266ac7ea3b46c0..2403d15ff7d6b3 100644 --- a/apps/web/public/service-worker.js +++ b/apps/web/public/service-worker.js @@ -1,16 +1,68 @@ -self.addEventListener("push", (event) => { +self.addEventListener("push", async (event) => { let notificationData = event.data.json(); - const title = notificationData.title || "You have new notification from Cal.com"; - const image ="/cal-com-icon.svg"; - const options = { - ...notificationData.options, + const allClients = await clients.matchAll({ + type: 'window', + includeUncontrolled: true + }); + + if(!allClients.length) { + console.log("No open tabs, skipping the push notification."); + return; + } + + + const title = notificationData.title || "You have a new notification from Cal.com"; + const image = "https://cal.com/api/logo?type=icon"; + const newNotificationOptions = { + requireInteraction: true, + ...notificationData, icon: image, + badge: image, + data: { + url: notificationData.data?.url || "https://app.cal.com", + }, + silent: false, + vibrate: [300, 100, 400], + tag: `notification-${Date.now()}-${Math.random()}`, }; - self.registration.showNotification(title, options); + + + const existingNotifications = await self.registration.getNotifications(); + + // Display each existing notification again to make sure old ones can still be clicked + existingNotifications.forEach((notification) => { + const options = { + body: notification.body, + icon: notification.icon, + badge: notification.badge, + data: notification.data, + silent: notification.silent, + vibrate: notification.vibrate, + requireInteraction: notification.requireInteraction, + tag: notification.tag, + }; + self.registration.showNotification(notification.title, options); + }); + + + // Show the new notification + self.registration.showNotification(title, newNotificationOptions); }); self.addEventListener("notificationclick", (event) => { - event.notification.close(); - event.waitUntil(self.clients.openWindow(event.notification.data.targetURL || "https://app.cal.com")); + if (!event.action) { + // Normal Notification Click + event.notification.close(); + const url = event.notification.data.url; + event.waitUntil(self.clients.openWindow(url)); + } + + switch (event.action) { + case 'connect-action': + event.notification.close(); + const url = event.notification.data.url; + event.waitUntil(self.clients.openWindow(url)); + break; + } }); diff --git a/packages/features/instant-meeting/handleInstantMeeting.ts b/packages/features/instant-meeting/handleInstantMeeting.ts index 9c3d73bfcba61e..bc3c4076c4430f 100644 --- a/packages/features/instant-meeting/handleInstantMeeting.ts +++ b/packages/features/instant-meeting/handleInstantMeeting.ts @@ -12,6 +12,7 @@ import { getCustomInputsResponses } from "@calcom/features/bookings/lib/handleNe import { getBookingData } from "@calcom/features/bookings/lib/handleNewBooking/getBookingData"; import { getEventTypesFromDB } from "@calcom/features/bookings/lib/handleNewBooking/getEventTypesFromDB"; import { getFullName } from "@calcom/features/form-builder/utils"; +import { sendNotification } from "@calcom/features/notifications/sendNotification"; import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload"; import { isPrismaObjOrUndefined } from "@calcom/lib"; import { WEBAPP_URL } from "@calcom/lib/constants"; @@ -21,6 +22,8 @@ import { getTranslation } from "@calcom/lib/server"; import prisma from "@calcom/prisma"; import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums"; +import { subscriptionSchema } from "./schema"; + const handleInstantMeetingWebhookTrigger = async (args: { eventTypeId: number; webhookData: Record; @@ -86,6 +89,74 @@ const handleInstantMeetingWebhookTrigger = async (args: { } }; +const triggerBrowserNotifications = async (args: { + title: string; + connectAndJoinUrl: string; + teamId?: number | null; +}) => { + const { title, connectAndJoinUrl, teamId } = args; + + if (!teamId) { + logger.warn("No teamId provided, skipping browser notification trigger"); + return; + } + + const subscribers = await prisma.membership.findMany({ + where: { + teamId, + accepted: true, + }, + select: { + user: { + select: { + id: true, + NotificationsSubscriptions: { + select: { + id: true, + subscription: true, + }, + }, + }, + }, + }, + }); + + const promises = subscribers.map((sub) => { + const subscription = sub.user?.NotificationsSubscriptions?.[0]?.subscription; + if (!subscription) return Promise.resolve(); + + const parsedSubscription = subscriptionSchema.safeParse(JSON.parse(subscription)); + + if (!parsedSubscription.success) { + logger.error("Invalid subscription", parsedSubscription.error, JSON.stringify(sub.user)); + return Promise.resolve(); + } + + return sendNotification({ + subscription: { + endpoint: parsedSubscription.data.endpoint, + keys: { + auth: parsedSubscription.data.keys.auth, + p256dh: parsedSubscription.data.keys.p256dh, + }, + }, + title: title, + body: "User is waiting for you to join. Click to Connect", + url: connectAndJoinUrl, + actions: [ + { + action: "connect-action", + title: "Connect and join", + type: "button", + image: "https://cal.com/api/logo?type=icon", + }, + ], + }); + }); + + await Promise.allSettled(promises); +}; + export type HandleInstantMeetingResponse = { message: string; meetingTokenId: number; @@ -252,6 +323,12 @@ async function handler(req: NextApiRequest) { teamId: eventType.team?.id, }); + await triggerBrowserNotifications({ + title: newBooking.title, + connectAndJoinUrl: webhookData.connectAndJoinUrl, + teamId: eventType.team?.id, + }); + return { message: "Success", meetingTokenId: instantMeetingToken.id, diff --git a/packages/features/instant-meeting/schema.ts b/packages/features/instant-meeting/schema.ts new file mode 100644 index 00000000000000..0cad150e256fc7 --- /dev/null +++ b/packages/features/instant-meeting/schema.ts @@ -0,0 +1,10 @@ +import { z } from "zod"; + +export const subscriptionSchema = z.object({ + endpoint: z.string(), + expirationTime: z.any().optional(), + keys: z.object({ + auth: z.string(), + p256dh: z.string(), + }), +}); diff --git a/packages/features/notifications/sendNotification.ts b/packages/features/notifications/sendNotification.ts index 6e436cba0592cf..3a603f09d5af0d 100644 --- a/packages/features/notifications/sendNotification.ts +++ b/packages/features/notifications/sendNotification.ts @@ -21,17 +21,28 @@ export const sendNotification = async ({ title, body, icon, + url, + actions, + requireInteraction, }: { subscription: Subscription; title: string; body: string; icon?: string; + url?: string; + actions?: { action: string; title: string; type: string; image: string | null }[]; + requireInteraction?: boolean; }) => { try { const payload = JSON.stringify({ title, body, icon, + data: { + url, + }, + actions, + requireInteraction, }); await webpush.sendNotification(subscription, payload); } catch (error) { diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx index 7a8a7fead3b6af..a365da4fe5cf42 100644 --- a/packages/features/shell/Shell.tsx +++ b/packages/features/shell/Shell.tsx @@ -53,6 +53,7 @@ import { useFormbricks } from "@calcom/lib/formbricks-client"; import getBrandColours from "@calcom/lib/getBrandColours"; import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { useNotifications, ButtonState } from "@calcom/lib/hooks/useNotifications"; import useTheme from "@calcom/lib/hooks/useTheme"; import { isKeyInObject } from "@calcom/lib/isKeyInObject"; import { localStorage } from "@calcom/lib/webstorage"; @@ -1084,7 +1085,9 @@ function SideBar({ bannersHeight, user }: SideBarProps) { export function ShellMain(props: LayoutProps) { const router = useRouter(); - const { isLocaleReady } = useLocale(); + const { isLocaleReady, t } = useLocale(); + + const { buttonToShow, isLoading, enableNotifications, disableNotifications } = useNotifications(); return ( <> @@ -1144,6 +1147,23 @@ export function ShellMain(props: LayoutProps) {
)} {props.actions && props.actions} + {props.heading === "Bookings" && buttonToShow && ( + + )} )}
diff --git a/packages/lib/hooks/useNotifications.tsx b/packages/lib/hooks/useNotifications.tsx index e8d5b3e44abe72..bc1f18ce6dbd6b 100644 --- a/packages/lib/hooks/useNotifications.tsx +++ b/packages/lib/hooks/useNotifications.tsx @@ -92,6 +92,7 @@ export const useNotifications = () => { } const registration = await navigator.serviceWorker?.getRegistration(); + if (!registration) { // This will not happen ideally as the button will not be shown if the service worker is not registered return; diff --git a/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.handler.ts b/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.handler.ts index 19529ab2ddbefd..1a197a1eddb426 100644 --- a/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.handler.ts +++ b/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.handler.ts @@ -1,6 +1,11 @@ +import { subscriptionSchema } from "@calcom/features/instant-meeting/schema"; +import { sendNotification } from "@calcom/features/notifications/sendNotification"; +import logger from "@calcom/lib/logger"; import prisma from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import type { TAddNotificationsSubscriptionInputSchema } from "./addNotificationsSubscription.schema"; type AddSecondaryEmailOptions = { @@ -10,20 +15,52 @@ type AddSecondaryEmailOptions = { input: TAddNotificationsSubscriptionInputSchema; }; +const log = logger.getSubLogger({ prefix: ["[addNotificationsSubscriptionHandler]"] }); + export const addNotificationsSubscriptionHandler = async ({ ctx, input }: AddSecondaryEmailOptions) => { const { user } = ctx; const { subscription } = input; + const parsedSubscription = subscriptionSchema.safeParse(JSON.parse(subscription)); + + if (!parsedSubscription.success) { + log.error("Invalid subscription", parsedSubscription.error, JSON.stringify(subscription)); + throw new TRPCError({ + code: "BAD_REQUEST", + message: "Invalid subscription", + }); + } + const existingSubscription = await prisma.notificationsSubscriptions.findFirst({ - where: { userId: user.id, subscription }, + where: { userId: user.id }, }); if (!existingSubscription) { await prisma.notificationsSubscriptions.create({ data: { userId: user.id, subscription }, }); + } else { + await prisma.notificationsSubscriptions.update({ + where: { id: existingSubscription.id }, + data: { userId: user.id, subscription }, + }); } + // send test notification + sendNotification({ + subscription: { + endpoint: parsedSubscription.data.endpoint, + keys: { + auth: parsedSubscription.data.keys.auth, + p256dh: parsedSubscription.data.keys.p256dh, + }, + }, + title: "Test Notification", + body: "Push Notifications activated successfully", + url: "https://app.cal.com/", + requireInteraction: false, + }); + return { message: "Subscription added successfully", }; diff --git a/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.handler.ts b/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.handler.ts index 55e576939c5509..dd53d1284b3ba9 100644 --- a/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.handler.ts +++ b/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.handler.ts @@ -10,15 +10,13 @@ type AddSecondaryEmailOptions = { input: TRemoveNotificationsSubscriptionInputSchema; }; -export const removeNotificationsSubscriptionHandler = async ({ ctx, input }: AddSecondaryEmailOptions) => { +export const removeNotificationsSubscriptionHandler = async ({ ctx }: AddSecondaryEmailOptions) => { const { user } = ctx; - const { subscription } = input; // We just use findFirst because there will only be single unique subscription for a user const subscriptionToDelete = await prisma.notificationsSubscriptions.findFirst({ where: { userId: user.id, - subscription, }, }); From 82053e0c7c4bea8921cc186bf57599cd4849d568 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 11 Sep 2024 11:16:46 -0300 Subject: [PATCH 06/40] perf: Include no shows in main status query (#16594) * perf: Include no shows in main status query * Removed the Promise.all call --- packages/features/insights/server/events.ts | 18 +++++++--------- .../features/insights/server/trpc-router.ts | 21 +++++++------------ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/features/insights/server/events.ts b/packages/features/insights/server/events.ts index 42ba2a077bf31c..bdd0e2044c8dd1 100644 --- a/packages/features/insights/server/events.ts +++ b/packages/features/insights/server/events.ts @@ -11,7 +11,7 @@ class EventsInsights { static countGroupedByStatus = async (where: Prisma.BookingTimeStatusWhereInput) => { const data = await prisma.bookingTimeStatus.groupBy({ where, - by: ["timeStatus"], + by: ["timeStatus", "noShowHost"], _count: { _all: true, }, @@ -22,6 +22,10 @@ class EventsInsights { if (typeof item.timeStatus === "string" && item) { aggregate[item.timeStatus] += item?._count?._all ?? 0; aggregate["_all"] += item?._count?._all ?? 0; + + if (item.noShowHost) { + aggregate["noShowHost"] += item?._count?._all ?? 0; + } } return aggregate; }, @@ -29,6 +33,7 @@ class EventsInsights { completed: 0, rescheduled: 0, cancelled: 0, + noShowHost: 0, _all: 0, } ); @@ -48,15 +53,6 @@ class EventsInsights { }); }; - static getTotalNoShows = async (whereConditional: Prisma.BookingTimeStatusWhereInput) => { - return await prisma.bookingTimeStatus.count({ - where: { - ...whereConditional, - noShowHost: true, - }, - }); - }; - static getTotalCSAT = async (whereConditional: Prisma.BookingTimeStatusWhereInput) => { const result = await prisma.bookingTimeStatus.findMany({ where: { @@ -173,9 +169,11 @@ class EventsInsights { return 0; } const result = (differenceActualVsPrevious * 100) / previousMetric; + if (isNaN(result) || !isFinite(result)) { return 0; } + return result; }; diff --git a/packages/features/insights/server/trpc-router.ts b/packages/features/insights/server/trpc-router.ts index e2953eae0d05e6..f821318ab0cf42 100644 --- a/packages/features/insights/server/trpc-router.ts +++ b/packages/features/insights/server/trpc-router.ts @@ -278,20 +278,16 @@ export const insightsRouter = router({ const [ countGroupedByStatus, totalRatingsAggregate, - totalNoShow, totalCSAT, lastPeriodCountGroupedByStatus, lastPeriodTotalRatingsAggregate, - lastPeriodTotalNoShow, lastPeriodTotalCSAT, ] = await Promise.all([ EventsInsights.countGroupedByStatus(baseWhereCondition), EventsInsights.getAverageRating(baseWhereCondition), - EventsInsights.getTotalNoShows(baseWhereCondition), EventsInsights.getTotalCSAT(baseWhereCondition), EventsInsights.countGroupedByStatus(lastPeriodBaseCondition), EventsInsights.getAverageRating(lastPeriodBaseCondition), - EventsInsights.getTotalNoShows(lastPeriodBaseCondition), EventsInsights.getTotalCSAT(lastPeriodBaseCondition), ]); @@ -299,6 +295,7 @@ export const insightsRouter = router({ const totalCompleted = countGroupedByStatus["completed"]; const totalRescheduled = countGroupedByStatus["rescheduled"]; const totalCancelled = countGroupedByStatus["cancelled"]; + const totalNoShow = countGroupedByStatus["noShowHost"]; const averageRating = totalRatingsAggregate._avg.rating ? parseFloat(totalRatingsAggregate._avg.rating.toFixed(1)) @@ -307,6 +304,7 @@ export const insightsRouter = router({ const lastPeriodBaseBookingsCount = lastPeriodCountGroupedByStatus["_all"]; const lastPeriodTotalRescheduled = lastPeriodCountGroupedByStatus["rescheduled"]; const lastPeriodTotalCancelled = lastPeriodCountGroupedByStatus["cancelled"]; + const lastPeriodTotalNoShow = lastPeriodCountGroupedByStatus["noShowHost"]; const lastPeriodAverageRating = lastPeriodTotalRatingsAggregate._avg.rating ? parseFloat(lastPeriodTotalRatingsAggregate._avg.rating.toFixed(1)) @@ -542,16 +540,13 @@ export const insightsRouter = router({ }, }; - const promisesResult = await Promise.all([ - EventsInsights.countGroupedByStatus(whereConditional), - EventsInsights.getTotalNoShows(whereConditional), - ]); + const countsByStatus = await EventsInsights.countGroupedByStatus(whereConditional); - EventData["Created"] = promisesResult[0]["_all"]; - EventData["Completed"] = promisesResult[0]["completed"]; - EventData["Rescheduled"] = promisesResult[0]["rescheduled"]; - EventData["Cancelled"] = promisesResult[0]["cancelled"]; - EventData["No-Show (Host)"] = promisesResult[1]; + EventData["Created"] = countsByStatus["_all"]; + EventData["Completed"] = countsByStatus["completed"]; + EventData["Rescheduled"] = countsByStatus["rescheduled"]; + EventData["Cancelled"] = countsByStatus["cancelled"]; + EventData["No-Show (Host)"] = countsByStatus["noShowHost"]; result.push(EventData); } From b292cafe7ba3d74fb44c78bbbc004e5170d2d3ba Mon Sep 17 00:00:00 2001 From: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:56:28 +0200 Subject: [PATCH 07/40] feat: update translations (#16592) Co-authored-by: Replexica --- apps/web/public/static/locales/ar/common.json | 3 +++ apps/web/public/static/locales/az/common.json | 3 +++ apps/web/public/static/locales/cs/common.json | 3 +++ apps/web/public/static/locales/da/common.json | 3 +++ apps/web/public/static/locales/de/common.json | 3 +++ apps/web/public/static/locales/es-419/common.json | 3 +++ apps/web/public/static/locales/es/common.json | 3 +++ apps/web/public/static/locales/et/common.json | 3 +++ apps/web/public/static/locales/fr/common.json | 3 +++ apps/web/public/static/locales/he/common.json | 3 +++ apps/web/public/static/locales/hu/common.json | 3 +++ apps/web/public/static/locales/it/common.json | 3 +++ apps/web/public/static/locales/ja/common.json | 3 +++ apps/web/public/static/locales/km/common.json | 3 +++ apps/web/public/static/locales/ko/common.json | 3 +++ apps/web/public/static/locales/nl/common.json | 3 +++ apps/web/public/static/locales/no/common.json | 3 +++ apps/web/public/static/locales/pl/common.json | 3 +++ apps/web/public/static/locales/pt-BR/common.json | 3 +++ apps/web/public/static/locales/pt/common.json | 3 +++ apps/web/public/static/locales/ro/common.json | 3 +++ apps/web/public/static/locales/sr/common.json | 3 +++ apps/web/public/static/locales/sv/common.json | 3 +++ apps/web/public/static/locales/tr/common.json | 3 +++ apps/web/public/static/locales/uk/common.json | 3 +++ apps/web/public/static/locales/vi/common.json | 3 +++ apps/web/public/static/locales/zh-CN/common.json | 3 +++ apps/web/public/static/locales/zh-TW/common.json | 3 +++ i18n.lock | 3 +++ 29 files changed, 87 insertions(+) diff --git a/apps/web/public/static/locales/ar/common.json b/apps/web/public/static/locales/ar/common.json index 1556310e34317b..2e2b1f9b943100 100644 --- a/apps/web/public/static/locales/ar/common.json +++ b/apps/web/public/static/locales/ar/common.json @@ -1147,6 +1147,7 @@ "set_location": "تعيين الموقع", "update_location": "تحديث الموقع", "location_updated": "تم تحديث الموقع", + "location_update_failed": "فشل تحديث الموقع", "guests_added": "تمت إضافة الضيوف", "unable_to_add_guests": "غير قادر على إضافة الضيوف", "email_validation_error": "لا يبدو هذا كعنوان بريد إلكتروني", @@ -1887,6 +1888,7 @@ "default_app_link_title": "تعيين رابط تطبيق افتراضي", "default_app_link_description": "يسمح تعيين رابط التطبيق الافتراضي لجميع أنواع الأحداث التي تم إنشاؤها حديثًا باستخدام رابط التطبيق الذي عينته.", "organizer_default_conferencing_app": "تطبيق المنظمة الافتراضي", + "organizer_default_conferencing_app_not_found": "لا يوجد تطبيق مؤتمرات افتراضي لـ {{organizer}}", "under_maintenance": "معطل للصيانة", "under_maintenance_description": "يجري فريق {{appName}} صيانة مجدولة. إذا كان لديك أي أسئلة، يرجى الاتصال بالدعم.", "event_type_seats": "{{numberOfSeats}} من المقاعد", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "إعادة الجدولة مع نفس مضيف round-robin", "reschedule_with_same_round_robin_host_description": "سيتم تعيين الأحداث المعاد جدولتها لنفس المضيف كما تم جدولتها في البداية", "disable_input_if_prefilled": "تعطيل الإدخال إذا كان معرف URL مملوء مسبقًا", + "you_are_unauthorized_to_make_this_change_to_the_booking": "أنت غير مخول لإجراء هذا التغيير على الحجز", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ أضف السلاسل الجديدة أعلاه هنا ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/az/common.json b/apps/web/public/static/locales/az/common.json index d67233c41dd857..2f0deea233498d 100644 --- a/apps/web/public/static/locales/az/common.json +++ b/apps/web/public/static/locales/az/common.json @@ -1147,6 +1147,7 @@ "set_location": "Yeri Təyin Et", "update_location": "Yeri Yenilə", "location_updated": "Yer yeniləndi", + "location_update_failed": "Məkan yeniləməsi uğursuz oldu", "guests_added": "Qonaqlar əlavə edildi", "unable_to_add_guests": "Qonaqları əlavə etmək mümkün deyil", "email_validation_error": "Bu, e-poçt ünvanına bənzəmir", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Varsayılan tətbiq bağlantısını təyin et", "default_app_link_description": "Varsayılan tətbiq bağlantısını təyin etmək, yeni yaradılan bütün tədbir növlərinin təyin etdiyiniz tətbiq bağlantısını istifadə etməsinə imkan verir.", "organizer_default_conferencing_app": "Təşkilatçının varsayılan tətbiqi", + "organizer_default_conferencing_app_not_found": "{{organizer}} üçün standart konfrans tətbiqi tapılmadı", "under_maintenance": "Baxım üçün bağlıdır", "under_maintenance_description": "{{appName}} komandası planlı baxım işləri aparır. Hər hansı bir sualınız varsa, dəstək ilə əlaqə saxlayın.", "event_type_seats": "{{numberOfSeats}} oturacaq", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Eyni Round-Robin ev sahibi ilə yenidən planlaşdır", "reschedule_with_same_round_robin_host_description": "Yenidən planlaşdırılan tədbirlər əvvəlcə təyin olunan ev sahibinə təyin ediləcək", "disable_input_if_prefilled": "URL identifikatoru əvvəlcədən doldurulubsa girişi deaktiv et", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Bu dəyişikliyi etmək üçün səlahiyyətiniz yoxdur", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Yeni sətirləri bura əlavə edin ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/cs/common.json b/apps/web/public/static/locales/cs/common.json index b92d3909eb2905..c68b138a0c84ed 100644 --- a/apps/web/public/static/locales/cs/common.json +++ b/apps/web/public/static/locales/cs/common.json @@ -1147,6 +1147,7 @@ "set_location": "Nastavit místo", "update_location": "Aktualizovat místo", "location_updated": "Místo aktualizováno", + "location_update_failed": "Aktualizace polohy se nezdařila", "guests_added": "Hosté přidáni", "unable_to_add_guests": "Nelze přidat hosty", "email_validation_error": "Tohle nevypadá jako e-mailová adresa", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Nastavte výchozí odkaz na aplikaci", "default_app_link_description": "Nastavení výchozího odkazu na aplikaci umožní, aby všechny nově vytvořené typy událostí používaly vámi nastavený odkaz na aplikaci.", "organizer_default_conferencing_app": "Výchozí aplikace organizátora", + "organizer_default_conferencing_app_not_found": "{{organizer}} nemá výchozí aplikaci pro konferenční hovory", "under_maintenance": "Odstávka z důvodu údržby", "under_maintenance_description": "Tým {{appName}} provádí plánovanou údržbu. V případě dotazů se obraťte na podporu.", "event_type_seats": "Počet míst: {{numberOfSeats}}", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Přeplánovat se stejným hostitelem Round-Robin", "reschedule_with_same_round_robin_host_description": "Přeplánované události budou přiřazeny stejnému hostiteli jako původně", "disable_input_if_prefilled": "Zakázat vstup, pokud je identifikátor URL předvyplněn", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Nemáte oprávnění provést tuto změnu v rezervaci", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Přidejte své nové řetězce nahoru ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/da/common.json b/apps/web/public/static/locales/da/common.json index 4e47066cbdfd28..4929668eb03eb5 100644 --- a/apps/web/public/static/locales/da/common.json +++ b/apps/web/public/static/locales/da/common.json @@ -1147,6 +1147,7 @@ "set_location": "Angiv Placering", "update_location": "Opdatér Placering", "location_updated": "Placering opdateret", + "location_update_failed": "Opdatering af placering mislykkedes", "guests_added": "Gæster tilføjet", "unable_to_add_guests": "Kan ikke tilføje gæster", "email_validation_error": "Det ligner ikke en e-mailadresse", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Angiv et standard app-link", "default_app_link_description": "Indstilling af et standard app-link gør det muligt for alle nyoprettede begivenhedstyper at bruge det app-link, du har angivet.", "organizer_default_conferencing_app": "Organisatorens standardapp", + "organizer_default_conferencing_app_not_found": "{{organizer}} har ingen standardkonferenceapp", "under_maintenance": "Nede for vedligeholdelse", "under_maintenance_description": "{{appName}} teamet udfører planlagt vedligeholdelse. Hvis du har spørgsmål, bedes du kontakte support.", "event_type_seats": "{{numberOfSeats}} pladser", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Omlæg med samme Round-Robin vært", "reschedule_with_same_round_robin_host_description": "Omlagte begivenheder vil blive tildelt den samme vært som oprindeligt planlagt", "disable_input_if_prefilled": "Deaktiver input, hvis URL-identifikatoren er udfyldt på forhånd", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Du har ikke tilladelse til at foretage denne ændring i bookingen", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Tilføj dine nye strenge ovenfor her ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json index 60573a78434c25..8d98a4f3075e39 100644 --- a/apps/web/public/static/locales/de/common.json +++ b/apps/web/public/static/locales/de/common.json @@ -1147,6 +1147,7 @@ "set_location": "Ort festlegen", "update_location": "Ort aktualisieren", "location_updated": "Ort aktualisiert", + "location_update_failed": "Aktualisierung des Standorts fehlgeschlagen", "guests_added": "Gäste hinzugefügt", "unable_to_add_guests": "Gäste konnten nicht hinzugefügt werden", "email_validation_error": "Das sieht nicht wie eine E-Mail-Adresse aus", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Standard-App-Link festlegen", "default_app_link_description": "Mit dem Festlegen eines Standard-App-Links können alle neu erstellten Ereignistypen den App-Link verwenden, den Sie gesetzt haben.", "organizer_default_conferencing_app": "Standard-App des Organisators", + "organizer_default_conferencing_app_not_found": "{{organizer}} hat keine Standard-Konferenz-App", "under_maintenance": "Wartungsarbeiten", "under_maintenance_description": "Das {{appName}} Team führt geplante Wartungsarbeiten durch. Wenn Sie Fragen haben, wenden Sie sich bitte an den Support.", "event_type_seats": "{{numberOfSeats}} Sitze", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Mit demselben Round-Robin-Gastgeber neu planen", "reschedule_with_same_round_robin_host_description": "Neu geplante Ereignisse werden demselben Gastgeber zugewiesen wie ursprünglich geplant", "disable_input_if_prefilled": "Eingabe deaktivieren, wenn die URL-Kennung vorausgefüllt ist", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Sie sind nicht berechtigt, diese Änderung an der Buchung vorzunehmen", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Fügen Sie Ihre neuen Code-Zeilen über dieser hinzu ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/es-419/common.json b/apps/web/public/static/locales/es-419/common.json index 32ea27b6efac9e..9e67af114dca9b 100644 --- a/apps/web/public/static/locales/es-419/common.json +++ b/apps/web/public/static/locales/es-419/common.json @@ -1147,6 +1147,7 @@ "set_location": "Establecer ubicación", "update_location": "Actualizar ubicación", "location_updated": "Ubicación actualizada", + "location_update_failed": "Error al actualizar la ubicación", "guests_added": "Invitados añadidos", "unable_to_add_guests": "No se pueden añadir invitados", "email_validation_error": "Eso no parece una dirección de correo electrónico", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Establecer un enlace de aplicación predeterminado", "default_app_link_description": "Establecer un enlace de aplicación predeterminado permite que todos los tipos de eventos recién creados usen el enlace de aplicación que configuraste.", "organizer_default_conferencing_app": "Aplicación predeterminada del organizador", + "organizer_default_conferencing_app_not_found": "{{organizer}} no tiene una aplicación de conferencias predeterminada", "under_maintenance": "En mantenimiento", "under_maintenance_description": "El equipo de {{appName}} está realizando un mantenimiento programado. Si tienes alguna pregunta, por favor contacta al soporte.", "event_type_seats": "{{numberOfSeats}} asientos", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reprogramar con el mismo anfitrión de Round-Robin", "reschedule_with_same_round_robin_host_description": "Los eventos reprogramados se asignarán al mismo anfitrión que se programó inicialmente", "disable_input_if_prefilled": "Desactivar entrada si el identificador de URL está prellenado", + "you_are_unauthorized_to_make_this_change_to_the_booking": "No tienes autorización para realizar este cambio en la reserva", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Agrega tus nuevas cadenas arriba de esta línea ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/es/common.json b/apps/web/public/static/locales/es/common.json index c7339bd9ba27de..6b3a1774347e0e 100644 --- a/apps/web/public/static/locales/es/common.json +++ b/apps/web/public/static/locales/es/common.json @@ -1147,6 +1147,7 @@ "set_location": "Establecer ubicación", "update_location": "Actualizar ubicación", "location_updated": "Ubicación actualizada", + "location_update_failed": "La actualización de la ubicación ha fallado", "guests_added": "Invitados añadidos", "unable_to_add_guests": "No se pueden añadir invitados", "email_validation_error": "Eso no parece una dirección de correo electrónico", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Establecer un enlace de aplicación predeterminado", "default_app_link_description": "Establecer un enlace de aplicación predeterminado permite que todos los tipos de eventos recién creados utilicen el enlace de aplicación que establezca.", "organizer_default_conferencing_app": "Aplicación por defecto del organizador", + "organizer_default_conferencing_app_not_found": "{{organizer}} no tiene una aplicación de conferencias predeterminada", "under_maintenance": "Fuera de servicio por mantenimiento", "under_maintenance_description": "El equipo de {{appName}} está realizando un mantenimiento programado. Si tiene alguna pregunta, comuníquese con soporte.", "event_type_seats": "{{numberOfSeats}} plazas", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reprogramar con el mismo anfitrión de Round-Robin", "reschedule_with_same_round_robin_host_description": "Los eventos reprogramados se asignarán al mismo anfitrión que inicialmente", "disable_input_if_prefilled": "Desactivar entrada si el identificador de URL está prellenado", + "you_are_unauthorized_to_make_this_change_to_the_booking": "No tienes autorización para realizar este cambio en la reserva", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Agregue sus nuevas cadenas arriba ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/et/common.json b/apps/web/public/static/locales/et/common.json index 2443853d8f6530..8dedd976a87629 100644 --- a/apps/web/public/static/locales/et/common.json +++ b/apps/web/public/static/locales/et/common.json @@ -1147,6 +1147,7 @@ "set_location": "Määra asukoht", "update_location": "Uuenda asukohta", "location_updated": "Asukoht värskendatud", + "location_update_failed": "Asukoha uuendamine ebaõnnestus", "guests_added": "Külalised lisatud", "unable_to_add_guests": "Külalisi ei saa lisada", "email_validation_error": "See ei näe välja nagu meiliaadress", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Rakenduse vaikelingi määramine", "default_app_link_description": "Rakenduse vaikelingi määramine võimaldab kõigil äsja loodud sündmuste tüüpidel kasutada teie määratud rakenduse linki.", "organizer_default_conferencing_app": "Korraldaja vaikerakendus", + "organizer_default_conferencing_app_not_found": "{{organizer}} ei ole määranud vaikimisi videokonverentsi rakendust", "under_maintenance": "Hoolduseks maha", "under_maintenance_description": "Tiim {{appName}} teeb plaanipärast hooldust. Kui teil on küsimusi, võtke ühendust toega.", "event_type_seats": "{{numberOfSeats}} kohta", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Planeeri ümber sama Round-Robin hostiga", "reschedule_with_same_round_robin_host_description": "Ümberplaneeritud sündmused määratakse samale hostile, kellele need algselt määrati", "disable_input_if_prefilled": "Keela sisend, kui URL-i identifikaator on eeltäidetud", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Teil puuduvad õigused selle broneeringu muutmiseks", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json index 44aa2514b3b4f0..7348b8796bb29c 100644 --- a/apps/web/public/static/locales/fr/common.json +++ b/apps/web/public/static/locales/fr/common.json @@ -1147,6 +1147,7 @@ "set_location": "Définir le lieu", "update_location": "Mettre à jour le lieu", "location_updated": "Lieu mis à jour", + "location_update_failed": "La mise à jour du lieu a échoué", "guests_added": "Invités ajoutés", "unable_to_add_guests": "Impossible d'ajouter des invités", "email_validation_error": "Ceci ne ressemble pas à une adresse e-mail", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Définir un lien d'application par défaut", "default_app_link_description": "Définir un lien d'application par défaut permet à tous les nouveaux types d'événements d'utiliser le lien d'application que vous avez défini.", "organizer_default_conferencing_app": "Application par défaut de l'organisateur", + "organizer_default_conferencing_app_not_found": "{{organizer}} n'a pas d'application de conférence par défaut", "under_maintenance": "En cours de maintenance", "under_maintenance_description": "L'équipe {{appName}} effectue une maintenance planifiée. Si vous avez des questions, veuillez contacter l'assistance.", "event_type_seats": "{{numberOfSeats}} places", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reprogrammer avec le même hôte round-robin", "reschedule_with_same_round_robin_host_description": "Les événements reprogrammés seront attribués au même hôte que celui initialement prévu", "disable_input_if_prefilled": "Désactiver la saisie si l'identifiant URL est prérempli", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Vous n'êtes pas autorisé à apporter cette modification à la réservation", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Ajoutez vos nouvelles chaînes ci-dessus ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/he/common.json b/apps/web/public/static/locales/he/common.json index 6a3e0248aa94d2..859c3b92c34a85 100644 --- a/apps/web/public/static/locales/he/common.json +++ b/apps/web/public/static/locales/he/common.json @@ -1147,6 +1147,7 @@ "set_location": "הגדרת מיקום", "update_location": "עדכון מיקום", "location_updated": "המיקום עודכן", + "location_update_failed": "עדכון המיקום נכשל", "guests_added": "אורחים נוספו", "unable_to_add_guests": "לא ניתן להוסיף אורחים", "email_validation_error": "המידע שהזנת לא נראה כמו כתובת דוא\"ל", @@ -1887,6 +1888,7 @@ "default_app_link_title": "צור קישור אפליקציה ברירת מחדל", "default_app_link_description": "הגדרת קישור אפליקציה ברירת מחדל מאפשר לכל הארועים החדשים להשתמש בקישור שהגדרת.", "organizer_default_conferencing_app": "אפליקציית ברירת המחדל של המארגן/ת", + "organizer_default_conferencing_app_not_found": "ל{{organizer}} אין אפליקציית ועידה ברירת מחדל", "under_maintenance": "אינו זמין עקב תחזוקה", "under_maintenance_description": "צוות {{appName}} מבצע עבודות תחזוקה שתוכננו מראש. אם יש לך שאלות, נא צור קשר עם התמיכה.", "event_type_seats": "{{numberOfSeats}} מושבים", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "תזמן מחדש עם אותו מארח Round-Robin", "reschedule_with_same_round_robin_host_description": "אירועים שתוזמנו מחדש יוקצו לאותו מארח כפי שתוזמנו במקור", "disable_input_if_prefilled": "השבת קלט אם מזהה ה-URL מולא מראש", + "you_are_unauthorized_to_make_this_change_to_the_booking": "אין לך הרשאה לבצע שינוי זה בהזמנה", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/hu/common.json b/apps/web/public/static/locales/hu/common.json index 4ee915311fd20a..9ca5b520fbcf8b 100644 --- a/apps/web/public/static/locales/hu/common.json +++ b/apps/web/public/static/locales/hu/common.json @@ -1147,6 +1147,7 @@ "set_location": "Hely beállítása", "update_location": "Hely frissítése", "location_updated": "Hely frissítve", + "location_update_failed": "A hely frissítése nem sikerült", "guests_added": "Vendégek hozzáadva", "unable_to_add_guests": "Nem sikerült vendégeket hozzáadni", "email_validation_error": "Ez nem úgy néz ki, mint egy e-mail cím", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Állítson be alapértelmezett alkalmazáshivatkozást", "default_app_link_description": "Az alapértelmezett alkalmazáshivatkozás beállítása lehetővé teszi, hogy minden újonnan létrehozott eseménytípus használja a beállított alkalmazáshivatkozást.", "organizer_default_conferencing_app": "A szervező alapértelmezett alkalmazása", + "organizer_default_conferencing_app_not_found": "{{organizer}} nem rendelkezik alapértelmezett konferenciaalkalmazással", "under_maintenance": "Karbantartás miatt nem elérhető", "under_maintenance_description": "A {{appName}} csapata ütemezett karbantartást végez. Ha bármilyen kérdése van, forduljon az ügyfélszolgálathoz.", "event_type_seats": "{{numberOfSeats}} ülőhely", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Újraütemezés ugyanazzal a Round-Robin házigazdával", "reschedule_with_same_round_robin_host_description": "Az újraütemezett események ugyanahhoz a házigazdához lesznek rendelve, mint eredetileg", "disable_input_if_prefilled": "Bemenet letiltása, ha az URL azonosító előre kitöltött", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Nincs jogosultsága a foglalás módosításához", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Adja hozzá az új karakterláncokat fent ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json index c01d2847da33f5..49e2832a6f52d9 100644 --- a/apps/web/public/static/locales/it/common.json +++ b/apps/web/public/static/locales/it/common.json @@ -1147,6 +1147,7 @@ "set_location": "Imposta luogo", "update_location": "Aggiorna luogo", "location_updated": "Luogo aggiornato", + "location_update_failed": "Aggiornamento della posizione fallito", "guests_added": "Ospiti aggiunti", "unable_to_add_guests": "Impossibile aggiungere ospiti", "email_validation_error": "Questo non sembra un indirizzo email valido", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Imposta il link dell'app predefinita", "default_app_link_description": "L'impostazione di un link dell'app predefinita permette a tutti i nuovi tipi di eventi di usare il link dell'app impostato.", "organizer_default_conferencing_app": "Applicazione predefinita dell'organizzatore", + "organizer_default_conferencing_app_not_found": "{{organizer}} non ha un'app di conferenza predefinita", "under_maintenance": "Inattivo per manutenzione", "under_maintenance_description": "Il team di {{appName}} sta eseguendo la manutenzione programmata. Per qualsiasi domanda, contattare il supporto.", "event_type_seats": "{{numberOfSeats}} posti", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Ripianifica con lo stesso host Round-Robin", "reschedule_with_same_round_robin_host_description": "Gli eventi ripianificati saranno assegnati allo stesso host inizialmente programmato", "disable_input_if_prefilled": "Disabilita input se l'identificatore URL è precompilato", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Non sei autorizzato a effettuare questa modifica alla prenotazione", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Aggiungi le tue nuove stringhe qui sopra ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json index eadd1cbcc51dc4..554557c68474a2 100644 --- a/apps/web/public/static/locales/ja/common.json +++ b/apps/web/public/static/locales/ja/common.json @@ -1147,6 +1147,7 @@ "set_location": "場所を設定", "update_location": "場所を更新", "location_updated": "場所を更新しました", + "location_update_failed": "位置情報の更新に失敗しました", "guests_added": "ゲストが追加されました", "unable_to_add_guests": "ゲストを追加できません", "email_validation_error": "メールアドレスのようには見えません", @@ -1887,6 +1888,7 @@ "default_app_link_title": "デフォルトのアプリリンクを設定", "default_app_link_description": "デフォルトのアプリリンクを設定することで、新たに作成するすべてのイベントの種類が設定したアプリリンクを使用できるようになります。", "organizer_default_conferencing_app": "主催者のデフォルトのアプリ", + "organizer_default_conferencing_app_not_found": "{{organizer}}にはデフォルトの会議アプリがありません", "under_maintenance": "メンテナンスのため停止中", "under_maintenance_description": "{{appName}} チームが定期メンテナンスを行っています。質問がある場合には、サポートへとお問い合わせください。", "event_type_seats": "{{numberOfSeats}} 席", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "同じRound-Robinホストで再スケジュール", "reschedule_with_same_round_robin_host_description": "再スケジュールされたイベントは、最初にスケジュールされたのと同じホストに割り当てられます", "disable_input_if_prefilled": "URL識別子が事前入力されている場合は入力を無効にする", + "you_are_unauthorized_to_make_this_change_to_the_booking": "この予約の変更を行う権限がありません", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ この上に新しい文字列を追加してください ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/km/common.json b/apps/web/public/static/locales/km/common.json index 151e626d4ad071..a1e8070445c918 100644 --- a/apps/web/public/static/locales/km/common.json +++ b/apps/web/public/static/locales/km/common.json @@ -1147,6 +1147,7 @@ "set_location": "កំណត់ទីតាំង", "update_location": "ធ្វើបច្ចុប្បន្នភាពទីតាំង", "location_updated": "ទីតាំងត្រូវបានធ្វើបច្ចុប្បន្នភាព", + "location_update_failed": "ការធ្វើបច្ចុប្បន្នភាពទីតាំងបានបរាជ័យ", "guests_added": "ភ្ញៀវត្រូវបានបន្ថែម", "unable_to_add_guests": "មិនអាចបន្ថែមភ្ញៀវបានទេ", "email_validation_error": "វាមិនមើលទៅដូចអាសយដ្ឋានអ៊ីមែលទេ", @@ -1887,6 +1888,7 @@ "default_app_link_title": "កំណត់តំណភ្ជាប់កម្មវិធីលំនាំដើម", "default_app_link_description": "ការកំណត់តំណភ្ជាប់កម្មវិធីលំនាំដើមអនុញ្ញាតឱ្យប្រភេទព្រឹត្តិការណ៍ថ្មីទាំងអស់ប្រើតំណភ្ជាប់កម្មវិធីដែលអ្នកកំណត់។", "organizer_default_conferencing_app": "កម្មវិធីលំនាំដើមរបស់អ្នករៀបចំ", + "organizer_default_conferencing_app_not_found": "{{organizer}} មិនមានកម្មវិធីសន្និសីទលំនាំដើមទេ", "under_maintenance": "កំពុងថែទាំ", "under_maintenance_description": "ក្រុម {{appName}} កំពុងធ្វើការថែទាំតាមកាលវិភាគ។ ប្រសិនបើអ្នកមានសំណួរ សូមទាក់ទងផ្នែកគាំទ្រ។", "event_type_seats": "{{numberOfSeats}} កៅអី", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "កំណត់ពេលថ្មីជាមួយម្ចាស់ Round-Robin ដដែល", "reschedule_with_same_round_robin_host_description": "ព្រឹត្តិការណ៍ដែលបានកំណត់ពេលថ្មីនឹងត្រូវចាត់ចែងទៅម្ចាស់ដដែលដូចពេលដំបូង", "disable_input_if_prefilled": "បិទការបញ្ចូលប្រសិនបើ URL identifier ត្រូវបានបំពេញរួចហើយ", + "you_are_unauthorized_to_make_this_change_to_the_booking": "អ្នកមិនមានសិទ្ធិធ្វើការផ្លាស់ប្តូរនេះលើការកក់ទេ", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ បន្ថែមខ្សែអក្សរថ្មីរបស់អ្នកនៅខាងលើនេះ ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/ko/common.json b/apps/web/public/static/locales/ko/common.json index 59aab69173eebd..c33fcea66ee331 100644 --- a/apps/web/public/static/locales/ko/common.json +++ b/apps/web/public/static/locales/ko/common.json @@ -1147,6 +1147,7 @@ "set_location": "위치 설정", "update_location": "위치 업데이트", "location_updated": "위치 업데이트됨", + "location_update_failed": "위치 업데이트에 실패했습니다", "guests_added": "게스트 추가됨", "unable_to_add_guests": "게스트를 추가할 수 없습니다", "email_validation_error": "이메일 주소가 아닌 것 같습니다", @@ -1887,6 +1888,7 @@ "default_app_link_title": "기본 앱 링크 설정", "default_app_link_description": "기본 앱 링크를 설정하면 새로 생성된 모든 이벤트 유형에서 설정된 앱 링크를 사용할 수 있습니다.", "organizer_default_conferencing_app": "주최자의 기본 앱", + "organizer_default_conferencing_app_not_found": "{{organizer}}님은 기본 화상 회의 앱이 없습니다", "under_maintenance": "아래로 밀어 유지관리", "under_maintenance_description": "{{appName}} 팀에서 예정된 유지관리를 수행하고 있습니다. 궁금한 점이 있으면 지원팀에 문의하세요.", "event_type_seats": "{{numberOfSeats}}개 시트", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "동일한 Round-Robin 호스트와 다시 예약", "reschedule_with_same_round_robin_host_description": "다시 예약된 이벤트는 처음 예약된 동일한 호스트에게 할당됩니다", "disable_input_if_prefilled": "URL 식별자가 미리 채워진 경우 입력 비활성화", + "you_are_unauthorized_to_make_this_change_to_the_booking": "이 예약을 변경할 권한이 없습니다", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ 여기에 새 문자열을 추가하세요 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/nl/common.json b/apps/web/public/static/locales/nl/common.json index b175b1df160a9d..85f7f4fc2ba9c6 100644 --- a/apps/web/public/static/locales/nl/common.json +++ b/apps/web/public/static/locales/nl/common.json @@ -1147,6 +1147,7 @@ "set_location": "Locatie instellen", "update_location": "Locatie bijwerken", "location_updated": "Locatie bijgewerkt", + "location_update_failed": "Locatie-update mislukt", "guests_added": "Gasten toegevoegd", "unable_to_add_guests": "Kan geen gasten toevoegen", "email_validation_error": "Dat lijkt niet op een e-mailadres", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Stel een standaard app-link in", "default_app_link_description": "Door een standaard app-link in te stellen kunnen alle nieuw gemaakte gebeurtenistypes de door u ingestelde app-link gebruiken.", "organizer_default_conferencing_app": "Standaardapp organisator", + "organizer_default_conferencing_app_not_found": "{{organizer}} heeft geen standaard vergaderapp", "under_maintenance": "Onbereikbaar wegens onderhoud", "under_maintenance_description": "Het {{appName}}-team voert gepland onderhoud uit. Neem contact op met de ondersteuning als u vragen heeft.", "event_type_seats": "{{numberOfSeats}} plaatsen", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Opnieuw plannen met dezelfde Round-Robin host", "reschedule_with_same_round_robin_host_description": "Opnieuw geplande evenementen worden toegewezen aan dezelfde host als oorspronkelijk gepland", "disable_input_if_prefilled": "Invoer uitschakelen als de URL-identificatie vooraf is ingevuld", + "you_are_unauthorized_to_make_this_change_to_the_booking": "U bent niet gemachtigd om deze wijziging in de boeking aan te brengen", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Voeg uw nieuwe strings hierboven toe ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/no/common.json b/apps/web/public/static/locales/no/common.json index 33ffd8ed345cbb..bac127adfa98c8 100644 --- a/apps/web/public/static/locales/no/common.json +++ b/apps/web/public/static/locales/no/common.json @@ -1147,6 +1147,7 @@ "set_location": "Velg Sted", "update_location": "Oppdater Sted", "location_updated": "Sted oppdatert", + "location_update_failed": "Oppdatering av plassering mislyktes", "guests_added": "Gjester lagt til", "unable_to_add_guests": "Kan ikke legge til gjester", "email_validation_error": "Det ser ikke ut som en e-postadresse", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Sett en standard applink", "default_app_link_description": "Å sette en standard applink gjør at alle nyopprettede arrangementstyper bruker applinken du har satt.", "organizer_default_conferencing_app": "Organisatorens standardapp", + "organizer_default_conferencing_app_not_found": "{{organizer}} har ingen standard konferanseapp", "under_maintenance": "Nede for vedlikehold", "under_maintenance_description": "{{appName}}-teamet utfører planlagt vedlikehold. Hvis du har spørsmål, vennligst kontakt support.", "event_type_seats": "{{numberOfSeats}} seter", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Omplanlegg med samme Round-Robin-vert", "reschedule_with_same_round_robin_host_description": "Omplanlagte hendelser vil bli tildelt samme vert som opprinnelig planlagt", "disable_input_if_prefilled": "Deaktiver inndata hvis URL-identifikatoren er forhåndsutfylt", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Du har ikke tillatelse til å gjøre denne endringen i bestillingen", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Legg til dine nye strenger over her ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/pl/common.json b/apps/web/public/static/locales/pl/common.json index 1c8d3fc809c1b1..c4eed9933b158a 100644 --- a/apps/web/public/static/locales/pl/common.json +++ b/apps/web/public/static/locales/pl/common.json @@ -1147,6 +1147,7 @@ "set_location": "Określ lokalizację", "update_location": "Zaktualizuj lokalizację", "location_updated": "Lokalizacja zaktualizowana", + "location_update_failed": "Aktualizacja lokalizacji nie powiodła się", "guests_added": "Dodano gości", "unable_to_add_guests": "Nie można dodać gości", "email_validation_error": "To nie wygląda jak adres e-mail", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Ustaw domyślny link do aplikacji", "default_app_link_description": "Ustawienie domyślnego linku do aplikacji pozwala wszystkim nowo utworzonym typom wydarzeń na używanie ustawionego przez Ciebie linku do aplikacji.", "organizer_default_conferencing_app": "Domyślna aplikacja organizatora", + "organizer_default_conferencing_app_not_found": "{{organizer}} nie ma domyślnej aplikacji do konferencji", "under_maintenance": "Przerwa konserwacyjna", "under_maintenance_description": "Zespół {{appName}} przeprowadza zaplanowane prace konserwacyjne. Jeśli masz jakieś pytania, skontaktuj się z pomocą techniczną.", "event_type_seats": "Liczba stanowisk: {{numberOfSeats}}", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Przełóż z tym samym gospodarzem Round-Robin", "reschedule_with_same_round_robin_host_description": "Przełożone wydarzenia zostaną przypisane do tego samego gospodarza, co pierwotnie zaplanowane", "disable_input_if_prefilled": "Wyłącz wprowadzanie, jeśli identyfikator URL jest wypełniony", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Nie masz uprawnień do wprowadzenia tej zmiany w rezerwacji", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Dodaj nowe ciągi powyżej ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/pt-BR/common.json b/apps/web/public/static/locales/pt-BR/common.json index 8e5a49804911ab..d6f322ca862c59 100644 --- a/apps/web/public/static/locales/pt-BR/common.json +++ b/apps/web/public/static/locales/pt-BR/common.json @@ -1147,6 +1147,7 @@ "set_location": "Definir local", "update_location": "Atualizar local", "location_updated": "Local atualizado", + "location_update_failed": "Falha na atualização da localização", "guests_added": "Convidados adicionados", "unable_to_add_guests": "Não foi possível adicionar convidados", "email_validation_error": "Isso não parece um endereço de e-mail", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Defina um link padrão para o app", "default_app_link_description": "Definir um link padrão para o app permite que todos os tipos de evento recém-criados usem o link definido para o app.", "organizer_default_conferencing_app": "Aplicativo padrão do organizador", + "organizer_default_conferencing_app_not_found": "{{organizer}} não possui um aplicativo de conferência padrão", "under_maintenance": "Serviço interrompido para manutenção", "under_maintenance_description": "A equipe do {{appName}} está realizando uma manutenção programada. Se tiver alguma dúvida, fale com o suporte.", "event_type_seats": "{{numberOfSeats}} assentos", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reagendar com o mesmo anfitrião Round-Robin", "reschedule_with_same_round_robin_host_description": "Eventos reagendados serão atribuídos ao mesmo anfitrião inicialmente agendado", "disable_input_if_prefilled": "Desativar entrada se o identificador da URL estiver preenchido", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Você não tem autorização para fazer essa alteração na reserva", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Adicione suas novas strings aqui em cima ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json index 258a53aca4634f..e960bd54c67288 100644 --- a/apps/web/public/static/locales/pt/common.json +++ b/apps/web/public/static/locales/pt/common.json @@ -1147,6 +1147,7 @@ "set_location": "Definir localização", "update_location": "Actualizar localização", "location_updated": "Localização actualizada", + "location_update_failed": "Falha na atualização da localização", "guests_added": "Convidados adicionados", "unable_to_add_guests": "Não foi possível adicionar convidados", "email_validation_error": "Isto não parece ser um endereço de email", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Definir uma ligação predefinida de aplicação", "default_app_link_description": "Ao definir uma ligação predefinida da aplicação, permite que todos os tipos de eventos recém-criados utilizem a ligação de aplicação que definiu.", "organizer_default_conferencing_app": "Aplicação predefinida do organizador", + "organizer_default_conferencing_app_not_found": "{{organizer}} não tem uma aplicação de conferência padrão", "under_maintenance": "Em manutenção", "under_maintenance_description": "A equipa {{appName}} está a executar uma operação de manutenção programada. Se tiver alguma dúvida, por favor, entre em contacto com o suporte.", "event_type_seats": "{{numberOfSeats}} lugares", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reagendar com o mesmo anfitrião Round-Robin", "reschedule_with_same_round_robin_host_description": "Os eventos reagendados serão atribuídos ao mesmo anfitrião inicialmente agendado", "disable_input_if_prefilled": "Desativar entrada se o identificador de URL estiver pré-preenchido", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Não tem autorização para fazer esta alteração na reserva", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/ro/common.json b/apps/web/public/static/locales/ro/common.json index f2a3f72c59b7ba..92c50f678d5e7a 100644 --- a/apps/web/public/static/locales/ro/common.json +++ b/apps/web/public/static/locales/ro/common.json @@ -1147,6 +1147,7 @@ "set_location": "Stabiliți locația", "update_location": "Actualizați locația", "location_updated": "Locație actualizată", + "location_update_failed": "Actualizarea locației a eșuat", "guests_added": "Invitați adăugați", "unable_to_add_guests": "Nu se pot adăuga invitați", "email_validation_error": "Aceasta nu pare să fie o adresă de e-mail", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Setați un link implicit pentru aplicații", "default_app_link_description": "Setarea unui link implicit pentru aplicații permite tuturor tipurilor de evenimente nou-create să utilizeze linkul pentru aplicații pe care l-ați setat.", "organizer_default_conferencing_app": "Aplicația implicită a organizatorului", + "organizer_default_conferencing_app_not_found": "{{organizer}} nu are o aplicație de conferință implicită", "under_maintenance": "Serviciu întrerupt pentru întreținere", "under_maintenance_description": "Echipa {{appName}} efectuează lucrări de întreținere programate. Dacă aveți întrebări, contactați serviciul de asistență.", "event_type_seats": "{{numberOfSeats}} (de) locuri", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Reprogramează cu același gazdă Round-Robin", "reschedule_with_same_round_robin_host_description": "Evenimentele reprogramate vor fi atribuite aceleași gazde ca inițial", "disable_input_if_prefilled": "Dezactivează introducerea dacă identificatorul URL este precompletat", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Nu aveți autorizația necesară pentru a face această modificare în rezervare", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Adăugați stringurile noi deasupra acestui rând ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/sr/common.json b/apps/web/public/static/locales/sr/common.json index 446cccef7b1edb..d7991f4dc720df 100644 --- a/apps/web/public/static/locales/sr/common.json +++ b/apps/web/public/static/locales/sr/common.json @@ -1147,6 +1147,7 @@ "set_location": "Podesite lokaciju", "update_location": "Ažurirajte lokaciju", "location_updated": "Lokacija je ažurirana", + "location_update_failed": "Ažuriranje lokacije nije uspelo", "guests_added": "Gosti dodati", "unable_to_add_guests": "Nije moguće dodati goste", "email_validation_error": "To ne liči na imejl adresu", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Podesite podrazumevani link aplikacije", "default_app_link_description": "Podešavanje podrazumevanog linka aplikacije omogućava novokreiranim tipovima događaja da koriste link aplikacije koji ste postavili.", "organizer_default_conferencing_app": "Podrazumevana aplikacija organizatora", + "organizer_default_conferencing_app_not_found": "{{organizer}} nema podrazumevanu aplikaciju za konferencije", "under_maintenance": "Ne radi zbog održavanja", "under_maintenance_description": "Tim {{appName}} izvodi zakazano održavanje. Ako imate pitanja, obratite se korisničkoj podršci.", "event_type_seats": "{{numberOfSeats}} mesta", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Ponovo zakaži sa istim Round-Robin domaćinom", "reschedule_with_same_round_robin_host_description": "Ponovo zakazani događaji će biti dodeljeni istom domaćinu kao i prvobitno zakazani", "disable_input_if_prefilled": "Onemogući unos ako je URL identifikator unapred popunjen", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Nemate ovlašćenje da izvršite ovu promenu u rezervaciji", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Dodajte svoje nove stringove iznad ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/sv/common.json b/apps/web/public/static/locales/sv/common.json index 3ef4ea84242b9d..a47f4b9415ba30 100644 --- a/apps/web/public/static/locales/sv/common.json +++ b/apps/web/public/static/locales/sv/common.json @@ -1147,6 +1147,7 @@ "set_location": "Ställ in plats", "update_location": "Uppdatera plats", "location_updated": "Plats uppdaterad", + "location_update_failed": "Uppdatering av plats misslyckades", "guests_added": "Gäster tillagda", "unable_to_add_guests": "Kan inte lägga till gäster", "email_validation_error": "Det ser inte ut som en e-postadress", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Skapa en standardapplänk", "default_app_link_description": "Om du skapar en standardapplänk kan alla händelsetyper som nyligen skapats använda den applänk som du har angett.", "organizer_default_conferencing_app": "Arrangörens standardapp", + "organizer_default_conferencing_app_not_found": "{{organizer}} har ingen standardkonferensapp", "under_maintenance": "Nere för underhåll", "under_maintenance_description": "{{appName}}-teamet genomför planerat underhåll. Om du har några frågor kan du kontakta supporten.", "event_type_seats": "{{numberOfSeats}} platser", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Boka om med samma Round-Robin värd", "reschedule_with_same_round_robin_host_description": "Ombokade händelser kommer att tilldelas samma värd som ursprungligen bokades", "disable_input_if_prefilled": "Inaktivera inmatning om URL-identifieraren är förifylld", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Du har inte behörighet att göra denna ändring i bokningen", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/tr/common.json b/apps/web/public/static/locales/tr/common.json index 30fb394361edc3..85f55add81747e 100644 --- a/apps/web/public/static/locales/tr/common.json +++ b/apps/web/public/static/locales/tr/common.json @@ -1147,6 +1147,7 @@ "set_location": "Konumu Ayarla", "update_location": "Konumu Güncelle", "location_updated": "Konum güncellendi", + "location_update_failed": "Konum güncellemesi başarısız oldu", "guests_added": "Misafirler eklendi", "unable_to_add_guests": "Konuklar eklenemiyor", "email_validation_error": "Bu bir e-posta adresi gibi görünmüyor", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Varsayılan uygulama bağlantısını ayarlayın", "default_app_link_description": "Varsayılan uygulama bağlantısını ayarlamak, yeni oluşturulan tüm etkinlik türlerinin ayarladığınız uygulama bağlantısını kullanmasına olanak tanır.", "organizer_default_conferencing_app": "Organizatörün varsayılan uygulaması", + "organizer_default_conferencing_app_not_found": "{{organizer}}'ın varsayılan konferans uygulaması bulunamadı", "under_maintenance": "Bakımda", "under_maintenance_description": "{{appName}} ekibi planlı bir bakım çalışması gerçekleştiriyor. Herhangi bir sorunuz varsa lütfen destek ekibiyle iletişime geçin.", "event_type_seats": "{{numberOfSeats}} yer", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Aynı Round-Robin ev sahibi ile yeniden planla", "reschedule_with_same_round_robin_host_description": "Yeniden planlanan etkinlikler, başlangıçta planlandığı gibi aynı ev sahibine atanacaktır", "disable_input_if_prefilled": "URL tanımlayıcısı önceden doldurulmuşsa girişi devre dışı bırak", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Bu rezervasyonda değişiklik yapma yetkiniz yok", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Yeni dizelerinizi yukarıya ekleyin ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/uk/common.json b/apps/web/public/static/locales/uk/common.json index b30c90b9025543..bbfaa9f9991c57 100644 --- a/apps/web/public/static/locales/uk/common.json +++ b/apps/web/public/static/locales/uk/common.json @@ -1147,6 +1147,7 @@ "set_location": "Указати розташування", "update_location": "Оновити розташування", "location_updated": "Розташування оновлено", + "location_update_failed": "Не вдалося оновити місцезнаходження", "guests_added": "Гостей додано", "unable_to_add_guests": "Не вдалося додати гостей", "email_validation_error": "Це не схоже на адресу електронної пошти", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Установити посилання на додаток за замовчуванням", "default_app_link_description": "Посилання на додаток за замовчуванням використовуватиметься для всіх новостворених типів подій.", "organizer_default_conferencing_app": "Додаток організації за замовчуванням", + "organizer_default_conferencing_app_not_found": "{{organizer}} не має додатку для конференцій за замовчуванням", "under_maintenance": "На обслуговуванні", "under_maintenance_description": "Команда {{appName}} здійснює планове обслуговування. Якщо маєте запитання, зверніться в службу підтримки.", "event_type_seats": "Місць: {{numberOfSeats}}", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Перепланувати з тим самим ведучим Round-Robin", "reschedule_with_same_round_robin_host_description": "Переплановані події будуть призначені тому ж ведучому, що й спочатку", "disable_input_if_prefilled": "Вимкнути введення, якщо ідентифікатор URL попередньо заповнений", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Ви не маєте дозволу на внесення цієї зміни до бронювання", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/vi/common.json b/apps/web/public/static/locales/vi/common.json index abf899bdecc60f..38d30b71b71291 100644 --- a/apps/web/public/static/locales/vi/common.json +++ b/apps/web/public/static/locales/vi/common.json @@ -1147,6 +1147,7 @@ "set_location": "Đặt địa điểm", "update_location": "Cập nhật địa điểm", "location_updated": "Địa điểm đã cập nhật", + "location_update_failed": "Cập nhật vị trí thất bại", "guests_added": "Khách đã thêm", "unable_to_add_guests": "Không thể thêm khách", "email_validation_error": "Đó không giống địa chỉ email", @@ -1887,6 +1888,7 @@ "default_app_link_title": "Đặt một liên kết ứng dụng mặc định", "default_app_link_description": "Thao tác đặt liên kết ứng dụng mặc định sẽ giúp cho phép tất cả các loại sự kiện mới tạo có thể dùng liên kết ứng dụng mà bạn đã đặt.", "organizer_default_conferencing_app": "Ứng dụng mặc định của nhà tổ chức", + "organizer_default_conferencing_app_not_found": "{{organizer}} không có ứng dụng hội nghị mặc định", "under_maintenance": "Tạm ngừng để bảo trì", "under_maintenance_description": "Nhóm {{appName}} đang thực hiện việc bảo trì theo lịch. Nếu bạn có thắc mắc gì, vui lòng liên hệ bộ phận hỗ trợ.", "event_type_seats": "{{numberOfSeats}} chỗ ngồi", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "Đặt lại lịch với cùng một host Round-Robin", "reschedule_with_same_round_robin_host_description": "Các sự kiện được đặt lại sẽ được giao cho cùng một host như ban đầu", "disable_input_if_prefilled": "Vô hiệu hóa đầu vào nếu URL đã được điền trước", + "you_are_unauthorized_to_make_this_change_to_the_booking": "Bạn không có quyền thực hiện thay đổi này đối với đặt chỗ", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json index 5ec2b19ed1e0fe..d6c807e4f7d08a 100644 --- a/apps/web/public/static/locales/zh-CN/common.json +++ b/apps/web/public/static/locales/zh-CN/common.json @@ -1147,6 +1147,7 @@ "set_location": "设置位置", "update_location": "更新位置", "location_updated": "位置已更新", + "location_update_failed": "位置更新失败", "guests_added": "嘉宾已添加", "unable_to_add_guests": "无法添加嘉宾", "email_validation_error": "这看起来不像是电子邮件地址", @@ -1887,6 +1888,7 @@ "default_app_link_title": "设置默认应用链接", "default_app_link_description": "设置默认应用链接可以让所有新创建的活动类型使用您设置的应用链接。", "organizer_default_conferencing_app": "组织者的默认应用", + "organizer_default_conferencing_app_not_found": "{{organizer}} 没有默认的会议应用", "under_maintenance": "停机维护", "under_maintenance_description": "{{appName}} 团队正在进行计划维护。如果您有任何疑问，请联系支持。", "event_type_seats": "{{numberOfSeats}} 个位置", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "与同一轮询主持人重新安排", "reschedule_with_same_round_robin_host_description": "重新安排的事件将分配给最初安排的同一主持人", "disable_input_if_prefilled": "如果 URL 标识符已预填，则禁用输入", + "you_are_unauthorized_to_make_this_change_to_the_booking": "您无权对此预订进行更改", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ 在此上方添加您的新字符串 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json index b0036c8bddd6c4..013b3cfb131b57 100644 --- a/apps/web/public/static/locales/zh-TW/common.json +++ b/apps/web/public/static/locales/zh-TW/common.json @@ -1147,6 +1147,7 @@ "set_location": "設定地點", "update_location": "更新地點", "location_updated": "地點已更新", + "location_update_failed": "位置更新失敗", "guests_added": "賓客已新增", "unable_to_add_guests": "無法新增賓客", "email_validation_error": "這似乎不是電子郵件地址", @@ -1887,6 +1888,7 @@ "default_app_link_title": "設定預設應用程式連結", "default_app_link_description": "設定預設應用程式連結，即可讓所有全新建立的活動類型使用您設定的應用程式連結。", "organizer_default_conferencing_app": "主辦者的預設應用程式", + "organizer_default_conferencing_app_not_found": "{{organizer}} 沒有預設的會議應用程式", "under_maintenance": "維修停機中", "under_maintenance_description": "{{appName}} 團隊正在執行預定維修。如有任何疑問，請聯絡支援團隊。", "event_type_seats": "{{numberOfSeats}} 個座位", @@ -2593,5 +2595,6 @@ "reschedule_with_same_round_robin_host_title": "重新安排與相同的 Round-Robin 主機", "reschedule_with_same_round_robin_host_description": "重新安排的事件將分配給最初安排的相同主機", "disable_input_if_prefilled": "如果 URL 識別碼已填寫，則禁用輸入", + "you_are_unauthorized_to_make_this_change_to_the_booking": "您無權更改此預訂", "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ 請在此處新增您的字串 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑" } diff --git a/i18n.lock b/i18n.lock index a57cbeffa725a1..f142447fdabb7d 100644 --- a/i18n.lock +++ b/i18n.lock @@ -1149,6 +1149,7 @@ checksums: set_location: 84a52cdae2ca02490055aaa40583fc1d update_location: 741758fb7a9c090a9ab9e87a6c62fedc location_updated: 639cd11ff17c5fea84384a06e686b782 + location_update_failed: a57b1dbaf515c1ab934522e6d837291a guests_added: a04cef448ca54083e9e741d1233ead0b unable_to_add_guests: 10d1eebffb88f731d40144bdf8e9929b email_validation_error: 0a26bc82b13d45d06d40a3e841877504 @@ -1889,6 +1890,7 @@ checksums: default_app_link_title: 449f7f5ed6e56536994089aa8f49e407 default_app_link_description: c5e6ef98d08cb425c3b2759b13b9a9c2 organizer_default_conferencing_app: 8cc159b92c6eb2bbcb90f0ddb70e7ee5 + organizer_default_conferencing_app_not_found: 783160f2c53f5d7fc92f8ae7430ff9cf under_maintenance: c07caeb218bfc9a104a00265857cd507 under_maintenance_description: b6da95c38efa2247c7bb8834523bf67d event_type_seats: a2dcd6b544ca1b20a2f1bf4166919e86 @@ -2595,4 +2597,5 @@ checksums: reschedule_with_same_round_robin_host_title: 0b315779fdae608827ceab1b1640423b reschedule_with_same_round_robin_host_description: d581417695b5275d6706a08b8d7dd39a disable_input_if_prefilled: 19415e3062d8ef1031beb38ce4a0b3c9 + you_are_unauthorized_to_make_this_change_to_the_booking: c770486d5b4b98a407ff485cbe60e563 ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS: 18323f2f3fabb169a7cb50ff62433850 From 2f2f4dba60fff18d47477d0ae1ffa630f335aa53 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 11 Sep 2024 12:19:00 -0300 Subject: [PATCH 08/40] chore: v4.4.8 (#16597) --- apps/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/package.json b/apps/web/package.json index a1fbd6707a5053..251062f49ede5e 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@calcom/web", - "version": "4.4.7", + "version": "4.4.8", "private": true, "scripts": { "analyze": "ANALYZE=true next build", From 89250422ea0dc2fa0f4d7f2c5b7d3ae29842cd45 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:14:03 +0400 Subject: [PATCH 09/40] fix: API V1 slots add explicit orgSlug null fallback (#16593) * add explicit orgSlug null fallback * do it in schema * to nullish --- .../api/get-inbound-dynamic-variables.ts | 2 +- apps/web/test/lib/getSchedule.test.ts | 23 +++++++++++++++++++ .../getSchedule/futureLimit.timezone.test.ts | 16 +++++++++++++ .../trpc/server/routers/viewer/slots/types.ts | 9 +++++--- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/apps/web/pages/api/get-inbound-dynamic-variables.ts b/apps/web/pages/api/get-inbound-dynamic-variables.ts index e7bc8ea99479ac..936da7f8a5b7af 100644 --- a/apps/web/pages/api/get-inbound-dynamic-variables.ts +++ b/apps/web/pages/api/get-inbound-dynamic-variables.ts @@ -85,7 +85,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { const startTime = now.startOf("month").toISOString(); const endTime = now.add(2, "month").endOf("month").toISOString(); - const orgSlug = eventType?.team?.parent?.slug ?? undefined; + const orgSlug = eventType?.team?.parent?.slug ?? null; const availableSlots = await getAvailableSlots({ input: { diff --git a/apps/web/test/lib/getSchedule.test.ts b/apps/web/test/lib/getSchedule.test.ts index 4d0a49c5763583..4946c304f6582a 100644 --- a/apps/web/test/lib/getSchedule.test.ts +++ b/apps/web/test/lib/getSchedule.test.ts @@ -78,6 +78,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -176,6 +177,7 @@ describe("getSchedule", () => { timeZone: Timezones["+5:30"], isTeamEvent: true, teamMemberEmail: "example@example.com", + orgSlug: null, }, }); @@ -195,6 +197,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: true, + orgSlug: null, }, }); @@ -321,6 +324,7 @@ describe("getSchedule", () => { timeZone: Timezones["+5:30"], isTeamEvent: true, teamMemberEmail: "example@example.com", + orgSlug: null, }, }); @@ -349,6 +353,7 @@ describe("getSchedule", () => { timeZone: Timezones["+5:30"], isTeamEvent: true, teamMemberEmail: "example1@example.com", + orgSlug: null, }, }); @@ -438,6 +443,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -470,6 +476,7 @@ describe("getSchedule", () => { endTime: `${plus3DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -529,6 +536,7 @@ describe("getSchedule", () => { const { dateString: plus2DateString } = getDate({ dateIncrement: 2 }); const scheduleForEventWith30Length = await getSchedule({ input: { + orgSlug: null, eventTypeId: 1, eventTypeSlug: "", startTime: `${plus1DateString}T18:30:00.000Z`, @@ -565,6 +573,7 @@ describe("getSchedule", () => { const scheduleForEventWith30minsLengthAndSlotInterval2hrs = await getSchedule({ input: { + orgSlug: null, eventTypeId: 2, eventTypeSlug: "", startTime: `${plus1DateString}T18:30:00.000Z`, @@ -630,6 +639,7 @@ describe("getSchedule", () => { endTime: `${todayDateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -653,6 +663,7 @@ describe("getSchedule", () => { endTime: `${todayDateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); expect(scheduleForEventWithBookingNotice10Hrs).toHaveTimeSlots( @@ -715,6 +726,7 @@ describe("getSchedule", () => { endTime: `${plus3DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -789,6 +801,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -847,6 +860,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -911,6 +925,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -989,6 +1004,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1101,6 +1117,7 @@ describe("getSchedule", () => { endTime: `${plus3DateString}T23:59:59.999Z`, timeZone: Timezones["+6:00"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1112,6 +1129,7 @@ describe("getSchedule", () => { endTime: `${plus3DateString}T23:59:59.999Z`, timeZone: Timezones["+6:00"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1202,6 +1220,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1300,6 +1319,7 @@ describe("getSchedule", () => { endTime: `${plus1DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: true, + orgSlug: null, }, }); @@ -1330,6 +1350,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: true, + orgSlug: null, }, }); @@ -1438,6 +1459,7 @@ describe("getSchedule", () => { endTime: `${plus2DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: true, + orgSlug: null, }, }); // A user with blocked time in another event, still affects Team Event availability @@ -1466,6 +1488,7 @@ describe("getSchedule", () => { endTime: `${plus3DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: true, + orgSlug: null, }, }); // A user with blocked time in another event, still affects Team Event availability diff --git a/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts b/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts index a720eb43b00c0d..84a76dec7313a3 100644 --- a/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts +++ b/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts @@ -121,6 +121,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -208,6 +209,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -291,6 +293,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -385,6 +388,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -488,6 +492,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -577,6 +582,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -660,6 +666,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["-11:00"], isTeamEvent: false, + orgSlug: null, }, }); @@ -782,6 +789,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -879,6 +887,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -979,6 +988,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1086,6 +1096,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1205,6 +1216,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1301,6 +1313,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1409,6 +1422,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1510,6 +1524,7 @@ describe("getSchedule", () => { endTime: `${plus5DateString}T18:29:59.999Z`, timeZone: Timezones["+5:30"], isTeamEvent: false, + orgSlug: null, }, }); @@ -1594,6 +1609,7 @@ describe("getSchedule", () => { endTime: `2024-07-31T18:29:59.999Z`, timeZone: Timezones["-11:00"], isTeamEvent: false, + orgSlug: null, }, }); diff --git a/packages/trpc/server/routers/viewer/slots/types.ts b/packages/trpc/server/routers/viewer/slots/types.ts index 851f2135818936..3e124615f942b5 100644 --- a/packages/trpc/server/routers/viewer/slots/types.ts +++ b/packages/trpc/server/routers/viewer/slots/types.ts @@ -20,17 +20,20 @@ export const getScheduleSchema = z .string() .optional() .transform((val) => val && parseInt(val)), - rescheduleUid: z.string().optional().nullable(), + rescheduleUid: z.string().nullish(), // whether to do team event or user event isTeamEvent: z.boolean().optional().default(false), - orgSlug: z.string().optional(), - teamMemberEmail: z.string().nullable().optional(), + orgSlug: z.string().nullish(), + teamMemberEmail: z.string().nullish(), }) .transform((val) => { // Need this so we can pass a single username in the query string form public API if (val.usernameList) { val.usernameList = Array.isArray(val.usernameList) ? val.usernameList : [val.usernameList]; } + if (!val.orgSlug) { + val.orgSlug = null; + } return val; }) .refine( From 74a9f3c19e23a7df40085366c36676db8f219714 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Wed, 11 Sep 2024 14:11:10 -0400 Subject: [PATCH 10/40] hotfix: availability/[schedule] (#16598) --- apps/web/app/future/availability/[schedule]/page.tsx | 2 +- apps/web/modules/availability/[schedule]/schedule-view.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/app/future/availability/[schedule]/page.tsx b/apps/web/app/future/availability/[schedule]/page.tsx index 88588d9de3fa0e..ec41afeb0329a7 100644 --- a/apps/web/app/future/availability/[schedule]/page.tsx +++ b/apps/web/app/future/availability/[schedule]/page.tsx @@ -71,7 +71,7 @@ const Page = async ({ params }: PageProps) => { travelSchedules = await TravelScheduleRepository.findTravelSchedulesByUserId(userId); } catch (e) {} - return ; + return ; }; export default WithLayout({ ServerPage: Page }); diff --git a/apps/web/modules/availability/[schedule]/schedule-view.tsx b/apps/web/modules/availability/[schedule]/schedule-view.tsx index 4876b29f47eddb..52b7b8ea2a3c50 100644 --- a/apps/web/modules/availability/[schedule]/schedule-view.tsx +++ b/apps/web/modules/availability/[schedule]/schedule-view.tsx @@ -15,12 +15,12 @@ import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; import { showToast } from "@calcom/ui"; type PageProps = { - schedule?: Awaited>; + scheduleFetched?: Awaited>; travelSchedules?: Awaited>; }; export const AvailabilitySettingsWebWrapper = ({ - schedule: scheduleProp, + scheduleFetched: scheduleProp, travelSchedules: travelSchedulesProp, }: PageProps) => { const searchParams = useCompatSearchParams(); From 4a59841b02ecbd614dcce110d09cf4f3a559a126 Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Thu, 12 Sep 2024 06:26:04 +0530 Subject: [PATCH 11/40] feat: booking with phone number (#14461) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Omar López Co-authored-by: Joe Au-Yeung Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> --- .../components/booking/BookingListItem.tsx | 42 +- apps/web/lib/booking.ts | 19 +- .../bookings/views/bookings-single-view.tsx | 12 +- apps/web/playwright/lib/testUtils.ts | 8 +- .../playwright/organization/booking.e2e.ts | 155 ++- apps/web/public/static/locales/en/common.json | 6 +- .../bookingScenario/MockPaymentService.ts | 4 +- .../utils/bookingScenario/bookingScenario.ts | 108 +- .../web/test/utils/bookingScenario/expects.ts | 80 +- .../getMockRequestDataForBooking.ts | 1 + .../app-store/paypal/lib/PaymentService.ts | 4 +- .../stripepayment/lib/PaymentService.ts | 20 +- .../app-store/stripepayment/lib/customer.ts | 8 +- packages/app-store/vital/lib/reschedule.ts | 31 +- .../wipemycalother/lib/reschedule.ts | 32 +- packages/emails/email-manager.ts | 104 +- packages/emails/src/components/WhoInfo.tsx | 20 +- packages/emails/templates/_base-email.ts | 6 + packages/features/bookings/Booker/Booker.tsx | 2 +- .../components/hooks/useInitialFormValues.ts | 4 +- packages/features/bookings/lib/SystemField.ts | 1 + .../features/bookings/lib/getBookingFields.ts | 29 +- .../lib/getBookingResponsesSchema.test.ts | 2 +- .../bookings/lib/getBookingResponsesSchema.ts | 14 +- .../bookings/lib/getCalEventResponses.ts | 12 + .../features/bookings/lib/getUserBooking.ts | 1 + .../bookings/lib/handleBookingRequested.ts | 5 +- .../bookings/lib/handleCancelBooking.ts | 16 +- .../bookings/lib/handleConfirmation.ts | 5 +- .../features/bookings/lib/handleNewBooking.ts | 76 +- .../lib/handleNewBooking/createBooking.ts | 2 + .../lib/handleNewBooking/getBookingData.ts | 2 + .../handleNewBooking/getEventTypesFromDB.ts | 12 +- .../getOriginalRescheduledBooking.ts | 1 + .../handleNewBooking/test/reschedule.test.ts | 214 +++- .../collective-scheduling.test.ts | 935 +++++++++++++++--- .../bookings/lib/handleNewBooking/types.ts | 1 + .../handleSeats/cancel/cancelAttendeeSeat.ts | 4 +- .../lib/handleSeats/create/createNewSeat.ts | 9 +- .../bookings/lib/handleSeats/handleSeats.ts | 5 +- .../attendeeRescheduleSeatedBooking.ts | 4 +- .../owner/combineTwoSeatedBookings.ts | 4 +- .../owner/moveSeatedBookingToNewTimeSlot.ts | 4 +- .../bookings/lib/handleSeats/types.d.ts | 1 + .../credentials/handleDeleteCredential.ts | 17 +- packages/features/ee/payments/api/webhook.ts | 4 +- .../ee/round-robin/roundRobinReassignment.ts | 7 +- .../lib/reminders/providers/twilioProvider.ts | 2 + .../lib/reminders/smsReminderManager.ts | 1 + .../eventtypes/lib/bookingFieldsManager.ts | 13 +- .../instant-meeting/handleInstantMeeting.ts | 3 +- packages/lib/CalEventParser.ts | 7 +- packages/lib/CalendarService.ts | 6 +- packages/lib/contructEmailFromPhoneNumber.ts | 4 + packages/lib/event-types/getEventTypeById.ts | 3 +- packages/lib/isSmsCalEmail.ts | 3 + packages/lib/payment/getBooking.ts | 9 + packages/lib/payment/handlePayment.ts | 9 +- packages/lib/payment/handlePaymentSuccess.ts | 4 +- .../atoms/booker/BookerWebWrapper.tsx | 2 + .../migration.sql | 2 + packages/prisma/schema.prisma | 1 + packages/prisma/zod-utils.ts | 1 + packages/sms/attendee/awaiting-payment-sms.ts | 20 + packages/sms/attendee/cancelled-seat-sms.ts | 18 + packages/sms/attendee/event-cancelled-sms.ts | 23 + packages/sms/attendee/event-declined-sms.ts | 17 + .../attendee/event-location-changed-sms.ts | 17 + packages/sms/attendee/event-request-sms.ts | 21 + .../event-request-to-reschedule-sms.ts | 19 + .../sms/attendee/event-rescheduled-sms.ts | 20 + packages/sms/attendee/event-scheduled-sms.ts | 20 + packages/sms/sms-manager.ts | 99 ++ .../loggedInViewer/connectAndJoin.handler.ts | 17 +- .../viewer/bookings/confirm.handler.ts | 18 +- .../viewer/bookings/editLocation.handler.ts | 4 +- .../bookings/requestReschedule.handler.ts | 14 +- .../server/routers/viewer/bookings/types.ts | 2 +- .../server/routers/viewer/bookings/util.ts | 37 +- .../viewer/eventTypes/update.handler.ts | 2 + .../server/routers/viewer/eventTypes/util.ts | 26 + .../workflows/activateEventType.handler.ts | 4 +- packages/types/Calendar.d.ts | 2 + packages/types/PaymentService.d.ts | 6 +- .../popover/MeetingTimeInTimezones.tsx | 1 + 85 files changed, 2167 insertions(+), 363 deletions(-) create mode 100644 packages/lib/contructEmailFromPhoneNumber.ts create mode 100644 packages/lib/isSmsCalEmail.ts create mode 100644 packages/prisma/migrations/20240408155446_add_phone_number_in_attendee/migration.sql create mode 100644 packages/sms/attendee/awaiting-payment-sms.ts create mode 100644 packages/sms/attendee/cancelled-seat-sms.ts create mode 100644 packages/sms/attendee/event-cancelled-sms.ts create mode 100644 packages/sms/attendee/event-declined-sms.ts create mode 100644 packages/sms/attendee/event-location-changed-sms.ts create mode 100644 packages/sms/attendee/event-request-sms.ts create mode 100644 packages/sms/attendee/event-request-to-reschedule-sms.ts create mode 100644 packages/sms/attendee/event-rescheduled-sms.ts create mode 100644 packages/sms/attendee/event-scheduled-sms.ts create mode 100644 packages/sms/sms-manager.ts diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx index 69c61e2cbd6539..8076a673e68dbe 100644 --- a/apps/web/components/booking/BookingListItem.tsx +++ b/apps/web/components/booking/BookingListItem.tsx @@ -14,6 +14,7 @@ import getPaymentAppData from "@calcom/lib/getPaymentAppData"; import { useCopy } from "@calcom/lib/hooks/useCopy"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useGetTheme } from "@calcom/lib/hooks/useTheme"; +import isSmsCalEmail from "@calcom/lib/isSmsCalEmail"; import { getEveryFreqFor } from "@calcom/lib/recurringStrings"; import { BookingStatus, SchedulingType } from "@calcom/prisma/enums"; import { bookingMetadataSchema } from "@calcom/prisma/zod-utils"; @@ -322,7 +323,7 @@ function BookingListItem(booking: BookingItemProps) { const urlSearchParams = new URLSearchParams({ allRemainingBookings: isTabRecurring.toString(), }); - if (booking.attendees[0]) urlSearchParams.set("email", booking.attendees[0].email); + if (booking.attendees[0].email) urlSearchParams.set("email", booking.attendees[0].email); return `/booking/${booking.uid}?${urlSearchParams.toString()}`; }; @@ -356,6 +357,7 @@ function BookingListItem(booking: BookingItemProps) { email: attendee.email, id: attendee.id, noShow: attendee.noShow || false, + phoneNumber: attendee.phoneNumber, }; }); return ( @@ -730,6 +732,7 @@ const FirstAttendee = ({ type AttendeeProps = { name?: string; email: string; + phoneNumber: string | null; id: number; noShow: boolean; }; @@ -740,7 +743,7 @@ type NoShowProps = { }; const Attendee = (attendeeProps: AttendeeProps & NoShowProps) => { - const { email, name, bookingUid, isBookingInPast, noShow: noShowAttendee } = attendeeProps; + const { email, name, bookingUid, isBookingInPast, noShow: noShowAttendee, phoneNumber } = attendeeProps; const { t } = useLocale(); const [noShow, setNoShow] = useState(noShowAttendee); @@ -784,38 +787,43 @@ const Attendee = (attendeeProps: AttendeeProps & NoShowProps) => { - - { - setOpenDropdown(false); - e.stopPropagation(); - }}> - {t("email")} - - + {!isSmsCalEmail(email) && ( + + { + setOpenDropdown(false); + e.stopPropagation(); + }}> + {t("email")} + + + )} + { e.preventDefault(); - copyToClipboard(email); + const isEmailCopied = isSmsCalEmail(email); + copyToClipboard(isEmailCopied ? email : phoneNumber ?? ""); setOpenDropdown(false); - showToast(t("email_copied"), "success"); + showToast(isEmailCopied ? t("email_copied") : t("phone_number_copied"), "success"); }}> {!isCopied ? t("copy") : t("copied")} + {isBookingInPast && ( {noShow ? ( { + e.preventDefault(); setOpenDropdown(false); toggleNoShow({ attendee: { noShow: false, email }, bookingUid }); - e.preventDefault(); }} StartIcon="eye"> {t("unmark_as_no_show")} @@ -824,9 +832,9 @@ const Attendee = (attendeeProps: AttendeeProps & NoShowProps) => { { + e.preventDefault(); setOpenDropdown(false); toggleNoShow({ attendee: { noShow: true, email }, bookingUid }); - e.preventDefault(); }} StartIcon="eye-off"> {t("mark_as_no_show")} diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts index c9033fa5aa96b9..81060f76f4ec15 100644 --- a/apps/web/lib/booking.ts +++ b/apps/web/lib/booking.ts @@ -39,6 +39,11 @@ export const getEventTypesFromDB = async (id: number) => { bookingFields: true, disableGuests: true, timeZone: true, + profile: { + select: { + organizationId: true, + }, + }, teamId: true, owner: { select: userSelect, @@ -82,11 +87,13 @@ export const getEventTypesFromDB = async (id: number) => { } const metadata = EventTypeMetaDataSchema.parse(eventType.metadata); + const { profile, ...restEventType } = eventType; + const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId; return { isDynamic: false, - ...eventType, - bookingFields: getBookingFieldsWithSystemFields(eventType), + ...restEventType, + bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }), metadata, }; }; @@ -101,7 +108,7 @@ export const handleSeatsEventTypeOnBooking = async ( bookingInfo: Partial< Prisma.BookingGetPayload<{ include: { - attendees: { select: { name: true; email: true } }; + attendees: { select: { name: true; email: true; phoneNumber: true } }; seatsReferences: { select: { referenceUid: true } }; user: { select: { @@ -123,6 +130,7 @@ export const handleSeatsEventTypeOnBooking = async ( attendee: { email: string; name: string; + phoneNumber: string | null; }; id: number; data: Prisma.JsonValue; @@ -141,6 +149,7 @@ export const handleSeatsEventTypeOnBooking = async ( select: { name: true, email: true, + phoneNumber: true, }, }, }, @@ -158,7 +167,9 @@ export const handleSeatsEventTypeOnBooking = async ( if (!eventType.seatsShowAttendees && !isHost) { if (seatAttendee) { const attendee = bookingInfo?.attendees?.find((a) => { - return a.email === seatAttendee?.attendee?.email; + return ( + a.email === seatAttendee?.attendee?.email || a.phoneNumber === seatAttendee?.attendee?.phoneNumber + ); }); bookingInfo["attendees"] = attendee ? [attendee] : []; } else { diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx index 56a9d2ec40af19..5079bfa7ffee86 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.tsx @@ -42,6 +42,7 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; import useTheme from "@calcom/lib/hooks/useTheme"; +import isSmsCalEmail from "@calcom/lib/isSmsCalEmail"; import { getEveryFreqFor } from "@calcom/lib/recurringStrings"; import { getIs24hClockFromLocalStorage, isBrowserLocale24h } from "@calcom/lib/timeFormat"; import { localStorage } from "@calcom/lib/webstorage"; @@ -144,7 +145,7 @@ export default function Success(props: PageProps) { const attendees = bookingInfo?.attendees; - const isGmail = !!attendees.find((attendee) => attendee.email.includes("gmail.com")); + const isGmail = !!attendees.find((attendee) => attendee?.email?.includes("gmail.com")); const [is24h, setIs24h] = useState( props?.userTimeFormat ? props.userTimeFormat === 24 : isBrowserLocale24h() @@ -551,7 +552,14 @@ export default function Success(props: PageProps) { {attendee.name && (

{attendee.name}

)} -

{attendee.email}

+ {attendee.phoneNumber && ( +

+ {attendee.phoneNumber} +

+ )} + {!isSmsCalEmail(attendee.email) && ( +

{attendee.email}

+ )}
))} diff --git a/apps/web/playwright/lib/testUtils.ts b/apps/web/playwright/lib/testUtils.ts index 7420bb5c40da71..2cdfb451cf3052 100644 --- a/apps/web/playwright/lib/testUtils.ts +++ b/apps/web/playwright/lib/testUtils.ts @@ -137,13 +137,19 @@ export async function bookFirstEvent(page: Page) { await bookEventOnThisPage(page); } -export const bookTimeSlot = async (page: Page, opts?: { name?: string; email?: string; title?: string }) => { +export const bookTimeSlot = async ( + page: Page, + opts?: { name?: string; email?: string; title?: string; attendeePhoneNumber?: string } +) => { // --- fill form await page.fill('[name="name"]', opts?.name ?? testName); await page.fill('[name="email"]', opts?.email ?? testEmail); if (opts?.title) { await page.fill('[name="title"]', opts.title); } + if (opts?.attendeePhoneNumber) { + await page.fill('[name="attendeePhoneNumber"]', opts.attendeePhoneNumber ?? "+918888888888"); + } await page.press('[name="email"]', "Enter"); }; diff --git a/apps/web/playwright/organization/booking.e2e.ts b/apps/web/playwright/organization/booking.e2e.ts index 8864798ef8135c..684cccfc0a0d2b 100644 --- a/apps/web/playwright/organization/booking.e2e.ts +++ b/apps/web/playwright/organization/booking.e2e.ts @@ -80,6 +80,63 @@ test.describe("Bookings", () => { // TODO: Assert whether the user received an email }); + test("Can create a booking for Collective EventType with only phone number", async ({ + page, + users, + orgs, + }) => { + const org = await orgs.create({ + name: "TestOrg", + }); + const teamMatesObj = [ + { name: "teammate-1" }, + { name: "teammate-2" }, + { name: "teammate-3" }, + { name: "teammate-4" }, + ]; + + const owner = await users.create( + { + username: "pro-user", + name: "pro-user", + organizationId: org.id, + roleInOrganization: MembershipRole.MEMBER, + }, + { + hasTeam: true, + teammates: teamMatesObj, + schedulingType: SchedulingType.COLLECTIVE, + } + ); + const { team } = await owner.getFirstTeamMembership(); + const teamEvent = await owner.getFirstTeamEvent(team.id); + await owner.apiLogin(); + + await markPhoneNumberAsRequiredAndEmailAsOptional(page, teamEvent.id); + + await expectPageToBeNotFound({ page, url: `/team/${team.slug}/${teamEvent.slug}` }); + await doOnOrgDomain( + { + orgSlug: org.slug, + page, + }, + async () => { + await bookTeamEvent({ + page, + team, + event: teamEvent, + opts: { attendeePhoneNumber: "+918888888888" }, + }); + // All the teammates should be in the booking + for (const teammate of teamMatesObj.concat([{ name: owner.name || "" }])) { + await expect(page.getByText(teammate.name, { exact: true })).toBeVisible(); + } + } + ); + + // TODO: Assert whether the user received an email + }); + test("Can create a booking for Round Robin EventType", async ({ page, users, orgs }) => { const org = await orgs.create({ name: "TestOrg", @@ -130,6 +187,69 @@ test.describe("Bookings", () => { // TODO: Assert whether the user received an email }); + test("Can create a booking for Round Robin EventType with both phone number and email required", async ({ + page, + users, + orgs, + }) => { + const org = await orgs.create({ + name: "TestOrg", + }); + const teamMatesObj = [ + { name: "teammate-1" }, + { name: "teammate-2" }, + { name: "teammate-3" }, + { name: "teammate-4" }, + ]; + const owner = await users.create( + { + username: "pro-user", + name: "pro-user", + organizationId: org.id, + roleInOrganization: MembershipRole.MEMBER, + }, + { + hasTeam: true, + teammates: teamMatesObj, + schedulingType: SchedulingType.ROUND_ROBIN, + } + ); + + const { team } = await owner.getFirstTeamMembership(); + const teamEvent = await owner.getFirstTeamEvent(team.id); + await owner.apiLogin(); + + await markPhoneNumberAsRequiredField(page, teamEvent.id); + + await expectPageToBeNotFound({ page, url: `/team/${team.slug}/${teamEvent.slug}` }); + + await doOnOrgDomain( + { + orgSlug: org.slug, + page, + }, + async () => { + await bookTeamEvent({ + page, + team, + event: teamEvent, + teamMatesObj, + opts: { attendeePhoneNumber: "+918888888888" }, + }); + + // Since all the users have the same leastRecentlyBooked value + // Anyone of the teammates could be the Host of the booking. + const chosenUser = await page.getByTestId("booking-host-name").textContent(); + expect(chosenUser).not.toBeNull(); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + expect(teamMatesObj.concat([{ name: owner.name! }]).some(({ name }) => name === chosenUser)).toBe( + true + ); + } + ); + // TODO: Assert whether the user received an email + }); + test("Can access booking page with event slug and team page in lowercase/uppercase/mixedcase", async ({ page, orgs, @@ -485,6 +605,7 @@ async function bookTeamEvent({ team, event, teamMatesObj, + opts, }: { page: Page; team: { @@ -493,6 +614,7 @@ async function bookTeamEvent({ }; event: { slug: string; title: string; schedulingType: SchedulingType | null }; teamMatesObj?: { name: string }[]; + opts?: { attendeePhoneNumber?: string }; }) { // Note that even though the default way to access a team booking in an organization is to not use /team in the URL, but it isn't testable with playwright as the rewrite is taken care of by Next.js config which can't handle on the fly org slug's handling // So, we are using /team in the URL to access the team booking @@ -501,7 +623,7 @@ async function bookTeamEvent({ await page.goto(`/team/${team.slug}/${event.slug}`); await selectFirstAvailableTimeSlotNextMonth(page); - await bookTimeSlot(page); + await bookTimeSlot(page, opts); await expect(page.getByTestId("success-page")).toBeVisible(); // The title of the booking @@ -526,3 +648,34 @@ async function expectPageToBeNotFound({ page, url }: { page: Page; url: string } await page.goto(`${url}`); await expect(page.getByTestId(`404-page`)).toBeVisible(); } + +const markPhoneNumberAsRequiredAndEmailAsOptional = async (page: Page, eventId: number) => { + // Make phone as required + await markPhoneNumberAsRequiredField(page, eventId); + + // Make email as not required + await page.locator('[data-testid="field-email"] [data-testid="edit-field-action"]').click(); + const emailRequiredFiled = await page.locator('[data-testid="field-required"]'); + await emailRequiredFiled.locator("> :nth-child(2)").click(); + await page.getByTestId("field-add-save").click(); + + const submitPromise = page.waitForResponse("/api/trpc/eventTypes/update?batch=1"); + await page.locator("[data-testid=update-eventtype]").click(); + const response = await submitPromise; + expect(response.status()).toBe(200); +}; + +const markPhoneNumberAsRequiredField = async (page: Page, eventId: number) => { + await page.goto(`/event-types/${eventId}?tabName=advanced`); + + await page.locator('[data-testid="field-attendeePhoneNumber"] [data-testid="toggle-field"]').click(); + await page.locator('[data-testid="field-attendeePhoneNumber"] [data-testid="edit-field-action"]').click(); + const phoneRequiredFiled = await page.locator('[data-testid="field-required"]'); + await phoneRequiredFiled.locator("> :nth-child(1)").click(); + await page.getByTestId("field-add-save").click(); + + const submitPromise = page.waitForResponse("/api/trpc/eventTypes/update?batch=1"); + await page.locator("[data-testid=update-eventtype]").click(); + const response = await submitPromise; + expect(response.status()).toBe(200); +}; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 0834ae22939b5b..b8028e77902c0e 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Your scheduled event was canceled", "organizer": "Organizer", "need_to_reschedule_or_cancel": "Need to reschedule or cancel?", + "you_can_view_booking_details_with_this_url":"You can view the booking details from this url {{url}} and add the event to your calendar", "no_options_available": "No options available", "cancellation_reason": "Reason for cancellation (optional)", "cancellation_reason_placeholder": "Why are you cancelling?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Thank you for trialing our Organization plan. We noticed your Organization \"{{teamName}}\" needs to be upgraded.", "org_upgraded_successfully": "Your Organization was upgraded successfully!", "use_link_to_reset_password": "Use the link below to reset your password", - "hey_there": "Hey there,", + "hey_there": "Hey there", "forgot_your_password_calcom": "Forgot your password? - {{appName}}", "delete_webhook_confirmation_message": "Are you sure you want to delete this webhook? You will no longer receive {{appName}} meeting data at a specified URL, in real-time, when an event is scheduled or canceled.", "confirm_delete_webhook": "Yes, delete webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Not enough seats", "form_builder_field_already_exists": "A field with this name already exists", "show_on_booking_page": "Show on booking page", + "visit_cancelled_booking": "You can visit the canceled booking page", "get_started_zapier_templates": "Get started with Zapier templates", "team_is_unpublished": "{{team}} is unpublished", "org_is_unpublished_description": "This organization link is currently not available. Please contact the organization owner or ask them to publish it.", @@ -2459,6 +2461,7 @@ "add_emails": "Add Emails", "add_email_description": "Add an email address to replace your primary or to use as an alternative email on your event types.", "confirm_email": "Confirm your email", + "confirming_your_booking_sms":"$t(hey_there) {{name}}, confirming your booking on {{date}}.", "scheduler_first_name": "The first name of the person booking", "scheduler_last_name": "The last name of the person booking", "scheduler_name": "Scheduler Name", @@ -2549,6 +2552,7 @@ "team_select_info": "triggers for all team event types and all team members' personal event types", "no_show_updated": "No-show status updated for attendees", "email_copied": "Email copied", + "phone_number_copied": "Phone Number Copied", "USER_PENDING_MEMBER_OF_THE_ORG": "User is a pending member of the organization", "USER_ALREADY_INVITED_OR_MEMBER": "User is already invited or a member", "USER_MEMBER_OF_OTHER_ORGANIZATION": "User is member of an organization that this team is not a part of.", diff --git a/apps/web/test/utils/bookingScenario/MockPaymentService.ts b/apps/web/test/utils/bookingScenario/MockPaymentService.ts index 2eef10444ac644..a69c90b431e19b 100644 --- a/apps/web/test/utils/bookingScenario/MockPaymentService.ts +++ b/apps/web/test/utils/bookingScenario/MockPaymentService.ts @@ -4,7 +4,7 @@ import type { Payment, Prisma, PaymentOption, Booking } from "@prisma/client"; import { v4 as uuidv4 } from "uuid"; import "vitest-fetch-mock"; -import { sendAwaitingPaymentEmail } from "@calcom/emails"; +import { sendAwaitingPaymentEmailAndSMS } from "@calcom/emails"; import logger from "@calcom/lib/logger"; import type { CalendarEvent } from "@calcom/types/Calendar"; import type { IAbstractPaymentService } from "@calcom/types/PaymentService"; @@ -64,7 +64,7 @@ export function getMockPaymentService() { paymentData: Payment ): Promise { // TODO: App implementing PaymentService is supposed to send email by itself at the moment. - await sendAwaitingPaymentEmail({ + await sendAwaitingPaymentEmailAndSMS({ ...event, paymentInfo: { link: createPaymentLink(/*{ diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts index 5a98727ae0400d..7f35c254c9f505 100644 --- a/apps/web/test/utils/bookingScenario/bookingScenario.ts +++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts @@ -27,6 +27,7 @@ import type { SchedulingType, SMSLockState, TimeUnit } from "@calcom/prisma/enum import type { BookingStatus } from "@calcom/prisma/enums"; import type { teamMetadataSchema } from "@calcom/prisma/zod-utils"; import type { userMetadataType } from "@calcom/prisma/zod-utils"; +import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils"; import type { AppMeta } from "@calcom/types/App"; import type { NewCalendarEventType } from "@calcom/types/Calendar"; import type { EventBusyDate, IntervalLimit } from "@calcom/types/Calendar"; @@ -34,6 +35,8 @@ import type { EventBusyDate, IntervalLimit } from "@calcom/types/Calendar"; import { getMockPaymentService } from "./MockPaymentService"; import type { getMockRequestDataForBooking } from "./getMockRequestDataForBooking"; +type Fields = z.infer; + logger.settings.minLevel = 1; const log = logger.getSubLogger({ prefix: ["[bookingScenario]"] }); @@ -179,6 +182,7 @@ type WhiteListedBookingProps = { status: BookingStatus; attendees?: { email: string; + phoneNumber?: string; bookingSeat?: AttendeeBookingSeatInput | null; }[]; references?: (Omit, "credentialId"> & { @@ -1708,10 +1712,19 @@ export function mockCrmApp( }; } -export function getBooker({ name, email }: { name: string; email: string }) { +export function getBooker({ + name, + email, + attendeePhoneNumber, +}: { + name: string; + email: string; + attendeePhoneNumber?: string; +}) { return { name, email, + attendeePhoneNumber, }; } @@ -1770,8 +1783,11 @@ export function getMockBookingReference( } export function getMockBookingAttendee( - attendee: Omit & { + attendee: Omit & { bookingSeat?: AttendeeBookingSeatInput; + phoneNumber?: string | null; + email: string; + noShow?: boolean; } ) { return { @@ -1781,6 +1797,8 @@ export function getMockBookingAttendee( email: attendee.email, locale: attendee.locale, bookingSeat: attendee.bookingSeat || null, + phoneNumber: attendee.phoneNumber ?? undefined, + noShow: attendee.noShow ?? false, }; } @@ -1823,3 +1841,89 @@ export const replaceDates = (dates: string[], replacement: Record `${replacement[group1]}T`); }); }; + +export const getDefaultBookingFields = ({ + emailField, + bookingFields = [], +}: { + emailField?: Fields[number]; + bookingFields: Fields; +}) => { + return [ + { + name: "name", + type: "name", + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system", + required: true, + defaultLabel: "your_name", + }, + !!emailField + ? emailField + : { + name: "email", + type: "email", + label: "", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system", + required: true, + placeholder: "", + defaultLabel: "email_address", + }, + { + name: "location", + type: "radioInput", + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system", + required: false, + defaultLabel: "location", + getOptionsAt: "locations", + optionsInputs: { + phone: { type: "phone", required: true, placeholder: "" }, + attendeeInPerson: { type: "address", required: true, placeholder: "" }, + }, + hideWhenJustOneOption: true, + }, + { + name: "title", + type: "text", + hidden: true, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + defaultLabel: "what_is_this_meeting_about", + defaultPlaceholder: "", + }, + { + name: "notes", + type: "textarea", + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: false, + defaultLabel: "additional_notes", + defaultPlaceholder: "share_additional_notes", + }, + { + name: "guests", + type: "multiemail", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: false, + defaultLabel: "additional_guests", + defaultPlaceholder: "email", + }, + { + name: "rescheduleReason", + type: "textarea", + views: [{ id: "reschedule", label: "Reschedule View" }], + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: false, + defaultLabel: "reason_for_reschedule", + defaultPlaceholder: "reschedule_placeholder", + }, + ...bookingFields, + ] as Fields; +}; diff --git a/apps/web/test/utils/bookingScenario/expects.ts b/apps/web/test/utils/bookingScenario/expects.ts index 48f6f818e09eca..901b2c7687de5f 100644 --- a/apps/web/test/utils/bookingScenario/expects.ts +++ b/apps/web/test/utils/bookingScenario/expects.ts @@ -427,6 +427,16 @@ export async function expectBookingToBeInDatabase( ); } +export function expectSMSToBeTriggered({ sms, toNumber }: { sms: Fixtures["sms"]; toNumber: string }) { + expect(sms.get()).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + to: toNumber, + }), + ]) + ); +} + export function expectSuccessfulBookingCreationEmails({ emails, organizer, @@ -818,7 +828,7 @@ export function expectBookingRequestedEmails({ }: { emails: Fixtures["emails"]; organizer: { email: string; name: string }; - booker: { email: string; name: string }; + booker?: { email: string; name: string }; }) { expect(emails).toHaveEmail( { @@ -829,14 +839,16 @@ export function expectBookingRequestedEmails({ `${organizer.email}` ); - expect(emails).toHaveEmail( - { - titleTag: "booking_submitted_subject", - to: `${booker.email}`, - noIcs: true, - }, - `${booker.email}` - ); + if (booker) { + expect(emails).toHaveEmail( + { + titleTag: "booking_submitted_subject", + to: `${booker.email}`, + noIcs: true, + }, + `${booker.email}` + ); + } } export function expectBookingRequestRescheduledEmails({ @@ -898,13 +910,17 @@ export function expectBookingRequestedWebhookToHaveBeenFired({ subscriberUrl, paidEvent, eventType, + isEmailHidden = false, + isAttendeePhoneNumberHidden = false, }: { organizer: { email: string; name: string }; - booker: { email: string; name: string }; + booker: { email: string; name: string; attendeePhoneNumber?: string }; subscriberUrl: string; location: string; paidEvent?: boolean; eventType: InputEventType; + isEmailHidden?: boolean; + isAttendeePhoneNumberHidden?: boolean; }) { // There is an inconsistency in the way we send the data to the webhook for paid events and unpaid events. Fix that and then remove this if statement. if (!paidEvent) { @@ -925,8 +941,17 @@ export function expectBookingRequestedWebhookToHaveBeenFired({ email: { label: "email_address", value: booker.email, - isHidden: false, + isHidden: isEmailHidden, }, + ...(booker.attendeePhoneNumber + ? { + attendeePhoneNumber: { + label: "phone_number", + value: booker.attendeePhoneNumber, + isHidden: isAttendeePhoneNumberHidden, + }, + } + : null), location: { label: "location", value: { optionValue: "", value: location }, @@ -947,6 +972,14 @@ export function expectBookingRequestedWebhookToHaveBeenFired({ responses: { name: { label: "name", value: booker.name }, email: { label: "email", value: booker.email }, + ...(booker.attendeePhoneNumber + ? { + attendeePhoneNumber: { + label: "phone_number", + value: booker.attendeePhoneNumber, + }, + } + : null), location: { label: "location", value: { optionValue: "", value: location }, @@ -963,13 +996,17 @@ export function expectBookingCreatedWebhookToHaveBeenFired({ subscriberUrl, paidEvent, videoCallUrl, + isEmailHidden = false, + isAttendeePhoneNumberHidden = false, }: { organizer: { email: string; name: string }; - booker: { email: string; name: string }; + booker: { email: string; name: string; attendeePhoneNumber?: string }; subscriberUrl: string; location: string; paidEvent?: boolean; videoCallUrl?: string | null; + isEmailHidden?: boolean; + isAttendeePhoneNumberHidden?: boolean; }) { if (!paidEvent) { expectWebhookToHaveBeenCalledWith(subscriberUrl, { @@ -980,7 +1017,16 @@ export function expectBookingCreatedWebhookToHaveBeenFired({ }, responses: { name: { label: "your_name", value: booker.name, isHidden: false }, - email: { label: "email_address", value: booker.email, isHidden: false }, + email: { label: "email_address", value: booker.email, isHidden: isEmailHidden }, + ...(booker.attendeePhoneNumber + ? { + attendeePhoneNumber: { + label: "phone_number", + value: booker.attendeePhoneNumber, + isHidden: isAttendeePhoneNumberHidden, + }, + } + : null), location: { label: "location", value: { optionValue: "", value: location }, @@ -1004,6 +1050,14 @@ export function expectBookingCreatedWebhookToHaveBeenFired({ label: "email", value: booker.email, }, + ...(booker.attendeePhoneNumber + ? { + attendeePhoneNumber: { + label: "phone_number", + value: booker.attendeePhoneNumber, + }, + } + : null), location: { label: "location", value: { optionValue: "", value: location }, diff --git a/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts b/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts index 9a5581c6c8bceb..bf64ffc9d0fffd 100644 --- a/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts +++ b/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts @@ -33,6 +33,7 @@ export function getMockRequestDataForBooking({ email: string; name: string; location?: { optionValue: ""; value: string }; + attendeePhoneNumber?: string; smsReminderNumber?: string; }; }; diff --git a/packages/app-store/paypal/lib/PaymentService.ts b/packages/app-store/paypal/lib/PaymentService.ts index ce3b1862bb7a3c..23cb891af3a321 100644 --- a/packages/app-store/paypal/lib/PaymentService.ts +++ b/packages/app-store/paypal/lib/PaymentService.ts @@ -105,8 +105,8 @@ export class PaymentService implements IAbstractPaymentService { async collectCard( payment: Pick, bookingId: number, - _bookerEmail: string, - paymentOption: PaymentOption + paymentOption: PaymentOption, + _bookerEmail?: string | null ): Promise { // Ensure that the payment service can support the passed payment option if (paymentOptionEnum.parse(paymentOption) !== "HOLD") { diff --git a/packages/app-store/stripepayment/lib/PaymentService.ts b/packages/app-store/stripepayment/lib/PaymentService.ts index 89c78ddb85b456..d3c3a3816e1b09 100644 --- a/packages/app-store/stripepayment/lib/PaymentService.ts +++ b/packages/app-store/stripepayment/lib/PaymentService.ts @@ -3,7 +3,7 @@ import Stripe from "stripe"; import { v4 as uuidv4 } from "uuid"; import z from "zod"; -import { sendAwaitingPaymentEmail } from "@calcom/emails"; +import { sendAwaitingPaymentEmailAndSMS } from "@calcom/emails"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { getErrorFromUnknown } from "@calcom/lib/errors"; import logger from "@calcom/lib/logger"; @@ -62,8 +62,9 @@ export class PaymentService implements IAbstractPaymentService { userId: Booking["userId"], username: string | null, bookerName: string, - bookerEmail: string, paymentOption: PaymentOption, + bookerEmail: string, + bookerPhoneNumber?: string | null, eventTitle?: string, bookingTitle?: string ) { @@ -78,8 +79,9 @@ export class PaymentService implements IAbstractPaymentService { } const customer = await retrieveOrCreateStripeCustomerByEmail( + this.credentials.stripe_user_id, bookerEmail, - this.credentials.stripe_user_id + bookerPhoneNumber ); const params: Stripe.PaymentIntentCreateParams = { @@ -93,7 +95,8 @@ export class PaymentService implements IAbstractPaymentService { calAccountId: userId, calUsername: username, bookerName, - bookerEmail, + bookerEmail: bookerEmail, + bookerPhoneNumber: bookerPhoneNumber ?? null, eventTitle: eventTitle || "", bookingTitle: bookingTitle || "", }, @@ -142,8 +145,9 @@ export class PaymentService implements IAbstractPaymentService { async collectCard( payment: Pick, bookingId: Booking["id"], + paymentOption: PaymentOption, bookerEmail: string, - paymentOption: PaymentOption + bookerPhoneNumber?: string | null ): Promise { try { if (!this.credentials) { @@ -156,8 +160,9 @@ export class PaymentService implements IAbstractPaymentService { } const customer = await retrieveOrCreateStripeCustomerByEmail( + this.credentials.stripe_user_id, bookerEmail, - this.credentials.stripe_user_id + bookerPhoneNumber ); const params = { @@ -165,6 +170,7 @@ export class PaymentService implements IAbstractPaymentService { payment_method_types: ["card"], metadata: { bookingId, + bookerPhoneNumber: bookerPhoneNumber ?? null, }, }; @@ -340,7 +346,7 @@ export class PaymentService implements IAbstractPaymentService { paymentData: Payment, eventTypeMetadata?: EventTypeMetadata ): Promise { - await sendAwaitingPaymentEmail( + await sendAwaitingPaymentEmailAndSMS( { ...event, paymentInfo: { diff --git a/packages/app-store/stripepayment/lib/customer.ts b/packages/app-store/stripepayment/lib/customer.ts index 3d68140aa5c5ba..78fbfef3bb5a67 100644 --- a/packages/app-store/stripepayment/lib/customer.ts +++ b/packages/app-store/stripepayment/lib/customer.ts @@ -83,7 +83,11 @@ export async function deleteStripeCustomer(user: UserType): Promise; +type PersonAttendeeCommonFields = Pick & { + phoneNumber?: string | null; +}; const Reschedule = async (bookingUid: string, cancellationReason: string) => { const bookingToReschedule = await prisma.booking.findFirstOrThrow({ @@ -30,6 +32,16 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { location: true, attendees: true, references: true, + eventType: { + include: { + team: { + select: { + id: true, + name: true, + }, + }, + }, + }, user: { select: { id: true, @@ -42,11 +54,6 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { destinationCalendar: true, }, }, - eventType: { - select: { - metadata: true, - }, - }, }, where: { uid: bookingUid, @@ -93,6 +100,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { username: user?.username || "", language: { translate: selectedLanguage, locale: user.locale || "en" }, timeZone: user?.timeZone, + phoneNumber: user?.phoneNumber, }; }); }; @@ -110,6 +118,13 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { tAttendees ), organizer: userOwnerAsPeopleType, + team: !!bookingToReschedule.eventType?.team + ? { + name: bookingToReschedule.eventType.team.name, + id: bookingToReschedule.eventType.team.id, + members: [], + } + : undefined, }); const director = new CalendarEventDirector(); director.setBuilder(builder); @@ -147,7 +162,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { // Send emails try { - await sendRequestRescheduleEmail( + await sendRequestRescheduleEmailAndSMS( builder.calendarEvent, { rescheduleLink: builder.rescheduleLink, diff --git a/packages/app-store/wipemycalother/lib/reschedule.ts b/packages/app-store/wipemycalother/lib/reschedule.ts index 91f3da71408c60..a0740bc0ab85cc 100644 --- a/packages/app-store/wipemycalother/lib/reschedule.ts +++ b/packages/app-store/wipemycalother/lib/reschedule.ts @@ -5,7 +5,7 @@ import { CalendarEventBuilder } from "@calcom/core/builders/CalendarEvent/builde import { CalendarEventDirector } from "@calcom/core/builders/CalendarEvent/director"; import { deleteMeeting } from "@calcom/core/videoClient"; import dayjs from "@calcom/dayjs"; -import { sendRequestRescheduleEmail } from "@calcom/emails"; +import { sendRequestRescheduleEmailAndSMS } from "@calcom/emails"; import logger from "@calcom/lib/logger"; import { getTranslation } from "@calcom/lib/server/i18n"; import prisma from "@calcom/prisma"; @@ -15,7 +15,9 @@ import type { Person } from "@calcom/types/Calendar"; import { getCalendar } from "../../_utils/getCalendar"; -type PersonAttendeeCommonFields = Pick; +type PersonAttendeeCommonFields = Pick & { + phoneNumber?: string | null; +}; const Reschedule = async (bookingUid: string, cancellationReason: string) => { const bookingToReschedule = await prisma.booking.findFirstOrThrow({ @@ -30,6 +32,17 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { location: true, attendees: true, references: true, + eventType: { + select: { + metadata: true, + team: { + select: { + id: true, + name: true, + }, + }, + }, + }, user: { select: { id: true, @@ -42,11 +55,6 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { destinationCalendar: true, }, }, - eventType: { - select: { - metadata: true, - }, - }, }, where: { uid: bookingUid, @@ -94,6 +102,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { username: user?.username || "", language: { translate: selectedLanguage, locale: user.locale || "en" }, timeZone: user?.timeZone, + phoneNumber: user?.phoneNumber, }; }); }; @@ -111,6 +120,13 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { tAttendees ), organizer: userOwnerAsPeopleType, + team: !!bookingToReschedule.eventType?.team + ? { + name: bookingToReschedule.eventType.team.name, + id: bookingToReschedule.eventType.team.id, + members: [], + } + : undefined, }); const director = new CalendarEventDirector(); director.setBuilder(builder); @@ -147,7 +163,7 @@ const Reschedule = async (bookingUid: string, cancellationReason: string) => { // Send emails try { - await sendRequestRescheduleEmail( + await sendRequestRescheduleEmailAndSMS( builder.calendarEvent, { rescheduleLink: builder.rescheduleLink, diff --git a/packages/emails/email-manager.ts b/packages/emails/email-manager.ts index 85a2a2c219647c..226be2c67b3987 100644 --- a/packages/emails/email-manager.ts +++ b/packages/emails/email-manager.ts @@ -12,6 +12,15 @@ import { safeStringify } from "@calcom/lib/safeStringify"; import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; import type { CalendarEvent, Person } from "@calcom/types/Calendar"; +import AwaitingPaymentSMS from "../sms/attendee/awaiting-payment-sms"; +import CancelledSeatSMS from "../sms/attendee/cancelled-seat-sms"; +import EventCancelledSMS from "../sms/attendee/event-cancelled-sms"; +import EventDeclinedSMS from "../sms/attendee/event-declined-sms"; +import EventLocationChangedSMS from "../sms/attendee/event-location-changed-sms"; +import EventRequestSMS from "../sms/attendee/event-request-sms"; +import EventRequestToRescheduleSMS from "../sms/attendee/event-request-to-reschedule-sms"; +import EventSuccessfullyReScheduledSMS from "../sms/attendee/event-rescheduled-sms"; +import EventSuccessfullyScheduledSMS from "../sms/attendee/event-scheduled-sms"; import type { MonthlyDigestEmailData } from "./src/templates/MonthlyDigestEmail"; import type { OrganizationAdminNoSlotsEmailInput } from "./src/templates/OrganizationAdminNoSlots"; import type { EmailVerifyLink } from "./templates/account-verify-email"; @@ -86,7 +95,7 @@ const eventTypeDisableHostEmail = (metadata?: EventTypeMetadata) => { return !!metadata?.disableStandardEmails?.all?.host; }; -export const sendScheduledEmails = async ( +export const sendScheduledEmailsAndSMS = async ( calEvent: CalendarEvent, eventNameObject?: EventNameObjectType, hostEmailDisabled?: boolean, @@ -129,62 +138,79 @@ export const sendScheduledEmails = async ( } await Promise.all(emailsToSend); + const successfullyScheduledSms = new EventSuccessfullyScheduledSMS(calEvent); + await successfullyScheduledSms.sendSMSToAttendees(); }; // for rescheduled round robin booking that assigned new members -export const sendRoundRobinScheduledEmails = async ( +export const sendRoundRobinScheduledEmailsAndSMS = async ( calEvent: CalendarEvent, members: Person[], eventTypeMetadata?: EventTypeMetadata ) => { if (eventTypeDisableHostEmail(eventTypeMetadata)) return; const formattedCalEvent = formatCalEvent(calEvent); - const emailsToSend: Promise[] = []; + const emailsAndSMSToSend: Promise[] = []; + const eventScheduledSMS = new EventSuccessfullyScheduledSMS(calEvent); for (const teamMember of members) { - emailsToSend.push( + emailsAndSMSToSend.push( sendEmail(() => new OrganizerScheduledEmail({ calEvent: formattedCalEvent, teamMember })) ); + if (teamMember.phoneNumber) { + emailsAndSMSToSend.push(eventScheduledSMS.sendSMSToAttendee(teamMember)); + } } - await Promise.all(emailsToSend); + await Promise.all(emailsAndSMSToSend); }; -export const sendRoundRobinRescheduledEmails = async ( +export const sendRoundRobinRescheduledEmailsAndSMS = async ( calEvent: CalendarEvent, - members: Person[], + teamMembersAndAttendees: Person[], eventTypeMetadata?: EventTypeMetadata ) => { if (eventTypeDisableHostEmail(eventTypeMetadata)) return; + const calendarEvent = formatCalEvent(calEvent); - const emailsToSend: Promise[] = []; + const emailsAndSMSToSend: Promise[] = []; + const successfullyReScheduledSMS = new EventSuccessfullyReScheduledSMS(calEvent); - for (const teamMember of members) { - emailsToSend.push( - sendEmail(() => new OrganizerRescheduledEmail({ calEvent: calendarEvent, teamMember })) + for (const person of teamMembersAndAttendees) { + emailsAndSMSToSend.push( + sendEmail(() => new OrganizerRescheduledEmail({ calEvent: calendarEvent, teamMember: person })) ); + if (person.phoneNumber) { + emailsAndSMSToSend.push(successfullyReScheduledSMS.sendSMSToAttendee(person)); + } } - await Promise.all(emailsToSend); + await Promise.all(emailsAndSMSToSend); }; -export const sendRoundRobinCancelledEmails = async ( +export const sendRoundRobinCancelledEmailsAndSMS = async ( calEvent: CalendarEvent, members: Person[], eventTypeMetadata?: EventTypeMetadata ) => { if (eventTypeDisableHostEmail(eventTypeMetadata)) return; const calendarEvent = formatCalEvent(calEvent); - const emailsToSend: Promise[] = []; + const emailsAndSMSToSend: Promise[] = []; + const successfullyReScheduledSMS = new EventCancelledSMS(calEvent); for (const teamMember of members) { - emailsToSend.push(sendEmail(() => new OrganizerCancelledEmail({ calEvent: calendarEvent, teamMember }))); + emailsAndSMSToSend.push( + sendEmail(() => new OrganizerCancelledEmail({ calEvent: calendarEvent, teamMember })) + ); + if (teamMember.phoneNumber) { + emailsAndSMSToSend.push(successfullyReScheduledSMS.sendSMSToAttendee(teamMember)); + } } - await Promise.all(emailsToSend); + await Promise.all(emailsAndSMSToSend); }; -export const sendRescheduledEmails = async ( +export const sendRescheduledEmailsAndSMS = async ( calEvent: CalendarEvent, eventTypeMetadata?: EventTypeMetadata ) => { @@ -212,9 +238,11 @@ export const sendRescheduledEmails = async ( } await Promise.all(emailsToSend); + const successfullyReScheduledSms = new EventSuccessfullyReScheduledSMS(calEvent); + await successfullyReScheduledSms.sendSMSToAttendees(); }; -export const sendRescheduledSeatEmail = async ( +export const sendRescheduledSeatEmailAndSMS = async ( calEvent: CalendarEvent, attendee: Person, eventTypeMetadata?: EventTypeMetadata @@ -229,10 +257,13 @@ export const sendRescheduledSeatEmail = async ( if (!eventTypeDisableAttendeeEmail(eventTypeMetadata)) emailsToSend.push(sendEmail(() => new AttendeeRescheduledEmail(clonedCalEvent, attendee))); + const successfullyReScheduledSMS = new EventSuccessfullyReScheduledSMS(calEvent); + await successfullyReScheduledSMS.sendSMSToAttendee(attendee); + await Promise.all(emailsToSend); }; -export const sendScheduledSeatsEmails = async ( +export const sendScheduledSeatsEmailsAndSMS = async ( calEvent: CalendarEvent, invitee: Person, newSeat: boolean, @@ -273,9 +304,11 @@ export const sendScheduledSeatsEmails = async ( ); } await Promise.all(emailsToSend); + const eventScheduledSMS = new EventSuccessfullyScheduledSMS(calendarEvent); + await eventScheduledSMS.sendSMSToAttendee(invitee); }; -export const sendCancelledSeatEmails = async ( +export const sendCancelledSeatEmailsAndSMS = async ( calEvent: CalendarEvent, cancelledAttendee: Person, eventTypeMetadata?: EventTypeMetadata @@ -292,6 +325,8 @@ export const sendCancelledSeatEmails = async ( ); await Promise.all(emailsToSend); + const cancelledSeatSMS = new CancelledSeatSMS(clonedCalEvent); + await cancelledSeatSMS.sendSMSToAttendee(cancelledAttendee); }; export const sendOrganizerRequestEmail = async ( @@ -314,18 +349,25 @@ export const sendOrganizerRequestEmail = async ( await Promise.all(emailsToSend); }; -export const sendAttendeeRequestEmail = async ( +export const sendAttendeeRequestEmailAndSMS = async ( calEvent: CalendarEvent, attendee: Person, eventTypeMetadata?: EventTypeMetadata ) => { if (eventTypeDisableAttendeeEmail(eventTypeMetadata)) return; + const calendarEvent = formatCalEvent(calEvent); await sendEmail(() => new AttendeeRequestEmail(calendarEvent, attendee)); + const eventRequestSms = new EventRequestSMS(calendarEvent); + await eventRequestSms.sendSMSToAttendee(attendee); }; -export const sendDeclinedEmails = async (calEvent: CalendarEvent, eventTypeMetadata?: EventTypeMetadata) => { +export const sendDeclinedEmailsAndSMS = async ( + calEvent: CalendarEvent, + eventTypeMetadata?: EventTypeMetadata +) => { if (eventTypeDisableAttendeeEmail(eventTypeMetadata)) return; + const calendarEvent = formatCalEvent(calEvent); const emailsToSend: Promise[] = []; @@ -336,9 +378,11 @@ export const sendDeclinedEmails = async (calEvent: CalendarEvent, eventTypeMetad ); await Promise.all(emailsToSend); + const eventDeclindedSms = new EventDeclinedSMS(calEvent); + await eventDeclindedSms.sendSMSToAttendees(); }; -export const sendCancelledEmails = async ( +export const sendCancelledEmailsAndSMS = async ( calEvent: CalendarEvent, eventNameObject: Pick, eventTypeMetadata?: EventTypeMetadata @@ -394,6 +438,8 @@ export const sendCancelledEmails = async ( } await Promise.all(emailsToSend); + const eventCancelledSms = new EventCancelledSMS(calEvent); + await eventCancelledSms.sendSMSToAttendees(); }; export const sendOrganizerRequestReminderEmail = async ( @@ -416,7 +462,7 @@ export const sendOrganizerRequestReminderEmail = async ( } }; -export const sendAwaitingPaymentEmail = async ( +export const sendAwaitingPaymentEmailAndSMS = async ( calEvent: CalendarEvent, eventTypeMetadata?: EventTypeMetadata ) => { @@ -429,6 +475,8 @@ export const sendAwaitingPaymentEmail = async ( }) ); await Promise.all(emailsToSend); + const awaitingPaymentSMS = new AwaitingPaymentSMS(calEvent); + await awaitingPaymentSMS.sendSMSToAttendees(); }; export const sendOrganizerPaymentRefundFailedEmail = async (calEvent: CalendarEvent) => { @@ -474,7 +522,7 @@ export const sendChangeOfEmailVerificationLink = async (verificationInput: Chang await sendEmail(() => new ChangeOfEmailVerifyEmail(verificationInput)); }; -export const sendRequestRescheduleEmail = async ( +export const sendRequestRescheduleEmailAndSMS = async ( calEvent: CalendarEvent, metadata: { rescheduleLink: string }, eventTypeMetadata?: EventTypeMetadata @@ -490,9 +538,11 @@ export const sendRequestRescheduleEmail = async ( } await Promise.all(emailsToSend); + const eventRequestToReschedule = new EventRequestToRescheduleSMS(calendarEvent); + await eventRequestToReschedule.sendSMSToAttendees(); }; -export const sendLocationChangeEmails = async ( +export const sendLocationChangeEmailsAndSMS = async ( calEvent: CalendarEvent, eventTypeMetadata?: EventTypeMetadata ) => { @@ -521,6 +571,8 @@ export const sendLocationChangeEmails = async ( } await Promise.all(emailsToSend); + const eventLocationChangedSMS = new EventLocationChangedSMS(calendarEvent); + await eventLocationChangedSMS.sendSMSToAttendees(); }; export const sendAddGuestsEmails = async (calEvent: CalendarEvent, newGuests: string[]) => { const calendarEvent = formatCalEvent(calEvent); diff --git a/packages/emails/src/components/WhoInfo.tsx b/packages/emails/src/components/WhoInfo.tsx index c710028d0bf39c..ec852d9120c91e 100644 --- a/packages/emails/src/components/WhoInfo.tsx +++ b/packages/emails/src/components/WhoInfo.tsx @@ -1,17 +1,20 @@ import type { TFunction } from "next-i18next"; +import isSmsCalEmail from "@calcom/lib/isSmsCalEmail"; import type { CalendarEvent } from "@calcom/types/Calendar"; import { Info } from "./Info"; -const PersonInfo = ({ name = "", email = "", role = "" }) => ( +const PersonInfo = ({ name = "", email = "", role = "", phoneNumber = "" }) => (
- {name} - {role}{" "} - - - {email} - - + {name} - {role} {phoneNumber} + {!isSmsCalEmail(email) && ( + + + {email} + + + )}
); @@ -28,7 +31,7 @@ export function WhoInfo(props: { calEvent: CalendarEvent; t: TFunction }) { email={props.calEvent.organizer.email} /> {props.calEvent.team?.members.map((member) => ( - + ))} {props.calEvent.attendees.map((attendee) => ( ))} diff --git a/packages/emails/templates/_base-email.ts b/packages/emails/templates/_base-email.ts index d5574f1e54ed32..74c3a6e6f7a508 100644 --- a/packages/emails/templates/_base-email.ts +++ b/packages/emails/templates/_base-email.ts @@ -5,6 +5,7 @@ import { z } from "zod"; import dayjs from "@calcom/dayjs"; import { getFeatureFlag } from "@calcom/features/flags/server/utils"; import { getErrorFromUnknown } from "@calcom/lib/errors"; +import isSmsCalEmail from "@calcom/lib/isSmsCalEmail"; import { serverConfig } from "@calcom/lib/serverConfig"; import { setTestEmail } from "@calcom/lib/testEmails"; import prisma from "@calcom/prisma"; @@ -52,6 +53,11 @@ export default class BaseEmail { const from = "from" in payload ? (payload.from as string) : ""; const to = "to" in payload ? (payload.to as string) : ""; + if (isSmsCalEmail(to)) { + console.log(`Skipped Sending Email to faux email: ${to}`); + return new Promise((r) => r(`Skipped Sending Email to faux email: ${to}`)); + } + const sanitizedFrom = sanitizeDisplayName(from); const sanitizedTo = sanitizeDisplayName(to); diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx index bbc798d44d5805..1155156f5ffff6 100644 --- a/packages/features/bookings/Booker/Booker.tsx +++ b/packages/features/bookings/Booker/Booker.tsx @@ -176,7 +176,7 @@ const BookerComponent = ({ isVerificationCodeSending={isVerificationCodeSending} isPlatform={isPlatform}> <> - {verifyCode ? ( + {verifyCode && formEmail ? ( []; metadata: EventType["metadata"] | z.infer; @@ -79,6 +81,7 @@ export const getBookingFieldsWithSystemFields = ({ return ensureBookingInputsHaveSystemFields({ bookingFields: parsedBookingFields, disableGuests, + isOrgTeamEvent, disableBookingTitle, additionalNotesRequired: parsedMetaData?.additionalNotesRequired || false, customInputs: parsedCustomInputs, @@ -89,6 +92,7 @@ export const getBookingFieldsWithSystemFields = ({ export const ensureBookingInputsHaveSystemFields = ({ bookingFields, disableGuests, + isOrgTeamEvent, disableBookingTitle, additionalNotesRequired, customInputs, @@ -96,6 +100,7 @@ export const ensureBookingInputsHaveSystemFields = ({ }: { bookingFields: Fields; disableGuests: boolean; + isOrgTeamEvent: boolean; disableBookingTitle?: boolean; additionalNotesRequired: boolean; customInputs: z.infer[]; @@ -130,6 +135,8 @@ export const ensureBookingInputsHaveSystemFields = ({ }); }); + const isEmailFieldOptional = !!bookingFields.find((field) => field.name === "email" && !field.required); + // These fields should be added before other user fields const systemBeforeFields: typeof bookingFields = [ { @@ -152,8 +159,8 @@ export const ensureBookingInputsHaveSystemFields = ({ defaultLabel: "email_address", type: "email", name: "email", - required: true, - editable: "system", + required: !isEmailFieldOptional, + editable: isOrgTeamEvent ? "system-but-optional" : "system", sources: [ { label: "Default", @@ -162,6 +169,7 @@ export const ensureBookingInputsHaveSystemFields = ({ }, ], }, + { defaultLabel: "location", type: "radioInput", @@ -196,6 +204,23 @@ export const ensureBookingInputsHaveSystemFields = ({ ], }, ]; + if (isOrgTeamEvent) { + systemBeforeFields.splice(2, 0, { + defaultLabel: "phone_number", + type: "phone", + name: "attendeePhoneNumber", + required: false, + hidden: true, + editable: "system-but-optional", + sources: [ + { + label: "Default", + id: "default", + type: "default", + }, + ], + }); + } // These fields should be added after other user fields const systemAfterFields: typeof bookingFields = [ diff --git a/packages/features/bookings/lib/getBookingResponsesSchema.test.ts b/packages/features/bookings/lib/getBookingResponsesSchema.test.ts index 8e0529773a64e9..0e5d21503c93b7 100644 --- a/packages/features/bookings/lib/getBookingResponsesSchema.test.ts +++ b/packages/features/bookings/lib/getBookingResponsesSchema.test.ts @@ -116,8 +116,8 @@ describe("getBookingResponsesSchema", () => { //@ts-ignore expect(parsedResponsesWithJustName.error.issues[0]).toEqual( expect.objectContaining({ - message: ZOD_REQUIRED_FIELD_ERROR_MSG, path: ["email"], + message: ZOD_REQUIRED_FIELD_ERROR_MSG, }) ); diff --git a/packages/features/bookings/lib/getBookingResponsesSchema.ts b/packages/features/bookings/lib/getBookingResponsesSchema.ts index 6260bbc1265a40..9e0a565b134ab0 100644 --- a/packages/features/bookings/lib/getBookingResponsesSchema.ts +++ b/packages/features/bookings/lib/getBookingResponsesSchema.ts @@ -117,6 +117,18 @@ function preprocess({ // if eventType has been deleted, we won't have bookingFields and thus we can't validate the responses. return; } + + const attendeePhoneNumberField = bookingFields.find((field) => field.name === "attendeePhoneNumber"); + const isAttendeePhoneNumberFieldHidden = attendeePhoneNumberField?.hidden; + + const emailField = bookingFields.find((field) => field.name === "email"); + const isEmailFieldHidden = !!emailField?.hidden; + + // To prevent using user's session email as attendee's email, we set email to empty string + if (isEmailFieldHidden && !isAttendeePhoneNumberFieldHidden) { + responses["email"] = ""; + } + for (const bookingField of bookingFields) { const value = responses[bookingField.name]; const stringSchema = z.string(); @@ -151,7 +163,7 @@ function preprocess({ if (bookingField.type === "email") { // Email RegExp to validate if the input is a valid email - if (!emailSchema.safeParse(value).success) { + if (!bookingField.hidden && !emailSchema.safeParse(value).success) { ctx.addIssue({ code: z.ZodIssueCode.custom, message: m("email_validation_error"), diff --git a/packages/features/bookings/lib/getCalEventResponses.ts b/packages/features/bookings/lib/getCalEventResponses.ts index 51625e88266a7e..29e1e508edaf52 100644 --- a/packages/features/bookings/lib/getCalEventResponses.ts +++ b/packages/features/bookings/lib/getCalEventResponses.ts @@ -3,6 +3,7 @@ import type z from "zod"; import { SystemField } from "@calcom/features/bookings/lib/SystemField"; import type { bookingResponsesDbSchema } from "@calcom/features/bookings/lib/getBookingResponsesSchema"; +import { contructEmailFromPhoneNumber } from "@calcom/lib/contructEmailFromPhoneNumber"; import { getBookingWithResponses } from "@calcom/lib/getBooking"; import { eventTypeBookingFields } from "@calcom/prisma/zod-utils"; import type { CalendarEvent } from "@calcom/types/Calendar"; @@ -38,6 +39,16 @@ export const getCalEventResponses = ({ responses ?? (booking ? getBookingWithResponses(booking).responses : null); if (!backwardCompatibleResponses) throw new Error("Couldn't get responses"); + // To set placeholder email for the booking + if (!!!backwardCompatibleResponses.email) { + if (typeof backwardCompatibleResponses["attendeePhoneNumber"] !== "string") + throw new Error("Both Phone and Email are missing"); + + backwardCompatibleResponses.email = contructEmailFromPhoneNumber( + backwardCompatibleResponses["attendeePhoneNumber"] + ); + } + if (parsedBookingFields) { parsedBookingFields.forEach((field) => { const label = field.label || field.defaultLabel; @@ -58,6 +69,7 @@ export const getCalEventResponses = ({ isHidden: !!field.hidden, }; } + calEventResponses[field.name] = { label, value: backwardCompatibleResponses[field.name], diff --git a/packages/features/bookings/lib/getUserBooking.ts b/packages/features/bookings/lib/getUserBooking.ts index 71468a45cc0b29..1a6d50e6ed23e4 100644 --- a/packages/features/bookings/lib/getUserBooking.ts +++ b/packages/features/bookings/lib/getUserBooking.ts @@ -39,6 +39,7 @@ const getUserBooking = async (uid: string) => { name: true, email: true, timeZone: true, + phoneNumber: true, }, }, eventTypeId: true, diff --git a/packages/features/bookings/lib/handleBookingRequested.ts b/packages/features/bookings/lib/handleBookingRequested.ts index 9252315690665a..5c3c321fc3497c 100644 --- a/packages/features/bookings/lib/handleBookingRequested.ts +++ b/packages/features/bookings/lib/handleBookingRequested.ts @@ -1,6 +1,6 @@ import type { Prisma } from "@prisma/client"; -import { sendAttendeeRequestEmail, sendOrganizerRequestEmail } from "@calcom/emails"; +import { sendAttendeeRequestEmailAndSMS, sendOrganizerRequestEmail } from "@calcom/emails"; import { getWebhookPayloadForBooking } from "@calcom/features/bookings/lib/getWebhookPayloadForBooking"; import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; @@ -41,8 +41,9 @@ export async function handleBookingRequested(args: { const { evt, booking } = args; log.debug("Emails: Sending booking requested emails"); + await sendOrganizerRequestEmail({ ...evt }, booking?.eventType?.metadata as EventTypeMetadata); - await sendAttendeeRequestEmail( + await sendAttendeeRequestEmailAndSMS( { ...evt }, evt.attendees[0], booking?.eventType?.metadata as EventTypeMetadata diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts index a54a98f4ca6ee3..a309a96fdcc424 100644 --- a/packages/features/bookings/lib/handleCancelBooking.ts +++ b/packages/features/bookings/lib/handleCancelBooking.ts @@ -5,7 +5,7 @@ import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApi import { DailyLocationType } from "@calcom/app-store/locations"; import EventManager from "@calcom/core/EventManager"; import dayjs from "@calcom/dayjs"; -import { sendCancelledEmails } from "@calcom/emails"; +import { sendCancelledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { workflowSelect } from "@calcom/features/ee/workflows/lib/getAllWorkflows"; import { sendCancelledReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; @@ -249,6 +249,7 @@ async function handler(req: CustomRequest) { name: attendee.name, email: attendee.email, timeZone: attendee.timeZone, + phoneNumber: attendee.phoneNumber, language: { translate: await getTranslation(attendee.locale ?? "en", "common"), locale: attendee.locale ?? "en", @@ -310,9 +311,14 @@ async function handler(req: CustomRequest) { ? [bookingToDelete?.user.destinationCalendar] : [], cancellationReason: cancellationReason, - ...(teamMembers && { - team: { name: bookingToDelete?.eventType?.team?.name || "Nameless", members: teamMembers, id: teamId! }, - }), + ...(teamMembers && + teamId && { + team: { + name: bookingToDelete?.eventType?.team?.name || "Nameless", + members: teamMembers, + id: teamId, + }, + }), seatsPerTimeSlot: bookingToDelete.eventType?.seatsPerTimeSlot, seatsShowAttendees: bookingToDelete.eventType?.seatsShowAttendees, iCalUID: bookingToDelete.iCalUID, @@ -523,7 +529,7 @@ async function handler(req: CustomRequest) { try { // TODO: if emails fail try to requeue them if (!platformClientId || (platformClientId && arePlatformEmailsEnabled)) - await sendCancelledEmails( + await sendCancelledEmailsAndSMS( evt, { eventName: bookingToDelete?.eventType?.eventName }, bookingToDelete?.eventType?.metadata as EventTypeMetadata diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts index 373a0b68076775..0c15709420145b 100644 --- a/packages/features/bookings/lib/handleConfirmation.ts +++ b/packages/features/bookings/lib/handleConfirmation.ts @@ -3,7 +3,7 @@ import type { Prisma } from "@prisma/client"; import type { EventManagerUser } from "@calcom/core/EventManager"; import EventManager from "@calcom/core/EventManager"; import { scheduleMandatoryReminder } from "@calcom/ee/workflows/lib/reminders/scheduleMandatoryReminder"; -import { sendScheduledEmails } from "@calcom/emails"; +import { sendScheduledEmailsAndSMS } from "@calcom/emails"; import { allowDisablingAttendeeConfirmationEmails, allowDisablingHostConfirmationEmails, @@ -108,7 +108,7 @@ export async function handleConfirmation(args: { } } - await sendScheduledEmails( + await sendScheduledEmailsAndSMS( { ...evt, additionalInformation: metadata }, undefined, isHostConfirmationEmailsDisabled, @@ -126,6 +126,7 @@ export async function handleConfirmation(args: { attendees: { name: string; email: string; + phoneNumber?: string | null; }[]; startTime: Date; endTime: Date; diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index a7ab6b65bd1d14..066bb65ef2aa3f 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -20,13 +20,13 @@ import { getEventName } from "@calcom/core/event"; import dayjs from "@calcom/dayjs"; import { scheduleMandatoryReminder } from "@calcom/ee/workflows/lib/reminders/scheduleMandatoryReminder"; import { - sendAttendeeRequestEmail, + sendAttendeeRequestEmailAndSMS, sendOrganizerRequestEmail, - sendRescheduledEmails, - sendRoundRobinCancelledEmails, - sendRoundRobinRescheduledEmails, - sendRoundRobinScheduledEmails, - sendScheduledEmails, + sendRescheduledEmailsAndSMS, + sendRoundRobinCancelledEmailsAndSMS, + sendRoundRobinRescheduledEmailsAndSMS, + sendRoundRobinScheduledEmailsAndSMS, + sendScheduledEmailsAndSMS, } from "@calcom/emails"; import getICalUID from "@calcom/emails/lib/getICalUID"; import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields"; @@ -215,9 +215,12 @@ async function handler( !req.body.eventTypeId && !!req.body.eventTypeSlug ? getDefaultEvent(req.body.eventTypeSlug) : await getEventTypesFromDB(req.body.eventTypeId); + + const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId; + eventType = { ...eventType, - bookingFields: getBookingFieldsWithSystemFields(eventType), + bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }), }; const bookingDataSchema = bookingDataSchemaGetter({ @@ -239,6 +242,7 @@ async function handler( language, appsStatus: reqAppsStatus, name: bookerName, + attendeePhoneNumber: bookerPhoneNumber, email: bookerEmail, guests: reqGuests, location, @@ -726,6 +730,7 @@ async function handler( { email: bookerEmail, name: fullName, + phoneNumber: bookerPhoneNumber, firstName: (typeof bookerName === "object" && bookerName.firstName) || "", lastName: (typeof bookerName === "object" && bookerName.lastName) || "", timeZone: attendeeTimezone, @@ -963,6 +968,14 @@ async function handler( const workflows = await getAllWorkflowsFromEventType(eventType, organizerUser.id); + if (isTeamEventType) { + evt.team = { + members: teamMembers, + name: eventType.team?.name || "Nameless", + id: eventType.team?.id ?? 0, + }; + } + // For seats, if the booking already exists then we want to add the new attendee to the existing booking if (eventType.seatsPerTimeSlot) { const newBooking = await handleSeats({ @@ -975,6 +988,7 @@ async function handler( organizerUser, originalRescheduledBooking, bookerEmail, + bookerPhoneNumber, tAttendees, bookingSeat, reqUserId: req.userId, @@ -1022,13 +1036,7 @@ async function handler( }); } } - if (isTeamEventType) { - evt.team = { - members: teamMembers, - name: eventType.team?.name || "Nameless", - id: eventType.team?.id ?? 0, - }; - } + if (reqBody.recurringEventId && eventType.recurringEvent) { // Overriding the recurring event configuration count to be the actual number of events booked for // the recurring event (equal or less than recurring event configuration count) @@ -1105,7 +1113,10 @@ async function handler( if (booking && booking.id && eventType.seatsPerTimeSlot) { const currentAttendee = booking.attendees.find( - (attendee) => attendee.email === req.body.responses.email + (attendee) => + attendee.email === req.body.responses.email || + (req.body.responses.attendeePhoneNumber && + attendee.phoneNumber === req.body.responses.attendeePhoneNumber) ); // Save description to bookingSeat @@ -1321,6 +1332,7 @@ async function handler( name: user.name, email: user.email, timeZone: user.timeZone, + phoneNumber: user.phoneNumber, language: { translate, locale: user.locale ?? "en" }, }); } @@ -1339,26 +1351,39 @@ async function handler( .concat(copyEvent.organizer) .concat(copyEvent.attendees) || []; + const matchOriginalMemberWithNewMember = (originalMember: Person, newMember: Person) => { + return originalMember.email === newMember.email; + }; + // scheduled Emails const newBookedMembers = newBookingMemberEmails.filter( (member) => - !originalBookingMemberEmails.find((originalMember) => originalMember.email === member.email) + !originalBookingMemberEmails.find((originalMember) => + matchOriginalMemberWithNewMember(originalMember, member) + ) ); // cancelled Emails const cancelledMembers = originalBookingMemberEmails.filter( - (member) => !newBookingMemberEmails.find((newMember) => newMember.email === member.email) + (member) => + !newBookingMemberEmails.find((newMember) => matchOriginalMemberWithNewMember(member, newMember)) ); // rescheduled Emails const rescheduledMembers = newBookingMemberEmails.filter((member) => - originalBookingMemberEmails.find((orignalMember) => orignalMember.email === member.email) + originalBookingMemberEmails.find((orignalMember) => + matchOriginalMemberWithNewMember(orignalMember, member) + ) ); - sendRoundRobinRescheduledEmails(copyEventAdditionalInfo, rescheduledMembers, eventType.metadata); - sendRoundRobinScheduledEmails(copyEventAdditionalInfo, newBookedMembers, eventType.metadata); - sendRoundRobinCancelledEmails(copyEventAdditionalInfo, cancelledMembers, eventType.metadata); + sendRoundRobinRescheduledEmailsAndSMS( + copyEventAdditionalInfo, + rescheduledMembers, + eventType.metadata + ); + sendRoundRobinScheduledEmailsAndSMS(copyEventAdditionalInfo, newBookedMembers, eventType.metadata); + sendRoundRobinCancelledEmailsAndSMS(copyEventAdditionalInfo, cancelledMembers, eventType.metadata); } else { // send normal rescheduled emails (non round robin event, where organizers stay the same) - await sendRescheduledEmails( + await sendRescheduledEmailsAndSMS( { ...copyEvent, additionalInformation: metadata, @@ -1496,7 +1521,7 @@ async function handler( }) ); - await sendScheduledEmails( + await sendScheduledEmailsAndSMS( { ...evt, additionalInformation, @@ -1536,7 +1561,7 @@ async function handler( }) ); await sendOrganizerRequestEmail({ ...evt, additionalNotes }, eventType.metadata); - await sendAttendeeRequestEmail({ ...evt, additionalNotes }, attendeesList[0], eventType.metadata); + await sendAttendeeRequestEmailAndSMS({ ...evt, additionalNotes }, attendeesList[0], eventType.metadata); } if (booking.location?.startsWith("http")) { @@ -1607,7 +1632,8 @@ async function handler( eventTypePaymentAppCredential as IEventTypePaymentCredentialType, booking, fullName, - bookerEmail + bookerEmail, + bookerPhoneNumber ); const subscriberOptionsPaymentInitiated: GetSubscriberOptions = { userId: triggerForUser ? organizerUser.id : null, diff --git a/packages/features/bookings/lib/handleNewBooking/createBooking.ts b/packages/features/bookings/lib/handleNewBooking/createBooking.ts index 8246e194b9ea91..f36244586b9024 100644 --- a/packages/features/bookings/lib/handleNewBooking/createBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking/createBooking.ts @@ -148,6 +148,7 @@ function getAttendeesData(evt: Pick) { email: attendee.email, timeZone: attendee.timeZone, locale: attendee.language.locale, + phoneNumber: attendee.phoneNumber, })); if (evt.team?.members) { @@ -157,6 +158,7 @@ function getAttendeesData(evt: Pick) { name: member.name, timeZone: member.timeZone, locale: member.language.locale, + phoneNumber: member.phoneNumber, })) ); } diff --git a/packages/features/bookings/lib/handleNewBooking/getBookingData.ts b/packages/features/bookings/lib/handleNewBooking/getBookingData.ts index 316630a1b85f75..1a2fffa542538c 100644 --- a/packages/features/bookings/lib/handleNewBooking/getBookingData.ts +++ b/packages/features/bookings/lib/handleNewBooking/getBookingData.ts @@ -51,6 +51,7 @@ export async function getBookingData({ calEventUserFieldsResponses: undefined, calEventResponses: undefined, customInputs: undefined, + attendeePhoneNumber: undefined, }; } if (!reqBody.responses) { @@ -67,6 +68,7 @@ export async function getBookingData({ ...reqBody, name: responses.name, email: responses.email, + attendeePhoneNumber: responses.attendeePhoneNumber, guests: responses.guests ? responses.guests : [], location: responses.location?.optionValue || responses.location?.value || "", smsReminderNumber: responses.smsReminderNumber, diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts index ccd0841b7872a2..80f5dd52f54e66 100644 --- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts +++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts @@ -24,6 +24,11 @@ export const getEventTypesFromDB = async (eventTypeId: number) => { }, }, slug: true, + profile: { + select: { + organizationId: true, + }, + }, teamId: true, team: { select: { @@ -124,13 +129,16 @@ export const getEventTypesFromDB = async (eventTypeId: number) => { }, }); + const { profile, ...restEventType } = eventType; + const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId; + return { - ...eventType, + ...restEventType, metadata: EventTypeMetaDataSchema.parse(eventType?.metadata || {}), recurringEvent: parseRecurringEvent(eventType?.recurringEvent), customInputs: customInputSchema.array().parse(eventType?.customInputs || []), locations: (eventType?.locations ?? []) as LocationObject[], - bookingFields: getBookingFieldsWithSystemFields(eventType || {}), + bookingFields: getBookingFieldsWithSystemFields({ ...restEventType, isOrgTeamEvent } || {}), isDynamic: false, }; }; diff --git a/packages/features/bookings/lib/handleNewBooking/getOriginalRescheduledBooking.ts b/packages/features/bookings/lib/handleNewBooking/getOriginalRescheduledBooking.ts index 55930a095f4a26..021541a03704e4 100644 --- a/packages/features/bookings/lib/handleNewBooking/getOriginalRescheduledBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking/getOriginalRescheduledBooking.ts @@ -18,6 +18,7 @@ export async function getOriginalRescheduledBooking(uid: string, seatsEventType? email: true, locale: true, timeZone: true, + phoneNumber: true, ...(seatsEventType && { bookingSeat: true, id: true }), }, }, diff --git a/packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts b/packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts index e6b106662dbab2..678dc7c641e6b7 100644 --- a/packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts +++ b/packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts @@ -17,6 +17,7 @@ import { getMockBookingAttendee, getMockFailingAppStatus, getMockPassingAppStatus, + getDefaultBookingFields, } from "@calcom/web/test/utils/bookingScenario/bookingScenario"; import { createMockNextJsRequest } from "@calcom/web/test/utils/bookingScenario/createMockNextJsRequest"; import { @@ -36,11 +37,12 @@ import { import { getMockRequestDataForBooking } from "@calcom/web/test/utils/bookingScenario/getMockRequestDataForBooking"; import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown"; -import { describe, expect } from "vitest"; +import { describe, expect, beforeEach } from "vitest"; import { appStoreMetadata } from "@calcom/app-store/apps.metadata.generated"; import { WEBAPP_URL } from "@calcom/lib/constants"; import logger from "@calcom/lib/logger"; +import { resetTestSMS } from "@calcom/lib/testSMS"; import { BookingStatus, SchedulingType } from "@calcom/prisma/enums"; import { test } from "@calcom/web/test/fixtures/fixtures"; @@ -50,6 +52,10 @@ const timeout = process.env.CI ? 5000 : 20000; describe("handleNewBooking", () => { setupAndTeardown(); + beforeEach(() => { + resetTestSMS(); + }); + describe("Reschedule", () => { describe("User event-type", () => { test( @@ -2174,6 +2180,210 @@ describe("handleNewBooking", () => { }, timeout ); + + test( + "[Event Type with Both Email and Attendee Phone Number as required fields] should send rescheduling emails when round robin is rescheduled to same host", + async ({ emails }) => { + const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const TEST_ATTENDEE_NUMBER = "+919876543210"; + const booker = getBooker({ + email: "booker@example.com", + name: "Booker", + attendeePhoneNumber: TEST_ATTENDEE_NUMBER, + }); + + const roundRobinHost1 = getOrganizer({ + name: "RR Host 1", + email: "rrhost1@example.com", + id: 101, + schedules: [TestData.schedules.IstMorningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + teams: [ + { + membership: { + accepted: true, + }, + team: { + id: 1, + name: "Team 1", + slug: "team-1", + }, + }, + ], + }); + + const roundRobinHost2 = getOrganizer({ + name: "RR Host 2", + email: "rrhost2@example.com", + id: 102, + schedules: [TestData.schedules.IstEveningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + teams: [ + { + membership: { + accepted: true, + }, + team: { + id: 1, + name: "Team 1", + slug: "team-1", + }, + }, + ], + }); + + const { dateString: plus1DateString } = getDate({ dateIncrement: 1 }); + const uidOfBookingToBeRescheduled = "n5Wv3eHgconAED2j4gcVhP"; + await createBookingScenario( + getScenarioData({ + eventTypes: [ + { + id: 1, + slotInterval: 15, + length: 15, + teamId: 1, + users: [ + { + id: 101, + }, + { + id: 102, + }, + ], + schedulingType: SchedulingType.ROUND_ROBIN, + bookingFields: getDefaultBookingFields({ + emailField: { + name: "email", + type: "email", + label: "", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + placeholder: "", + defaultLabel: "email_address", + }, + bookingFields: [ + { + name: "attendeePhoneNumber", + type: "phone", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + defaultLabel: "phone_number", + }, + ], + }), + }, + ], + bookings: [ + { + uid: uidOfBookingToBeRescheduled, + eventTypeId: 1, + userId: 101, + status: BookingStatus.ACCEPTED, + startTime: `${plus1DateString}T05:00:00.000Z`, + endTime: `${plus1DateString}T05:15:00.000Z`, + }, + ], + organizer: roundRobinHost1, + usersApartFromOrganizer: [roundRobinHost2], + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }) + ); + + mockSuccessfulVideoMeetingCreation({ + metadataLookupKey: "dailyvideo", + }); + + mockCalendarToHaveNoBusySlots("googlecalendar", { + create: { + uid: "MOCK_ID", + }, + update: { + uid: "UPDATED_MOCK_ID", + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }, + }); + + const mockBookingData = getMockRequestDataForBooking({ + data: { + eventTypeId: 1, + user: roundRobinHost1.name, + rescheduleUid: uidOfBookingToBeRescheduled, + start: `${plus1DateString}T04:00:00.000Z`, + end: `${plus1DateString}T04:15:00.000Z`, + responses: { + email: booker.email, + name: booker.name, + attendeePhoneNumber: booker.attendeePhoneNumber, + location: { optionValue: "", value: BookingLocations.CalVideo }, + }, + }, + }); + const { req } = createMockNextJsRequest({ + method: "POST", + body: mockBookingData, + }); + + const createdBooking = await handleNewBooking(req); + + const previousBooking = await prismaMock.booking.findUnique({ + where: { + uid: uidOfBookingToBeRescheduled, + }, + }); + + logger.silly({ + previousBooking, + allBookings: await prismaMock.booking.findMany(), + }); + + // Expect previous booking to be cancelled + await expectBookingToBeInDatabase({ + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: uidOfBookingToBeRescheduled, + status: BookingStatus.CANCELLED, + }); + + expect(previousBooking?.status).toBe(BookingStatus.CANCELLED); + /** + * Booking Time should be new time + */ + expect(createdBooking.startTime?.toISOString()).toBe(`${plus1DateString}T04:00:00.000Z`); + expect(createdBooking.endTime?.toISOString()).toBe(`${plus1DateString}T04:15:00.000Z`); + + await expectBookingInDBToBeRescheduledFromTo({ + from: { + uid: uidOfBookingToBeRescheduled, + }, + to: { + description: "", + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: createdBooking.uid!, + eventTypeId: mockBookingData.eventTypeId, + status: BookingStatus.ACCEPTED, + location: BookingLocations.CalVideo, + responses: expect.objectContaining({ + email: booker.email, + attendeePhoneNumber: booker.attendeePhoneNumber, + name: booker.name, + }), + }, + }); + + expectSuccessfulRoundRobinReschedulingEmails({ + prevOrganizer: roundRobinHost1, + newOrganizer: roundRobinHost1, // Round robin host 2 is not available and it will be rescheduled to same user + emails, + }); + }, + timeout + ); + test( "should reschedule event with same round robin host", async ({ emails }) => { @@ -2304,7 +2514,7 @@ describe("handleNewBooking", () => { expect(createdBooking.endTime?.toISOString()).toBe(`${plus1DateString}T04:15:00.000Z`); // Expect both hosts for the event types to be the same - expect(createdBooking.userId).toBe(previousBooking.userId); + expect(createdBooking.userId).toBe(previousBooking?.userId ?? -1); await expectBookingInDBToBeRescheduledFromTo({ from: { diff --git a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts index ecb098639402f8..65caaf31a65e58 100644 --- a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts +++ b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts @@ -1,6 +1,6 @@ -import { createOrganization } from "@calcom/web/test/utils/bookingScenario/bookingScenario"; import { createBookingScenario, + createOrganization, getGoogleCalendarCredential, TestData, getOrganizer, @@ -13,6 +13,7 @@ import { getExpectedCalEventForBookingRequest, BookingLocations, getZoomAppCredential, + getDefaultBookingFields, } from "@calcom/web/test/utils/bookingScenario/bookingScenario"; import { createMockNextJsRequest } from "@calcom/web/test/utils/bookingScenario/createMockNextJsRequest"; import { @@ -22,18 +23,23 @@ import { expectBookingCreatedWebhookToHaveBeenFired, expectSuccessfulCalendarEventCreationInCalendar, expectSuccessfulVideoMeetingCreation, + expectSMSToBeTriggered, + expectBookingRequestedEmails, + expectBookingRequestedWebhookToHaveBeenFired, } from "@calcom/web/test/utils/bookingScenario/expects"; import { getMockRequestDataForBooking } from "@calcom/web/test/utils/bookingScenario/getMockRequestDataForBooking"; import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown"; import type { Request, Response } from "express"; import type { NextApiRequest, NextApiResponse } from "next"; -import { describe, expect } from "vitest"; +import { describe, expect, beforeEach } from "vitest"; import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData"; import { OrganizerDefaultConferencingAppType } from "@calcom/app-store/locations"; import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants"; +import { contructEmailFromPhoneNumber } from "@calcom/lib/contructEmailFromPhoneNumber"; import { ErrorCode } from "@calcom/lib/errorCodes"; +import { resetTestSMS } from "@calcom/lib/testSMS"; import { SchedulingType } from "@calcom/prisma/enums"; import { BookingStatus } from "@calcom/prisma/enums"; import { test } from "@calcom/web/test/fixtures/fixtures"; @@ -46,6 +52,10 @@ const timeout = process.env.CI ? 5000 : 20000; describe("handleNewBooking", () => { setupAndTeardown(); + beforeEach(() => { + resetTestSMS(); + }); + describe("Team Events", () => { describe("Collective Assignment", () => { describe("When there is no schedule set on eventType - Hosts schedules would be used", () => { @@ -283,41 +293,633 @@ describe("handleNewBooking", () => { }); await createBookingScenario( - getScenarioData({ - webhooks: [ - { - userId: organizer.id, - eventTriggers: ["BOOKING_CREATED"], - subscriberUrl: "http://my-webhook.example.com", - active: true, - eventTypeId: 1, - appId: null, - }, - ], - eventTypes: [ - { - id: 1, - slotInterval: 15, - schedulingType: SchedulingType.COLLECTIVE, - length: 15, - users: [ - { - id: 101, - }, - { - id: 102, + getScenarioData({ + webhooks: [ + { + userId: organizer.id, + eventTriggers: ["BOOKING_CREATED"], + subscriberUrl: "http://my-webhook.example.com", + active: true, + eventTypeId: 1, + appId: null, + }, + ], + eventTypes: [ + { + id: 1, + slotInterval: 15, + schedulingType: SchedulingType.COLLECTIVE, + length: 15, + users: [ + { + id: 101, + }, + { + id: 102, + }, + ], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + }, + ], + organizer, + usersApartFromOrganizer: otherTeamMembers, + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }) + ); + + mockSuccessfulVideoMeetingCreation({ + metadataLookupKey: appStoreMetadata.dailyvideo.dirName, + videoMeetingData: { + id: "MOCK_ID", + password: "MOCK_PASS", + url: `http://mock-dailyvideo.example.com/meeting-1`, + }, + }); + + const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { + create: { + id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }, + }); + + const mockBookingData = getMockRequestDataForBooking({ + data: { + // Try booking the first available free timeslot in both the users' schedules + start: `${getDate({ dateIncrement: 1 }).dateString}T09:00:00.000Z`, + end: `${getDate({ dateIncrement: 1 }).dateString}T09:15:00.000Z`, + eventTypeId: 1, + responses: { + email: booker.email, + name: booker.name, + location: { optionValue: "", value: BookingLocations.CalVideo }, + }, + }, + }); + + const { req } = createMockNextJsRequest({ + method: "POST", + body: mockBookingData, + }); + + await expect(async () => { + await handleNewBooking(req); + }).rejects.toThrowError(ErrorCode.HostsUnavailableForBooking); + }, + timeout + ); + }); + + describe("When there is a schedule set on eventType - Event Type common schedule would be used", () => { + test( + `succesfully creates a booking when the users are available as per the common schedule selected in the event-type + - Destination calendars for event-type and non-first hosts are used to create calendar events + `, + async ({ emails }) => { + const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const booker = getBooker({ + email: "booker@example.com", + name: "Booker", + }); + const otherTeamMembers = [ + { + name: "Other Team Member 1", + username: "other-team-member-1", + timeZone: Timezones["+5:30"], + defaultScheduleId: null, + email: "other-team-member-1@example.com", + id: 102, + // No user schedules are here + schedules: [], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + }, + ]; + const organizer = getOrganizer({ + name: "Organizer", + email: "organizer@example.com", + id: 101, + defaultScheduleId: null, + // No user schedules are here + schedules: [], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "organizer@google-calendar.com", + }, + }); + await createBookingScenario( + getScenarioData({ + webhooks: [ + { + userId: organizer.id, + eventTriggers: ["BOOKING_CREATED"], + subscriberUrl: "http://my-webhook.example.com", + active: true, + eventTypeId: 1, + appId: null, + }, + ], + eventTypes: [ + { + id: 1, + slotInterval: 15, + schedulingType: SchedulingType.COLLECTIVE, + length: 15, + users: [ + { + id: 101, + }, + { + id: 102, + }, + ], + // Common schedule is the morning shift + schedule: TestData.schedules.IstMorningShift, + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + }, + ], + organizer, + usersApartFromOrganizer: otherTeamMembers, + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }) + ); + + mockSuccessfulVideoMeetingCreation({ + metadataLookupKey: appStoreMetadata.dailyvideo.dirName, + videoMeetingData: { + id: "MOCK_ID", + password: "MOCK_PASS", + url: `http://mock-dailyvideo.example.com/meeting-1`, + }, + }); + const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { + create: { + id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }, + }); + const mockBookingData = getMockRequestDataForBooking({ + data: { + // Try booking the first available free timeslot in both the users' schedules + start: `${getDate({ dateIncrement: 1 }).dateString}T11:30:00.000Z`, + end: `${getDate({ dateIncrement: 1 }).dateString}T11:45:00.000Z`, + eventTypeId: 1, + responses: { + email: booker.email, + name: booker.name, + location: { optionValue: "", value: BookingLocations.CalVideo }, + }, + }, + }); + const { req } = createMockNextJsRequest({ + method: "POST", + body: mockBookingData, + }); + const createdBooking = await handleNewBooking(req); + await expectBookingToBeInDatabase({ + description: "", + location: BookingLocations.CalVideo, + responses: expect.objectContaining({ + email: booker.email, + name: booker.name, + }), + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: createdBooking.uid!, + eventTypeId: mockBookingData.eventTypeId, + status: BookingStatus.ACCEPTED, + references: [ + { + type: appStoreMetadata.dailyvideo.type, + uid: "MOCK_ID", + meetingId: "MOCK_ID", + meetingPassword: "MOCK_PASS", + meetingUrl: "http://mock-dailyvideo.example.com/meeting-1", + }, + { + type: TestData.apps["google-calendar"].type, + uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingId: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingPassword: "MOCK_PASSWORD", + meetingUrl: "https://UNUSED_URL", + }, + ], + }); + // expectWorkflowToBeTriggered(); + expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { + destinationCalendars: [ + { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + ], + videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", + }); + expectSuccessfulBookingCreationEmails({ + booking: { + uid: createdBooking.uid!, + }, + booker, + organizer, + otherTeamMembers, + emails, + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }); + expectBookingCreatedWebhookToHaveBeenFired({ + booker, + organizer, + location: BookingLocations.CalVideo, + subscriberUrl: "http://my-webhook.example.com", + videoCallUrl: `${WEBAPP_URL}/video/${createdBooking.uid}`, + }); + }, + timeout + ); + test( + `[Event Type with both Attendee Phone number and Email as required fields] succesfully creates a booking when the users are available as per the common schedule selected in the event-type + - Destination calendars for event-type and non-first hosts are used to create calendar events + `, + async ({ emails, sms }) => { + const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const org = await createOrganization({ + name: "Test Org", + slug: "testorg", + }); + const TEST_ATTENDEE_NUMBER = "+918888888888"; + const booker = getBooker({ + email: "booker@example.com", + name: "Booker", + attendeePhoneNumber: TEST_ATTENDEE_NUMBER, + }); + + const otherTeamMembers = [ + { + name: "Other Team Member 1", + username: "other-team-member-1", + timeZone: Timezones["+5:30"], + defaultScheduleId: null, + email: "other-team-member-1@example.com", + id: 102, + schedules: [TestData.schedules.IstEveningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + }, + ]; + + const organizer = getOrganizer({ + name: "Organizer", + email: "organizer@example.com", + id: 101, + defaultScheduleId: null, + organizationId: org.id, + schedules: [TestData.schedules.IstMorningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "organizer@google-calendar.com", + }, + teams: [ + { + membership: { + accepted: true, + }, + team: { + id: 1, + name: "Team 1", + slug: "team-1", + parentId: org.id, + }, + }, + ], + }); + + await createBookingScenario( + getScenarioData( + { + webhooks: [ + { + userId: organizer.id, + eventTriggers: ["BOOKING_CREATED"], + subscriberUrl: "http://my-webhook.example.com", + active: true, + eventTypeId: 1, + appId: null, + }, + ], + eventTypes: [ + { + id: 1, + teamId: 1, + slotInterval: 15, + schedulingType: SchedulingType.COLLECTIVE, + length: 15, + users: [ + { + id: 101, + }, + { + id: 102, + }, + ], + // Both Email and Attendee Phone Number Fields are required + bookingFields: getDefaultBookingFields({ + emailField: { + name: "email", + type: "email", + label: "", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + placeholder: "", + defaultLabel: "email_address", + }, + bookingFields: [ + { + name: "attendeePhoneNumber", + type: "phone", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + defaultLabel: "phone_number", + }, + ], + }), + // Common schedule is the morning shift + schedule: TestData.schedules.IstMorningShift, + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + }, + ], + organizer, + usersApartFromOrganizer: otherTeamMembers, + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }, + { id: org.id } + ) + ); + + mockSuccessfulVideoMeetingCreation({ + metadataLookupKey: appStoreMetadata.dailyvideo.dirName, + videoMeetingData: { + id: "MOCK_ID", + password: "MOCK_PASS", + url: `http://mock-dailyvideo.example.com/meeting-1`, + }, + }); + + const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { + create: { + id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }, + }); + + const mockBookingData = getMockRequestDataForBooking({ + data: { + // Try booking the first available free timeslot in both the users' schedules + start: `${getDate({ dateIncrement: 1 }).dateString}T11:30:00.000Z`, + end: `${getDate({ dateIncrement: 1 }).dateString}T11:45:00.000Z`, + eventTypeId: 1, + responses: { + email: booker.email, + name: booker.name, + attendeePhoneNumber: booker.attendeePhoneNumber, + location: { optionValue: "", value: BookingLocations.CalVideo }, + }, + }, + }); + + const { req } = createMockNextJsRequest({ + method: "POST", + body: mockBookingData, + }); + + const createdBooking = await handleNewBooking(req); + + await expectBookingToBeInDatabase({ + description: "", + location: BookingLocations.CalVideo, + responses: expect.objectContaining({ + email: booker.email, + name: booker.name, + }), + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: createdBooking.uid!, + eventTypeId: mockBookingData.eventTypeId, + status: BookingStatus.ACCEPTED, + references: [ + { + type: appStoreMetadata.dailyvideo.type, + uid: "MOCK_ID", + meetingId: "MOCK_ID", + meetingPassword: "MOCK_PASS", + meetingUrl: "http://mock-dailyvideo.example.com/meeting-1", + }, + { + type: TestData.apps["google-calendar"].type, + uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingId: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingPassword: "MOCK_PASSWORD", + meetingUrl: "https://UNUSED_URL", + }, + ], + }); + + // expectWorkflowToBeTriggered(); + expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { + destinationCalendars: [ + { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + ], + videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", + }); + const WEBSITE_PROTOCOL = new URL(WEBSITE_URL).protocol; + expectSuccessfulBookingCreationEmails({ + booking: { + uid: createdBooking.uid!, + urlOrigin: `${WEBSITE_PROTOCOL}//team-1.cal.local:3000`, + }, + booker, + organizer, + otherTeamMembers, + emails, + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }); + + expectBookingCreatedWebhookToHaveBeenFired({ + booker, + organizer, + location: BookingLocations.CalVideo, + subscriberUrl: "http://my-webhook.example.com", + videoCallUrl: `${WEBAPP_URL}/video/${createdBooking.uid}`, + }); + + expectSMSToBeTriggered({ sms, toNumber: TEST_ATTENDEE_NUMBER }); + }, + timeout + ); + + test( + `[Event Type with only Attendee Phone number as required field and Email as hidden field] succesfully creates a booking when the users are available as per the common schedule selected in the event-type + - Destination calendars for event-type and non-first hosts are used to create calendar events + `, + async ({ emails, sms }) => { + const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const org = await createOrganization({ + name: "Test Org", + slug: "testorg", + }); + + const TEST_ATTENDEE_NUMBER = "+918888888888"; + const booker = getBooker({ + email: "booker@example.com", + name: "Booker", + attendeePhoneNumber: TEST_ATTENDEE_NUMBER, + }); + + const otherTeamMembers = [ + { + name: "Other Team Member 1", + username: "other-team-member-1", + timeZone: Timezones["+5:30"], + defaultScheduleId: null, + email: "other-team-member-1@example.com", + id: 102, + schedules: [TestData.schedules.IstEveningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + }, + ]; + + const organizer = getOrganizer({ + name: "Organizer", + email: "organizer@example.com", + id: 101, + defaultScheduleId: null, + organizationId: org.id, + schedules: [TestData.schedules.IstMorningShift], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "organizer@google-calendar.com", + }, + teams: [ + { + membership: { + accepted: true, + }, + team: { + id: 1, + name: "Team 1", + slug: "team-1", + parentId: org.id, + }, + }, + ], + }); + + await createBookingScenario( + getScenarioData( + { + webhooks: [ + { + userId: organizer.id, + eventTriggers: ["BOOKING_CREATED"], + subscriberUrl: "http://my-webhook.example.com", + active: true, + eventTypeId: 1, + appId: null, + }, + ], + eventTypes: [ + { + id: 1, + teamId: 1, + slotInterval: 15, + schedulingType: SchedulingType.COLLECTIVE, + length: 15, + users: [ + { + id: 101, + }, + { + id: 102, + }, + ], + // Both Email and Attendee Phone Number Fields are required + bookingFields: getDefaultBookingFields({ + emailField: { + name: "email", + type: "email", + label: "", + hidden: true, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: false, + placeholder: "", + defaultLabel: "email_address", + }, + bookingFields: [ + { + name: "attendeePhoneNumber", + type: "phone", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + defaultLabel: "phone_number", + }, + ], + }), + // Common schedule is the morning shift + schedule: TestData.schedules.IstMorningShift, + destinationCalendar: { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", }, - ], - destinationCalendar: { - integration: TestData.apps["google-calendar"].type, - externalId: "event-type-1@google-calendar.com", }, - }, - ], - organizer, - usersApartFromOrganizer: otherTeamMembers, - apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], - }) + ], + organizer, + usersApartFromOrganizer: otherTeamMembers, + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }, + { id: org.id } + ) ); mockSuccessfulVideoMeetingCreation({ @@ -345,6 +947,7 @@ describe("handleNewBooking", () => { responses: { email: booker.email, name: booker.name, + attendeePhoneNumber: booker.attendeePhoneNumber, location: { optionValue: "", value: BookingLocations.CalVideo }, }, }, @@ -355,24 +958,95 @@ describe("handleNewBooking", () => { body: mockBookingData, }); - await expect(async () => { - await handleNewBooking(req); - }).rejects.toThrowError(ErrorCode.HostsUnavailableForBooking); + const createdBooking = await handleNewBooking(req); + + await expectBookingToBeInDatabase({ + description: "", + location: BookingLocations.CalVideo, + responses: expect.objectContaining({ + attendeePhoneNumber: booker.attendeePhoneNumber, + name: booker.name, + }), + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: createdBooking.uid!, + eventTypeId: mockBookingData.eventTypeId, + status: BookingStatus.ACCEPTED, + references: [ + { + type: appStoreMetadata.dailyvideo.type, + uid: "MOCK_ID", + meetingId: "MOCK_ID", + meetingPassword: "MOCK_PASS", + meetingUrl: "http://mock-dailyvideo.example.com/meeting-1", + }, + { + type: TestData.apps["google-calendar"].type, + uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingId: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", + meetingPassword: "MOCK_PASSWORD", + meetingUrl: "https://UNUSED_URL", + }, + ], + }); + + expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { + destinationCalendars: [ + { + integration: TestData.apps["google-calendar"].type, + externalId: "event-type-1@google-calendar.com", + }, + { + integration: TestData.apps["google-calendar"].type, + externalId: "other-team-member-1@google-calendar.com", + }, + ], + videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", + }); + + const WEBSITE_PROTOCOL = new URL(WEBSITE_URL).protocol; + expectSuccessfulBookingCreationEmails({ + booking: { + uid: createdBooking.uid!, + urlOrigin: `${WEBSITE_PROTOCOL}//team-1.cal.local:3000`, + }, + booker: { email: contructEmailFromPhoneNumber(TEST_ATTENDEE_NUMBER), name: booker.name }, + organizer, + otherTeamMembers, + emails, + iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", + }); + + expectBookingCreatedWebhookToHaveBeenFired({ + booker: { email: contructEmailFromPhoneNumber(TEST_ATTENDEE_NUMBER), name: booker.name }, + organizer, + location: BookingLocations.CalVideo, + subscriberUrl: "http://my-webhook.example.com", + videoCallUrl: `${WEBAPP_URL}/video/${createdBooking.uid}`, + isEmailHidden: true, + isAttendeePhoneNumberHidden: false, + }); + + expectSMSToBeTriggered({ sms, toNumber: TEST_ATTENDEE_NUMBER }); }, timeout ); - }); - - describe("When there is a schedule set on eventType - Event Type common schedule would be used", () => { test( - `succesfully creates a booking when the users are available as per the common schedule selected in the event-type + `[Event Type that requires confirmation with only Attendee Phone number as required field and Email as optional field] succesfully creates a booking when the users are available as per the common schedule selected in the event-type - Destination calendars for event-type and non-first hosts are used to create calendar events `, - async ({ emails }) => { + async ({ emails, sms }) => { const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const org = await createOrganization({ + name: "Test Org", + slug: "testorg", + }); + const subscriberUrl = "http://my-webhook.example.com"; + const TEST_ATTENDEE_NUMBER = "+918888888888"; + const booker = getBooker({ email: "booker@example.com", name: "Booker", + attendeePhoneNumber: TEST_ATTENDEE_NUMBER, }); const otherTeamMembers = [ @@ -383,8 +1057,7 @@ describe("handleNewBooking", () => { defaultScheduleId: null, email: "other-team-member-1@example.com", id: 102, - // No user schedules are here - schedules: [], + schedules: [TestData.schedules.IstEveningShift], credentials: [getGoogleCalendarCredential()], selectedCalendars: [TestData.selectedCalendars.google], destinationCalendar: { @@ -399,18 +1072,31 @@ describe("handleNewBooking", () => { email: "organizer@example.com", id: 101, defaultScheduleId: null, - // No user schedules are here - schedules: [], + organizationId: org.id, + schedules: [TestData.schedules.IstMorningShift], credentials: [getGoogleCalendarCredential()], selectedCalendars: [TestData.selectedCalendars.google], destinationCalendar: { integration: TestData.apps["google-calendar"].type, externalId: "organizer@google-calendar.com", }, + teams: [ + { + membership: { + accepted: true, + }, + team: { + id: 1, + name: "Team 1", + slug: "team-1", + parentId: org.id, + }, + }, + ], }); - await createBookingScenario( - getScenarioData({ + const scenarioData = getScenarioData( + { webhooks: [ { userId: organizer.id, @@ -424,7 +1110,9 @@ describe("handleNewBooking", () => { eventTypes: [ { id: 1, + teamId: 1, slotInterval: 15, + requiresConfirmation: true, schedulingType: SchedulingType.COLLECTIVE, length: 15, users: [ @@ -435,6 +1123,31 @@ describe("handleNewBooking", () => { id: 102, }, ], + // Both Email and Attendee Phone Number Fields are required + bookingFields: getDefaultBookingFields({ + emailField: { + name: "email", + type: "email", + label: "", + hidden: true, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: false, + placeholder: "", + defaultLabel: "email_address", + }, + bookingFields: [ + { + name: "attendeePhoneNumber", + type: "phone", + hidden: false, + sources: [{ id: "default", type: "default", label: "Default" }], + editable: "system-but-optional", + required: true, + defaultLabel: "phone_number", + }, + ], + }), // Common schedule is the morning shift schedule: TestData.schedules.IstMorningShift, destinationCalendar: { @@ -446,8 +1159,10 @@ describe("handleNewBooking", () => { organizer, usersApartFromOrganizer: otherTeamMembers, apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], - }) + }, + { id: org.id } ); + await createBookingScenario(scenarioData); mockSuccessfulVideoMeetingCreation({ metadataLookupKey: appStoreMetadata.dailyvideo.dirName, @@ -458,7 +1173,7 @@ describe("handleNewBooking", () => { }, }); - const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { + mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", @@ -471,9 +1186,11 @@ describe("handleNewBooking", () => { start: `${getDate({ dateIncrement: 1 }).dateString}T11:30:00.000Z`, end: `${getDate({ dateIncrement: 1 }).dateString}T11:45:00.000Z`, eventTypeId: 1, + // No Email Passed responses: { - email: booker.email, name: booker.name, + email: "", + attendeePhoneNumber: booker.attendeePhoneNumber, location: { optionValue: "", value: BookingLocations.CalVideo }, }, }, @@ -490,64 +1207,30 @@ describe("handleNewBooking", () => { description: "", location: BookingLocations.CalVideo, responses: expect.objectContaining({ - email: booker.email, + attendeePhoneNumber: booker.attendeePhoneNumber, name: booker.name, }), // eslint-disable-next-line @typescript-eslint/no-non-null-assertion uid: createdBooking.uid!, eventTypeId: mockBookingData.eventTypeId, - status: BookingStatus.ACCEPTED, - references: [ - { - type: appStoreMetadata.dailyvideo.type, - uid: "MOCK_ID", - meetingId: "MOCK_ID", - meetingPassword: "MOCK_PASS", - meetingUrl: "http://mock-dailyvideo.example.com/meeting-1", - }, - { - type: TestData.apps["google-calendar"].type, - uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", - meetingId: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", - meetingPassword: "MOCK_PASSWORD", - meetingUrl: "https://UNUSED_URL", - }, - ], - }); - - // expectWorkflowToBeTriggered(); - expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { - destinationCalendars: [ - { - integration: TestData.apps["google-calendar"].type, - externalId: "event-type-1@google-calendar.com", - }, - { - integration: TestData.apps["google-calendar"].type, - externalId: "other-team-member-1@google-calendar.com", - }, - ], - videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", + status: BookingStatus.PENDING, }); - expectSuccessfulBookingCreationEmails({ - booking: { - uid: createdBooking.uid!, - }, - booker, + expectBookingRequestedEmails({ organizer, - otherTeamMembers, emails, - iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }); - expectBookingCreatedWebhookToHaveBeenFired({ - booker, + expectBookingRequestedWebhookToHaveBeenFired({ + booker: { name: booker.name, email: contructEmailFromPhoneNumber(TEST_ATTENDEE_NUMBER) }, organizer, location: BookingLocations.CalVideo, - subscriberUrl: "http://my-webhook.example.com", - videoCallUrl: `${WEBAPP_URL}/video/${createdBooking.uid}`, + subscriberUrl, + eventType: scenarioData.eventTypes[0], + isEmailHidden: true, }); + + expectSMSToBeTriggered({ sms, toNumber: TEST_ATTENDEE_NUMBER }); }, timeout ); @@ -560,7 +1243,6 @@ describe("handleNewBooking", () => { email: "booker@example.com", name: "Booker", }); - const otherTeamMembers = [ { name: "Other Team Member 1", @@ -579,7 +1261,6 @@ describe("handleNewBooking", () => { }, }, ]; - const organizer = getOrganizer({ name: "Organizer", email: "organizer@example.com", @@ -594,7 +1275,6 @@ describe("handleNewBooking", () => { externalId: "organizer@google-calendar.com", }, }); - await createBookingScenario( getScenarioData({ webhooks: [ @@ -633,7 +1313,6 @@ describe("handleNewBooking", () => { apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], }) ); - mockSuccessfulVideoMeetingCreation({ metadataLookupKey: appStoreMetadata.dailyvideo.dirName, videoMeetingData: { @@ -642,14 +1321,12 @@ describe("handleNewBooking", () => { url: `http://mock-dailyvideo.example.com/meeting-1`, }, }); - mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }, }); - const mockBookingData = getMockRequestDataForBooking({ data: { start: `${getDate({ dateIncrement: 1 }).dateString}T03:30:00.000Z`, @@ -662,12 +1339,10 @@ describe("handleNewBooking", () => { }, }, }); - const { req } = createMockNextJsRequest({ method: "POST", body: mockBookingData, }); - await expect(async () => { await handleNewBooking(req); }).rejects.toThrowError(ErrorCode.NoAvailableUsersFound); @@ -684,7 +1359,6 @@ describe("handleNewBooking", () => { email: "booker@example.com", name: "Booker", }); - const otherTeamMembers = [ { name: "Other Team Member 1", @@ -702,7 +1376,6 @@ describe("handleNewBooking", () => { }, }, ]; - const organizer = getOrganizer({ name: "Organizer", email: "organizer@example.com", @@ -716,7 +1389,6 @@ describe("handleNewBooking", () => { externalId: "organizer@google-calendar.com", }, }); - const { eventTypes } = await createBookingScenario( getScenarioData({ webhooks: [ @@ -754,7 +1426,6 @@ describe("handleNewBooking", () => { apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], }) ); - const videoMock = mockSuccessfulVideoMeetingCreation({ metadataLookupKey: appStoreMetadata.dailyvideo.dirName, videoMeetingData: { @@ -763,14 +1434,12 @@ describe("handleNewBooking", () => { url: `http://mock-dailyvideo.example.com/meeting-1`, }, }); - const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }, }); - const mockBookingData = getMockRequestDataForBooking({ data: { start: `${getDate({ dateIncrement: 1 }).dateString}T05:00:00.000Z`, @@ -783,14 +1452,11 @@ describe("handleNewBooking", () => { }, }, }); - const { req } = createMockNextJsRequest({ method: "POST", body: mockBookingData, }); - const createdBooking = await handleNewBooking(req); - await expectBookingToBeInDatabase({ description: "", location: BookingLocations.CalVideo, @@ -819,7 +1485,6 @@ describe("handleNewBooking", () => { }, ], }); - // expectWorkflowToBeTriggered(); expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { destinationCalendars: [ @@ -834,7 +1499,6 @@ describe("handleNewBooking", () => { ], videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", }); - expectSuccessfulVideoMeetingCreation(videoMock, { credential: expect.objectContaining({ appId: "daily-video", @@ -849,7 +1513,6 @@ describe("handleNewBooking", () => { }) ), }); - expectSuccessfulBookingCreationEmails({ booking: { uid: createdBooking.uid!, @@ -860,7 +1523,6 @@ describe("handleNewBooking", () => { emails, iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }); - expectBookingCreatedWebhookToHaveBeenFired({ booker, organizer, @@ -880,7 +1542,6 @@ describe("handleNewBooking", () => { email: "booker@example.com", name: "Booker", }); - const otherTeamMembers = [ { name: "Other Team Member 1", @@ -904,7 +1565,6 @@ describe("handleNewBooking", () => { }, }, ]; - const organizer = getOrganizer({ name: "Organizer", email: "organizer@example.com", @@ -926,7 +1586,6 @@ describe("handleNewBooking", () => { externalId: "organizer@google-calendar.com", }, }); - const { eventTypes } = await createBookingScenario( getScenarioData({ webhooks: [ @@ -970,7 +1629,6 @@ describe("handleNewBooking", () => { apps: [TestData.apps["google-calendar"], TestData.apps["zoomvideo"]], }) ); - const videoMock = mockSuccessfulVideoMeetingCreation({ metadataLookupKey: "zoomvideo", videoMeetingData: { @@ -979,14 +1637,12 @@ describe("handleNewBooking", () => { url: `http://mock-zoomvideo.example.com/meeting-1`, }, }); - const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }, }); - const mockBookingData = getMockRequestDataForBooking({ data: { start: `${getDate({ dateIncrement: 1 }).dateString}T05:00:00.000Z`, @@ -999,14 +1655,11 @@ describe("handleNewBooking", () => { }, }, }); - const { req } = createMockNextJsRequest({ method: "POST", body: mockBookingData, }); - const createdBooking = await handleNewBooking(req); - await expectBookingToBeInDatabase({ description: "", location: BookingLocations.ZoomVideo, @@ -1034,7 +1687,6 @@ describe("handleNewBooking", () => { }, ], }); - // expectWorkflowToBeTriggered(); expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { destinationCalendars: [ @@ -1049,7 +1701,6 @@ describe("handleNewBooking", () => { ], videoCallUrl: "http://mock-zoomvideo.example.com/meeting-1", }); - expectSuccessfulVideoMeetingCreation(videoMock, { credential: expect.objectContaining({ appId: TestData.apps.zoomvideo.slug, @@ -1066,7 +1717,6 @@ describe("handleNewBooking", () => { }) ), }); - expectSuccessfulBookingCreationEmails({ booking: { uid: createdBooking.uid!, @@ -1077,7 +1727,6 @@ describe("handleNewBooking", () => { emails, iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }); - expectBookingCreatedWebhookToHaveBeenFired({ booker, organizer, @@ -1097,7 +1746,6 @@ describe("handleNewBooking", () => { email: "booker@example.com", name: "Booker", }); - const otherTeamMembers = [ { name: "Other Team Member 1", @@ -1121,7 +1769,6 @@ describe("handleNewBooking", () => { }, }, ]; - const organizer = getOrganizer({ name: "Organizer", email: "organizer@example.com", @@ -1144,7 +1791,6 @@ describe("handleNewBooking", () => { externalId: "organizer@google-calendar.com", }, }); - const { eventTypes } = await createBookingScenario( getScenarioData({ webhooks: [ @@ -1191,7 +1837,6 @@ describe("handleNewBooking", () => { ], }) ); - mockSuccessfulVideoMeetingCreation({ metadataLookupKey: appStoreMetadata.dailyvideo.dirName, videoMeetingData: { @@ -1200,14 +1845,12 @@ describe("handleNewBooking", () => { url: `http://mock-dailyvideo.example.com/meeting-1`, }, }); - const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }, }); - const mockBookingData = getMockRequestDataForBooking({ data: { start: `${getDate({ dateIncrement: 1 }).dateString}T05:00:00.000Z`, @@ -1220,14 +1863,11 @@ describe("handleNewBooking", () => { }, }, }); - const { req } = createMockNextJsRequest({ method: "POST", body: mockBookingData, }); - const createdBooking = await handleNewBooking(req); - await expectBookingToBeInDatabase({ description: "", location: BookingLocations.CalVideo, @@ -1257,8 +1897,6 @@ describe("handleNewBooking", () => { ], }); - // expectWorkflowToBeTriggered(); - expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { destinationCalendars: [ { @@ -1272,7 +1910,6 @@ describe("handleNewBooking", () => { ], videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", }); - expectSuccessfulBookingCreationEmails({ booking: { uid: createdBooking.uid!, @@ -1283,7 +1920,6 @@ describe("handleNewBooking", () => { emails, iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }); - expectBookingCreatedWebhookToHaveBeenFired({ booker, organizer, @@ -1307,12 +1943,10 @@ describe("handleNewBooking", () => { name: "Test Org", slug: "testorg", }); - const booker = getBooker({ email: "booker@example.com", name: "Booker", }); - const otherTeamMembers = [ { name: "Other Team Member 1", @@ -1332,7 +1966,6 @@ describe("handleNewBooking", () => { }, }, ]; - const organizer = getOrganizer({ name: "Organizer", email: "organizer@example.com", @@ -1361,7 +1994,6 @@ describe("handleNewBooking", () => { externalId: "organizer@google-calendar.com", }, }); - await createBookingScenario( getScenarioData({ webhooks: [ @@ -1401,7 +2033,6 @@ describe("handleNewBooking", () => { apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], }) ); - mockSuccessfulVideoMeetingCreation({ metadataLookupKey: appStoreMetadata.dailyvideo.dirName, videoMeetingData: { @@ -1410,14 +2041,12 @@ describe("handleNewBooking", () => { url: `http://mock-dailyvideo.example.com/meeting-1`, }, }); - const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { create: { id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID", iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }, }); - const mockBookingData = getMockRequestDataForBooking({ data: { // Try booking the first available free timeslot in both the users' schedules @@ -1431,14 +2060,11 @@ describe("handleNewBooking", () => { }, }, }); - const { req } = createMockNextJsRequest({ method: "POST", body: mockBookingData, }); - const createdBooking = await handleNewBooking(req); - await expectBookingToBeInDatabase({ description: "", location: BookingLocations.CalVideo, @@ -1467,7 +2093,6 @@ describe("handleNewBooking", () => { }, ], }); - // expectWorkflowToBeTriggered(); expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { destinationCalendars: [ @@ -1482,7 +2107,6 @@ describe("handleNewBooking", () => { ], videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", }); - expectSuccessfulBookingCreationEmails({ booking: { uid: createdBooking.uid!, @@ -1495,7 +2119,6 @@ describe("handleNewBooking", () => { emails, iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID", }); - expectBookingCreatedWebhookToHaveBeenFired({ booker, organizer, diff --git a/packages/features/bookings/lib/handleNewBooking/types.ts b/packages/features/bookings/lib/handleNewBooking/types.ts index 2b42e2de13fad4..315b2606d08fc2 100644 --- a/packages/features/bookings/lib/handleNewBooking/types.ts +++ b/packages/features/bookings/lib/handleNewBooking/types.ts @@ -37,6 +37,7 @@ export type Invitee = { firstName: string; lastName: string; timeZone: string; + phoneNumber?: string; language: { translate: TFunction; locale: string; diff --git a/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts b/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts index 2f77deadedcc86..dd164370e93510 100644 --- a/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts +++ b/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts @@ -1,6 +1,6 @@ import { getCalendar } from "@calcom/app-store/_utils/getCalendar"; import { updateMeeting } from "@calcom/core/videoClient"; -import { sendCancelledSeatEmails } from "@calcom/emails"; +import { sendCancelledSeatEmailsAndSMS } from "@calcom/emails"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; import { HttpError } from "@calcom/lib/http-error"; @@ -107,7 +107,7 @@ async function cancelAttendeeSeat( const tAttendees = await getTranslation(attendee.locale ?? "en", "common"); - await sendCancelledSeatEmails( + await sendCancelledSeatEmailsAndSMS( evt, { ...attendee, diff --git a/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts b/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts index 6bedcc2f2ee277..ef12b0255b385c 100644 --- a/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts +++ b/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts @@ -3,7 +3,7 @@ import { cloneDeep } from "lodash"; import { uuid } from "short-uuid"; import EventManager from "@calcom/core/EventManager"; -import { sendScheduledSeatsEmails } from "@calcom/emails"; +import { sendScheduledSeatsEmailsAndSMS } from "@calcom/emails"; import { refreshCredentials } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials"; import { allowDisablingAttendeeConfirmationEmails, @@ -37,6 +37,7 @@ const createNewSeat = async ( bookerEmail, responses, workflows, + bookerPhoneNumber, } = rescheduleSeatedBookingObject; let { evt } = rescheduleSeatedBookingObject; let resultBooking: HandleSeatsResultBooking; @@ -80,6 +81,7 @@ const createNewSeat = async ( attendees: { create: { email: inviteeToAdd.email, + phoneNumber: inviteeToAdd.phoneNumber, name: inviteeToAdd.name, timeZone: inviteeToAdd.timeZone, locale: inviteeToAdd.language.locale, @@ -132,7 +134,7 @@ const createNewSeat = async ( if (isAttendeeConfirmationEmailDisabled) { isAttendeeConfirmationEmailDisabled = allowDisablingAttendeeConfirmationEmails(workflows); } - await sendScheduledSeatsEmails( + await sendScheduledSeatsEmailsAndSMS( copyEvent, inviteeToAdd, newSeat, @@ -187,7 +189,8 @@ const createNewSeat = async ( eventTypePaymentAppCredential as IEventTypePaymentCredentialType, seatedBooking, fullName, - bookerEmail + bookerEmail, + bookerPhoneNumber ); resultBooking = { ...foundBooking }; diff --git a/packages/features/bookings/lib/handleSeats/handleSeats.ts b/packages/features/bookings/lib/handleSeats/handleSeats.ts index 1a342abee3295b..7c834727097191 100644 --- a/packages/features/bookings/lib/handleSeats/handleSeats.ts +++ b/packages/features/bookings/lib/handleSeats/handleSeats.ts @@ -77,7 +77,9 @@ const handleSeats = async (newSeatedBookingObject: NewSeatedBookingObject) => { // See if attendee is already signed up for timeslot if ( - seatedBooking.attendees.find((attendee) => attendee.email === invitee[0].email) && + seatedBooking.attendees.find((attendee) => { + return attendee.email === invitee[0].email; + }) && dayjs.utc(seatedBooking.startTime).format() === evt.startTime ) { throw new HttpError({ statusCode: 409, message: ErrorCode.AlreadySignedUpForBooking }); @@ -119,6 +121,7 @@ const handleSeats = async (newSeatedBookingObject: NewSeatedBookingObject) => { }, isNotConfirmed: evt.requiresConfirmation || false, isRescheduleEvent: !!rescheduleUid, + isFirstRecurringEvent: true, emailAttendeeSendToOverride: bookerEmail, seatReferenceUid: evt.attendeeSeatId, }); diff --git a/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts b/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts index c3a8369f79e97d..8eb88a60aaf950 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts @@ -2,7 +2,7 @@ import { cloneDeep } from "lodash"; import type EventManager from "@calcom/core/EventManager"; -import { sendRescheduledSeatEmail } from "@calcom/emails"; +import { sendRescheduledSeatEmailAndSMS } from "@calcom/emails"; import { getTranslation } from "@calcom/lib/server/i18n"; import prisma from "@calcom/prisma"; import type { Person, CalendarEvent } from "@calcom/types/Calendar"; @@ -91,7 +91,7 @@ const attendeeRescheduleSeatedBooking = async ( await eventManager.updateCalendarAttendees(copyEvent, newTimeSlotBooking); - await sendRescheduledSeatEmail(copyEvent, seatAttendee as Person, eventType.metadata); + await sendRescheduledSeatEmailAndSMS(copyEvent, seatAttendee as Person, eventType.metadata); const filteredAttendees = originalRescheduledBooking?.attendees.filter((attendee) => { return attendee.email !== bookerEmail; }); diff --git a/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts b/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts index 8b009e7ee0c223..5d1132f4754302 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts @@ -3,7 +3,7 @@ import { cloneDeep } from "lodash"; import { uuid } from "short-uuid"; import type EventManager from "@calcom/core/EventManager"; -import { sendRescheduledEmails } from "@calcom/emails"; +import { sendRescheduledEmailsAndSMS } from "@calcom/emails"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { HttpError } from "@calcom/lib/http-error"; import prisma from "@calcom/prisma"; @@ -136,7 +136,7 @@ const combineTwoSeatedBookings = async ( if (noEmail !== true && isConfirmedByDefault) { // TODO send reschedule emails to attendees of the old booking loggerWithEventDetails.debug("Emails: Sending reschedule emails - handleSeats"); - await sendRescheduledEmails( + await sendRescheduledEmailsAndSMS( { ...copyEvent, additionalNotes, // Resets back to the additionalNote input and not the override value diff --git a/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts b/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts index 42222aa9296602..524fc243f36e45 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts @@ -2,7 +2,7 @@ import { cloneDeep } from "lodash"; import type EventManager from "@calcom/core/EventManager"; -import { sendRescheduledEmails } from "@calcom/emails"; +import { sendRescheduledEmailsAndSMS } from "@calcom/emails"; import prisma from "@calcom/prisma"; import type { AdditionalInformation, AppsStatus } from "@calcom/types/Calendar"; @@ -90,7 +90,7 @@ const moveSeatedBookingToNewTimeSlot = async ( if (noEmail !== true && isConfirmedByDefault) { const copyEvent = cloneDeep(evt); loggerWithEventDetails.debug("Emails: Sending reschedule emails - handleSeats"); - await sendRescheduledEmails( + await sendRescheduledEmailsAndSMS( { ...copyEvent, additionalNotes, // Resets back to the additionalNote input and not the override value diff --git a/packages/features/bookings/lib/handleSeats/types.d.ts b/packages/features/bookings/lib/handleSeats/types.d.ts index 4390ff74143022..ef639438c62d5f 100644 --- a/packages/features/bookings/lib/handleSeats/types.d.ts +++ b/packages/features/bookings/lib/handleSeats/types.d.ts @@ -18,6 +18,7 @@ export type NewSeatedBookingObject = { organizerUser: OrganizerUser; originalRescheduledBooking: OriginalRescheduledBooking; bookerEmail: string; + bookerPhoneNumber?: string | null; tAttendees: TFunction; bookingSeat: BookingSeat; reqUserId: number | undefined; diff --git a/packages/features/credentials/handleDeleteCredential.ts b/packages/features/credentials/handleDeleteCredential.ts index c5343fdf7cfad8..ebb46b82964719 100644 --- a/packages/features/credentials/handleDeleteCredential.ts +++ b/packages/features/credentials/handleDeleteCredential.ts @@ -4,7 +4,7 @@ import z from "zod"; import { getCalendar } from "@calcom/app-store/_utils/getCalendar"; import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData"; import { DailyLocationType } from "@calcom/core/location"; -import { sendCancelledEmails } from "@calcom/emails"; +import { sendCancelledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/scheduleTrigger"; import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; @@ -244,6 +244,12 @@ const handleDeleteCredential = async ({ seatsPerTimeSlot: true, seatsShowAttendees: true, eventName: true, + team: { + select: { + id: true, + name: true, + }, + }, metadata: true, }, }, @@ -303,7 +309,7 @@ const handleDeleteCredential = async ({ const attendeesList = await Promise.all(attendeesListPromises); const tOrganizer = await getTranslation(booking?.user?.locale ?? "en", "common"); - await sendCancelledEmails( + await sendCancelledEmailsAndSMS( { type: booking?.eventType?.title as string, title: booking.title, @@ -333,6 +339,13 @@ const handleDeleteCredential = async ({ cancellationReason: "Payment method removed by organizer", seatsPerTimeSlot: booking.eventType?.seatsPerTimeSlot, seatsShowAttendees: booking.eventType?.seatsShowAttendees, + team: !!booking.eventType?.team + ? { + name: booking.eventType.team.name, + id: booking.eventType.team.id, + members: [], + } + : undefined, }, { eventName: booking?.eventType?.eventName, diff --git a/packages/features/ee/payments/api/webhook.ts b/packages/features/ee/payments/api/webhook.ts index 3992966b8d7963..2474b010dd64f4 100644 --- a/packages/features/ee/payments/api/webhook.ts +++ b/packages/features/ee/payments/api/webhook.ts @@ -5,7 +5,7 @@ import type Stripe from "stripe"; import stripe from "@calcom/app-store/stripepayment/lib/server"; import EventManager from "@calcom/core/EventManager"; -import { sendAttendeeRequestEmail, sendOrganizerRequestEmail } from "@calcom/emails"; +import { sendAttendeeRequestEmailAndSMS, sendOrganizerRequestEmail } from "@calcom/emails"; import { doesBookingRequireConfirmation } from "@calcom/features/bookings/lib/doesBookingRequireConfirmation"; import { handleConfirmation } from "@calcom/features/bookings/lib/handleConfirmation"; import { IS_PRODUCTION } from "@calcom/lib/constants"; @@ -108,7 +108,7 @@ const handleSetupSuccess = async (event: Stripe.Event) => { }); } else { await sendOrganizerRequestEmail({ ...evt }, eventType.metadata); - await sendAttendeeRequestEmail({ ...evt }, evt.attendees[0], eventType.metadata); + await sendAttendeeRequestEmailAndSMS({ ...evt }, evt.attendees[0], eventType.metadata); } }; diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts index b3223467fa38ed..98f3bc8adbdcc0 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.ts @@ -5,7 +5,7 @@ import { OrganizerDefaultConferencingAppType, getLocationValueForDB } from "@cal import EventManager from "@calcom/core/EventManager"; import { getEventName } from "@calcom/core/event"; import dayjs from "@calcom/dayjs"; -import { sendRoundRobinCancelledEmails, sendRoundRobinScheduledEmails } from "@calcom/emails"; +import { sendRoundRobinCancelledEmailsAndSMS, sendRoundRobinScheduledEmailsAndSMS } from "@calcom/emails"; import getBookingResponsesSchema from "@calcom/features/bookings/lib/getBookingResponsesSchema"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { ensureAvailableUsers } from "@calcom/features/bookings/lib/handleNewBooking/ensureAvailableUsers"; @@ -202,6 +202,7 @@ export const roundRobinReassignment = async ({ bookingId }: { bookingId: number name: attendee.name, timeZone: attendee.timeZone, language: { translate: tAttendee, locale: attendee.locale ?? "en" }, + phoneNumber: attendee.phoneNumber || undefined, })) ); } @@ -369,7 +370,7 @@ export const roundRobinReassignment = async ({ bookingId }: { bookingId: number }); // Send to new RR host - await sendRoundRobinScheduledEmails(evt, [ + await sendRoundRobinScheduledEmailsAndSMS(evt, [ { ...reassignedRRHost, name: reassignedRRHost.name || "", @@ -410,7 +411,7 @@ export const roundRobinReassignment = async ({ bookingId }: { bookingId: number }); } - await sendRoundRobinCancelledEmails( + await sendRoundRobinCancelledEmailsAndSMS( cancelledRRHostEvt, [ { diff --git a/packages/features/ee/workflows/lib/reminders/providers/twilioProvider.ts b/packages/features/ee/workflows/lib/reminders/providers/twilioProvider.ts index 99cc6c8c218ff1..806aeb3375f4f8 100644 --- a/packages/features/ee/workflows/lib/reminders/providers/twilioProvider.ts +++ b/packages/features/ee/workflows/lib/reminders/providers/twilioProvider.ts @@ -38,6 +38,8 @@ export const sendSMS = async ( teamId?: number | null, whatsapp = false ) => { + log.silly("sendSMS", JSON.stringify({ phoneNumber, body, sender, userId, teamId })); + const isSMSSendingLocked = await isLockedForSMSSending(userId, teamId); if (isSMSSendingLocked) { diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts index 3bff4f7b1f2542..08fab335bdcd81 100644 --- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts @@ -29,6 +29,7 @@ export type AttendeeInBookingInfo = { firstName?: string; lastName?: string; email: string; + phoneNumber?: string | null; timeZone: string; language: { locale: string }; }; diff --git a/packages/features/eventtypes/lib/bookingFieldsManager.ts b/packages/features/eventtypes/lib/bookingFieldsManager.ts index f9a4656f1dea6f..780005747cd3e5 100644 --- a/packages/features/eventtypes/lib/bookingFieldsManager.ts +++ b/packages/features/eventtypes/lib/bookingFieldsManager.ts @@ -15,6 +15,11 @@ async function getEventType(eventTypeId: EventType["id"]) { }, include: { customInputs: true, + profile: { + select: { + organizationId: true, + }, + }, workflows: { select: { workflow: { @@ -29,9 +34,13 @@ async function getEventType(eventTypeId: EventType["id"]) { throw new Error(`EventType:${eventTypeId} not found`); } + const { profile, ...restEventType } = rawEventType; + + const isOrgTeamEvent = !!rawEventType?.teamId && !!profile?.organizationId; + const eventType = { - ...rawEventType, - bookingFields: getBookingFieldsWithSystemFields(rawEventType), + ...restEventType, + bookingFields: getBookingFieldsWithSystemFields({ ...restEventType, isOrgTeamEvent }), }; return eventType; } diff --git a/packages/features/instant-meeting/handleInstantMeeting.ts b/packages/features/instant-meeting/handleInstantMeeting.ts index bc3c4076c4430f..0e45ad6ba04cfd 100644 --- a/packages/features/instant-meeting/handleInstantMeeting.ts +++ b/packages/features/instant-meeting/handleInstantMeeting.ts @@ -168,9 +168,10 @@ export type HandleInstantMeetingResponse = { async function handler(req: NextApiRequest) { let eventType = await getEventTypesFromDB(req.body.eventTypeId); + const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId; eventType = { ...eventType, - bookingFields: getBookingFieldsWithSystemFields(eventType), + bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }), }; if (!eventType.team?.id) { diff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.ts index 9dfdea42ee60de..8a03f029f9abb3 100644 --- a/packages/lib/CalEventParser.ts +++ b/packages/lib/CalEventParser.ts @@ -6,6 +6,7 @@ import type { CalendarEvent, Person } from "@calcom/types/Calendar"; import { WEBAPP_URL } from "./constants"; import getLabelValueMapFromResponses from "./getLabelValueMapFromResponses"; +import isSmsCalEmail from "./isSmsCalEmail"; const translator = short(); @@ -39,9 +40,11 @@ export const getWho = (calEvent: CalendarEvent, t: TFunction) => { .map((attendee) => { return ` ${attendee?.name || t("guest")} -${attendee.email} - `; +${!isSmsCalEmail(attendee.email) ? `${attendee.email}\n` : `${attendee.phoneNumber}\n`} + +`; }) + .join(""); const organizer = ` diff --git a/packages/lib/CalendarService.ts b/packages/lib/CalendarService.ts index 5aeca7ee1bcd30..d32c98af9b7a86 100644 --- a/packages/lib/CalendarService.ts +++ b/packages/lib/CalendarService.ts @@ -2,7 +2,7 @@ /// import type { Prisma } from "@prisma/client"; import ICAL from "ical.js"; -import type { Attendee, DateArray, DurationObject, Person } from "ics"; +import type { Attendee, DateArray, DurationObject } from "ics"; import { createEvent } from "ics"; import type { DAVAccount, DAVCalendar, DAVObject } from "tsdav"; import { @@ -18,6 +18,7 @@ import { v4 as uuidv4 } from "uuid"; import dayjs from "@calcom/dayjs"; import sanitizeCalendarObject from "@calcom/lib/sanitizeCalendarObject"; +import type { Person as AttendeeInCalendarEvent } from "@calcom/types/Calendar"; import type { Calendar, CalendarEvent, @@ -25,6 +26,7 @@ import type { EventBusyDate, IntegrationCalendar, NewCalendarEventType, + TeamMember, } from "@calcom/types/Calendar"; import type { CredentialPayload } from "@calcom/types/Credential"; @@ -95,7 +97,7 @@ const getDuration = (start: string, end: string): DurationObject => ({ minutes: dayjs(end).diff(dayjs(start), "minute"), }); -const mapAttendees = (attendees: Person[]): Attendee[] => +const mapAttendees = (attendees: AttendeeInCalendarEvent[] | TeamMember[]): Attendee[] => attendees.map(({ email, name }) => ({ name, email, partstat: "NEEDS-ACTION" })); export default abstract class BaseCalendarService implements Calendar { diff --git a/packages/lib/contructEmailFromPhoneNumber.ts b/packages/lib/contructEmailFromPhoneNumber.ts new file mode 100644 index 00000000000000..63d73a4e383f8a --- /dev/null +++ b/packages/lib/contructEmailFromPhoneNumber.ts @@ -0,0 +1,4 @@ +export const contructEmailFromPhoneNumber = (phoneNumber: string) => { + const cleanedPhoneNumber = phoneNumber.replace(/\+/g, ""); + return `${cleanedPhoneNumber}@sms.cal.com`; +}; diff --git a/packages/lib/event-types/getEventTypeById.ts b/packages/lib/event-types/getEventTypeById.ts index 935284697b88cf..cc661b058e17ab 100644 --- a/packages/lib/event-types/getEventTypeById.ts +++ b/packages/lib/event-types/getEventTypeById.ts @@ -194,11 +194,12 @@ export const getEventTypeById = async ({ }); } + const isOrgTeamEvent = !!eventType?.teamId && !!eventType.team?.parentId; const eventTypeObject = Object.assign({}, eventType, { users: eventTypeUsers, periodStartDate: eventType.periodStartDate?.toString() ?? null, periodEndDate: eventType.periodEndDate?.toString() ?? null, - bookingFields: getBookingFieldsWithSystemFields(eventType), + bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }), }); const isOrgEventType = !!eventTypeObject.team?.parentId; diff --git a/packages/lib/isSmsCalEmail.ts b/packages/lib/isSmsCalEmail.ts new file mode 100644 index 00000000000000..e4f3ccbfc9fa32 --- /dev/null +++ b/packages/lib/isSmsCalEmail.ts @@ -0,0 +1,3 @@ +export default function isSmsCalEmail(email: string) { + return email.endsWith("@sms.cal.com"); +} diff --git a/packages/lib/payment/getBooking.ts b/packages/lib/payment/getBooking.ts index e5b7a5d6672739..8e1a93ff42e430 100644 --- a/packages/lib/payment/getBooking.ts +++ b/packages/lib/payment/getBooking.ts @@ -60,6 +60,8 @@ export async function getBooking(bookingId: number) { bookingFields: true, team: { select: { + id: true, + name: true, parentId: true, }, }, @@ -152,6 +154,13 @@ export async function getBooking(bookingId: number) { language: { translate: t, locale: user.locale ?? "en" }, id: user.id, }, + team: !!booking.eventType?.team + ? { + name: booking.eventType.team.name, + id: booking.eventType.team.id, + members: [], + } + : undefined, attendees: attendeesList, location: booking.location, uid: booking.uid, diff --git a/packages/lib/payment/handlePayment.ts b/packages/lib/payment/handlePayment.ts index 2288dff7aa6d23..a2093051e0d7d9 100644 --- a/packages/lib/payment/handlePayment.ts +++ b/packages/lib/payment/handlePayment.ts @@ -25,7 +25,8 @@ const handlePayment = async ( uid: string; }, bookerName: string, - bookerEmail: string + bookerEmail: string, + bookerPhoneNumber?: string | null ) => { const paymentApp = (await appStore[ paymentAppCredentials?.app?.dirName as keyof typeof appStore @@ -50,8 +51,9 @@ const handlePayment = async ( currency: selectedEventType?.metadata?.apps?.[paymentAppCredentials.appId].currency, }, booking.id, + paymentOption, bookerEmail, - paymentOption + bookerPhoneNumber ); } else { paymentData = await paymentInstance.create( @@ -63,8 +65,9 @@ const handlePayment = async ( booking.userId, booking.user?.username ?? null, bookerName, - bookerEmail, paymentOption, + bookerEmail, + bookerPhoneNumber, selectedEventType.title, evt.title ); diff --git a/packages/lib/payment/handlePaymentSuccess.ts b/packages/lib/payment/handlePaymentSuccess.ts index 1e5eaa8fcffdd5..84db4bd57bc1ec 100644 --- a/packages/lib/payment/handlePaymentSuccess.ts +++ b/packages/lib/payment/handlePaymentSuccess.ts @@ -1,7 +1,7 @@ import type { Prisma } from "@prisma/client"; import EventManager from "@calcom/core/EventManager"; -import { sendScheduledEmails } from "@calcom/emails"; +import { sendScheduledEmailsAndSMS } from "@calcom/emails"; import { doesBookingRequireConfirmation } from "@calcom/features/bookings/lib/doesBookingRequireConfirmation"; import { handleBookingRequested } from "@calcom/features/bookings/lib/handleBookingRequested"; import { handleConfirmation } from "@calcom/features/bookings/lib/handleConfirmation"; @@ -76,7 +76,7 @@ export async function handlePaymentSuccess(paymentId: number, bookingId: number) log.debug(`handling booking request for eventId ${eventType.id}`); } } else { - await sendScheduledEmails({ ...evt }, undefined, undefined, undefined, eventType.metadata); + await sendScheduledEmailsAndSMS({ ...evt }, undefined, undefined, undefined, eventType.metadata); } throw new HttpCode({ diff --git a/packages/platform/atoms/booker/BookerWebWrapper.tsx b/packages/platform/atoms/booker/BookerWebWrapper.tsx index d89e42787fe6b6..ac3a272e248529 100644 --- a/packages/platform/atoms/booker/BookerWebWrapper.tsx +++ b/packages/platform/atoms/booker/BookerWebWrapper.tsx @@ -142,6 +142,8 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => { const verifyCode = useVerifyCode({ onSuccess: () => { + if (!bookerForm.formEmail) return; + verifyEmail.setVerifiedEmail(bookerForm.formEmail); verifyEmail.setEmailVerificationModalVisible(false); bookings.handleBookEvent(); diff --git a/packages/prisma/migrations/20240408155446_add_phone_number_in_attendee/migration.sql b/packages/prisma/migrations/20240408155446_add_phone_number_in_attendee/migration.sql new file mode 100644 index 00000000000000..0f9f527cf32296 --- /dev/null +++ b/packages/prisma/migrations/20240408155446_add_phone_number_in_attendee/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Attendee" ADD COLUMN "phoneNumber" TEXT; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 7c48c344c0fb31..3a6c9d374776b8 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -541,6 +541,7 @@ model Attendee { email String name String timeZone String + phoneNumber String? locale String? @default("en") booking Booking? @relation(fields: [bookingId], references: [id], onDelete: Cascade) bookingId Int? diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts index 6e8995dad6b486..e212a94556a74b 100644 --- a/packages/prisma/zod-utils.ts +++ b/packages/prisma/zod-utils.ts @@ -126,6 +126,7 @@ export type BookingFieldType = FormBuilderFieldType; export const bookingResponses = z .object({ email: z.string(), + attendeePhoneNumber: z.string().optional(), //TODO: Why don't we move name out of bookingResponses and let it be handled like user fields? name: z.union([ z.string(), diff --git a/packages/sms/attendee/awaiting-payment-sms.ts b/packages/sms/attendee/awaiting-payment-sms.ts new file mode 100644 index 00000000000000..931d915246bbb4 --- /dev/null +++ b/packages/sms/attendee/awaiting-payment-sms.ts @@ -0,0 +1,20 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class AwaitingPaymentSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("meeting_awaiting_payment")}: ${t("complete_your_booking_subject", { + title: this.calEvent.title, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + })}. \n\n ${t("you_can_view_booking_details_with_this_url", { + url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`, + })} `; + } +} diff --git a/packages/sms/attendee/cancelled-seat-sms.ts b/packages/sms/attendee/cancelled-seat-sms.ts new file mode 100644 index 00000000000000..35d9d033f0d632 --- /dev/null +++ b/packages/sms/attendee/cancelled-seat-sms.ts @@ -0,0 +1,18 @@ +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class CancelledSeatSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + return `${attendee.language.translate("no_longer_attending", { + name: attendee.name, + })}. \n\n${attendee.language.translate("event_no_longer_attending_subject", { + name: this.calEvent.team?.name || this.calEvent.organizer.name, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + })} `; + } +} diff --git a/packages/sms/attendee/event-cancelled-sms.ts b/packages/sms/attendee/event-cancelled-sms.ts new file mode 100644 index 00000000000000..b24b369e1a9892 --- /dev/null +++ b/packages/sms/attendee/event-cancelled-sms.ts @@ -0,0 +1,23 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventCancelledSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("hey_there")} ${attendee.name}, ${t("event_request_cancelled")}/n/n ${t( + "event_cancelled_subject", + { + title: this.calEvent.title, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + } + )}. /n/n ${t("visit_cancelled_booking")} ${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${ + this.calEvent.uid + } `; + } +} diff --git a/packages/sms/attendee/event-declined-sms.ts b/packages/sms/attendee/event-declined-sms.ts new file mode 100644 index 00000000000000..3b14099e9c99e3 --- /dev/null +++ b/packages/sms/attendee/event-declined-sms.ts @@ -0,0 +1,17 @@ +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventDeclinedSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("hey_there")} ${attendee.name}, ${t("event_request_declined")} ${t("event_declined_subject", { + title: this.calEvent.title, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + })}`; + } +} diff --git a/packages/sms/attendee/event-location-changed-sms.ts b/packages/sms/attendee/event-location-changed-sms.ts new file mode 100644 index 00000000000000..0dab9aa1734b55 --- /dev/null +++ b/packages/sms/attendee/event-location-changed-sms.ts @@ -0,0 +1,17 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventLocationChangedSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("event_location_changed")}. \n\n ${t("you_can_view_booking_details_with_this_url", { + url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`, + })}`; + } +} diff --git a/packages/sms/attendee/event-request-sms.ts b/packages/sms/attendee/event-request-sms.ts new file mode 100644 index 00000000000000..2341b435a2e18e --- /dev/null +++ b/packages/sms/attendee/event-request-sms.ts @@ -0,0 +1,21 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventRequestSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("booking_submitted", { + name: attendee.name, + })}. ${t("user_needs_to_confirm_or_reject_booking", { + user: this.calEvent.organizer.name, + })}\n\n ${t("you_can_view_booking_details_with_this_url", { + url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`, + })}`; + } +} diff --git a/packages/sms/attendee/event-request-to-reschedule-sms.ts b/packages/sms/attendee/event-request-to-reschedule-sms.ts new file mode 100644 index 00000000000000..5b99d43b59e72b --- /dev/null +++ b/packages/sms/attendee/event-request-to-reschedule-sms.ts @@ -0,0 +1,19 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventRequestToRescheduleSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("request_reschedule_booking")}: ${t("request_reschedule_subtitle", { + organizer: this.calEvent.organizer.name, + })} \n\n${t("need_to_reschedule_or_cancel")} ${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${ + this.calEvent.uid + }?changes=true`; + } +} diff --git a/packages/sms/attendee/event-rescheduled-sms.ts b/packages/sms/attendee/event-rescheduled-sms.ts new file mode 100644 index 00000000000000..02d8b8361e6443 --- /dev/null +++ b/packages/sms/attendee/event-rescheduled-sms.ts @@ -0,0 +1,20 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventSuccessfullyReScheduledSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("hey_there")} ${attendee.name}, ${t("event_type_has_been_rescheduled_on_time_date", { + title: this.calEvent.title, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + })} \n\n ${t("you_can_view_booking_details_with_this_url", { + url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`, + })}`; + } +} diff --git a/packages/sms/attendee/event-scheduled-sms.ts b/packages/sms/attendee/event-scheduled-sms.ts new file mode 100644 index 00000000000000..73c91f846f3717 --- /dev/null +++ b/packages/sms/attendee/event-scheduled-sms.ts @@ -0,0 +1,20 @@ +import { WEBAPP_URL } from "@calcom/lib/constants"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +import SMSManager from "../sms-manager"; + +export default class EventSuccessfullyScheduledSMS extends SMSManager { + constructor(calEvent: CalendarEvent) { + super(calEvent); + } + + getMessage(attendee: Person) { + const t = attendee.language.translate; + return `${t("confirming_your_booking_sms", { + name: attendee.name, + date: this.getFormattedDate(attendee.timeZone, attendee.language.locale), + })} \n\n ${t("you_can_view_booking_details_with_this_url", { + url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`, + })}`; + } +} diff --git a/packages/sms/sms-manager.ts b/packages/sms/sms-manager.ts new file mode 100644 index 00000000000000..b08e32f0d6686f --- /dev/null +++ b/packages/sms/sms-manager.ts @@ -0,0 +1,99 @@ +import dayjs from "@calcom/dayjs"; +import { getSenderId } from "@calcom/features/ee/workflows/lib/alphanumericSenderIdSupport"; +import * as twilio from "@calcom/features/ee/workflows/lib/reminders/providers/twilioProvider"; +import { checkSMSRateLimit } from "@calcom/lib/checkRateLimitAndThrowError"; +import { SENDER_ID } from "@calcom/lib/constants"; +import { TimeFormat } from "@calcom/lib/timeFormat"; +import prisma from "@calcom/prisma"; +import type { CalendarEvent, Person } from "@calcom/types/Calendar"; + +const handleSendingSMS = ({ + reminderPhone, + smsMessage, + senderID, + teamId, +}: { + reminderPhone: string; + smsMessage: string; + senderID: string; + teamId: number; +}) => { + return new Promise(async (resolve, reject) => { + try { + const team = await prisma.team.findUnique({ + where: { + id: teamId, + }, + select: { + parent: { + select: { + isOrganization: true, + }, + }, + }, + }); + + if (!team?.parent?.isOrganization) return; + + await checkSMSRateLimit({ identifier: `handleSendingSMS:team:${teamId}`, rateLimitingType: "sms" }); + const sms = twilio.sendSMS(reminderPhone, smsMessage, senderID, teamId); + resolve(sms); + } catch (e) { + reject(console.error(`twilio.sendSMS failed`, e)); + } + }); +}; + +export default abstract class SMSManager { + calEvent: CalendarEvent; + isTeamEvent = false; + teamId: number | undefined = undefined; + + constructor(calEvent: CalendarEvent) { + this.calEvent = calEvent; + this.teamId = this.calEvent?.team?.id; + this.isTeamEvent = !!this.calEvent?.team?.id; + } + + getFormattedTime( + timezone: string, + locale: string, + time: string, + format = `dddd, LL | ${TimeFormat.TWELVE_HOUR}` + ) { + return dayjs(time).tz(timezone).locale(locale).format(format); + } + + getFormattedDate(timezone: string, locale: string) { + return `${this.getFormattedTime(timezone, locale, this.calEvent.startTime)} - ${this.getFormattedTime( + timezone, + locale, + this.calEvent.endTime + )} (${timezone})`; + } + + abstract getMessage(attendee: Person): string; + + async sendSMSToAttendee(attendee: Person) { + const teamId = this.teamId; + if (!this.isTeamEvent || !teamId) return; + + const attendeePhoneNumber = attendee.phoneNumber; + if (!attendeePhoneNumber) return; + + const smsMessage = this.getMessage(attendee); + const senderID = getSenderId(attendeePhoneNumber, SENDER_ID); + return handleSendingSMS({ reminderPhone: attendeePhoneNumber, smsMessage, senderID, teamId }); + } + + async sendSMSToAttendees() { + if (!this.isTeamEvent) return; + const smsToSend: Promise[] = []; + + for (const attendee of this.calEvent.attendees) { + smsToSend.push(this.sendSMSToAttendee(attendee)); + } + + await Promise.all(smsToSend); + } +} diff --git a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts index 99dea2cc9628ec..9d658e4fe5756d 100644 --- a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts +++ b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts @@ -1,4 +1,4 @@ -import { sendScheduledEmails } from "@calcom/emails"; +import { sendScheduledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { isPrismaObjOrUndefined } from "@calcom/lib"; import { getTranslation } from "@calcom/lib/server/i18n"; @@ -128,6 +128,12 @@ export const Handler = async ({ ctx, input }: Options) => { metadata: true, customInputs: true, parentId: true, + team: { + select: { + id: true, + name: true, + }, + }, }, }, location: true, @@ -202,11 +208,18 @@ export const Handler = async ({ ctx, input }: Options) => { requiresConfirmation: false, eventTypeId: eventType?.id, videoCallData, + team: !!updatedBooking.eventType?.team + ? { + name: updatedBooking.eventType.team.name, + id: updatedBooking.eventType.team.id, + members: [], + } + : undefined, }; const eventTypeMetadata = EventTypeMetaDataSchema.parse(updatedBooking?.eventType?.metadata); - await sendScheduledEmails( + await sendScheduledEmailsAndSMS( { ...evt, }, diff --git a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts index b0011a32c8911b..1bd0203b648a2c 100644 --- a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @@ -1,13 +1,13 @@ import { Prisma } from "@prisma/client"; import appStore from "@calcom/app-store"; -import { getLocationValueForDB } from "@calcom/app-store/locations"; import type { LocationObject } from "@calcom/app-store/locations"; -import { workflowSelect } from "@calcom/ee/workflows/lib/getAllWorkflows"; -import { sendDeclinedEmails } from "@calcom/emails"; +import { getLocationValueForDB } from "@calcom/app-store/locations"; +import { sendDeclinedEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { handleConfirmation } from "@calcom/features/bookings/lib/handleConfirmation"; import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhookTrigger"; +import { workflowSelect } from "@calcom/features/ee/workflows/lib/getAllWorkflows"; import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; @@ -74,6 +74,8 @@ export const confirmHandler = async ({ ctx, input }: ConfirmOptions) => { locations: true, team: { select: { + id: true, + name: true, parentId: true, members: true, }, @@ -165,6 +167,7 @@ export const confirmHandler = async ({ ctx, input }: ConfirmOptions) => { name: attendee.name, email: attendee.email, timeZone: attendee.timeZone, + phoneNumber: attendee.phoneNumber, language: { translate, locale, @@ -217,6 +220,13 @@ export const confirmHandler = async ({ ctx, input }: ConfirmOptions) => { : [], requiresConfirmation: booking?.eventType?.requiresConfirmation ?? false, eventTypeId: booking.eventType?.id, + team: !!booking.eventType?.team + ? { + name: booking.eventType.team.name, + id: booking.eventType.team.id, + members: [], + } + : undefined, }; const recurringEvent = parseRecurringEvent(booking.eventType?.recurringEvent); @@ -371,7 +381,7 @@ export const confirmHandler = async ({ ctx, input }: ConfirmOptions) => { }); } - await sendDeclinedEmails(evt, booking.eventType?.metadata as EventTypeMetadata); + await sendDeclinedEmailsAndSMS(evt, booking.eventType?.metadata as EventTypeMetadata); const teamId = await getTeamIdFromEventType({ eventType: { diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts index cb6ae567387774..3bf85bbf7d7831 100644 --- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts @@ -3,7 +3,7 @@ import type { z } from "zod"; import { getEventLocationType, OrganizerDefaultConferencingAppType } from "@calcom/app-store/locations"; import { getAppFromSlug } from "@calcom/app-store/utils"; import EventManager from "@calcom/core/EventManager"; -import { sendLocationChangeEmails } from "@calcom/emails"; +import { sendLocationChangeEmailsAndSMS } from "@calcom/emails"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; import { buildCalEventFromBooking } from "@calcom/lib/buildCalEventFromBooking"; import logger from "@calcom/lib/logger"; @@ -277,7 +277,7 @@ export async function editLocationHandler({ ctx, input }: EditLocationOptions) { await updateBookingLocationInDb({ booking, evt, referencesToCreate: updatedResult.referencesToCreate }); try { - await sendLocationChangeEmails( + await sendLocationChangeEmailsAndSMS( { ...evt, additionalInformation: extractAdditionalInformation(updatedResult.results[0]) }, booking?.eventType?.metadata as EventTypeMetadata ); diff --git a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts index dbb77d48a34f9d..d1e78ee5704908 100644 --- a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts @@ -6,7 +6,7 @@ import { CalendarEventBuilder } from "@calcom/core/builders/CalendarEvent/builde import { CalendarEventDirector } from "@calcom/core/builders/CalendarEvent/director"; import { deleteMeeting } from "@calcom/core/videoClient"; import dayjs from "@calcom/dayjs"; -import { sendRequestRescheduleEmail } from "@calcom/emails"; +import { sendRequestRescheduleEmailAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/scheduleTrigger"; @@ -58,6 +58,8 @@ export const requestRescheduleHandler = async ({ ctx, input }: RequestReschedule include: { team: { select: { + id: true, + name: true, parentId: true, }, }, @@ -170,6 +172,7 @@ export const requestRescheduleHandler = async ({ ctx, input }: RequestReschedule username: user?.username || "", language: { translate: selectedLanguage, locale: user.locale || "en" }, timeZone: user?.timeZone, + phoneNumber: user.phoneNumber, }; }); }; @@ -198,6 +201,13 @@ export const requestRescheduleHandler = async ({ ctx, input }: RequestReschedule ), organizer, iCalUID: bookingToReschedule.iCalUID, + team: !!bookingToReschedule.eventType?.team + ? { + name: bookingToReschedule.eventType.team.name, + id: bookingToReschedule.eventType.team.id, + members: [], + } + : undefined, }); const director = new CalendarEventDirector(); @@ -243,7 +253,7 @@ export const requestRescheduleHandler = async ({ ctx, input }: RequestReschedule log.debug("builder.calendarEvent", safeStringify(builder.calendarEvent)); // Send emails - await sendRequestRescheduleEmail( + await sendRequestRescheduleEmailAndSMS( builder.calendarEvent, { rescheduleLink: builder.rescheduleLink, diff --git a/packages/trpc/server/routers/viewer/bookings/types.ts b/packages/trpc/server/routers/viewer/bookings/types.ts index 1cca8e0ef09719..7596d28ac41bde 100644 --- a/packages/trpc/server/routers/viewer/bookings/types.ts +++ b/packages/trpc/server/routers/viewer/bookings/types.ts @@ -4,7 +4,7 @@ import { z } from "zod"; export type PersonAttendeeCommonFields = Pick< User, "id" | "email" | "name" | "locale" | "timeZone" | "username" ->; +> & { phoneNumber?: string | null }; // Common data for all endpoints under webhook export const commonBookingSchema = z.object({ diff --git a/packages/trpc/server/routers/viewer/bookings/util.ts b/packages/trpc/server/routers/viewer/bookings/util.ts index fdf5ad7b887ca1..de6f54305ce788 100644 --- a/packages/trpc/server/routers/viewer/bookings/util.ts +++ b/packages/trpc/server/routers/viewer/bookings/util.ts @@ -1,16 +1,15 @@ -import { - MembershipRole, - type Attendee, - type Booking, - type BookingReference, - type Credential, - type DestinationCalendar, - type EventType, - type User, +import type { + Booking, + EventType, + BookingReference, + Attendee, + Credential, + DestinationCalendar, + User, } from "@prisma/client"; import { prisma } from "@calcom/prisma"; -import { SchedulingType } from "@calcom/prisma/enums"; +import { MembershipRole, SchedulingType } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; @@ -25,7 +24,17 @@ export const bookingsProcedure = authedProcedure const loggedInUser = ctx.user; const bookingInclude = { attendees: true, - eventType: true, + eventType: { + include: { + team: { + select: { + id: true, + name: true, + parentId: true, + }, + }, + }, + }, destinationCalendar: true, references: true, user: { @@ -92,7 +101,11 @@ export const bookingsProcedure = authedProcedure export type BookingsProcedureContext = { booking: Booking & { - eventType: EventType | null; + eventType: + | (EventType & { + team?: { id: number; name: string; parentId?: number | null } | null; + }) + | null; destinationCalendar: DestinationCalendar | null; user: | (User & { diff --git a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts index f1ceb7ec474e90..91ed0377cb84ea 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts @@ -23,6 +23,7 @@ import type { TUpdateInputSchema } from "./update.schema"; import { addWeightAdjustmentToNewHosts, ensureUniqueBookingFields, + ensureEmailOrPhoneNumberIsPresent, handleCustomInputs, handlePeriodType, } from "./util"; @@ -141,6 +142,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => { const teamId = input.teamId || eventType.team?.id; ensureUniqueBookingFields(bookingFields); + ensureEmailOrPhoneNumberIsPresent(bookingFields); const data: Prisma.EventTypeUpdateInput = { ...rest, diff --git a/packages/trpc/server/routers/viewer/eventTypes/util.ts b/packages/trpc/server/routers/viewer/eventTypes/util.ts index b464229f517078..d58bbdc83eb40b 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/util.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/util.ts @@ -161,6 +161,31 @@ export function ensureUniqueBookingFields(fields: z.infer); } +export function ensureEmailOrPhoneNumberIsPresent( + fields: z.infer["bookingFields"] +) { + if (!fields || fields.length === 0) { + return; + } + + const attendeePhoneNumberField = fields.find((field) => field.name === "attendeePhoneNumber"); + + const emailField = fields.find((field) => field.name === "email"); + + if (emailField?.hidden && attendeePhoneNumberField?.hidden) { + throw new TRPCError({ + code: "BAD_REQUEST", + message: `Both Email and Attendee Phone Number cannot be hidden`, + }); + } + if (!emailField?.required && !attendeePhoneNumberField?.required) { + throw new TRPCError({ + code: "BAD_REQUEST", + message: `At least Email or Attendee Phone Number need to be required field.`, + }); + } +} + type Host = { userId: number; isFixed?: boolean | undefined; @@ -284,6 +309,7 @@ export async function addWeightAdjustmentToNewHosts({ return hostsWithWeightAdjustments; } + export const mapEventType = async (eventType: EventType) => ({ ...eventType, safeDescription: eventType?.description ? markdownToSafeHTML(eventType.description) : undefined, diff --git a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts index 0379145e4879ac..d42b2916535f43 100644 --- a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts +++ b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts @@ -282,7 +282,9 @@ export const activateEventTypeHandler = async ({ ctx, input }: ActivateEventType } break; case WorkflowActions.EMAIL_ATTENDEE: - sendTo = bookingInfo.attendees.map((attendee) => attendee.email); + sendTo = bookingInfo.attendees + .map((attendee) => attendee.email) + .filter((email): email is string => !!email); break; case WorkflowActions.EMAIL_ADDRESS: sendTo = step.sendTo ? [step.sendTo] : []; diff --git a/packages/types/Calendar.d.ts b/packages/types/Calendar.d.ts index 494442484f856e..8e0d1c6d40f3b0 100644 --- a/packages/types/Calendar.d.ts +++ b/packages/types/Calendar.d.ts @@ -36,12 +36,14 @@ export type Person = { locale?: string | null; timeFormat?: TimeFormat; bookingSeat?: BookingSeat | null; + phoneNumber?: string | null; }; export type TeamMember = { id?: number; name: string; email: string; + phoneNumber?: string | null; timeZone: string; language: { translate: TFunction; locale: string }; }; diff --git a/packages/types/PaymentService.d.ts b/packages/types/PaymentService.d.ts index da9d1869cb9e5c..6e316eeb195a94 100644 --- a/packages/types/PaymentService.d.ts +++ b/packages/types/PaymentService.d.ts @@ -20,8 +20,9 @@ export interface IAbstractPaymentService { userId: Booking["userId"], username: string | null, bookerName: string | null, - bookerEmail: string, paymentOption: PaymentOption, + bookerEmail: string, + bookerPhoneNumber?: string | null, eventTitle?: string, bookingTitle?: string ): Promise; @@ -29,8 +30,9 @@ export interface IAbstractPaymentService { collectCard( payment: Pick, bookingId: Booking["id"], + paymentOption: PaymentOption, bookerEmail: string, - paymentOption: PaymentOption + bookerPhoneNumber?: string | null ): Promise; chargeCard( payment: Pick, diff --git a/packages/ui/components/popover/MeetingTimeInTimezones.tsx b/packages/ui/components/popover/MeetingTimeInTimezones.tsx index 5c429d0874c7b7..af711ee8366eaf 100644 --- a/packages/ui/components/popover/MeetingTimeInTimezones.tsx +++ b/packages/ui/components/popover/MeetingTimeInTimezones.tsx @@ -13,6 +13,7 @@ import { Icon } from "../.."; type Attendee = { id: number; email: string; + phoneNumber?: string | null; name: string; timeZone: string; locale: string | null; From 55e1e0fa3d62eb3f89bf6609c1487b4aa0db1d47 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Wed, 11 Sep 2024 21:14:19 -0400 Subject: [PATCH 12/40] chore: Remove passing optional prisma select prop to Repository classes (#16600) --- .../future/availability/[schedule]/page.tsx | 8 +-- .../video/meeting-not-started/[uid]/page.tsx | 2 +- .../web/lib/video/[uid]/getServerSideProps.ts | 28 +------- .../meeting-ended/[uid]/getServerSideProps.ts | 17 +---- .../[uid]/getServerSideProps.ts | 2 +- packages/lib/server/repository/booking.ts | 69 ++++++++++++++++--- packages/lib/server/repository/user.ts | 16 ++++- 7 files changed, 81 insertions(+), 61 deletions(-) diff --git a/apps/web/app/future/availability/[schedule]/page.tsx b/apps/web/app/future/availability/[schedule]/page.tsx index ec41afeb0329a7..8955baa8c7301e 100644 --- a/apps/web/app/future/availability/[schedule]/page.tsx +++ b/apps/web/app/future/availability/[schedule]/page.tsx @@ -43,12 +43,8 @@ const Page = async ({ params }: PageProps) => { let userData, schedule, travelSchedules; try { - userData = await UserRepository.findById({ - id: userId, - select: { - timeZone: true, - defaultScheduleId: true, - }, + userData = await UserRepository.getTimeZoneAndDefaultScheduleId({ + userId, }); if (!userData?.timeZone || !userData?.defaultScheduleId) { throw new Error("timeZone and defaultScheduleId not found"); diff --git a/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx b/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx index 790367733ee0df..3fc30bd6c2ac3e 100644 --- a/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx +++ b/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx @@ -12,7 +12,7 @@ import MeetingNotStarted from "~/videos/views/videos-meeting-not-started-single- export const generateMetadata = async ({ params, searchParams }: _PageProps) => { const p = { ...params, ...searchParams }; - const booking = await BookingRepository.findBookingByUidWithOptionalSelect({ + const booking = await BookingRepository.findBookingByUid({ bookingUid: typeof p?.uid === "string" ? p.uid : "", }); diff --git a/apps/web/lib/video/[uid]/getServerSideProps.ts b/apps/web/lib/video/[uid]/getServerSideProps.ts index ea41d739d61c0b..181f3b7925cdef 100644 --- a/apps/web/lib/video/[uid]/getServerSideProps.ts +++ b/apps/web/lib/video/[uid]/getServerSideProps.ts @@ -20,34 +20,8 @@ export async function getServerSideProps(context: GetServerSidePropsContext) { const ssr = await ssrInit(context); - const booking = await BookingRepository.findBookingByUidWithOptionalSelect({ + const booking = await BookingRepository.findBookingForMeetingPage({ bookingUid: context.query.uid as string, - select: { - uid: true, - description: true, - isRecorded: true, - user: { - select: { - id: true, - timeZone: true, - name: true, - email: true, - username: true, - }, - }, - references: { - select: { - id: true, - uid: true, - type: true, - meetingUrl: true, - meetingPassword: true, - }, - where: { - type: "daily_video", - }, - }, - }, }); if (!booking || booking.references.length === 0 || !booking.references[0].meetingUrl) { diff --git a/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts b/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts index 9e073704ebdf51..3aa4fc476c751a 100644 --- a/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts +++ b/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts @@ -6,23 +6,8 @@ import { type inferSSRProps } from "@lib/types/inferSSRProps"; export type PageProps = inferSSRProps; export async function getServerSideProps(context: GetServerSidePropsContext) { - const booking = await BookingRepository.findBookingByUidWithOptionalSelect({ + const booking = await BookingRepository.findBookingForMeetingEndedPage({ bookingUid: context.query.uid as string, - select: { - uid: true, - user: { - select: { - credentials: true, - }, - }, - references: { - select: { - uid: true, - type: true, - meetingUrl: true, - }, - }, - }, }); if (!booking) { diff --git a/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts b/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts index 379a34bd81d048..ce1e6d3a9ccd67 100644 --- a/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts +++ b/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts @@ -4,7 +4,7 @@ import { BookingRepository } from "@calcom/lib/server/repository/booking"; // change the type export async function getServerSideProps(context: GetServerSidePropsContext) { - const booking = await BookingRepository.findBookingByUidWithOptionalSelect({ + const booking = await BookingRepository.findBookingByUid({ bookingUid: context.query.uid as string, }); diff --git a/packages/lib/server/repository/booking.ts b/packages/lib/server/repository/booking.ts index 87581b3856d07e..a82c98d47c91b3 100644 --- a/packages/lib/server/repository/booking.ts +++ b/packages/lib/server/repository/booking.ts @@ -113,18 +113,71 @@ export class BookingRepository { return allBookings; } - static async findBookingByUidWithOptionalSelect({ - bookingUid, - select, - }: { - bookingUid: string; - select?: Prisma.BookingSelect; - }) { + static async findBookingByUid({ bookingUid }: { bookingUid: string }) { + return await prisma.booking.findUnique({ + where: { + uid: bookingUid, + }, + select: bookingMinimalSelect, + }); + } + + static async findBookingForMeetingPage({ bookingUid }: { bookingUid: string }) { return await prisma.booking.findUnique({ where: { uid: bookingUid, }, - select: { ...bookingMinimalSelect, ...select }, + select: { + ...bookingMinimalSelect, + uid: true, + description: true, + isRecorded: true, + user: { + select: { + id: true, + timeZone: true, + name: true, + email: true, + username: true, + }, + }, + references: { + select: { + id: true, + uid: true, + type: true, + meetingUrl: true, + meetingPassword: true, + }, + where: { + type: "daily_video", + }, + }, + }, + }); + } + + static async findBookingForMeetingEndedPage({ bookingUid }: { bookingUid: string }) { + return await prisma.booking.findUnique({ + where: { + uid: bookingUid, + }, + select: { + ...bookingMinimalSelect, + uid: true, + user: { + select: { + credentials: true, + }, + }, + references: { + select: { + uid: true, + type: true, + meetingUrl: true, + }, + }, + }, }); } diff --git a/packages/lib/server/repository/user.ts b/packages/lib/server/repository/user.ts index e67f3415995b93..4772332c7846a4 100644 --- a/packages/lib/server/repository/user.ts +++ b/packages/lib/server/repository/user.ts @@ -239,12 +239,12 @@ export class UserRepository { }; } - static async findById({ id, select }: { id: number; select?: Prisma.UserSelect }) { + static async findById({ id }: { id: number }) { const user = await prisma.user.findUnique({ where: { id, }, - select: { ...userSelect, ...select }, + select: userSelect, }); if (!user) { @@ -566,6 +566,18 @@ export class UserRepository { return teamIds; } + static async getTimeZoneAndDefaultScheduleId({ userId }: { userId: number }) { + return await prisma.user.findUnique({ + where: { + id: userId, + }, + select: { + timeZone: true, + defaultScheduleId: true, + }, + }); + } + static async adminFindById(userId: number) { return await prisma.user.findUniqueOrThrow({ where: { From 91f5d49cd4be95719f6231842a7ef11a44c587e1 Mon Sep 17 00:00:00 2001 From: Rajiv Sahal Date: Thu, 12 Sep 2024 12:14:01 +0530 Subject: [PATCH 13/40] feat: update v2 calendar services logic to handle multiple calendars (#16478) * update calendar logic to handle multiple calendars * add method to link calendar to credential * remove logs * update platform libraries * update calendar logic to handle multiple calendars * update credentials repository * add selected calendars repository to destination calendars module * add method to get user selected calendars and rename fn * chore: PR feedback * resolve merge conflicts * fixup * make sure we cover all edge cases for apple calendar --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> --- .../services/apple-calendar.service.ts | 71 +++++++++++++++---- .../calendars/services/calendars.service.ts | 34 ++++++++- .../src/ee/calendars/services/gcal.service.ts | 40 ++++++++--- .../ee/calendars/services/outlook.service.ts | 35 +++++++-- .../credentials/credentials.repository.ts | 36 ++++++++-- .../destination-calendars.module.ts | 2 + .../selected-calendars.repository.ts | 14 +++- .../v2/src/modules/users/users.repository.ts | 1 - .../atoms/connect/apple/AppleConnect.tsx | 2 +- 9 files changed, 200 insertions(+), 35 deletions(-) diff --git a/apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts b/apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts index e04ee36b7f2490..d54f4b0df597dd 100644 --- a/apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts +++ b/apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts @@ -5,7 +5,8 @@ import { BadRequestException, UnauthorizedException } from "@nestjs/common"; import { Injectable } from "@nestjs/common"; import { SUCCESS_STATUS, APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants"; -import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries"; +import { symmetricEncrypt, CalendarService, symmetricDecrypt } from "@calcom/platform-libraries"; +import { Credential } from "@calcom/prisma/client"; @Injectable() export class AppleCalendarService implements CredentialSyncCalendarApp { @@ -61,26 +62,70 @@ export class AppleCalendarService implements CredentialSyncCalendarApp { if (username.length <= 1 || password.length <= 1) throw new BadRequestException(`Username or password cannot be empty`); - const data = { - type: APPLE_CALENDAR_TYPE, - key: symmetricEncrypt( - JSON.stringify({ username, password }), - process.env.CALENDSO_ENCRYPTION_KEY || "" - ), - userId: userId, - teamId: null, - appId: APPLE_CALENDAR_ID, - invalid: false, - }; + const existingAppleCalendarCredentials = await this.credentialRepository.getAllUserCredentialsByTypeAndId( + APPLE_CALENDAR_TYPE, + userId + ); + + let hasMatchingUsernameAndPassword = false; + + if (existingAppleCalendarCredentials.length > 0) { + const hasCalendarWithGivenCredentials = existingAppleCalendarCredentials.find( + (calendarCredential: Credential) => { + const decryptedKey = JSON.parse( + symmetricDecrypt(calendarCredential.key as string, process.env.CALENDSO_ENCRYPTION_KEY || "") + ); + + if (decryptedKey.username === username) { + if (decryptedKey.password === password) { + hasMatchingUsernameAndPassword = true; + } + + return true; + } + } + ); + + if (!!hasCalendarWithGivenCredentials && hasMatchingUsernameAndPassword) { + return { + status: SUCCESS_STATUS, + }; + } + + if (!!hasCalendarWithGivenCredentials && !hasMatchingUsernameAndPassword) { + await this.credentialRepository.upsertAppCredential( + APPLE_CALENDAR_TYPE, + symmetricEncrypt(JSON.stringify({ username, password }), process.env.CALENDSO_ENCRYPTION_KEY || ""), + userId, + hasCalendarWithGivenCredentials.id + ); + + return { + status: SUCCESS_STATUS, + }; + } + } try { + const data = { + type: APPLE_CALENDAR_TYPE, + key: symmetricEncrypt( + JSON.stringify({ username, password }), + process.env.CALENDSO_ENCRYPTION_KEY || "" + ), + userId: userId, + teamId: null, + appId: APPLE_CALENDAR_ID, + invalid: false, + }; + const dav = new CalendarService({ id: 0, ...data, user: { email: userEmail }, }); await dav?.listCalendars(); - await this.credentialRepository.createAppCredential(APPLE_CALENDAR_TYPE, data.key, userId); + await this.credentialRepository.upsertAppCredential(APPLE_CALENDAR_TYPE, data.key, userId); } catch (reason) { throw new BadRequestException(`Could not add this apple calendar account: ${reason}`); } diff --git a/apps/api/v2/src/ee/calendars/services/calendars.service.ts b/apps/api/v2/src/ee/calendars/services/calendars.service.ts index 4f509f19350109..ba2ce7b2a897ec 100644 --- a/apps/api/v2/src/ee/calendars/services/calendars.service.ts +++ b/apps/api/v2/src/ee/calendars/services/calendars.service.ts @@ -6,6 +6,7 @@ import { } from "@/modules/credentials/credentials.repository"; import { PrismaReadService } from "@/modules/prisma/prisma-read.service"; import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; +import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository"; import { UsersRepository } from "@/modules/users/users.repository"; import { Injectable, @@ -15,9 +16,11 @@ import { } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { User } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import { DateTime } from "luxon"; import { z } from "zod"; +import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants"; import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries"; import { Calendar } from "@calcom/platform-types"; import { PrismaClient } from "@calcom/prisma"; @@ -33,7 +36,8 @@ export class CalendarsService { private readonly calendarsRepository: CalendarsRepository, private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService, - private readonly config: ConfigService + private readonly config: ConfigService, + private readonly selectedCalendarsRepository: SelectedCalendarsRepository ) {} async getCalendars(userId: number) { @@ -145,4 +149,32 @@ export class CalendarsService { throw new NotFoundException("Calendar credentials not found"); } } + + async createAndLinkCalendarEntry( + userId: number, + externalId: string, + key: Prisma.InputJsonValue, + calendarType: keyof typeof APPS_TYPE_ID_MAPPING, + credentialId?: number | null + ) { + const credential = await this.credentialsRepository.upsertAppCredential( + calendarType, + key, + userId, + credentialId + ); + + await this.selectedCalendarsRepository.upsertSelectedCalendar( + externalId, + credential.id, + userId, + calendarType + ); + } + + async checkCalendarCredentialValidity(userId: number, credentialId: number, type: string) { + const credential = await this.credentialsRepository.getUserCredentialById(userId, credentialId, type); + + return !credential?.invalid; + } } diff --git a/apps/api/v2/src/ee/calendars/services/gcal.service.ts b/apps/api/v2/src/ee/calendars/services/gcal.service.ts index 9f0d25471c8be2..ea1d220d41348b 100644 --- a/apps/api/v2/src/ee/calendars/services/gcal.service.ts +++ b/apps/api/v2/src/ee/calendars/services/gcal.service.ts @@ -131,11 +131,6 @@ export class GoogleCalendarService implements OAuthCalendarApp { const token = await oAuth2Client.getToken(parsedCode); // Google oAuth Credentials are stored in token.tokens const key = token.tokens; - const credential = await this.credentialRepository.createAppCredential( - GOOGLE_CALENDAR_TYPE, - key as Prisma.InputJsonValue, - ownerId - ); oAuth2Client.setCredentials(key); @@ -149,10 +144,39 @@ export class GoogleCalendarService implements OAuthCalendarApp { const primaryCal = cals.data.items?.find((cal) => cal.primary); if (primaryCal?.id) { - await this.selectedCalendarsRepository.createSelectedCalendar( - primaryCal.id, - credential.id, + const alreadyExistingSelectedCalendar = await this.selectedCalendarsRepository.getUserSelectedCalendar( + ownerId, + GOOGLE_CALENDAR_TYPE, + primaryCal.id + ); + + if (alreadyExistingSelectedCalendar) { + const isCredentialValid = await this.calendarsService.checkCalendarCredentialValidity( + ownerId, + alreadyExistingSelectedCalendar.credentialId ?? 0, + GOOGLE_CALENDAR_TYPE + ); + + // user credential probably got expired in this case + if (!isCredentialValid) { + await this.calendarsService.createAndLinkCalendarEntry( + ownerId, + alreadyExistingSelectedCalendar.externalId, + key as Prisma.InputJsonValue, + GOOGLE_CALENDAR_TYPE, + alreadyExistingSelectedCalendar.credentialId + ); + } + + return { + url: redir || origin, + }; + } + + await this.calendarsService.createAndLinkCalendarEntry( ownerId, + primaryCal.id, + key as Prisma.InputJsonValue, GOOGLE_CALENDAR_TYPE ); } diff --git a/apps/api/v2/src/ee/calendars/services/outlook.service.ts b/apps/api/v2/src/ee/calendars/services/outlook.service.ts index 060427fdcee819..eeab3027e1a858 100644 --- a/apps/api/v2/src/ee/calendars/services/outlook.service.ts +++ b/apps/api/v2/src/ee/calendars/services/outlook.service.ts @@ -168,16 +168,39 @@ export class OutlookService implements OAuthCalendarApp { const defaultCalendar = await this.getDefaultCalendar(office365OAuthCredentials.access_token); if (defaultCalendar?.id) { - const credential = await this.credentialRepository.createAppCredential( + const alreadyExistingSelectedCalendar = await this.selectedCalendarsRepository.getUserSelectedCalendar( + ownerId, OFFICE_365_CALENDAR_TYPE, - office365OAuthCredentials, - ownerId + defaultCalendar.id ); - await this.selectedCalendarsRepository.createSelectedCalendar( - defaultCalendar.id, - credential.id, + if (alreadyExistingSelectedCalendar) { + const isCredentialValid = await this.calendarsService.checkCalendarCredentialValidity( + ownerId, + alreadyExistingSelectedCalendar.credentialId ?? 0, + OFFICE_365_CALENDAR_TYPE + ); + + // user credential probably got expired in this case + if (!isCredentialValid) { + await this.calendarsService.createAndLinkCalendarEntry( + ownerId, + alreadyExistingSelectedCalendar.externalId, + office365OAuthCredentials, + OFFICE_365_CALENDAR_TYPE, + alreadyExistingSelectedCalendar.credentialId + ); + } + + return { + url: redir || origin, + }; + } + + await this.calendarsService.createAndLinkCalendarEntry( ownerId, + defaultCalendar.id, + office365OAuthCredentials, OFFICE_365_CALENDAR_TYPE ); } diff --git a/apps/api/v2/src/modules/credentials/credentials.repository.ts b/apps/api/v2/src/modules/credentials/credentials.repository.ts index 5a496cc85fa4de..3ae5dd57982442 100644 --- a/apps/api/v2/src/modules/credentials/credentials.repository.ts +++ b/apps/api/v2/src/modules/credentials/credentials.repository.ts @@ -9,12 +9,12 @@ import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants"; export class CredentialsRepository { constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {} - async createAppCredential( + async upsertAppCredential( type: keyof typeof APPS_TYPE_ID_MAPPING, key: Prisma.InputJsonValue, - userId: number + userId: number, + credentialId?: number | null ) { - const credential = await this.getByTypeAndUserId(type, userId); return this.dbWrite.prisma.credential.upsert({ create: { type, @@ -27,7 +27,7 @@ export class CredentialsRepository { invalid: false, }, where: { - id: credential?.id ?? 0, + id: credentialId ?? 0, }, }); } @@ -36,6 +36,10 @@ export class CredentialsRepository { return this.dbWrite.prisma.credential.findFirst({ where: { type, userId } }); } + getAllUserCredentialsByTypeAndId(type: string, userId: number) { + return this.dbRead.prisma.credential.findMany({ where: { type, userId } }); + } + getUserCredentialsByIds(userId: number, credentialIds: number[]) { return this.dbRead.prisma.credential.findMany({ where: { @@ -60,6 +64,30 @@ export class CredentialsRepository { }, }); } + + async getUserCredentialById(userId: number, credentialId: number, type: string) { + return await this.dbRead.prisma.credential.findUnique({ + where: { + userId, + type, + id: credentialId, + }, + select: { + id: true, + type: true, + key: true, + userId: true, + teamId: true, + appId: true, + invalid: true, + user: { + select: { + email: true, + }, + }, + }, + }); + } } export type CredentialsWithUserEmail = Awaited< diff --git a/apps/api/v2/src/modules/destination-calendars/destination-calendars.module.ts b/apps/api/v2/src/modules/destination-calendars/destination-calendars.module.ts index 0c0c29085a3a60..46107490752e38 100644 --- a/apps/api/v2/src/modules/destination-calendars/destination-calendars.module.ts +++ b/apps/api/v2/src/modules/destination-calendars/destination-calendars.module.ts @@ -6,6 +6,7 @@ import { DestinationCalendarsController } from "@/modules/destination-calendars/ import { DestinationCalendarsRepository } from "@/modules/destination-calendars/destination-calendars.repository"; import { DestinationCalendarsService } from "@/modules/destination-calendars/services/destination-calendars.service"; import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository"; import { UsersRepository } from "@/modules/users/users.repository"; import { Module } from "@nestjs/common"; @@ -19,6 +20,7 @@ import { Module } from "@nestjs/common"; UsersRepository, CredentialsRepository, AppsRepository, + SelectedCalendarsRepository, ], controllers: [DestinationCalendarsController], exports: [DestinationCalendarsRepository], diff --git a/apps/api/v2/src/modules/selected-calendars/selected-calendars.repository.ts b/apps/api/v2/src/modules/selected-calendars/selected-calendars.repository.ts index bdf98d4fce12b9..eb0b8d989e7133 100644 --- a/apps/api/v2/src/modules/selected-calendars/selected-calendars.repository.ts +++ b/apps/api/v2/src/modules/selected-calendars/selected-calendars.repository.ts @@ -6,7 +6,7 @@ import { Injectable } from "@nestjs/common"; export class SelectedCalendarsRepository { constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {} - createSelectedCalendar(externalId: string, credentialId: number, userId: number, integration: string) { + upsertSelectedCalendar(externalId: string, credentialId: number, userId: number, integration: string) { return this.dbWrite.prisma.selectedCalendar.upsert({ create: { userId, @@ -38,6 +38,18 @@ export class SelectedCalendarsRepository { }); } + getUserSelectedCalendar(userId: number, integration: string, externalId: string) { + return this.dbRead.prisma.selectedCalendar.findUnique({ + where: { + userId_integration_externalId: { + userId, + externalId, + integration, + }, + }, + }); + } + async addUserSelectedCalendar( userId: number, integration: string, diff --git a/apps/api/v2/src/modules/users/users.repository.ts b/apps/api/v2/src/modules/users/users.repository.ts index b6ee18fa74726e..444b87a17363fb 100644 --- a/apps/api/v2/src/modules/users/users.repository.ts +++ b/apps/api/v2/src/modules/users/users.repository.ts @@ -68,7 +68,6 @@ export class UsersRepository { } async findByIdWithProfile(userId: number): Promise { - console.log("findByIdWithProfile"); return this.dbRead.prisma.user.findUnique({ where: { id: userId, diff --git a/packages/platform/atoms/connect/apple/AppleConnect.tsx b/packages/platform/atoms/connect/apple/AppleConnect.tsx index 128cd970996cf5..83e655f58abe22 100644 --- a/packages/platform/atoms/connect/apple/AppleConnect.tsx +++ b/packages/platform/atoms/connect/apple/AppleConnect.tsx @@ -76,7 +76,7 @@ export const AppleConnect: FC>> = ({
From 8ce018995a78d0e46cf595ab4713805eadf8d316 Mon Sep 17 00:00:00 2001 From: Abhijeet Singh Date: Thu, 12 Sep 2024 19:35:05 +0530 Subject: [PATCH 15/40] fix: (managed-event-booking): slug conflict handling (#16540) * fix(managed-event-booking): slug conflict handling * refactor logic --------- Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> --- packages/features/eventtypes/components/EventType.tsx | 7 ++++++- .../components/tabs/assignment/EventTeamAssignmentTab.tsx | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/features/eventtypes/components/EventType.tsx b/packages/features/eventtypes/components/EventType.tsx index 202ce3750c08cf..6880badb49609b 100644 --- a/packages/features/eventtypes/components/EventType.tsx +++ b/packages/features/eventtypes/components/EventType.tsx @@ -504,7 +504,7 @@ export const EventType = (props: EventTypeSetupProps & { allActiveWorkflows?: Wo length, ...input } = dirtyValues; - if (!Number(length)) throw new Error(t("event_setup_length_error")); + if (length && !Number(length)) throw new Error(t("event_setup_length_error")); if (bookingLimits) { const isValid = validateIntervalLimitOrder(bookingLimits); @@ -633,6 +633,11 @@ export const EventType = (props: EventTypeSetupProps & { allActiveWorkflows?: Wo id="event-type-form" handleSubmit={async (values) => { const { children } = values; + const conflicts = children.filter((child) => child.owner.eventTypeSlugs.includes(values.slug)); + if (conflicts.length > 0) { + setSlugExistsChildrenDialogOpen(conflicts); + return; + } const dirtyValues = getDirtyFields(values); const dirtyFieldExists = Object.keys(dirtyValues).length !== 0; const { diff --git a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx b/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx index c8ee253534226f..2c025529d63277 100644 --- a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx +++ b/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx @@ -422,7 +422,12 @@ export const EventTeamAssignmentTab = ({ .map((member) => mapUserToValue(member, t("pending"))); const childrenEventTypeOptions = teamMembers.filter(pendingMembers).map((member) => { return mapMemberToChildrenOption( - { ...member, eventTypes: member.eventTypes.filter((et) => et !== eventType.slug) }, + { + ...member, + eventTypes: member.eventTypes.filter( + (et) => et !== eventType.slug || !eventType.children.some((c) => c.owner.id === member.id) + ), + }, eventType.slug, t("pending") ); From b983adb16afa991eb761113b701c7e54504d8da7 Mon Sep 17 00:00:00 2001 From: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:06:47 +0200 Subject: [PATCH 16/40] feat: update translations (#16603) Co-authored-by: Replexica --- apps/web/public/static/locales/ar/common.json | 6 +++++- apps/web/public/static/locales/az/common.json | 6 +++++- apps/web/public/static/locales/cs/common.json | 6 +++++- apps/web/public/static/locales/da/common.json | 6 +++++- apps/web/public/static/locales/de/common.json | 6 +++++- apps/web/public/static/locales/es-419/common.json | 6 +++++- apps/web/public/static/locales/es/common.json | 6 +++++- apps/web/public/static/locales/et/common.json | 6 +++++- apps/web/public/static/locales/fr/common.json | 6 +++++- apps/web/public/static/locales/he/common.json | 6 +++++- apps/web/public/static/locales/hu/common.json | 6 +++++- apps/web/public/static/locales/it/common.json | 6 +++++- apps/web/public/static/locales/ja/common.json | 6 +++++- apps/web/public/static/locales/km/common.json | 6 +++++- apps/web/public/static/locales/ko/common.json | 6 +++++- apps/web/public/static/locales/nl/common.json | 6 +++++- apps/web/public/static/locales/no/common.json | 6 +++++- apps/web/public/static/locales/pl/common.json | 6 +++++- apps/web/public/static/locales/pt-BR/common.json | 6 +++++- apps/web/public/static/locales/pt/common.json | 6 +++++- apps/web/public/static/locales/ro/common.json | 6 +++++- apps/web/public/static/locales/sr/common.json | 6 +++++- apps/web/public/static/locales/sv/common.json | 6 +++++- apps/web/public/static/locales/tr/common.json | 6 +++++- apps/web/public/static/locales/uk/common.json | 6 +++++- apps/web/public/static/locales/vi/common.json | 6 +++++- apps/web/public/static/locales/zh-CN/common.json | 6 +++++- apps/web/public/static/locales/zh-TW/common.json | 6 +++++- i18n.lock | 6 +++++- 29 files changed, 145 insertions(+), 29 deletions(-) diff --git a/apps/web/public/static/locales/ar/common.json b/apps/web/public/static/locales/ar/common.json index 2e2b1f9b943100..9ca03f572ecc59 100644 --- a/apps/web/public/static/locales/ar/common.json +++ b/apps/web/public/static/locales/ar/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "تم إلغاء حدثك المُجَدْوَل", "organizer": "المنظِّم", "need_to_reschedule_or_cancel": "هل تحتاج إلى إعادة جدولة أو إلغاء؟", + "you_can_view_booking_details_with_this_url": "يمكنك عرض تفاصيل الحجز من هذا الرابط {{url}} وإضافة الحدث إلى تقويمك", "no_options_available": "لا توجد خيارات متاحة", "cancellation_reason": "سبب الإلغاء (اختياري)", "cancellation_reason_placeholder": "لماذا تلغي؟", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "شكرًا لك على تجربة خطة Organization الجديدة التي نقدمها. لقد لاحظنا أن منظمتك \"{{teamName}}\" بحاجة إلى الترقية.", "org_upgraded_successfully": "تمت ترقية خطة Organization بنجاح!", "use_link_to_reset_password": "استخدم الرابط أدناه لإعادة تعيين كلمة المرور", - "hey_there": "مرحبًا،", + "hey_there": "مرحبًا", "forgot_your_password_calcom": "نسيت كلمة المرور الخاصة بك؟ - {{appName}}", "delete_webhook_confirmation_message": "هل أنت متأكد أنك تريد حذف الويب هوك هذا؟ لن تتلقى بعد الآن بيانات اجتماعات {{appName}} على عنوان URL محدد، وفي الوقت الفعلي، عندما تتم جدولة حدث أو يتم إلغاؤه.", "confirm_delete_webhook": "نعم، قم بحذف الويبهوك", @@ -1904,6 +1905,7 @@ "not_enough_seats": "لا توجد مقاعد كافية", "form_builder_field_already_exists": "يوجد حقل بهذا الاسم بالفعل", "show_on_booking_page": "إظهار في صفحة الحجز", + "visit_cancelled_booking": "يمكنك زيارة صفحة الحجز الملغى", "get_started_zapier_templates": "البدء في استخدام قوالب Zapier", "team_is_unpublished": "لم يُنشر {{team}}", "org_is_unpublished_description": "رابط هذه المنظمة غير متاح حاليًا. يرجى الاتصال بمالك المنظمة أو طلب النشر منه.", @@ -2455,6 +2457,7 @@ "add_emails": "أضف عناوين بريد إلكتروني", "add_email_description": "أضف عنوان بريد إلكتروني لاستبدال بريدك الأساسي أو لاستخدامه كبريد بديل في أنواع الأحداث الخاصة بك.", "confirm_email": "تأكيد بريدك الإلكتروني", + "confirming_your_booking_sms": "$t(hey_there) {{name}}، نؤكد حجزك في {{date}}.", "scheduler_first_name": "الاسم الأول للشخص الذي يقوم بالحجز", "scheduler_last_name": "الاسم الأخير للشخص الذي يقوم بالحجز", "scheduler_name": "اسم المجدول", @@ -2545,6 +2548,7 @@ "team_select_info": "يتم تفعيلها لجميع أنواع أحداث الفريق وجميع أنواع الأحداث الشخصية لأعضاء الفريق", "no_show_updated": "تم تحديث حالة عدم الحضور للحاضرين", "email_copied": "تم نسخ البريد الإلكتروني", + "phone_number_copied": "تم نسخ رقم الهاتف", "USER_PENDING_MEMBER_OF_THE_ORG": "المستخدم عضو معلق في المنظمة", "USER_ALREADY_INVITED_OR_MEMBER": "المستخدم مدعو بالفعل أو عضو", "USER_MEMBER_OF_OTHER_ORGANIZATION": "المستخدم عضو في منظمة لا ينتمي إليها هذا الفريق.", diff --git a/apps/web/public/static/locales/az/common.json b/apps/web/public/static/locales/az/common.json index 2f0deea233498d..f9354a0bedfbc7 100644 --- a/apps/web/public/static/locales/az/common.json +++ b/apps/web/public/static/locales/az/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Planlaşdırılmış tədbiriniz ləğv edildi", "organizer": "Təşkilatçı", "need_to_reschedule_or_cancel": "Yenidən planlaşdırmaq və ya ləğv etmək lazımdır?", + "you_can_view_booking_details_with_this_url": "Bu URL-dən {{url}} rezervasiya təfərrüatlarını görə və tədbiri təqviminizə əlavə edə bilərsiniz", "no_options_available": "Mövcud seçimlər yoxdur", "cancellation_reason": "Ləğv səbəbi (isteğe bağlı)", "cancellation_reason_placeholder": "Niyə ləğv edirsiniz?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Təşkilat planımızı sınaqdan keçirdiyiniz üçün təşəkkür edirik. Təşkilatınız \"{{teamName}}\" təkmilləşdirilməlidir.", "org_upgraded_successfully": "Təşkilatınız uğurla təkmilləşdirildi!", "use_link_to_reset_password": "Şifrənizi sıfırlamaq üçün aşağıdakı linkdən istifadə edin", - "hey_there": "Salam,", + "hey_there": "Salam", "forgot_your_password_calcom": "Şifrənizi unutmusunuz? - {{appName}}", "delete_webhook_confirmation_message": "Bu webhook-u silmək istədiyinizə əminsinizmi? Tədbir planlaşdırıldıqda və ya ləğv edildikdə, real vaxtda müəyyən edilmiş URL-də {{appName}} görüş məlumatlarını artıq almayacaqsınız.", "confirm_delete_webhook": "Bəli, webhook-u silin", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Kifayət qədər oturacaq yoxdur", "form_builder_field_already_exists": "Bu adla bir sahə artıq mövcuddur", "show_on_booking_page": "Rezervasiya səhifəsində göstər", + "visit_cancelled_booking": "Ləğv edilmiş rezervasiya səhifəsinə baxa bilərsiniz", "get_started_zapier_templates": "Zapier şablonları ilə başlayın", "team_is_unpublished": "{{team}} yayımlanmayıb", "org_is_unpublished_description": "Bu təşkilat bağlantısı hazırda mövcud deyil. Zəhmət olmasa təşkilat sahibinə müraciət edin və ya onu yayımlamasını xahiş edin.", @@ -2455,6 +2457,7 @@ "add_emails": "E-poçtlar əlavə edin", "add_email_description": "Əsas e-poçtunuzu əvəz etmək və ya tədbir növlərinizdə alternativ e-poçt kimi istifadə etmək üçün e-poçt ünvanı əlavə edin.", "confirm_email": "E-poçtunuzu təsdiqləyin", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, {{date}} tarixindəki rezervasiyanızı təsdiqləyirik.", "scheduler_first_name": "Rezervasiya edən şəxsin adı", "scheduler_last_name": "Rezervasiya edən şəxsin soyadı", "scheduler_name": "Rezervasiya edən şəxsin adı", @@ -2545,6 +2548,7 @@ "team_select_info": "bütün komanda tədbir növləri və bütün komanda üzvlərinin şəxsi tədbir növləri üçün tetikleyicilər", "no_show_updated": "İştirakçılar üçün gəlməmə statusu yeniləndi", "email_copied": "E-poçt kopyalandı", + "phone_number_copied": "Telefon nömrəsi kopyalandı", "USER_PENDING_MEMBER_OF_THE_ORG": "İstifadəçi təşkilatın gözləyən üzvüdür", "USER_ALREADY_INVITED_OR_MEMBER": "İstifadəçi artıq dəvət olunub və ya üzvdür", "USER_MEMBER_OF_OTHER_ORGANIZATION": "İstifadəçi bu komandanın bir hissəsi olmayan bir təşkilatın üzvüdür.", diff --git a/apps/web/public/static/locales/cs/common.json b/apps/web/public/static/locales/cs/common.json index c68b138a0c84ed..e7ce308c0732d4 100644 --- a/apps/web/public/static/locales/cs/common.json +++ b/apps/web/public/static/locales/cs/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Vaše plánovaná událost byla zrušena", "organizer": "Organizátor", "need_to_reschedule_or_cancel": "Přeplánovat nebo zrušit?", + "you_can_view_booking_details_with_this_url": "Podrobnosti rezervace si můžete prohlédnout na této adrese URL {{url}} a přidat událost do svého kalendáře", "no_options_available": "Nejsou k dispozici žádné možnosti", "cancellation_reason": "Důvod zrušení", "cancellation_reason_placeholder": "Proč rušíte?\n", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Děkujeme, že jste vyzkoušeli náš tarif Organizace. Všimli jsme si, že vaše organizace „{{teamName}}“ vyžaduje upgrade.", "org_upgraded_successfully": "Váš upgrade na tarif Organization byl úspěšně dokončen!", "use_link_to_reset_password": "Pro obnovení hesla použijte odkaz níž", - "hey_there": "Zdravíme,", + "hey_there": "Ahoj", "forgot_your_password_calcom": "Zapomněli jste heslo? - {{appName}}", "delete_webhook_confirmation_message": "Opravdu chcete smazat tento webhook? Přestanete v reálném čase dostávat {{appName}} data o schůzce na dané URL, pokud bude událost naplánována nebo zrušena.", "confirm_delete_webhook": "Ano, smazat webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Nedostatek míst", "form_builder_field_already_exists": "Pole s tímto názvem již existuje", "show_on_booking_page": "Zobrazit na stránce rezervace", + "visit_cancelled_booking": "Můžete navštívit stránku zrušené rezervace", "get_started_zapier_templates": "Začněte používat šablony Zapier", "team_is_unpublished": "Tým {{team}} není zveřejněn", "org_is_unpublished_description": "Tento odkaz organizace není v současné době k dispozici. Kontaktujte prosím vlastníka organizace nebo ho požádejte o jeho zveřejnění.", @@ -2455,6 +2457,7 @@ "add_emails": "Přidat e-maily", "add_email_description": "Přidejte e-mailovou adresu, která nahradí vaši primární nebo bude použita jako alternativní e-mail pro vaše typy událostí.", "confirm_email": "Potvrďte svůj e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, potvrzujeme vaši rezervaci na {{date}}.", "scheduler_first_name": "Křestní jméno osoby, která rezervuje", "scheduler_last_name": "Příjmení osoby, která rezervuje", "scheduler_name": "Jméno plánovače", @@ -2545,6 +2548,7 @@ "team_select_info": "spouští se pro všechny typy týmových událostí a osobní typy událostí všech členů týmu", "no_show_updated": "Stav nepřítomnosti aktualizován pro účastníky", "email_copied": "E-mail zkopírován", + "phone_number_copied": "Telefonní číslo zkopírováno", "USER_PENDING_MEMBER_OF_THE_ORG": "Uživatel je čekajícím členem organizace", "USER_ALREADY_INVITED_OR_MEMBER": "Uživatel je již pozván nebo je členem", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Uživatel je členem organizace, která není součástí tohoto týmu.", diff --git a/apps/web/public/static/locales/da/common.json b/apps/web/public/static/locales/da/common.json index 4929668eb03eb5..052598adb65188 100644 --- a/apps/web/public/static/locales/da/common.json +++ b/apps/web/public/static/locales/da/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Dit planlagte arrangement blev annulleret", "organizer": "Arrangør", "need_to_reschedule_or_cancel": "Behov for at omlægge eller annullere?", + "you_can_view_booking_details_with_this_url": "Du kan se bookingdetaljerne fra denne URL {{url}} og tilføje begivenheden til din kalender", "no_options_available": "Ingen muligheder tilgængelige", "cancellation_reason": "Årsag til aflysning (valgfri)", "cancellation_reason_placeholder": "Hvorfor aflyser du?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Tak fordi du prøver vores organisationsplan. Vi har bemærket, at din organisation \"{{teamName}}\" skal opgraderes.", "org_upgraded_successfully": "Din organisation blev opgraderet med succes!", "use_link_to_reset_password": "Brug nedenstående link for at nulstille din adgangskode", - "hey_there": "Hej,", + "hey_there": "Hej der", "forgot_your_password_calcom": "Glemt din adgangskode? - {{appName}}", "delete_webhook_confirmation_message": "Er du sikker på, at du vil slette denne webhook? Du vil ikke længere modtage {{appName}} mødedata på en specificeret URL, i realtid, når en begivenhed bliver planlagt eller annulleret.", "confirm_delete_webhook": "Ja, slet webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Ikke nok pladser", "form_builder_field_already_exists": "Et felt med dette navn findes allerede", "show_on_booking_page": "Vis på bookingsiden", + "visit_cancelled_booking": "Du kan besøge siden for den aflyste booking", "get_started_zapier_templates": "Kom i gang med Zapier skabeloner", "team_is_unpublished": "{{team}} er upubliceret", "org_is_unpublished_description": "Dette organisationslink er i øjeblikket ikke tilgængeligt. Kontakt venligst organisationsindehaveren eller bed dem om at offentliggøre det.", @@ -2455,6 +2457,7 @@ "add_emails": "Tilføj e-mails", "add_email_description": "Tilføj en e-mailadresse for at erstatte din primære eller for at bruge som en alternativ e-mail på dine begivenhedstyper.", "confirm_email": "Bekræft din e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, bekræfter din booking den {{date}}.", "scheduler_first_name": "Fornavn på personen, der booker", "scheduler_last_name": "Efternavn på personen, der booker", "scheduler_name": "Bookerens navn", @@ -2545,6 +2548,7 @@ "team_select_info": "udløser for alle team begivenhedstyper og alle teammedlemmers personlige begivenhedstyper", "no_show_updated": "Udeblivelsesstatus opdateret for deltagere", "email_copied": "Email kopieret", + "phone_number_copied": "Telefonnummer kopieret", "USER_PENDING_MEMBER_OF_THE_ORG": "Bruger er et ventende medlem af organisationen", "USER_ALREADY_INVITED_OR_MEMBER": "Bruger er allerede inviteret eller medlem", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Bruger er medlem af en organisation, som dette team ikke er en del af.", diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json index 8d98a4f3075e39..ca0cc3a42d4fbb 100644 --- a/apps/web/public/static/locales/de/common.json +++ b/apps/web/public/static/locales/de/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Ihr geplanter Termin wurde abgesagt", "organizer": "Organisator", "need_to_reschedule_or_cancel": "Möchten Sie einen neuen Termin finden oder absagen?", + "you_can_view_booking_details_with_this_url": "Sie können die Buchungsdetails unter dieser URL einsehen {{url}} und den Termin zu Ihrem Kalender hinzufügen", "no_options_available": "Keine Optionen verfügbar", "cancellation_reason": "Grund für Ihre Absage (optional)", "cancellation_reason_placeholder": "Warum sagen Sie ab? (optional)", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Vielen Dank, dass Sie unseren neuen Tarif „Organization“ getestet haben. Wir haben festgestellt, dass Ihre Organization „{{teamName}}“ ein Upgrade benötigt.", "org_upgraded_successfully": "Das Upgrade für Ihre Organization war erfolgreich!", "use_link_to_reset_password": "Benutzen Sie den Link, um Ihr Passwort zurückzusetzen", - "hey_there": "Hallo,", + "hey_there": "Hallo", "forgot_your_password_calcom": "Passwort vergessen? - {{appName}}", "delete_webhook_confirmation_message": "Sind Sie sicher, dass Sie diesen Webhook löschen möchten? Sie werden keine {{appName}}-Meetingdaten mehr unter einer bestimmten URL, in Echtzeit erhalten, wenn ein Ereignis geplant oder abgesagt wird.", "confirm_delete_webhook": "Ja, Webhook löschen", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Nicht genügend Plätze", "form_builder_field_already_exists": "Ein Feld mit diesem Namen ist bereits vorhanden", "show_on_booking_page": "Auf der Buchungsseite anzeigen", + "visit_cancelled_booking": "Sie können die Seite der stornierten Buchung besuchen", "get_started_zapier_templates": "Legen Sie mit Zapier-Vorlagen los", "team_is_unpublished": "{{team}} ist unveröffentlicht", "org_is_unpublished_description": "Dieser Organisations-Link ist derzeit nicht verfügbar. Bitte kontaktieren Sie den Organisations-Besitzer oder fragen Sie ihn, ob er ihn veröffentlicht.", @@ -2455,6 +2457,7 @@ "add_emails": "E-Mails hinzufügen", "add_email_description": "Fügen Sie eine E-Mail-Adresse hinzu, um die Ihre primäre E-Mail-Adresse ersetzt, oder als alternative E-Mail in Ihren Ereignistypen verwendet wird.", "confirm_email": "Bestätigen Sie Ihre E-Mail-Adresse", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, wir bestätigen Ihre Buchung am {{date}}.", "scheduler_first_name": "Der Vorname der buchenden Person", "scheduler_last_name": "Der Nachname der buchenden Person", "scheduler_name": "Name des Planers", @@ -2545,6 +2548,7 @@ "team_select_info": "Auslöser für alle Team-Ereignistypen und persönliche Ereignistypen aller Teammitglieder", "no_show_updated": "No-Show-Status für Teilnehmer aktualisiert", "email_copied": "E-Mail kopiert", + "phone_number_copied": "Telefonnummer kopiert", "USER_PENDING_MEMBER_OF_THE_ORG": "Benutzer ist ein ausstehendes Mitglied der Organisation", "USER_ALREADY_INVITED_OR_MEMBER": "Benutzer ist bereits ein Mitglied oder eingeladen", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Benutzer ist Mitglied einer Organisation, zu der dieses Team nicht angehört.", diff --git a/apps/web/public/static/locales/es-419/common.json b/apps/web/public/static/locales/es-419/common.json index 9e67af114dca9b..fa5317f75d2079 100644 --- a/apps/web/public/static/locales/es-419/common.json +++ b/apps/web/public/static/locales/es-419/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Tu evento programado fue cancelado", "organizer": "Organizador", "need_to_reschedule_or_cancel": "¿Necesitas reprogramar o cancelar?", + "you_can_view_booking_details_with_this_url": "Puedes ver los detalles de la reserva en este enlace {{url}} y agregar el evento a tu calendario", "no_options_available": "No hay opciones disponibles", "cancellation_reason": "Razón de la cancelación (opcional)", "cancellation_reason_placeholder": "¿Por qué estás cancelando?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Gracias por probar nuestro plan de Organización. Notamos que tu Organización \"{{teamName}}\" necesita ser actualizada.", "org_upgraded_successfully": "¡Tu Organización se actualizó con éxito!", "use_link_to_reset_password": "Usa el enlace a continuación para restablecer tu contraseña", - "hey_there": "Hola,", + "hey_there": "Hola", "forgot_your_password_calcom": "¿Olvidaste tu contraseña? - {{appName}}", "delete_webhook_confirmation_message": "¿Estás seguro de que deseas eliminar este webhook? Ya no recibirás datos de reuniones de {{appName}} en una URL especificada, en tiempo real, cuando se programe o cancele un evento.", "confirm_delete_webhook": "Sí, eliminar webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "No hay suficientes asientos", "form_builder_field_already_exists": "Ya existe un campo con este nombre", "show_on_booking_page": "Mostrar en la página de reserva", + "visit_cancelled_booking": "Puedes visitar la página de la reserva cancelada", "get_started_zapier_templates": "Comienza con las plantillas de Zapier", "team_is_unpublished": "{{team}} no está publicado", "org_is_unpublished_description": "Este enlace de la organización no está disponible actualmente. Por favor, contacta al propietario de la organización o pídele que lo publique.", @@ -2455,6 +2457,7 @@ "add_emails": "Agregar correos electrónicos", "add_email_description": "Agrega una dirección de correo electrónico para reemplazar tu principal o usarla como un correo alternativo en tus tipos de eventos.", "confirm_email": "Confirma tu correo electrónico", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confirmando tu reserva para el {{date}}.", "scheduler_first_name": "El nombre de la persona que reserva", "scheduler_last_name": "El apellido de la persona que reserva", "scheduler_name": "Nombre del reservador", @@ -2545,6 +2548,7 @@ "team_select_info": "disparadores para todos los tipos de eventos del equipo y todos los tipos de eventos personales de los miembros del equipo", "no_show_updated": "Estado de no-show actualizado para los asistentes", "email_copied": "Correo electrónico copiado", + "phone_number_copied": "Número de teléfono copiado", "USER_PENDING_MEMBER_OF_THE_ORG": "El usuario es un miembro pendiente de la organización", "USER_ALREADY_INVITED_OR_MEMBER": "El usuario ya está invitado o es miembro", "USER_MEMBER_OF_OTHER_ORGANIZATION": "El usuario es miembro de una organización de la que este equipo no forma parte.", diff --git a/apps/web/public/static/locales/es/common.json b/apps/web/public/static/locales/es/common.json index 6b3a1774347e0e..f8da14b7e6f9d9 100644 --- a/apps/web/public/static/locales/es/common.json +++ b/apps/web/public/static/locales/es/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Se canceló su evento programado", "organizer": "Organizador", "need_to_reschedule_or_cancel": "¿Necesita reprogramar o cancelar?", + "you_can_view_booking_details_with_this_url": "Puedes ver los detalles de la reserva desde esta URL {{url}} y añadir el evento a tu calendario", "no_options_available": "No hay opciones disponibles", "cancellation_reason": "Motivo de la cancelación (opcional)", "cancellation_reason_placeholder": "¿Por qué razón está cancelando?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Gracias por probar nuestro nuevo plan Organization. Notamos que su Organization \"{{teamName}}\" necesita actualizarse.", "org_upgraded_successfully": "Su Organization se actualizó con éxito.", "use_link_to_reset_password": "Utilice el enlace de abajo para restablecer su contraseña", - "hey_there": "Hola,", + "hey_there": "Hola", "forgot_your_password_calcom": "¿Olvidaste tu contraseña? - {{appName}}", "delete_webhook_confirmation_message": "¿Está seguro de que desea eliminar este webhook? Ya no recibirá datos de reuniones de {{appName}} en una URL específica, en tiempo real, cuando se programe o cancele un evento.", "confirm_delete_webhook": "Sí, elimina este webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "No hay suficientes plazas", "form_builder_field_already_exists": "Ya existe un campo con este nombre", "show_on_booking_page": "Mostrar en la página de reserva", + "visit_cancelled_booking": "Puedes visitar la página de la reserva cancelada", "get_started_zapier_templates": "Comience con las plantillas de Zapier", "team_is_unpublished": "{{team}} no está publicado", "org_is_unpublished_description": "El enlace de esta organización no está disponible actualmente. Comuníquese con el propietario de la organización o pídale que lo publique.", @@ -2455,6 +2457,7 @@ "add_emails": "Añadir correos electrónicos", "add_email_description": "Añade una dirección de correo electrónico para reemplazar tu principal o para usar como correo alternativo en tus tipos de eventos.", "confirm_email": "Confirma tu correo electrónico", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confirmando tu reserva para el {{date}}.", "scheduler_first_name": "El nombre de la persona que reserva", "scheduler_last_name": "El apellido de la persona que reserva", "scheduler_name": "Nombre del programador", @@ -2545,6 +2548,7 @@ "team_select_info": "se activa para todos los tipos de eventos del equipo y los tipos de eventos personales de todos los miembros del equipo", "no_show_updated": "Estado de no presentado actualizado para los asistentes", "email_copied": "Correo electrónico copiado", + "phone_number_copied": "Número de teléfono copiado", "USER_PENDING_MEMBER_OF_THE_ORG": "El usuario es un miembro pendiente de la organización", "USER_ALREADY_INVITED_OR_MEMBER": "El usuario ya está invitado o es miembro", "USER_MEMBER_OF_OTHER_ORGANIZATION": "El usuario es miembro de una organización de la que este equipo no forma parte.", diff --git a/apps/web/public/static/locales/et/common.json b/apps/web/public/static/locales/et/common.json index 8dedd976a87629..9e986d369e1baa 100644 --- a/apps/web/public/static/locales/et/common.json +++ b/apps/web/public/static/locales/et/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Teie ajastatud üritus tühistati", "organizer": "Korraldaja", "need_to_reschedule_or_cancel": "Kas on vaja ümber ajastada või tühistada?", + "you_can_view_booking_details_with_this_url": "Saate broneeringu üksikasju vaadata sellelt lingilt {{url}} ja lisada sündmuse oma kalendrisse", "no_options_available": "Valikud pole saadaval", "cancellation_reason": "Tühistamise põhjus (valikuline)", "cancellation_reason_placeholder": "Miks sa tühistad?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Täname, et proovisite meie organisatsiooni plaani. Märkasime, et teie organisatsiooni \"{{teamName}}\" tuleb uuendada.", "org_upgraded_successfully": "Teie organisatsiooni uuendamine õnnestus!", "use_link_to_reset_password": "Kasutage oma parooli lähtestamiseks allolevat linki", - "hey_there": "Tere,", + "hey_there": "Tere", "forgot_your_password_calcom": "Unustasite oma parooli? - {{appName}}", "delete_webhook_confirmation_message": "Kas soovite kindlasti selle veebihaagi kustutada? Kui üritus on ajastatud või tühistatud, ei saa te enam reaalajas {{appName}} koosoleku andmeid määratud URL-il.", "confirm_delete_webhook": "Jah, kustuta veebihaak", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Pole piisavalt kohti", "form_builder_field_already_exists": "Selle nimega väli on juba olemas", "show_on_booking_page": "Näita broneerimislehel", + "visit_cancelled_booking": "Saate külastada tühistatud broneeringu lehte", "get_started_zapier_templates": "Alustage Zapieri mallidega", "team_is_unpublished": "{{team}} on avaldamata", "org_is_unpublished_description": "See organisatsiooni link pole praegu saadaval. Võtke ühendust organisatsiooni omanikuga või paluge tal see avaldada.", @@ -2455,6 +2457,7 @@ "add_emails": "Lisa e-kirjad", "add_email_description": "Lisage e-posti aadress, et asendada oma esmane e-posti aadress või kasutada seda alternatiivse e-posti aadressina oma sündmuste tüüpide puhul.", "confirm_email": "Kinnita oma e-posti aadress", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, kinnitan teie broneeringut kuupäeval {{date}}.", "scheduler_first_name": "Broneerija eesnimi", "scheduler_last_name": "Broneerija perekonnanimi", "scheduler_name": "Planeerija nimi", @@ -2545,6 +2548,7 @@ "team_select_info": "käivitub kõigi meeskonna sündmuste tüüpide ja kõigi meeskonnaliikmete isiklike sündmuste tüüpide jaoks", "no_show_updated": "Osalejate mitteilmumise olek on värskendatud", "email_copied": "E-post kopeeritud", + "phone_number_copied": "Telefoninumber kopeeritud", "USER_PENDING_MEMBER_OF_THE_ORG": "Kasutaja on organisatsiooni ootel liige", "USER_ALREADY_INVITED_OR_MEMBER": "Kasutaja on juba kutsutud või liige", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Kasutaja on organisatsiooni liige, millesse see meeskond ei kuulu.", diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json index 7348b8796bb29c..fc3ee11152edc1 100644 --- a/apps/web/public/static/locales/fr/common.json +++ b/apps/web/public/static/locales/fr/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Votre événement planifié a été annulé", "organizer": "Organisateur", "need_to_reschedule_or_cancel": "Besoin de replanifier ou d'annuler ?", + "you_can_view_booking_details_with_this_url": "Vous pouvez consulter les détails de la réservation à partir de cette URL {{url}} et ajouter l'événement à votre calendrier", "no_options_available": "Aucune option disponible", "cancellation_reason": "Motif de l'annulation (facultatif)", "cancellation_reason_placeholder": "Pourquoi annulez-vous ?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Merci d'avoir testé notre plan Organisation. Nous avons remarqué que votre organisation « {{teamName}} » doit être mise à niveau.", "org_upgraded_successfully": "Votre organisation a été mise à niveau avec succès !", "use_link_to_reset_password": "Utilisez le lien ci-dessous pour réinitialiser votre mot de passe", - "hey_there": "Salut,", + "hey_there": "Bonjour", "forgot_your_password_calcom": "Mot de passe oublié ? - {{appName}}", "delete_webhook_confirmation_message": "Voulez-vous vraiment supprimer ce webhook ? Vous ne recevrez plus les données de rendez-vous de {{appName}} à un lien spécifié, en temps réel, lorsqu'un événement est planifié ou annulé.", "confirm_delete_webhook": "Oui, supprimer le webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Pas assez de places", "form_builder_field_already_exists": "Un champ avec ce nom existe déjà", "show_on_booking_page": "Afficher sur la page de réservation", + "visit_cancelled_booking": "Vous pouvez consulter la page de réservation annulée", "get_started_zapier_templates": "Démarrer avec les modèles Zapier", "team_is_unpublished": "{{team}} n'est pas publiée", "org_is_unpublished_description": "Ce lien d'organisation n'est actuellement pas disponible. Veuillez contacter le propriétaire de l'organisation ou lui demander de le publier.", @@ -2455,6 +2457,7 @@ "add_emails": "Ajouter des e-mails", "add_email_description": "Ajoutez une adresse e-mail pour remplacer votre adresse principale ou pour utiliser comme adresse de courriel alternative sur vos types d'événements.", "confirm_email": "Confirmez votre adresse e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confirmation de votre réservation le {{date}}.", "scheduler_first_name": "Le prénom de la personne qui effectue la réservation", "scheduler_last_name": "Le nom de famille de la personne qui effectue la réservation", "scheduler_name": "Nom du planificateur", @@ -2545,6 +2548,7 @@ "team_select_info": "déclencheurs pour tous les types d'événements d'équipe et les types d'événements personnels de tous les membres de l'équipe", "no_show_updated": "Statut absence mis à jour pour les participants", "email_copied": "E-mail copié", + "phone_number_copied": "Numéro de téléphone copié", "USER_PENDING_MEMBER_OF_THE_ORG": "L'utilisateur est un membre en attente de l'organisation", "USER_ALREADY_INVITED_OR_MEMBER": "L'utilisateur a déjà été invité ou est déjà membre", "USER_MEMBER_OF_OTHER_ORGANIZATION": "L'utilisateur est membre d'une organisation dont cette équipe ne fait pas partie.", diff --git a/apps/web/public/static/locales/he/common.json b/apps/web/public/static/locales/he/common.json index 859c3b92c34a85..80df7e14c7fde5 100644 --- a/apps/web/public/static/locales/he/common.json +++ b/apps/web/public/static/locales/he/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "האירוע המתוכנן שלך בוטל", "organizer": "ארגון", "need_to_reschedule_or_cancel": "רוצה לקבוע מועד חדש או לבטל?", + "you_can_view_booking_details_with_this_url": "ניתן לצפות בפרטי ההזמנה מהקישור הזה {{url}} ולהוסיף את האירוע ליומן שלך", "no_options_available": "אין אפשרויות זמינות", "cancellation_reason": "הסיבה לביטול (רשות)", "cancellation_reason_placeholder": "מדוע בחרת לבטל?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "אנחנו מודים לך על כך שניסית את חבילת Organization החדשה שלנו. שמנו לב שה-Organization שלך, ״{{teamName}}״, זקוק לשדרוג.", "org_upgraded_successfully": "ה-Organization שלך שודרג בהצלחה!", "use_link_to_reset_password": "נא להשתמש בקישור הבא כדי לאפס את הסיסמה", - "hey_there": "שלום,", + "hey_there": "היי שם", "forgot_your_password_calcom": "שכחתה את הסיסמה? - {{appName}}", "delete_webhook_confirmation_message": "בטוח שברצונך למחוק את ה-Webhook הזה? אם אירוע יבוטל או שייקבע עבורו מועד, לא תקבל יותר נתוני פגישות מ-{{appName}} בזמן אמת או בכתובת ה-URL שציינת.", "confirm_delete_webhook": "כן, אני רוצה למחוק את ה-Webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "אין מספיק מושבים", "form_builder_field_already_exists": "שדה עם שם זה כבר קיים", "show_on_booking_page": "להציג בדף ההזמנות", + "visit_cancelled_booking": "ניתן לבקר בדף ההזמנה שבוטלה", "get_started_zapier_templates": "התחל עם תבניות Zapier", "team_is_unpublished": "צוות {{team}} אינו מפורסם", "org_is_unpublished_description": "הקישור לארגון הזה אינו זמין כעת. יש ליצור קשר עם הבעלים של הארגון או לבקש מהם לפרסם אותו.", @@ -2455,6 +2457,7 @@ "add_emails": "הוסף אימיילים", "add_email_description": "אפשר להוסיף כתובת דוא״ל כדי להחליף את הכתובת העיקרית שלך או ככתובת חלופית לסוגי האירועים שלך.", "confirm_email": "אישור כתובת הדוא״ל שלך", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, מאשר את ההזמנה שלך בתאריך {{date}}.", "scheduler_first_name": "השם הפרטי של האדם שמזמין", "scheduler_last_name": "שם המשפחה של האדם שמזמין", "scheduler_name": "שם המזמין", @@ -2545,6 +2548,7 @@ "team_select_info": "מפעיל עבור כל סוגי האירועים של הצוות וכל סוגי האירועים האישיים של חברי הצוות", "no_show_updated": "סטטוס ההיעדרות עודכן עבור המשתתפים", "email_copied": "האימייל הועתק", + "phone_number_copied": "מספר הטלפון הועתק", "USER_PENDING_MEMBER_OF_THE_ORG": "המשתמש ממתין לאישור כחבר בארגון", "USER_ALREADY_INVITED_OR_MEMBER": "המשתמש כבר הוזמן או חבר בארגון", "USER_MEMBER_OF_OTHER_ORGANIZATION": "המשתמש חבר בארגון שאינו חלק מהצוות הזה.", diff --git a/apps/web/public/static/locales/hu/common.json b/apps/web/public/static/locales/hu/common.json index 9ca5b520fbcf8b..5561d51204e4ae 100644 --- a/apps/web/public/static/locales/hu/common.json +++ b/apps/web/public/static/locales/hu/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "A lefoglalt időpontod vissza lett mondva", "organizer": "Szervező", "need_to_reschedule_or_cancel": "Átütemeznéd vagy lemondanád?", + "you_can_view_booking_details_with_this_url": "A foglalás részleteit megtekintheti ezen az URL-en: {{url}}, és hozzáadhatja az eseményt a naptárához", "no_options_available": "Nem állnak rendelkezésre opciók", "cancellation_reason": "Lemondás oka (opcionális)", "cancellation_reason_placeholder": "Mi az oka, hogy le kell mondanod az időpontot?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Köszönjük, hogy kipróbálta Szervezeti csomagunkat. Észrevettük, hogy a(z) „{{teamName}}” szervezetet frissíteni kell.", "org_upgraded_successfully": "Szervezete sikeresen frissítve!", "use_link_to_reset_password": "Jelszó visszaállításához használja az alábbi linket", - "hey_there": "Üdv itt,", + "hey_there": "Szia", "forgot_your_password_calcom": "Elfelejtette a jelszavát? - {{appName}}", "delete_webhook_confirmation_message": "Biztosan törli ezt a webhookot? A továbbiakban nem kapja meg valós időben a(z) {{appName}} megbeszélés adatait egy megadott URL-címen, ha egy esemény ütemezett vagy lemondott.", "confirm_delete_webhook": "Igen, webhook törlése", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Nincs elég hely", "form_builder_field_already_exists": "Már létezik ilyen nevű mező", "show_on_booking_page": "Megjelenítés a foglalási oldalon", + "visit_cancelled_booking": "Megtekintheti a lemondott foglalás oldalát", "get_started_zapier_templates": "Kezdje el a Zapier-sablonokat", "team_is_unpublished": "{{team}} nincs közzétéve", "org_is_unpublished_description": "Ez a szervezeti link jelenleg nem érhető el. Kérjük, lépjen kapcsolatba a szervezet tulajdonosával, vagy kérje meg, hogy tegye közzé.", @@ -2455,6 +2457,7 @@ "add_emails": "Email címek hozzáadása", "add_email_description": "Adj hozzá egy e-mail címet, hogy lecseréld az elsődleges címed, vagy hogy használhass egy alternatív e-mailt az esemény típusoknél.", "confirm_email": "Igazold az e-mail címed", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, megerősítjük a foglalását {{date}}-re.", "scheduler_first_name": "A foglaló személy keresztneve", "scheduler_last_name": "A foglaló személy vezetékneve", "scheduler_name": "Foglaló neve", @@ -2545,6 +2548,7 @@ "team_select_info": "minden csapateseménytípusra és minden csapattag személyes eseménytípusára vonatkozik", "no_show_updated": "A nem megjelent státusz frissítve a résztvevők számára", "email_copied": "E-mail másolva", + "phone_number_copied": "Telefonszám másolva", "USER_PENDING_MEMBER_OF_THE_ORG": "A felhasználó a szervezet függőben lévő tagja", "USER_ALREADY_INVITED_OR_MEMBER": "A felhasználó már meghívott vagy tag", "USER_MEMBER_OF_OTHER_ORGANIZATION": "A felhasználó egy olyan szervezet tagja, amely nem része ennek a csapatnak.", diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json index 49e2832a6f52d9..58a3c8ee1db7e0 100644 --- a/apps/web/public/static/locales/it/common.json +++ b/apps/web/public/static/locales/it/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Il tuo evento programmato è stato cancellato", "organizer": "Organizzatore", "need_to_reschedule_or_cancel": "È necessario riprogrammare o annullare?", + "you_can_view_booking_details_with_this_url": "Puoi visualizzare i dettagli della prenotazione da questo URL {{url}} e aggiungere l'evento al tuo calendario", "no_options_available": "Nessuna opzione disponibile", "cancellation_reason": "Motivo dell'annullamento (facoltativo)", "cancellation_reason_placeholder": "Perché stai annullando?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Grazie per aver provato il nostro piano Organization. Abbiamo notato che è necessario eseguire l'upgrade del piano Organization per \"{{teamName}}\".", "org_upgraded_successfully": "È stato eseguito l'upgrade del piano Organization!", "use_link_to_reset_password": "Usa il link qui sotto per reimpostare la tua password", - "hey_there": "Ciao,", + "hey_there": "Ciao", "forgot_your_password_calcom": "Hai dimenticato la password? - {{appName}}", "delete_webhook_confirmation_message": "Sei sicuro di voler eliminare questo webhook? Non riceverai più {{appName}} dati di riunione in un URL specificato, in tempo reale, quando un evento è programmato o annullato.", "confirm_delete_webhook": "Sì, elimina webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Posti insufficienti", "form_builder_field_already_exists": "Esiste già un campo con questo nome", "show_on_booking_page": "Mostra nella pagina di prenotazione", + "visit_cancelled_booking": "Puoi visitare la pagina della prenotazione annullata", "get_started_zapier_templates": "Inizia con i modelli Zapier", "team_is_unpublished": "{{team}} non è pubblicato", "org_is_unpublished_description": "Il link di questa organizzazione non è attualmente disponibile. Contatta il proprietario dell'organizzazione o chiedigli di pubblicarlo.", @@ -2455,6 +2457,7 @@ "add_emails": "Aggiungi Email", "add_email_description": "Aggiungi un indirizzo email con cui sostituire quello principale o da utilizzare come email alternativa per i tipi di evento.", "confirm_email": "Conferma la tua email", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confermiamo la tua prenotazione per il {{date}}.", "scheduler_first_name": "Nome della persona che prenota", "scheduler_last_name": "Cognome della persona che prenota", "scheduler_name": "Nome del Pianificatore", @@ -2545,6 +2548,7 @@ "team_select_info": "attiva per tutti i tipi di eventi del team e per tutti i tipi di eventi personali dei membri del team", "no_show_updated": "Stato di Mancata presentazione aggiornato per i partecipanti", "email_copied": "Email copiata", + "phone_number_copied": "Numero di telefono copiato", "USER_PENDING_MEMBER_OF_THE_ORG": "L'utente è un membro in sospeso dell'organizzazione", "USER_ALREADY_INVITED_OR_MEMBER": "L'utente è già stato invitato o è un membro", "USER_MEMBER_OF_OTHER_ORGANIZATION": "L'utente è membro di un'organizzazione di cui questo team non fa parte.", diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json index 554557c68474a2..f0eb1a94dfd792 100644 --- a/apps/web/public/static/locales/ja/common.json +++ b/apps/web/public/static/locales/ja/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "スケジュール設定済みのイベントがキャンセルされました", "organizer": "主催者", "need_to_reschedule_or_cancel": "再スケジュールまたはキャンセルが必要ですか？", + "you_can_view_booking_details_with_this_url": "このURL {{url}} から予約の詳細を確認し、イベントをカレンダーに追加できます", "no_options_available": "利用可能なオプションがありません", "cancellation_reason": "キャンセルの理由 (オプション)", "cancellation_reason_placeholder": "キャンセルが必要な理由をお教えください", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Organization プランをお試しいただきありがとうございます。ご利用の「{{teamName}}」の Organization プランには、アップグレードが必要です。", "org_upgraded_successfully": "あなたの Organization プランは正常にアップグレードされました！", "use_link_to_reset_password": "以下のリンクを使用してパスワードをリセットしてください", - "hey_there": "こんにちは！", + "hey_there": "こんにちは", "forgot_your_password_calcom": "パスワードをお忘れですか? - {{appName}}", "delete_webhook_confirmation_message": "この Webhook を削除してもよろしいですか? イベントがスケジュールまたはキャンセルされた場合、指定された URL で {{appName}} ミーティング データをリアルタイムで受信しなくなります。", "confirm_delete_webhook": "はい、ウェブフックを削除します", @@ -1904,6 +1905,7 @@ "not_enough_seats": "座席が不足しています", "form_builder_field_already_exists": "この名前のフィールドは既に存在します", "show_on_booking_page": "予約ページに表示", + "visit_cancelled_booking": "キャンセルされた予約ページを訪問できます", "get_started_zapier_templates": "Zapier テンプレートの使用を開始する", "team_is_unpublished": "{{team}} は公開されていません", "org_is_unpublished_description": "この組織のリンクは現在利用できません。組織の所有者に連絡するか、リンクを公開するよう依頼してください。", @@ -2455,6 +2457,7 @@ "add_emails": "メールアドレスを追加", "add_email_description": "プライマリの代わりに使用するか、イベントタイプの代替メールとして使用するためのメールアドレスを追加します。", "confirm_email": "メールを確認", + "confirming_your_booking_sms": "$t(hey_there) {{name}}さん、{{date}}の予約を確認します。", "scheduler_first_name": "予約者の名", "scheduler_last_name": "予約者の姓", "scheduler_name": "予約者の名前", @@ -2545,6 +2548,7 @@ "team_select_info": "すべてのチームイベントタイプとすべてのチームメンバーの個人イベントタイプにトリガーされます", "no_show_updated": "出席者のノーショーステータスが更新されました", "email_copied": "メールがコピーされました", + "phone_number_copied": "電話番号がコピーされました", "USER_PENDING_MEMBER_OF_THE_ORG": "ユーザーは組織の保留中のメンバーです", "USER_ALREADY_INVITED_OR_MEMBER": "ユーザーはすでに招待されているかメンバーです", "USER_MEMBER_OF_OTHER_ORGANIZATION": "ユーザーはこのチームの一部ではない他の組織のメンバーです。", diff --git a/apps/web/public/static/locales/km/common.json b/apps/web/public/static/locales/km/common.json index a1e8070445c918..9ad0b1901499af 100644 --- a/apps/web/public/static/locales/km/common.json +++ b/apps/web/public/static/locales/km/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "ព្រឹត្តិការណ៍ដែលបានគ្រោងទុករបស់អ្នកត្រូវបានលុបចោល", "organizer": "អ្នករៀបចំ", "need_to_reschedule_or_cancel": "ត្រូវ​ការ​កំណត់​ពេល​វេលា​ឡើងវិញ​ឬ​បោះបង់?", + "you_can_view_booking_details_with_this_url": "អ្នកអាចមើលព័ត៌មានលម្អិតនៃការកក់តាមរយៈ URL នេះ {{url}} ហើយបន្ថែមព្រឹត្តិការណ៍ទៅកាន់ប្រតិទិនរបស់អ្នក", "no_options_available": "មិនមានជម្រើសទេ។", "cancellation_reason": "ហេតុផលសម្រាប់ការលុបចោល (មិនចាំបាច់)", "cancellation_reason_placeholder": "ហេតុអ្វីបានជាអ្នកលុបចោល?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "សូមអរគុណសម្រាប់ការសាកល្បងគម្រោង Organization របស់យើង។ យើងកត់សំគាល់ Organization របស់អ្នក \"{{teamName}}\" ត្រូវការធ្វើឱ្យប្រសើរឡើង។", "org_upgraded_successfully": "Organization របស់អ្នកត្រូវបានដំឡើងកំណែដោយជោគជ័យ!", "use_link_to_reset_password": "ប្រើតំណខាងក្រោមដើម្បីកំណត់ពាក្យសម្ងាត់របស់អ្នកឡើងវិញ", - "hey_there": "ហេ!", + "hey_there": "សួស្តី", "forgot_your_password_calcom": "ភ្លេចពាក្យសម្ងាត់? - {{appName}}", "delete_webhook_confirmation_message": "តើអ្នកប្រាកដថាចង់លុប webhook នេះទេ? អ្នកនឹងលែងទទួលបានទិន្នន័យប្រជុំ {{appName}} តាម URL ដែលបានបញ្ជាក់, ក្នុងពេលវេលាជាក់ស្តែង នៅពេលដែលព្រឹត្តិការណ៍មួយត្រូវបានកំណត់ពេល ឬលុបចោល។", "confirm_delete_webhook": "បាទ/ចាស លុប webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "កៅអីមិនគ្រប់គ្រាន់", "form_builder_field_already_exists": "វាលដែលមានឈ្មោះនេះមានរួចហើយ", "show_on_booking_page": "បង្ហាញនៅលើទំព័រការកក់", + "visit_cancelled_booking": "អ្នកអាចចូលទៅកាន់ទំព័រការកក់ដែលបានលុបចោល", "get_started_zapier_templates": "ចាប់ផ្តើមជាមួយពុម្ព Zapier", "team_is_unpublished": "{{team}} មិនបានបោះពុម្ពផ្សាយ", "org_is_unpublished_description": "តំណភ្ជាប់អង្គការនេះមិនមានសម្រាប់ឥឡូវទេ។ សូមទាក់ទងម្ចាស់អង្គការឬស្នើសុំឱ្យពួកគេបោះពុម្ពផ្សាយវា។", @@ -2455,6 +2457,7 @@ "add_emails": "បន្ថែមអ៊ីមែល", "add_email_description": "បន្ថែមអាសយដ្ឋានអ៊ីមែលដើម្បីជំនួសអ៊ីមែលសំខាន់របស់អ្នក ឬប្រើជាអ៊ីមែលជំនួសនៅលើប្រភេទព្រឹត្តិការណ៍របស់អ្នក។", "confirm_email": "បញ្ជាក់អ៊ីមែលរបស់អ្នក", + "confirming_your_booking_sms": "$t(hey_there) {{name}} សូមបញ្ជាក់ការកក់របស់អ្នកនៅថ្ងៃទី {{date}}", "scheduler_first_name": "នាមខ្លួនរបស់អ្នកដែលកំពុងកក់", "scheduler_last_name": "នាមត្រកូលរបស់អ្នកដែលកំពុងកក់", "scheduler_name": "ឈ្មោះអ្នកកំណត់ពេល", @@ -2545,6 +2548,7 @@ "team_select_info": "បង្កើតសម្រាប់ប្រភេទព្រឹត្តិការណ៍របស់ក្រុមទាំងអស់ និងប្រភេទព្រឹត្តិការណ៍ផ្ទាល់ខ្លួនរបស់សមាជិកក្រុមទាំងអស់", "no_show_updated": "ស្ថានភាពមិនបានបង្ហាញត្រូវបានធ្វើបច្ចុប្បន្នភាពសម្រាប់អ្នកចូលរួម", "email_copied": "អ៊ីមែលត្រូវបានចម្លង", + "phone_number_copied": "លេខទូរស័ព្ទត្រូវបានចម្លង", "USER_PENDING_MEMBER_OF_THE_ORG": "អ្នកប្រើប្រាស់គឺជាសមាជិកដែលកំពុងរង់ចាំរបស់អង្គការ", "USER_ALREADY_INVITED_OR_MEMBER": "អ្នកប្រើប្រាស់ត្រូវបានអញ្ជើញរួចហើយ ឬជាសមាជិករួចហើយ", "USER_MEMBER_OF_OTHER_ORGANIZATION": "អ្នកប្រើប្រាស់គឺជាសមាជិកនៃអង្គការមួយដែលក្រុមនេះមិនមែនជាផ្នែកមួយនៃអង្គការនោះទេ។", diff --git a/apps/web/public/static/locales/ko/common.json b/apps/web/public/static/locales/ko/common.json index c33fcea66ee331..f1fb38db8704b0 100644 --- a/apps/web/public/static/locales/ko/common.json +++ b/apps/web/public/static/locales/ko/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "예약된 일정이 취소되었습니다", "organizer": "주최자", "need_to_reschedule_or_cancel": "다시 일정을 잡거나 취소하시겠습니까?", + "you_can_view_booking_details_with_this_url": "이 URL {{url}}에서 예약 세부 정보를 확인하고 일정을 캘린더에 추가할 수 있습니다", "no_options_available": "사용 가능한 옵션 없음", "cancellation_reason": "취소 사유(선택사항)", "cancellation_reason_placeholder": "취소하는 이유가 무엇인가요?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "당사의 Organization 플랜 체험을 선택해 주셔서 감사합니다. 귀하의 Organization \"{{teamName}}\"에 업그레이드가 필요한 것으로 확인되었습니다.", "org_upgraded_successfully": "Organization이 성공적으로 업그레이드되었습니다!", "use_link_to_reset_password": "비밀번호를 재설정하시려면 아래 링크를 사용하세요.", - "hey_there": "안녕하세요.", + "hey_there": "안녕하세요", "forgot_your_password_calcom": "비밀번호를 잊어버리셨나요? - {{appName}}", "delete_webhook_confirmation_message": "웹훅을 정말로 삭제하시겠습니까? 이벤트 일정이 잡혔거나 취소되었을 때 {{appName}}의 회의 정보를 더 이상 실시간으로 받아보실 수 없게 됩니다.", "confirm_delete_webhook": "네, 웹훅을 삭제하겠습니다.", @@ -1904,6 +1905,7 @@ "not_enough_seats": "좌석이 부족합니다", "form_builder_field_already_exists": "이 이름을 가진 필드가 이미 존재합니다", "show_on_booking_page": "예약 페이지에 표시", + "visit_cancelled_booking": "취소된 예약 페이지를 방문할 수 있습니다", "get_started_zapier_templates": "Zapier 템플릿 시작하기", "team_is_unpublished": "{{team}} 팀은 게시되지 않았습니다", "org_is_unpublished_description": "이 조직 링크는 현재 사용할 수 없습니다. 조직 소유자에게 문의하거나 게시해 달라고 요청하세요.", @@ -2455,6 +2457,7 @@ "add_emails": "이메일 추가", "add_email_description": "기본 이메일을 대체하거나 이벤트 유형에서 대체 이메일로 사용할 이메일 주소를 추가하세요.", "confirm_email": "이메일 확인", + "confirming_your_booking_sms": "$t(hey_there) {{name}}님, {{date}}에 예약이 확인되었습니다.", "scheduler_first_name": "예약하는 사람의 이름", "scheduler_last_name": "예약하는 사람의 성", "scheduler_name": "예약자 이름", @@ -2545,6 +2548,7 @@ "team_select_info": "모든 팀 이벤트 유형과 모든 팀원의 개인 이벤트 유형에 대한 트리거", "no_show_updated": "참석자에 대한 노쇼 상태가 업데이트되었습니다", "email_copied": "이메일이 복사되었습니다", + "phone_number_copied": "전화번호가 복사되었습니다", "USER_PENDING_MEMBER_OF_THE_ORG": "사용자가 조직의 대기 중인 멤버입니다", "USER_ALREADY_INVITED_OR_MEMBER": "사용자가 이미 초대되었거나 멤버입니다", "USER_MEMBER_OF_OTHER_ORGANIZATION": "사용자가 이 팀의 일부가 아닌 다른 조직의 멤버입니다.", diff --git a/apps/web/public/static/locales/nl/common.json b/apps/web/public/static/locales/nl/common.json index 85f7f4fc2ba9c6..21882622a0fa72 100644 --- a/apps/web/public/static/locales/nl/common.json +++ b/apps/web/public/static/locales/nl/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Uw geplande gebeurtenis is geannuleerd", "organizer": "Organisator", "need_to_reschedule_or_cancel": "Moet u verplaatsen of annuleren?", + "you_can_view_booking_details_with_this_url": "Je kunt de boekingsdetails bekijken via deze url {{url}} en het evenement aan je agenda toevoegen", "no_options_available": "Geen opties beschikbaar", "cancellation_reason": "Reden voor annulering (optioneel)", "cancellation_reason_placeholder": "Waarom annuleert u?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Bedankt voor het testen van ons organisatieabonnement. We hebben geconstateerd dat uw organisatie \"{{teamName}}\" moet worden geüpgraded.", "org_upgraded_successfully": "Uw organisatie is geüpgraded!", "use_link_to_reset_password": "Gebruik de onderstaande link om uw wachtwoord te resetten", - "hey_there": "Hallo daar,", + "hey_there": "Hoi daar", "forgot_your_password_calcom": "Wachtwoord vergeten? - {{appName}}", "delete_webhook_confirmation_message": "Weet u zeker dat u deze webhook wilt verwijderen? U ontvangt dan niet langer {{appName}} vergadergegevens op een opgegeven URL, in real-time, wanneer een evenement is geboekt of geannuleerd.", "confirm_delete_webhook": "Ja, webhook verwijderen", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Onvoldoende plaatsen", "form_builder_field_already_exists": "Een veld met deze naam bestaat al", "show_on_booking_page": "Weergeven op boekingspagina", + "visit_cancelled_booking": "Je kunt de pagina van de geannuleerde boeking bezoeken", "get_started_zapier_templates": "Aan de slag met Zapier-sjablonen", "team_is_unpublished": "{{team}} is niet gepubliceerd", "org_is_unpublished_description": "Deze organisatiekoppeling is momenteel niet beschikbaar. Neem contact op met de organisatie-eigenaar of vraag om het te publiceren.", @@ -2455,6 +2457,7 @@ "add_emails": "E-mailadressen toevoegen", "add_email_description": "Voeg een e-mailadres toe om uw primaire te vervangen of als alternatief e-mailadres voor uw evenementtypes te gebruiken.", "confirm_email": "Bevestig uw e-mailadres", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, bevestiging van je boeking op {{date}}.", "scheduler_first_name": "De voornaam van de persoon die boekt", "scheduler_last_name": "De achternaam van de persoon die boekt", "scheduler_name": "Naam van de planner", @@ -2545,6 +2548,7 @@ "team_select_info": "triggers voor alle evenementtypes van het team en persoonlijke evenementtypes van alle teamleden", "no_show_updated": "No-show status bijgewerkt voor deelnemers", "email_copied": "E-mail gekopieerd", + "phone_number_copied": "Telefoonnummer gekopieerd", "USER_PENDING_MEMBER_OF_THE_ORG": "Gebruiker is een in afwachting zijnd lid van de organisatie", "USER_ALREADY_INVITED_OR_MEMBER": "Gebruiker is al uitgenodigd of een lid", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Gebruiker is lid van een organisatie waar dit team geen deel van uitmaakt.", diff --git a/apps/web/public/static/locales/no/common.json b/apps/web/public/static/locales/no/common.json index bac127adfa98c8..076cecbc01f660 100644 --- a/apps/web/public/static/locales/no/common.json +++ b/apps/web/public/static/locales/no/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Din planlagte hendelse ble avlyst", "organizer": "Arrangør", "need_to_reschedule_or_cancel": "Trenger du å velge ny tid eller kansellere?", + "you_can_view_booking_details_with_this_url": "Du kan se bookingdetaljene fra denne URL-en {{url}} og legge til hendelsen i kalenderen din", "no_options_available": "Ingen alternativer tilgjengelige", "cancellation_reason": "Årsak til kansellering (valgfritt)", "cancellation_reason_placeholder": "Hvorfor kansellerer du?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Takk for at du prøver vår organisasjonsplan. Vi har lagt merke til at din organisasjon \"{{teamName}}\" trenger en oppgradering.", "org_upgraded_successfully": "Organisasjonen din ble oppgradert!", "use_link_to_reset_password": "Bruk lenken nedenfor for å tilbakestille passordet ditt", - "hey_there": "Hei der,", + "hey_there": "Hei der", "forgot_your_password_calcom": "Glemt passordet? - {{appName}}", "delete_webhook_confirmation_message": "Er du sikker på at du vil slette denne webhooken? Du vil ikke lenger motta {{appName}} møtedata på en spesifisert URL, i sanntid, når en hendelse er planlagt eller avlyst.", "confirm_delete_webhook": "Ja, slett webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Ikke nok seter", "form_builder_field_already_exists": "Et felt med dette navnet eksisterer allerede", "show_on_booking_page": "Vis på bestillingssiden", + "visit_cancelled_booking": "Du kan besøke siden for avbestilt booking", "get_started_zapier_templates": "Kom i gang med Zapier-maler", "team_is_unpublished": "{{team}} er upublisert", "org_is_unpublished_description": "Denne organisasjonslinken er for øyeblikket ikke tilgjengelig. Vennligst kontakt organisasjonseieren eller be dem publisere den.", @@ -2455,6 +2457,7 @@ "add_emails": "Legg til e-poster", "add_email_description": "Legg til en e-postadresse for å erstatte din primære eller for å bruke som en alternativ e-post på dine hendelsestyper.", "confirm_email": "Bekreft din e-post", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, bekrefter din booking den {{date}}.", "scheduler_first_name": "Fornavn på personen som booker", "scheduler_last_name": "Etternavn på personen som booker", "scheduler_name": "Navn på planlegger", @@ -2545,6 +2548,7 @@ "team_select_info": "utløser for alle teamhendelsestyper og alle teammedlemmers personlige hendelsestyper", "no_show_updated": "Status for ikke møtt oppdatert for deltakere", "email_copied": "E-post kopiert", + "phone_number_copied": "Telefonnummer kopiert", "USER_PENDING_MEMBER_OF_THE_ORG": "Bruker er et ventende medlem av organisasjonen", "USER_ALREADY_INVITED_OR_MEMBER": "Bruker er allerede invitert eller medlem", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Bruker er medlem av en organisasjon som dette teamet ikke er en del av.", diff --git a/apps/web/public/static/locales/pl/common.json b/apps/web/public/static/locales/pl/common.json index c4eed9933b158a..22ab747dfe0538 100644 --- a/apps/web/public/static/locales/pl/common.json +++ b/apps/web/public/static/locales/pl/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Twoje zaplanowane wydarzenie zostało anulowane", "organizer": "Organizator", "need_to_reschedule_or_cancel": "Potrzebujesz zmienić harmonogram lub anulować?", + "you_can_view_booking_details_with_this_url": "Możesz zobaczyć szczegóły rezerwacji pod tym adresem URL {{url}} i dodać wydarzenie do swojego kalendarza", "no_options_available": "Brak dostępnych opcji", "cancellation_reason": "Powód anulowania (opcjonalnie)", "cancellation_reason_placeholder": "Dlaczego anulujesz?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Dziękujemy za wypróbowanie naszego planu Organization. Zauważyliśmy, że Twój zespół „{{teamName}}” z planu Organization wymaga przejścia na wyższą wersję.", "org_upgraded_successfully": "Twój zespół z planu Organization przeszedł na wyższą wersję!", "use_link_to_reset_password": "Użyj poniższego linku, aby zresetować swoje hasło", - "hey_there": "Cześć,", + "hey_there": "Cześć", "forgot_your_password_calcom": "Nie pamiętasz swojego hasła? - {{appName}}", "delete_webhook_confirmation_message": "Czy na pewno chcesz usunąć ten webhook? Nie będziesz już otrzymywać danych o spotkaniach w {{appName}} w określonym URL, w czasie rzeczywistym, gdy zdarzenie jest zaplanowane lub anulowane.", "confirm_delete_webhook": "Tak, usuń webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Za mało miejsc", "form_builder_field_already_exists": "Pole o tej nazwie już istnieje", "show_on_booking_page": "Pokaż na stronie rezerwacji", + "visit_cancelled_booking": "Możesz odwiedzić stronę anulowanej rezerwacji", "get_started_zapier_templates": "Zacznij korzystać z szablonów Zapier", "team_is_unpublished": "Zespół {{team}} nie został opublikowany", "org_is_unpublished_description": "Link organizacji jest obecnie niedostępny. Skontaktuj się z właścicielem organizacji lub poproś o jego opublikowanie.", @@ -2455,6 +2457,7 @@ "add_emails": "Dodaj e-maile", "add_email_description": "Dodaj adres e-mail, aby zastąpić główny lub użyć jako alternatywnego e-maila w typach wydarzeń.", "confirm_email": "Potwierdź swój e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, potwierdzamy Twoją rezerwację na {{date}}.", "scheduler_first_name": "Imię osoby rezerwującej", "scheduler_last_name": "Nazwisko osoby rezerwującej", "scheduler_name": "Nazwa rezerwującego", @@ -2545,6 +2548,7 @@ "team_select_info": "dotyczy wszystkich typów wydarzeń zespołowych i osobistych typów wydarzeń wszystkich członków zespołu", "no_show_updated": "Status nieobecności zaktualizowany dla uczestników", "email_copied": "Email skopiowany", + "phone_number_copied": "Numer telefonu skopiowany", "USER_PENDING_MEMBER_OF_THE_ORG": "Użytkownik jest oczekującym członkiem organizacji", "USER_ALREADY_INVITED_OR_MEMBER": "Użytkownik jest już zaproszony lub jest członkiem", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Użytkownik jest członkiem organizacji, która nie jest częścią tego zespołu.", diff --git a/apps/web/public/static/locales/pt-BR/common.json b/apps/web/public/static/locales/pt-BR/common.json index d6f322ca862c59..6f54247b745586 100644 --- a/apps/web/public/static/locales/pt-BR/common.json +++ b/apps/web/public/static/locales/pt-BR/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Seu evento agendado foi cancelado", "organizer": "Organizador", "need_to_reschedule_or_cancel": "Precisa reagendar ou cancelar?", + "you_can_view_booking_details_with_this_url": "Você pode ver os detalhes da reserva neste URL {{url}} e adicionar o evento ao seu calendário", "no_options_available": "Sem opções disponíveis", "cancellation_reason": "Motivo do cancelamento", "cancellation_reason_placeholder": "Por que você está cancelando?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Agradecemos por testar nosso novo plano Organization. Notamos que a sua organização \"{{teamName}}\" precisa ser atualizada.", "org_upgraded_successfully": "Sua Organização foi atualizada com êxito!", "use_link_to_reset_password": "Use o link abaixo para redefinir a sua senha", - "hey_there": "Olá,", + "hey_there": "Olá", "forgot_your_password_calcom": "Esqueceu sua senha? - {{appName}}", "delete_webhook_confirmation_message": "Você tem certeza que quer remover este Webhook? Você não receberá mais dados de reuniões de {{appName}} na URL especificada, em tempo real, quando um evento for agendado ou cancelado.", "confirm_delete_webhook": "Sim, remover o Webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Sem assentos suficientes", "form_builder_field_already_exists": "Já existe um campo com este nome", "show_on_booking_page": "Mostrar na página de reservas", + "visit_cancelled_booking": "Você pode visitar a página de reserva cancelada", "get_started_zapier_templates": "Comece agora com modelos do Zapier", "team_is_unpublished": "Publicação de {{team}} cancelada", "org_is_unpublished_description": "Este link da organização não está disponível no momento. Entre em contato com o proprietário da organização ou peça que seja publicado.", @@ -2455,6 +2457,7 @@ "add_emails": "Adicionar e-mails", "add_email_description": "Adicione um endereço de e-mail para substituir seu e-mail principal ou para usar como e-mail alternativo em seus tipos de eventos.", "confirm_email": "Confirme seu e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confirmando sua reserva em {{date}}.", "scheduler_first_name": "O primeiro nome da pessoa que está agendando", "scheduler_last_name": "O sobrenome da pessoa que está agendando", "scheduler_name": "Nome do agendador", @@ -2545,6 +2548,7 @@ "team_select_info": "disparadores para todos os tipos de eventos da equipe e todos os tipos de eventos pessoais dos membros da equipe", "no_show_updated": "Status de não comparecimento atualizado para os participantes", "email_copied": "Email copiado", + "phone_number_copied": "Número de telefone copiado", "USER_PENDING_MEMBER_OF_THE_ORG": "Usuário é um membro pendente da organização", "USER_ALREADY_INVITED_OR_MEMBER": "Usuário já foi convidado ou é membro", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Usuário é membro de uma organização que esta equipe não faz parte.", diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json index e960bd54c67288..7c5e14230ef80d 100644 --- a/apps/web/public/static/locales/pt/common.json +++ b/apps/web/public/static/locales/pt/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "O seu evento agendado foi cancelado", "organizer": "Organizador", "need_to_reschedule_or_cancel": "Precisa reagendar ou cancelar?", + "you_can_view_booking_details_with_this_url": "Pode ver os detalhes da reserva através deste URL {{url}} e adicionar o evento ao seu calendário", "no_options_available": "Não existem opções disponíveis", "cancellation_reason": "Motivo do cancelamento", "cancellation_reason_placeholder": "Porque está a cancelar? (opcional)", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Obrigado por experimentar o nosso plano Organization. Verificámos que a sua Organização \"{{teamName}}\" precisa de ser atualizada.", "org_upgraded_successfully": "A sua Organização foi atualizada com sucesso!", "use_link_to_reset_password": "Use a ligação abaixo para redefinir a sua senha", - "hey_there": "Olá,", + "hey_there": "Olá", "forgot_your_password_calcom": "Esqueceu-se da sua senha? - {{appName}}", "delete_webhook_confirmation_message": "De certeza que quer eliminar este Webhook? Não receberá mais dados de reuniões de {{appName}} do URL especificado, em tempo real, quando um evento for agendado ou cancelado.", "confirm_delete_webhook": "Sim, eliminar o Webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Não existem lugares suficientes", "form_builder_field_already_exists": "Já existe um campo com este nome", "show_on_booking_page": "Mostrar na página de reservas", + "visit_cancelled_booking": "Pode visitar a página da reserva cancelada", "get_started_zapier_templates": "Comece a utilizar os modelos Zapier", "team_is_unpublished": "A equipa {{team}} ainda não está publicada", "org_is_unpublished_description": "Esta ligação da organização não está atualmente disponível. Por favor, entre em contacto com os responsáveis pela organização ou solicite aos mesmos a respetiva publicação.", @@ -2455,6 +2457,7 @@ "add_emails": "Adicionar Emails", "add_email_description": "Adicione um endereço de e-mail para substituir o seu primário ou para utilizar como um e-mail alternativo nos seus tipos de evento.", "confirm_email": "Confirme o seu e-mail", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, a confirmar a sua reserva para o dia {{date}}.", "scheduler_first_name": "O primeiro nome da reserva da pessoa", "scheduler_last_name": "O último nome da reserva da pessoa", "scheduler_name": "Nome do Agendador", @@ -2545,6 +2548,7 @@ "team_select_info": "triggers para todos os tipos de eventos da equipa e todos os tipos de eventos pessoais dos membros da equipa", "no_show_updated": "Estado de falta de comparência atualizado para os participantes", "email_copied": "E-mail copiado", + "phone_number_copied": "Número de telefone copiado", "USER_PENDING_MEMBER_OF_THE_ORG": "O utilizador é um membro pendente da organização", "USER_ALREADY_INVITED_OR_MEMBER": "O utilizador já está convidado ou já é um membro", "USER_MEMBER_OF_OTHER_ORGANIZATION": "O utilizador é membro de uma organização da qual esta equipa não faz parte.", diff --git a/apps/web/public/static/locales/ro/common.json b/apps/web/public/static/locales/ro/common.json index 92c50f678d5e7a..e9e1dd36a9c4ee 100644 --- a/apps/web/public/static/locales/ro/common.json +++ b/apps/web/public/static/locales/ro/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Evenimentul programat a fost anulat", "organizer": "Organizator", "need_to_reschedule_or_cancel": "Trebuie să reprogramați sau să anulați?", + "you_can_view_booking_details_with_this_url": "Puteți vizualiza detaliile rezervării folosind acest URL {{url}} și adăuga evenimentul în calendarul dvs.", "no_options_available": "Nu există opțiuni disponibile", "cancellation_reason": "Motivul anulării (opțional)", "cancellation_reason_placeholder": "De ce anulați?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Vă mulțumim că ați încercat planul nostru Organization. Am observat că organizația dvs. „{{teamName}}” necesită un upgrade.", "org_upgraded_successfully": "Upgrade-ul pentru Organization a fost realizat cu succes!", "use_link_to_reset_password": "Utilizați linkul de mai jos pentru a vă reseta parola", - "hey_there": "Bună,", + "hey_there": "Salut", "forgot_your_password_calcom": "Ți-ai uitat parola? - {{appName}}", "delete_webhook_confirmation_message": "Ești sigur că vrei să ștergi acest webhook? Nu vei mai primi {{appName}} date de întâlnire la un URL specificat, în timp real, atunci când un eveniment este programat sau anulat.", "confirm_delete_webhook": "Da, șterge webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Nu sunt suficiente locuri", "form_builder_field_already_exists": "Există deja un câmp cu acest nume", "show_on_booking_page": "Afișare pe pagina de rezervare", + "visit_cancelled_booking": "Puteți vizita pagina rezervării anulate", "get_started_zapier_templates": "Faceți primii pași cu șabloanele Zapier", "team_is_unpublished": "Echipa {{team}} nu este publicată", "org_is_unpublished_description": "Acest link de organizație nu este disponibil momentan. Contactați proprietarul organizației sau rugați-l să îl publice.", @@ -2455,6 +2457,7 @@ "add_emails": "Adăugați emailuri", "add_email_description": "Adăugați o adresă de email pentru a înlocui adresa principală sau pentru a o folosi ca email alternativ pentru tipurile dvs. de evenimente.", "confirm_email": "Confirmați emailul", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, confirmăm rezervarea dvs. pentru data de {{date}}.", "scheduler_first_name": "Prenumele persoanei care rezervă", "scheduler_last_name": "Numele de familie al persoanei care rezervă", "scheduler_name": "Numele programatorului", @@ -2545,6 +2548,7 @@ "team_select_info": "declanșează pentru toate tipurile de evenimente ale echipei și pentru toate tipurile de evenimente personale ale membrilor echipei", "no_show_updated": "Starea de neprezentare actualizată pentru participanți", "email_copied": "Email copiat", + "phone_number_copied": "Numărul de telefon a fost copiat", "USER_PENDING_MEMBER_OF_THE_ORG": "Utilizatorul este un membru în așteptare al organizației", "USER_ALREADY_INVITED_OR_MEMBER": "Utilizatorul este deja invitat sau membru", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Utilizatorul este membru al unei organizații din care această echipă nu face parte.", diff --git a/apps/web/public/static/locales/sr/common.json b/apps/web/public/static/locales/sr/common.json index d7991f4dc720df..7a55573e39c738 100644 --- a/apps/web/public/static/locales/sr/common.json +++ b/apps/web/public/static/locales/sr/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Vaš zakazani događaj je otkazan", "organizer": "Organizator", "need_to_reschedule_or_cancel": "Morate da odložite ili otkažete?", + "you_can_view_booking_details_with_this_url": "Možete pogledati detalje rezervacije na ovom linku {{url}} i dodati događaj u svoj kalendar", "no_options_available": "Nema raspoloživih opcija", "cancellation_reason": "Razlog otkazivanja (opciono)", "cancellation_reason_placeholder": "Zašto otkazujete?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Hvala što isprobavate naš Organization plan. Primetili smo da vaš Organization „{{teamName}}” treba da se nadogradi.", "org_upgraded_successfully": "Vaš Organization je uspešno nadograđen!", "use_link_to_reset_password": "Resetujte lozinku koristeći link ispod", - "hey_there": "Zdravo,", + "hey_there": "Zdravo", "forgot_your_password_calcom": "Zaboravili ste lozinku? - {{appName}}", "delete_webhook_confirmation_message": "Da li ste sigurni da želite da obrišete ovaj webhook? Nećete više dobijati {{appName}} podatke o sastancima preko naznačenog URL, istovremeno kad je dogadjaj zakazan ili otkazan.", "confirm_delete_webhook": "Da, obriši webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Nema dovoljno mesta", "form_builder_field_already_exists": "Polje sa ovim imenom već postoji", "show_on_booking_page": "Prikaži na stranici zakazivanja", + "visit_cancelled_booking": "Možete posetiti stranicu otkazane rezervacije", "get_started_zapier_templates": "Započnite sa Zapier predlošcima", "team_is_unpublished": "Opozvano je objavljivanje tima {{team}}", "org_is_unpublished_description": "Ovaj link Organizacije trenutno nije dostupan. Obratite se vlasniku Organizacije i zamolite ga da ga objavi.", @@ -2455,6 +2457,7 @@ "add_emails": "Dodajte emailove", "add_email_description": "Dodajte email adresu da zamenite vašu primarnu ili da je koristite kao alternativni email za vaše tipove događaja.", "confirm_email": "Potvrdite vaš email", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, potvrđujemo vašu rezervaciju za {{date}}.", "scheduler_first_name": "Ime osobe koja rezerviše", "scheduler_last_name": "Prezime osobe koja rezerviše", "scheduler_name": "Ime rezervatora", @@ -2545,6 +2548,7 @@ "team_select_info": "pokreće se za sve tipove timskih događaja i sve lične tipove događaja članova tima", "no_show_updated": "Status nepojavljivanja ažuriran za prisutne", "email_copied": "Email kopiran", + "phone_number_copied": "Broj telefona je kopiran", "USER_PENDING_MEMBER_OF_THE_ORG": "Korisnik je na čekanju za članstvo u organizaciji", "USER_ALREADY_INVITED_OR_MEMBER": "Korisnik je već pozvan ili je član", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Korisnik je član organizacije koja nije deo ovog tima.", diff --git a/apps/web/public/static/locales/sv/common.json b/apps/web/public/static/locales/sv/common.json index a47f4b9415ba30..fdfaad816da820 100644 --- a/apps/web/public/static/locales/sv/common.json +++ b/apps/web/public/static/locales/sv/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Din schemalagda bokning ställdes in", "organizer": "Arrangör", "need_to_reschedule_or_cancel": "Behöver du boka om eller avboka?", + "you_can_view_booking_details_with_this_url": "Du kan se bokningsdetaljerna från denna URL {{url}} och lägga till händelsen i din kalender", "no_options_available": "Inga alternativ tillgängliga", "cancellation_reason": "Orsaker till annullering (valfritt)", "cancellation_reason_placeholder": "Varför avbryter du?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Tack för att du testade vår nya Organization-plan. Vi märkte att din Organization \"{{teamName}}\" måste uppgraderas.", "org_upgraded_successfully": "Din Organization har uppgraderats!", "use_link_to_reset_password": "Använd länken nedan för att återställa ditt lösenord", - "hey_there": "Hallå där,", + "hey_there": "Hej där", "forgot_your_password_calcom": "Glömt ditt lösenord? - {{appName}}", "delete_webhook_confirmation_message": "Är du säker på att du vill ta bort denna webhook? Du kommer inte längre att få {{appName}} mötesdata på en angiven webbadress, i realtid, när en händelse är schemalagd eller inställd.", "confirm_delete_webhook": "Ja, ta bort webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Inte tillräckligt med platser", "form_builder_field_already_exists": "Det finns redan ett fält med det här namnet", "show_on_booking_page": "Visa på bokningssidan", + "visit_cancelled_booking": "Du kan besöka sidan för avbokade bokningar", "get_started_zapier_templates": "Kom igång med Zapier-mallar", "team_is_unpublished": "{{team}} har avpublicerats", "org_is_unpublished_description": "Den här organisationslänken är för närvarande inte tillgänglig. Kontakta organisationens ägare eller be denne att publicera den.", @@ -2455,6 +2457,7 @@ "add_emails": "Lägg till e-postadresser", "add_email_description": "Lägg till en e-postadress för att ersätta din primära eller använda som en alternativ e-post för dina eventtyper.", "confirm_email": "Bekräfta din e-post", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, bekräftar din bokning den {{date}}.", "scheduler_first_name": "Förnamnet på personen som bokar", "scheduler_last_name": "Efternamnet på personen som bokar", "scheduler_name": "Bokarens namn", @@ -2545,6 +2548,7 @@ "team_select_info": "utlösare för alla teamhändelsetyper och alla teammedlemmars personliga händelsetyper", "no_show_updated": "Utebliven status uppdaterad för deltagare", "email_copied": "E-post kopierad", + "phone_number_copied": "Telefonnummer kopierat", "USER_PENDING_MEMBER_OF_THE_ORG": "Användaren är en väntande medlem av organisationen", "USER_ALREADY_INVITED_OR_MEMBER": "Användaren är redan inbjuden eller medlem", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Användaren är medlem i en organisation som detta team inte är en del av.", diff --git a/apps/web/public/static/locales/tr/common.json b/apps/web/public/static/locales/tr/common.json index 85f55add81747e..87005d4fa2e526 100644 --- a/apps/web/public/static/locales/tr/common.json +++ b/apps/web/public/static/locales/tr/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Planlanan etkinliğiniz iptal edildi", "organizer": "Organizatör", "need_to_reschedule_or_cancel": "Yeniden planlamanız veya iptal etmeniz mi gerekiyor?", + "you_can_view_booking_details_with_this_url": "Rezervasyon detaylarını bu URL'den {{url}} görüntüleyebilir ve etkinliği takviminize ekleyebilirsiniz", "no_options_available": "Kullanılabilir seçenek yok", "cancellation_reason": "İptal nedeni (isteğe bağlı)", "cancellation_reason_placeholder": "Neden iptal ediyorsunuz?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Yeni Organization planımızı denediğiniz için teşekkür ederiz. \"{{teamName}}\" adlı Kuruluşunuzun planının yükseltilmesi gerektiğini fark ettik.", "org_upgraded_successfully": "Organization'ınız başarıyla yükseltildi!", "use_link_to_reset_password": "Şifrenizi sıfırlamak için aşağıdaki bağlantıyı kullanın", - "hey_there": "Selam,", + "hey_there": "Merhaba", "forgot_your_password_calcom": "Şifrenizi mi unuttunuz? - {{appName}}", "delete_webhook_confirmation_message": "Bu web kancasını silmek istediğinizden emin misiniz? Bir etkinlik planlandığında veya iptal edildiğinde, {{appName}} toplantı verilerini gerçek zamanlı olarak belirli bir URL'de almazsınız.", "confirm_delete_webhook": "Evet, web kancasını sil", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Yeterli yer yok", "form_builder_field_already_exists": "Bu ada sahip bir alan zaten var", "show_on_booking_page": "Rezervasyon sayfasında göster", + "visit_cancelled_booking": "İptal edilen rezervasyon sayfasını ziyaret edebilirsiniz", "get_started_zapier_templates": "Zapier şablonlarını kullanmaya başlayın", "team_is_unpublished": "{{team}} paylaşılmadı", "org_is_unpublished_description": "Bu kuruluş bağlantısı şu anda kullanılamıyor. Lütfen kuruluş sahibiyle iletişime geçin veya ondan bir bağlantı paylaşmasını isteyin.", @@ -2455,6 +2457,7 @@ "add_emails": "E-postalar Ekle", "add_email_description": "Birincil e-postanızı değiştirmek veya etkinlik türlerinizde alternatif bir e-posta olarak kullanmak için bir e-posta adresi ekleyin.", "confirm_email": "E-postanızı onaylayın", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, {{date}} tarihinde rezervasyonunuzu onaylıyoruz.", "scheduler_first_name": "Rezervasyon yapan kişinin adı", "scheduler_last_name": "Rezervasyon yapan kişinin soyadı", "scheduler_name": "Planlayıcı Adı", @@ -2545,6 +2548,7 @@ "team_select_info": "tüm takım etkinlik türleri ve tüm takım üyelerinin kişisel etkinlik türleri için tetikleyiciler", "no_show_updated": "Katılmama durumu katılımcılar için güncellendi", "email_copied": "E-posta kopyalandı", + "phone_number_copied": "Telefon Numarası Kopyalandı", "USER_PENDING_MEMBER_OF_THE_ORG": "Kullanıcı, organizasyonun bekleyen bir üyesidir", "USER_ALREADY_INVITED_OR_MEMBER": "Kullanıcı zaten davet edilmiş veya üye", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Kullanıcı, bu takımın parçası olmadığı bir organizasyonun üyesidir.", diff --git a/apps/web/public/static/locales/uk/common.json b/apps/web/public/static/locales/uk/common.json index bbfaa9f9991c57..d742976e0994f9 100644 --- a/apps/web/public/static/locales/uk/common.json +++ b/apps/web/public/static/locales/uk/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Ваш запланований захід скасовано", "organizer": "Організатор", "need_to_reschedule_or_cancel": "Потрібно перенести чи скасувати?", + "you_can_view_booking_details_with_this_url": "Ви можете переглянути деталі бронювання за цим посиланням {{url}} і додати подію до свого календаря", "no_options_available": "Немає доступних варіантів", "cancellation_reason": "Причина скасування", "cancellation_reason_placeholder": "Укажіть причину скасування (необов’язково)", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Дякуємо, що спробували наш новий план Organization! Ми помітили, що для команди «{{teamName}}» вашої організації потрібно підвищити рівень плану.", "org_upgraded_successfully": "Рівень плану вашої організації підвищено!", "use_link_to_reset_password": "Скористайтеся посиланням нижче, щоб скинути пароль", - "hey_there": "Привіт!", + "hey_there": "Привіт", "forgot_your_password_calcom": "Забули пароль? – {{appName}}", "delete_webhook_confirmation_message": "Справді видалити цей вебгук? Ви більше не отримуватимете дані про нараду {{appName}} за вказаною URL-адресою: у реальному часі, а також під час планування та скасування.", "confirm_delete_webhook": "Так, видалити вебгук", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Недостатньо місць", "form_builder_field_already_exists": "Поле з такою назвою вже існує", "show_on_booking_page": "Показувати на сторінці бронювання", + "visit_cancelled_booking": "Ви можете відвідати сторінку скасованого бронювання", "get_started_zapier_templates": "Розпочніть роботу із шаблонами Zapier", "team_is_unpublished": "Публікацію команди «{{team}}» скасовано", "org_is_unpublished_description": "Посилання на цю організацію зараз недоступне. Зверніться до власника організації або попросіть його опублікувати посилання.", @@ -2455,6 +2457,7 @@ "add_emails": "Додати електронні адреси", "add_email_description": "Додайте електронну адресу, щоб замінити основну або використовувати як альтернативну для ваших типів подій.", "confirm_email": "Підтвердьте вашу електронну адресу", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, підтверджуємо ваше бронювання на {{date}}.", "scheduler_first_name": "Ім'я особи, яка бронює", "scheduler_last_name": "Прізвище особи, яка бронює", "scheduler_name": "Ім'я планувальника", @@ -2545,6 +2548,7 @@ "team_select_info": "тригери для всіх типів подій команди та особистих типів подій всіх членів команди", "no_show_updated": "Статус неявки оновлено для учасників", "email_copied": "Електронну адресу скопійовано", + "phone_number_copied": "Номер телефону скопійовано", "USER_PENDING_MEMBER_OF_THE_ORG": "Користувач є очікуючим членом організації", "USER_ALREADY_INVITED_OR_MEMBER": "Користувач вже запрошений або є членом", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Користувач є членом організації, яка не є частиною цієї команди.", diff --git a/apps/web/public/static/locales/vi/common.json b/apps/web/public/static/locales/vi/common.json index 38d30b71b71291..62f81a2f66c4cf 100644 --- a/apps/web/public/static/locales/vi/common.json +++ b/apps/web/public/static/locales/vi/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "Sự kiện của bạn đã bị hủy", "organizer": "Tổ chức", "need_to_reschedule_or_cancel": "Cần phải đổi lịch hẹn hoặc huỷ?", + "you_can_view_booking_details_with_this_url": "Bạn có thể xem chi tiết đặt chỗ từ đường dẫn này {{url}} và thêm sự kiện vào lịch của bạn", "no_options_available": "Không tùy chọn nào khả dụng", "cancellation_reason": "Lý do hủy", "cancellation_reason_placeholder": "Lý do bạn muốn hủy?", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "Cám ơn bạn đã dùng thử gói Organization. Chúng tôi để ý thấy Organization \"{{teamName}}\" của bạn cần được nâng cấp.", "org_upgraded_successfully": "Organization của bạn đã được nâng cấp thành công!", "use_link_to_reset_password": "Sử dụng đường link dưới đây để thay đổi mật khẩu của bạn", - "hey_there": "Xin chào,", + "hey_there": "Chào bạn", "forgot_your_password_calcom": "Quên mật khẩu của bạn? - {{appName}}", "delete_webhook_confirmation_message": "Bạn có chắc bạn muốn xoá webhook này? Bạn sẽ không còn nhận dữ liệu cuộc họp {{appName}} tại đường URL này, trong thời gian thực, khi một sự kiện được lên lịch hoặc huỷ.", "confirm_delete_webhook": "Vâng, hãy xoá webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "Không đủ chỗ", "form_builder_field_already_exists": "Đã tồn tại một trường có tên này", "show_on_booking_page": "Hiện trên trang lịch hẹn", + "visit_cancelled_booking": "Bạn có thể truy cập trang đặt chỗ đã hủy", "get_started_zapier_templates": "Bắt đầu với các mẫu Zapier", "team_is_unpublished": "{{team}} chưa được công bố", "org_is_unpublished_description": "Liên kết tổ chức này hiện không khả dụng. Hãy liên lạc với chủ tổ chức hoặc yêu cầu họ công bố liên kết đó.", @@ -2455,6 +2457,7 @@ "add_emails": "Thêm Email", "add_email_description": "Thêm địa chỉ email để thay thế email chính của bạn hoặc sử dụng làm email thay thế cho các loại sự kiện của bạn.", "confirm_email": "Xác nhận email của bạn", + "confirming_your_booking_sms": "$t(hey_there) {{name}}, xác nhận đặt chỗ của bạn vào ngày {{date}}.", "scheduler_first_name": "Tên của người đặt lịch", "scheduler_last_name": "Họ của người đặt lịch", "scheduler_name": "Tên người đặt lịch", @@ -2545,6 +2548,7 @@ "team_select_info": "kích hoạt cho tất cả các loại sự kiện của nhóm và tất cả các loại sự kiện cá nhân của các thành viên trong nhóm", "no_show_updated": "Trạng thái không xuất hiện đã được cập nhật cho người tham dự", "email_copied": "Email đã được sao chép", + "phone_number_copied": "Số điện thoại đã được sao chép", "USER_PENDING_MEMBER_OF_THE_ORG": "Người dùng đang là thành viên chờ của tổ chức", "USER_ALREADY_INVITED_OR_MEMBER": "Người dùng đã được mời hoặc là thành viên", "USER_MEMBER_OF_OTHER_ORGANIZATION": "Người dùng là thành viên của một tổ chức mà nhóm này không thuộc về.", diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json index d6c807e4f7d08a..c22465a362d659 100644 --- a/apps/web/public/static/locales/zh-CN/common.json +++ b/apps/web/public/static/locales/zh-CN/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "您安排的活动已被取消", "organizer": "组织者", "need_to_reschedule_or_cancel": "需要重新安排还是取消？", + "you_can_view_booking_details_with_this_url": "您可以通过此网址 {{url}} 查看预订详情，并将事件添加到您的日历中", "no_options_available": "没有可用选项", "cancellation_reason": "取消原因(选填)", "cancellation_reason_placeholder": "您为什么要取消？", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "感谢您试用我们的 Organization 计划。我们注意到您的组织“{{teamName}}”需要升级。", "org_upgraded_successfully": "您的 Organization 已成功升级！", "use_link_to_reset_password": "使用下面的链接重置您的密码", - "hey_there": "嘿，您好！", + "hey_there": "您好", "forgot_your_password_calcom": "忘记密码？- {{appName}}", "delete_webhook_confirmation_message": "您确定要删除此Webhook吗？当活动被安排或取消时，您将不再会在指定的链接收到 {{appName}} 实时提供的会议数据。", "confirm_delete_webhook": "是，删除 Webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "位置不足", "form_builder_field_already_exists": "具有此名称的字段已存在", "show_on_booking_page": "在预约页面上显示", + "visit_cancelled_booking": "您可以访问已取消的预订页面", "get_started_zapier_templates": "开始使用 Zapier 模板", "team_is_unpublished": "{{team}} 已被取消发布", "org_is_unpublished_description": "该组织链接当前不可用。请联系组织所有者或要求他们发布。", @@ -2455,6 +2457,7 @@ "add_emails": "添加电子邮件", "add_email_description": "添加电子邮件地址以替换您的主要地址，或在您的活动类型中用作备用电子邮件。", "confirm_email": "确认您的邮箱", + "confirming_your_booking_sms": "$t(hey_there) {{name}}，确认您在 {{date}} 的预订。", "scheduler_first_name": "预订人的名字", "scheduler_last_name": "预订人的姓氏", "scheduler_name": "预订人姓名", @@ -2545,6 +2548,7 @@ "team_select_info": "触发所有团队事件类型和所有团队成员的个人事件类型", "no_show_updated": "未出席状态已更新", "email_copied": "电子邮件已复制", + "phone_number_copied": "电话号码已复制", "USER_PENDING_MEMBER_OF_THE_ORG": "用户是组织的待定成员", "USER_ALREADY_INVITED_OR_MEMBER": "用户已被邀请或已是成员", "USER_MEMBER_OF_OTHER_ORGANIZATION": "用户是其他组织的成员，该团队不属于该组织。", diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json index 013b3cfb131b57..eff5a351fa5129 100644 --- a/apps/web/public/static/locales/zh-TW/common.json +++ b/apps/web/public/static/locales/zh-TW/common.json @@ -44,6 +44,7 @@ "event_request_cancelled": "您預定的活動取消了", "organizer": "主辦", "need_to_reschedule_or_cancel": "要重新規劃還是取消嗎？", + "you_can_view_booking_details_with_this_url": "您可以透過此網址 {{url}} 查看預訂詳情，並將活動添加到您的日曆中", "no_options_available": "沒有可用的選項", "cancellation_reason": "取消原因（選填）", "cancellation_reason_placeholder": "您為什麼要取消？", @@ -181,7 +182,7 @@ "org_upgrade_banner_description": "謝謝您試用我們的 Organization 方案。我們注意到您的組織「{{teamName}}」需要升級。", "org_upgraded_successfully": "您的 Organization 成功升級！", "use_link_to_reset_password": "使用以下連結重置密碼", - "hey_there": "哈囉，", + "hey_there": "嗨，您好", "forgot_your_password_calcom": "忘記密碼了？ - {{appName}}", "delete_webhook_confirmation_message": "您確定要刪除這組 Webhook 嗎？之後活動預定或取消的時候，您就不會即時經特定連結收到 {{appName}} 的會議資料。", "confirm_delete_webhook": "是的，刪除 Webhook", @@ -1904,6 +1905,7 @@ "not_enough_seats": "座位不足", "form_builder_field_already_exists": "已存在使用此名稱的欄位", "show_on_booking_page": "在預約頁面上顯示", + "visit_cancelled_booking": "您可以訪問已取消的預訂頁面", "get_started_zapier_templates": "開始使用 Zapier 範本", "team_is_unpublished": "已取消發佈 {{team}}", "org_is_unpublished_description": "此組織連結目前無法使用。請聯絡組織擁有者，或請對方發佈。", @@ -2455,6 +2457,7 @@ "add_emails": "新增電子郵件", "add_email_description": "新增一個電子郵件地址以取代您的主要電子郵件或作為活動類型的替代電子郵件。", "confirm_email": "確認您的電子郵件", + "confirming_your_booking_sms": "$t(hey_there) {{name}}，確認您在 {{date}} 的預訂。", "scheduler_first_name": "預訂人的名字", "scheduler_last_name": "預訂人的姓氏", "scheduler_name": "預訂人姓名", @@ -2545,6 +2548,7 @@ "team_select_info": "觸發所有團隊事件類型和所有團隊成員的個人事件類型", "no_show_updated": "未出席狀態已更新", "email_copied": "電子郵件已複製", + "phone_number_copied": "電話號碼已複製", "USER_PENDING_MEMBER_OF_THE_ORG": "用戶是組織的待定成員", "USER_ALREADY_INVITED_OR_MEMBER": "用戶已被邀請或已是成員", "USER_MEMBER_OF_OTHER_ORGANIZATION": "用戶是其他組織的成員，該團隊不屬於該組織。", diff --git a/i18n.lock b/i18n.lock index f142447fdabb7d..acfb45189efcfa 100644 --- a/i18n.lock +++ b/i18n.lock @@ -46,6 +46,7 @@ checksums: event_request_cancelled: 130fd0087bd535dc755eec339732dcaf organizer: cff6864d56049b2de93285c6fb7648ca need_to_reschedule_or_cancel: 8e4fcedd363b7f923dceb26c8143ba54 + you_can_view_booking_details_with_this_url: 64f9ae32d2162ea4afab41fb8ac07fb1 no_options_available: 1578bfcdda54521607e7695776832765 cancellation_reason: 8e73160be8cdaed6e71565a4ec49e0e0 cancellation_reason_placeholder: f4eac23857afdc8b674ba077e25e8799 @@ -183,7 +184,7 @@ checksums: org_upgrade_banner_description: 5a1acb34eb2a3682f4dceb478b425d15 org_upgraded_successfully: b803e2b8a503792206beaf1f4f2c861e use_link_to_reset_password: 75eea563335b8773fa581c61307b4b22 - hey_there: ab526f798b3a2000aee04d9455a05dbe + hey_there: abc179eec007507d2e54e5ef922c04d7 forgot_your_password_calcom: e25822f11d138676f1151900a12be61f delete_webhook_confirmation_message: e6c1794d4d697286d2b55eb24c08990f confirm_delete_webhook: ef3672fcdca099306496ef20d846724d @@ -1906,6 +1907,7 @@ checksums: not_enough_seats: f2c120d55643caa712a0ef44350e56af form_builder_field_already_exists: 623a2903bef6bc840794893083969567 show_on_booking_page: 515d42a965a615916eb9299f9a8ba698 + visit_cancelled_booking: 42c1a6ee7e33ca49661c4e4763feb9e3 get_started_zapier_templates: 0adfac5a026b181a55ff131b9572b5ab team_is_unpublished: 57d5a8b888c52b11062c208a1c4f5146 org_is_unpublished_description: 61c9364cb8fba87d1e442db181155c1e @@ -2457,6 +2459,7 @@ checksums: add_emails: da0df34b3a50ebabcb79e394a13cd221 add_email_description: 86620e8688fe3212c3d0341867f329ac confirm_email: b3a52c3b2ac05c7db469c519736560ca + confirming_your_booking_sms: ea4cab8c018b8d8a31f0d15925c2447b scheduler_first_name: 07e7edb32b4ca2f49575acf01b72cc84 scheduler_last_name: 118b5c449032449d395b2d08455ab592 scheduler_name: dc5b678d5a3ce40b72a8169e033de452 @@ -2547,6 +2550,7 @@ checksums: team_select_info: 67576cede7244533acb9c4e3b31a6c52 no_show_updated: ab2125e3ec6df87572ef5e0b76d26970 email_copied: f8145a83c29485da2cf7bb36ff920470 + phone_number_copied: b91f492fa4f5be4edda64b9e48a11690 USER_PENDING_MEMBER_OF_THE_ORG: 22c8f28829f0542dc5afb0b47a7d7b98 USER_ALREADY_INVITED_OR_MEMBER: 2ed415bc3a7bd57f234310680cc2cd6e USER_MEMBER_OF_OTHER_ORGANIZATION: 1126e7a981f56f7b5fdcae4e8f4399d4 From 8f5ac26bb18ada147e42cac57f610c3d86f35067 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Thu, 12 Sep 2024 19:42:54 +0530 Subject: [PATCH 17/40] fix: profile page flickering and refactor (#16555) Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- .../ui/UsernameAvailability/index.tsx | 59 ++++++++++++------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/apps/web/components/ui/UsernameAvailability/index.tsx b/apps/web/components/ui/UsernameAvailability/index.tsx index f65efe65aad406..9d2636d76aee26 100644 --- a/apps/web/components/ui/UsernameAvailability/index.tsx +++ b/apps/web/components/ui/UsernameAvailability/index.tsx @@ -1,6 +1,7 @@ import dynamic from "next/dynamic"; import { useSearchParams } from "next/navigation"; import { useState } from "react"; +import type { RefCallback, ReactNode } from "react"; import { Controller, useForm } from "react-hook-form"; import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider"; @@ -16,10 +17,28 @@ interface UsernameAvailabilityFieldProps { onErrorMutation?: (error: TRPCClientErrorLike) => void; } -export const getUsernameAvailabilityComponent = (isPremium: boolean) => { - if (isPremium) - return dynamic(() => import("./PremiumTextfield").then((m) => m.PremiumTextfield), { ssr: false }); - return dynamic(() => import("./UsernameTextfield").then((m) => m.UsernameTextfield), { ssr: false }); +interface ICustomUsernameProps extends UsernameAvailabilityFieldProps { + currentUsername: string | undefined; + setCurrentUsername?: (newUsername: string) => void; + inputUsernameValue: string | undefined; + usernameRef: RefCallback; + setInputUsernameValue: (value: string) => void; + disabled?: boolean | undefined; + addOnLeading?: ReactNode; + isPremium: boolean; +} + +const PremiumTextfield = dynamic(() => import("./PremiumTextfield").then((m) => m.PremiumTextfield), { + ssr: false, +}); +const UsernameTextfield = dynamic(() => import("./UsernameTextfield").then((m) => m.UsernameTextfield), { + ssr: false, +}); + +export const UsernameAvailability = (props: ICustomUsernameProps) => { + const { isPremium, ...otherProps } = props; + const UsernameAvailabilityComponent = isPremium ? PremiumTextfield : UsernameTextfield; + return ; }; export const UsernameAvailabilityField = ({ @@ -40,32 +59,32 @@ export const UsernameAvailabilityField = ({ }, }); - const UsernameAvailability = getUsernameAvailabilityComponent(!IS_SELF_HOSTED && !user.organization?.id); const orgBranding = useOrgBranding(); const usernamePrefix = orgBranding ? orgBranding?.fullDomain.replace(/^(https?:|)\/\//, "") : `${WEBSITE_URL?.replace(/^(https?:|)\/\//, "")}`; + const isPremium = !IS_SELF_HOSTED && !user.organization?.id; + return ( { - return ( - - ); - }} + render={({ field: { ref, onChange, value } }) => ( + + )} /> ); }; From f5f7242f02f9bc99e5cb907d3f9445d567eab379 Mon Sep 17 00:00:00 2001 From: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:02:49 +0530 Subject: [PATCH 18/40] fix: use current user email (#16577) * fix: use current user email * dont fallback to email param --- apps/web/modules/bookings/views/bookings-single-view.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx index 5079bfa7ffee86..ba1c4965e504c7 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.tsx @@ -161,8 +161,7 @@ export default function Success(props: PageProps) { const [calculatedDuration, setCalculatedDuration] = useState(undefined); const [comment, setComment] = useState(""); const parsedRating = rating ? parseInt(rating, 10) : 3; - const currentUserEmail = - searchParams?.get("cancelledBy") ?? searchParams?.get("email") ?? session?.user?.email ?? undefined; + const currentUserEmail = searchParams?.get("cancelledBy") ?? session?.user?.email ?? undefined; const defaultRating = isNaN(parsedRating) ? 3 : parsedRating > 5 ? 5 : parsedRating < 1 ? 1 : parsedRating; const [rateValue, setRateValue] = useState(defaultRating); From f4bc7d2ea4ea476d9383b9fe290aa72c47378745 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Thu, 12 Sep 2024 15:25:10 -0300 Subject: [PATCH 19/40] chore: Remove PR reviewed automation (#16615) --- .github/workflows/pr-review.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/pr-review.yml diff --git a/.github/workflows/pr-review.yml b/.github/workflows/pr-review.yml deleted file mode 100644 index 7f64220c67721f..00000000000000 --- a/.github/workflows/pr-review.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: PR Reviewed - -on: - pull_request_review: - types: [submitted] - -jobs: - label-pr: - runs-on: ubuntu-latest - permissions: - actions: read - issues: write - pull-requests: write - steps: - - name: Label PR as ready for E2E - if: github.event.review.state == 'approved' - uses: actions/github-script@v4 - with: - script: | - await github.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - labels: process.env.labels.split(', '), - }) - env: - github_token: ${{ secrets.READY_FOR_E2E_PAT }} - labels: 'ready-for-e2e' From cf16cd3ed29afa2e09c63ca923cddccb0af1bee6 Mon Sep 17 00:00:00 2001 From: Steven Tey Date: Thu, 12 Sep 2024 12:33:10 -0700 Subject: [PATCH 20/40] feat: Implement Dub.co for conversion tracking (#16165) * FEAT: Implement Dub.co for conversion tracking * add link creation, @vercel/functions * use refer.cal.com/:username instead of go.cal.com/r/:username * sale conversion tracking * add copy referral link * limit to IS_CALCOM only * Update yarn.lock * fix DubAnalytics * use workaround for isNewUser * pass req to getOptions * Update next-auth-options.ts * fix ts errors * only show DubAnalytics outside EU * add Dub Analytics to /signup * use WEBSITE_URL instead * on-demand generate links * add migration * add check for existing link + change fetch method to poast * remove refer.cal.com from PoweredByCal * limit DubAnalytics to /signup only * simplify generate-referral-link * restore yarn.lock * add yarn with dub sdk in * add yarn with dub sdk in * yarn * Update yarn.lock --------- Co-authored-by: sean Co-authored-by: Peer Richelsen --- apps/api/v1/pages/api/teams/_post.ts | 1 + .../future/availability/[schedule]/page.tsx | 5 +- apps/web/app/future/availability/page.tsx | 5 +- .../(admin)/admin/apps/[category]/page.tsx | 5 +- .../(admin)/admin/impersonation/page.tsx | 5 +- .../(admin)/admin/organizations/page.tsx | 5 +- .../settings/(settings)/billing/page.tsx | 6 +- .../(settings)/developer/api-keys/page.tsx | 6 +- .../developer/webhooks/[id]/page.tsx | 5 +- .../developer/webhooks/new/page.tsx | 5 +- .../(settings)/my-account/appearance/page.tsx | 5 +- .../(settings)/my-account/calendars/page.tsx | 5 +- .../my-account/conferencing/page.tsx | 5 +- .../(settings)/my-account/general/page.tsx | 5 +- .../my-account/out-of-office/page.tsx | 5 +- .../(settings)/my-account/profile/page.tsx | 5 +- .../organizations/admin-api/page.tsx | 5 +- .../(settings)/organizations/dsync/page.tsx | 5 +- .../(settings)/organizations/privacy/page.tsx | 5 +- .../security/impersonation/page.tsx | 5 +- .../(settings)/security/password/page.tsx | 5 +- .../settings/(settings)/security/sso/page.tsx | 5 +- .../security/two-factor-auth/page.tsx | 5 +- .../app/future/workflows/[workflow]/page.tsx | 6 +- apps/web/app/future/workflows/page.tsx | 6 +- .../auth/layouts/AdminLayoutAppDir.tsx | 6 +- .../license-key/new/getServerSideProps.tsx | 5 +- apps/web/package.json | 1 + apps/web/pages/api/auth/[...nextauth].tsx | 9 +- apps/web/pages/api/generate-referral-link.ts | 49 + apps/web/pages/signup.tsx | 8 + apps/web/playwright/fixtures/workflows.ts | 3 + apps/web/playwright/workflow.e2e.ts | 2 +- apps/web/public/static/locales/en/common.json | 1 + .../sso/[provider]/getServerSideProps.tsx | 6 + packages/features/auth/lib/dub.ts | 5 + .../lib/get-server-session-for-app-dir.ts | 8 + .../features/auth/lib/next-auth-options.ts | 52 +- packages/features/auth/package.json | 1 + packages/features/ee/teams/lib/payments.ts | 2 + packages/features/package.json | 1 + .../settings/appDir/SettingsLayoutAppDir.tsx | 5 +- packages/features/shell/Shell.tsx | 25 +- packages/lib/hooks/useCopy.ts | 5 + packages/lib/server/repository/user.ts | 1 + .../migration.sql | 2 + packages/prisma/schema.prisma | 1 + turbo.json | 1 + yarn.lock | 1344 ++++++++++++++++- 49 files changed, 1548 insertions(+), 120 deletions(-) create mode 100644 apps/web/pages/api/generate-referral-link.ts create mode 100644 packages/features/auth/lib/dub.ts create mode 100644 packages/features/auth/lib/get-server-session-for-app-dir.ts create mode 100644 packages/prisma/migrations/20240909084221_add_referal_link_id/migration.sql diff --git a/apps/api/v1/pages/api/teams/_post.ts b/apps/api/v1/pages/api/teams/_post.ts index 9b01ffe83a4e3f..12fef369d4a8ed 100644 --- a/apps/api/v1/pages/api/teams/_post.ts +++ b/apps/api/v1/pages/api/teams/_post.ts @@ -215,6 +215,7 @@ const generateTeamCheckoutSession = async ({ metadata: { pendingPaymentTeamId, ownerId, + dubCustomerId: ownerId, // pass the userId during checkout creation for sales conversion tracking: https://d.to/conversions/stripe }, }); diff --git a/apps/web/app/future/availability/[schedule]/page.tsx b/apps/web/app/future/availability/[schedule]/page.tsx index 8955baa8c7301e..2c4fb1382e67e9 100644 --- a/apps/web/app/future/availability/[schedule]/page.tsx +++ b/apps/web/app/future/availability/[schedule]/page.tsx @@ -1,10 +1,9 @@ import type { PageProps } from "app/_types"; import { _generateMetadata } from "app/_utils"; import { WithLayout } from "app/layoutHOC"; -import { getServerSession } from "next-auth"; import { notFound } from "next/navigation"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import { ScheduleRepository } from "@calcom/lib/server/repository/schedule"; import { TravelScheduleRepository } from "@calcom/lib/server/repository/travelSchedule"; import { UserRepository } from "@calcom/lib/server/repository/user"; @@ -34,7 +33,7 @@ const Page = async ({ params }: PageProps) => { } const scheduleId = Number(params.schedule); - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const userId = session?.user?.id; if (!userId) { notFound(); diff --git a/apps/web/app/future/availability/page.tsx b/apps/web/app/future/availability/page.tsx index c75021f80a082c..09d33577b0cf50 100644 --- a/apps/web/app/future/availability/page.tsx +++ b/apps/web/app/future/availability/page.tsx @@ -1,9 +1,8 @@ import { _generateMetadata } from "app/_utils"; import { WithLayout } from "app/layoutHOC"; -import { getServerSession } from "next-auth"; import { notFound } from "next/navigation"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import { OrganizationRepository } from "@calcom/lib/server/repository/organization"; import AvailabilityPage from "~/availability/availability-view"; @@ -16,7 +15,7 @@ export const generateMetadata = async () => { }; const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const userId = session?.user?.id; const orgId = session?.user?.org?.id; if (!userId || !orgId) { diff --git a/apps/web/app/future/settings/(admin)/admin/apps/[category]/page.tsx b/apps/web/app/future/settings/(admin)/admin/apps/[category]/page.tsx index 90c04a5c3a0175..cd70a918fa4b47 100644 --- a/apps/web/app/future/settings/(admin)/admin/apps/[category]/page.tsx +++ b/apps/web/app/future/settings/(admin)/admin/apps/[category]/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import AdminAppsList from "@calcom/features/apps/AdminAppsList"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -13,7 +12,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(admin)/admin/impersonation/page.tsx b/apps/web/app/future/settings/(admin)/admin/impersonation/page.tsx index d3c29d61ad159d..8b932d1dcca727 100644 --- a/apps/web/app/future/settings/(admin)/admin/impersonation/page.tsx +++ b/apps/web/app/future/settings/(admin)/admin/impersonation/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ImpersonationView from "~/settings/admin/impersonation-view"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(admin)/admin/organizations/page.tsx b/apps/web/app/future/settings/(admin)/admin/organizations/page.tsx index 672632f91a7b40..2b20b5d39372e4 100644 --- a/apps/web/app/future/settings/(admin)/admin/organizations/page.tsx +++ b/apps/web/app/future/settings/(admin)/admin/organizations/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/billing/page.tsx b/apps/web/app/future/settings/(settings)/billing/page.tsx index 656487851da81e..0822b347cc60a0 100644 --- a/apps/web/app/future/settings/(settings)/billing/page.tsx +++ b/apps/web/app/future/settings/(settings)/billing/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import BillingView from "~/settings/billing/billing-view"; @@ -14,7 +13,8 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/developer/api-keys/page.tsx b/apps/web/app/future/settings/(settings)/developer/api-keys/page.tsx index 31f740e36d2044..d64087b672b2b2 100644 --- a/apps/web/app/future/settings/(settings)/developer/api-keys/page.tsx +++ b/apps/web/app/future/settings/(settings)/developer/api-keys/page.tsx @@ -1,7 +1,6 @@ import { getFixedT, _generateMetadata } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; @@ -15,7 +14,8 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/developer/webhooks/[id]/page.tsx b/apps/web/app/future/settings/(settings)/developer/webhooks/[id]/page.tsx index 709d2e0fffd75e..718fd1faf44f9f 100644 --- a/apps/web/app/future/settings/(settings)/developer/webhooks/[id]/page.tsx +++ b/apps/web/app/future/settings/(settings)/developer/webhooks/[id]/page.tsx @@ -1,8 +1,7 @@ import type { PageProps } from "app/_types"; import { getFixedT, _generateMetadata } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view"; import { APP_NAME } from "@calcom/lib/constants"; @@ -15,7 +14,7 @@ export const generateMetadata = async () => ); const Page = async ({ params }: PageProps) => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); const id = typeof params?.id === "string" ? params.id : undefined; diff --git a/apps/web/app/future/settings/(settings)/developer/webhooks/new/page.tsx b/apps/web/app/future/settings/(settings)/developer/webhooks/new/page.tsx index 4c60a8989f4bd1..f871693059a429 100644 --- a/apps/web/app/future/settings/(settings)/developer/webhooks/new/page.tsx +++ b/apps/web/app/future/settings/(settings)/developer/webhooks/new/page.tsx @@ -1,7 +1,6 @@ import { getFixedT, _generateMetadata } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view"; import { APP_NAME } from "@calcom/lib/constants"; @@ -13,7 +12,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx b/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx index b32f763a79f766..9a3c085aab1787 100644 --- a/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import AppearancePage from "~/settings/my-account/appearance-view"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx b/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx index 4b5b25885af8d7..7802d51a9171c2 100644 --- a/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { Button } from "@calcom/ui"; @@ -15,7 +14,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); const AddCalendarButton = () => { diff --git a/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx b/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx index add5f7dd586d15..dbfe9642877c61 100644 --- a/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { Button } from "@calcom/ui"; @@ -15,7 +14,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); const AddConferencingButton = () => { diff --git a/apps/web/app/future/settings/(settings)/my-account/general/page.tsx b/apps/web/app/future/settings/(settings)/my-account/general/page.tsx index 773337ae0744b6..c6ef48a09bc118 100644 --- a/apps/web/app/future/settings/(settings)/my-account/general/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/general/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import GeneralQueryView from "~/settings/my-account/general-view"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx b/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx index 993615b0a6cb2a..47c1466719890f 100644 --- a/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import CreateNewOutOfOfficeEntryButton from "@calcom/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton"; import { OutOfOfficeEntriesList } from "@calcom/features/settings/outOfOffice/OutOfOfficeEntriesList"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx b/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx index 3504f51af9e5c7..a1981539d18ce7 100644 --- a/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; @@ -15,7 +14,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/organizations/admin-api/page.tsx b/apps/web/app/future/settings/(settings)/organizations/admin-api/page.tsx index 8f5b2ddea05ad8..254d6b4c2ea330 100644 --- a/apps/web/app/future/settings/(settings)/organizations/admin-api/page.tsx +++ b/apps/web/app/future/settings/(settings)/organizations/admin-api/page.tsx @@ -1,7 +1,6 @@ import { getFixedT, _generateMetadata } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -12,7 +11,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/organizations/dsync/page.tsx b/apps/web/app/future/settings/(settings)/organizations/dsync/page.tsx index 78a01b931a2333..6a963583fb0728 100644 --- a/apps/web/app/future/settings/(settings)/organizations/dsync/page.tsx +++ b/apps/web/app/future/settings/(settings)/organizations/dsync/page.tsx @@ -1,7 +1,6 @@ import { _generateMetadata, getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import DirectorySyncTeamView from "@calcom/features/ee/dsync/page/team-dsync-view"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -12,7 +11,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/organizations/privacy/page.tsx b/apps/web/app/future/settings/(settings)/organizations/privacy/page.tsx index bf9ade6a032f8b..d95eed66a0e0e1 100644 --- a/apps/web/app/future/settings/(settings)/organizations/privacy/page.tsx +++ b/apps/web/app/future/settings/(settings)/organizations/privacy/page.tsx @@ -1,7 +1,6 @@ import { _generateMetadata, getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -12,7 +11,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/future/settings/(settings)/security/impersonation/page.tsx b/apps/web/app/future/settings/(settings)/security/impersonation/page.tsx index 4e209393936cdc..1d4edc82bed8dd 100644 --- a/apps/web/app/future/settings/(settings)/security/impersonation/page.tsx +++ b/apps/web/app/future/settings/(settings)/security/impersonation/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ProfileImpersonationViewWrapper from "~/settings/security/impersonation-view"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/security/password/page.tsx b/apps/web/app/future/settings/(settings)/security/password/page.tsx index 09a6d0e68ffc7f..df37858d994a00 100644 --- a/apps/web/app/future/settings/(settings)/security/password/page.tsx +++ b/apps/web/app/future/settings/(settings)/security/password/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import PasswordViewWrapper from "~/settings/security/password-view"; @@ -14,7 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/security/sso/page.tsx b/apps/web/app/future/settings/(settings)/security/sso/page.tsx index b5f311b3691e73..4579dd6abd4b7e 100644 --- a/apps/web/app/future/settings/(settings)/security/sso/page.tsx +++ b/apps/web/app/future/settings/(settings)/security/sso/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SAMLSSO from "@calcom/features/ee/sso/page/user-sso-view"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -13,7 +12,7 @@ export const generateMetadata = async () => ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx b/apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx index dbfed4e9abb627..b60a01617c4183 100644 --- a/apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx +++ b/apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx @@ -1,8 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import TwoFactorAuthView from "~/settings/security/two-factor-auth-view"; @@ -13,7 +12,7 @@ export const generateMetadata = async () => (t) => t("add_an_extra_layer_of_security") ); const Page = async () => { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); diff --git a/apps/web/app/future/workflows/[workflow]/page.tsx b/apps/web/app/future/workflows/[workflow]/page.tsx index c66b415071fba0..e09a9562f978f3 100644 --- a/apps/web/app/future/workflows/[workflow]/page.tsx +++ b/apps/web/app/future/workflows/[workflow]/page.tsx @@ -1,11 +1,10 @@ import type { PageProps } from "app/_types"; import { _generateMetadata } from "app/_utils"; import { WithLayout } from "app/layoutHOC"; -import { getServerSession } from "next-auth"; import { notFound } from "next/navigation"; import { z } from "zod"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import LegacyPage from "@calcom/features/ee/workflows/pages/workflow"; import { WorkflowRepository } from "@calcom/lib/server/repository/workflow"; @@ -30,7 +29,8 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => { export const generateStaticParams = () => []; const Page = async ({ params, searchParams }: PageProps) => { - const session = await getServerSession(AUTH_OPTIONS); + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + const session = await getServerSessionForAppDir(); const user = session?.user; const parsed = querySchema.safeParse({ ...params, ...searchParams }); if (!parsed.success) { diff --git a/apps/web/app/future/workflows/page.tsx b/apps/web/app/future/workflows/page.tsx index 416ec0f6e4a7f0..7c869e031d89ca 100644 --- a/apps/web/app/future/workflows/page.tsx +++ b/apps/web/app/future/workflows/page.tsx @@ -1,9 +1,8 @@ import type { PageProps } from "app/_types"; import { _generateMetadata } from "app/_utils"; import { WithLayout } from "app/layoutHOC"; -import { getServerSession } from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import LegacyPage from "@calcom/features/ee/workflows/pages/index"; import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; import { WorkflowRepository } from "@calcom/lib/server/repository/workflow"; @@ -15,7 +14,8 @@ export const generateMetadata = async () => ); const Page = async ({ params, searchParams }: PageProps) => { - const session = await getServerSession(AUTH_OPTIONS); + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + const session = await getServerSessionForAppDir(); const user = session?.user; const filters = getTeamsFiltersFromQuery({ ...searchParams, ...params }); diff --git a/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx b/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx index 8404786384efdc..44ac10743a004f 100644 --- a/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx +++ b/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx @@ -1,8 +1,7 @@ -import { getServerSession } from "next-auth"; import dynamic from "next/dynamic"; import React from "react"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsLayoutAppDir from "@calcom/features/settings/appDir/SettingsLayoutAppDir"; import type { AdminLayoutProps } from "./AdminLayoutAppDirClient"; @@ -14,7 +13,8 @@ const AdminLayoutAppDirClient = dynamic(() => import("./AdminLayoutAppDirClient" type AdminLayoutAppDirProps = Omit; export default async function AdminLayoutAppDir(props: AdminLayoutAppDirProps) { - const session = await getServerSession(AUTH_OPTIONS); + // FIXME: Refactor me once next-auth endpoint is migrated to App Router + const session = await getServerSessionForAppDir(); const userRole = session?.user?.role; return await SettingsLayoutAppDir({ children: }); diff --git a/apps/web/lib/settings/license-key/new/getServerSideProps.tsx b/apps/web/lib/settings/license-key/new/getServerSideProps.tsx index 31e018e8e450a0..8b8be211d17f53 100644 --- a/apps/web/lib/settings/license-key/new/getServerSideProps.tsx +++ b/apps/web/lib/settings/license-key/new/getServerSideProps.tsx @@ -1,12 +1,13 @@ import type { GetServerSidePropsContext } from "next"; import { getServerSession } from "@calcom/feature-auth/lib/getServerSession"; -import { AUTH_OPTIONS } from "@calcom/feature-auth/lib/next-auth-options"; +import { getOptions } from "@calcom/feature-auth/lib/next-auth-options"; export const getServerSideProps = async (context: GetServerSidePropsContext) => { const session = await getServerSession({ req: context.req, - authOptions: AUTH_OPTIONS, + res: context.res, + authOptions: getOptions({ getDclid: () => context.req.cookies.dclid }), }); // Disable this check if we ever make this self serve. if (session?.user.role !== "ADMIN") { diff --git a/apps/web/package.json b/apps/web/package.json index 251062f49ede5e..b0ce626a516ae0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -44,6 +44,7 @@ "@calcom/ui": "*", "@daily-co/daily-js": "^0.59.0", "@daily-co/daily-react": "^0.17.2", + "@dub/analytics": "^0.0.15", "@formkit/auto-animate": "1.0.0-beta.5", "@glidejs/glide": "^3.5.2", "@hookform/error-message": "^2.0.0", diff --git a/apps/web/pages/api/auth/[...nextauth].tsx b/apps/web/pages/api/auth/[...nextauth].tsx index dcc7a822d27825..ccb457fad9689e 100644 --- a/apps/web/pages/api/auth/[...nextauth].tsx +++ b/apps/web/pages/api/auth/[...nextauth].tsx @@ -1,5 +1,10 @@ +import type { NextApiRequest, NextApiResponse } from "next"; import NextAuth from "next-auth"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getOptions } from "@calcom/features/auth/lib/next-auth-options"; -export default NextAuth(AUTH_OPTIONS); +// pass req to NextAuth: https://github.com/nextauthjs/next-auth/discussions/469 +const handler = (req: NextApiRequest, res: NextApiResponse) => + NextAuth(req, res, getOptions({ getDclid: () => req.cookies.dclid })); + +export default handler; diff --git a/apps/web/pages/api/generate-referral-link.ts b/apps/web/pages/api/generate-referral-link.ts new file mode 100644 index 00000000000000..a28c25266445f2 --- /dev/null +++ b/apps/web/pages/api/generate-referral-link.ts @@ -0,0 +1,49 @@ +import type { NextApiRequest, NextApiResponse } from "next"; + +import { dub } from "@calcom/features/auth/lib/dub"; +import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; +import prisma from "@calcom/prisma"; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + if (req.method !== "POST") { + return res.status(405).json({ message: "Method not allowed" }); + } + + const session = await getServerSession({ req, res }); + + if (!session?.user?.username) { + return res.status(401).json({ message: "Unauthorized" }); + } + + try { + return await dub.links.get({ + externalId: `ext_${session.user.id.toString()}`, + }); + } catch (error) { + console.log("Referral link not found, creating..."); + } + + const { id: referralLinkId, shortLink } = await dub.links.create({ + domain: "refer.cal.com", + key: session.user.username, + url: "https://cal.com", + externalId: session.user.id.toString(), // @see https://d.to/externalId + trackConversion: true, // enable conversion tracking @see https://d.to/conversions + }); + + /* + Even though we are relying in externalId for retrieving the referral link, + we still save the referralLinkId in the database for future reference. + E.g. we can use this to tell how many users created a referral link. + */ + await prisma.user.update({ + where: { + id: session.user.id, + }, + data: { + referralLinkId, + }, + }); + + return res.status(200).json({ shortLink }); +} diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx index 2620efd1757c0e..233a13cc05c35f 100644 --- a/apps/web/pages/signup.tsx +++ b/apps/web/pages/signup.tsx @@ -1,5 +1,6 @@ "use client"; +import { Analytics as DubAnalytics } from "@dub/analytics/react"; import { zodResolver } from "@hookform/resolvers/zod"; import { signIn } from "next-auth/react"; import { Trans } from "next-i18next"; @@ -26,7 +27,9 @@ import { CLOUDFLARE_SITE_ID, WEBSITE_PRIVACY_POLICY_URL, WEBSITE_TERMS_URL, + WEBSITE_URL, } from "@calcom/lib/constants"; +import { isENVDev } from "@calcom/lib/env"; import { fetchUsername } from "@calcom/lib/fetchUsername"; import { pushGTMEvent } from "@calcom/lib/gtm"; import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; @@ -309,6 +312,11 @@ export default function Signup({ __html: ``, }} /> + ) : null}
{ + const submitPromise = page.waitForResponse("/api/trpc/workflows/update?batch=1"); await page.getByTestId("save-workflow").click(); + const response = await submitPromise; + expect(response.status()).toBe(200); }; const assertListCount = async (count: number) => { diff --git a/apps/web/playwright/workflow.e2e.ts b/apps/web/playwright/workflow.e2e.ts index 60df8c7814a99f..96a0595d56ccb4 100644 --- a/apps/web/playwright/workflow.e2e.ts +++ b/apps/web/playwright/workflow.e2e.ts @@ -26,7 +26,7 @@ test.describe("Workflow Tab - Event Type", () => { await fillNameInput("Edited Workflow"); await saveWorkflow(); await page.getByTestId("go-back-button").click(); - await page.waitForLoadState("networkidle"); + page.getByTestId("workflow-list").waitFor(); await hasWorkflowInList("Edited Workflow"); }); diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index b8028e77902c0e..8b26870690ec1a 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -213,6 +213,7 @@ "view_notifications": "View notifications", "view_public_page": "View public page", "copy_public_page_link": "Copy public page link", + "copy_referral_link": "Copy referral link", "sign_out": "Sign out", "add_another": "Add another", "install_another": "Install another", diff --git a/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx b/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx index 338bdd934bba51..88166626f12059 100644 --- a/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx +++ b/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx @@ -37,6 +37,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => const availability = await checkUsername(usernameParam, currentOrgDomain); if (availability.available && availability.premium && IS_PREMIUM_USERNAME_ENABLED) { const stripePremiumUrl = await getStripePremiumUsernameUrl({ + userId: session.user.id.toString(), userEmail: session.user.email, username: usernameParam, successDestination, @@ -104,12 +105,14 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => }; type GetStripePremiumUsernameUrl = { + userId: string; userEmail: string; username: string; successDestination: string; }; const getStripePremiumUsernameUrl = async ({ + userId, userEmail, username, successDestination, @@ -136,6 +139,9 @@ const getStripePremiumUsernameUrl = async ({ success_url: `${process.env.NEXT_PUBLIC_WEBAPP_URL}${successDestination}&session_id={CHECKOUT_SESSION_ID}`, cancel_url: process.env.NEXT_PUBLIC_WEBAPP_URL || "https://app.cal.com", allow_promotion_codes: true, + metadata: { + dubCustomerId: userId, // pass the userId during checkout creation for sales conversion tracking: https://d.to/conversions/stripe + }, }); return checkoutSession.url; diff --git a/packages/features/auth/lib/dub.ts b/packages/features/auth/lib/dub.ts new file mode 100644 index 00000000000000..59acf19b971d21 --- /dev/null +++ b/packages/features/auth/lib/dub.ts @@ -0,0 +1,5 @@ +import { Dub } from "dub"; + +export const dub = new Dub({ + token: process.env.DUB_API_KEY, +}); diff --git a/packages/features/auth/lib/get-server-session-for-app-dir.ts b/packages/features/auth/lib/get-server-session-for-app-dir.ts new file mode 100644 index 00000000000000..37d83b87b74f0d --- /dev/null +++ b/packages/features/auth/lib/get-server-session-for-app-dir.ts @@ -0,0 +1,8 @@ +import { getServerSession } from "next-auth"; +import { cookies } from "next/headers"; + +import { getOptions } from "./next-auth-options"; + +export async function getServerSessionForAppDir() { + return await getServerSession(getOptions({ getDclid: () => cookies().get("dclid")?.value })); +} diff --git a/packages/features/auth/lib/next-auth-options.ts b/packages/features/auth/lib/next-auth-options.ts index 2e645671ca6f58..b75a98a13c4b2b 100644 --- a/packages/features/auth/lib/next-auth-options.ts +++ b/packages/features/auth/lib/next-auth-options.ts @@ -1,5 +1,6 @@ import type { Membership, Team, UserPermissionRole } from "@prisma/client"; -import type { AuthOptions, Session } from "next-auth"; +import { waitUntil } from "@vercel/functions"; +import type { AuthOptions, Session, User } from "next-auth"; import type { JWT } from "next-auth/jwt"; import { encode } from "next-auth/jwt"; import type { Provider } from "next-auth/providers"; @@ -13,7 +14,7 @@ import ImpersonationProvider from "@calcom/features/ee/impersonation/lib/Imperso import { getOrgFullOrigin, subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains"; import { clientSecretVerifier, hostedCal, isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml"; import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; -import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants"; +import { HOSTED_CAL_FEATURES, IS_CALCOM } from "@calcom/lib/constants"; import { ENABLE_PROFILE_SWITCHER, IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants"; import { symmetricDecrypt, symmetricEncrypt } from "@calcom/lib/crypto"; import { defaultCookies } from "@calcom/lib/default-cookies"; @@ -29,6 +30,7 @@ import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums"; import { teamMetadataSchema, userMetadata } from "@calcom/prisma/zod-utils"; import { ErrorCode } from "./ErrorCode"; +import { dub } from "./dub"; import { isPasswordValid } from "./isPasswordValid"; import CalComAdapter from "./next-auth-custom-adapter"; import { verifyPassword } from "./verifyPassword"; @@ -235,6 +237,7 @@ const providers: Provider[] = [ belongsToActiveTeam: hasActiveTeams, locale: user.locale, profile: user.allProfiles[0], + createdAt: user.createdDate, }; }, }), @@ -404,7 +407,12 @@ const mapIdentityProvider = (providerName: string) => { } }; -export const AUTH_OPTIONS: AuthOptions = { +export const getOptions = ({ + getDclid, +}: { + /** so we can extract the Dub cookie in both pages and app routers */ + getDclid: () => string | undefined; +}): AuthOptions => ({ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore adapter: calcomAdapter, @@ -924,7 +932,43 @@ export const AUTH_OPTIONS: AuthOptions = { return baseUrl; }, }, -}; + events: { + async signIn(message) { + /* only run this code if: + - it's a hosted cal account + - DUB_API_KEY is configured + - it's a new user + */ + const user = message.user as User & { + username: string; + createdAt: string; + }; + // check if the user was created in the last 10 minutes + // this is a workaround – in the future once we move to use the Account model in the DB + // we should use NextAuth's isNewUser flag instead: https://next-auth.js.org/configuration/events#signin + const isNewUser = new Date(user.createdAt) > new Date(Date.now() - 10 * 60 * 1000); + if ((isENVDev || IS_CALCOM) && process.env.DUB_API_KEY && isNewUser) { + const dclid = getDclid(); + // check if there's a dclid cookie set by @dub/analytics + if (dclid) { + // here we use waitUntil – meaning this code will run async to not block the main thread + waitUntil( + // if so, send a lead event to Dub + // @see https://d.to/conversions/next-auth + dub.track.lead({ + clickId: dclid, + eventName: "Sign Up", + customerId: user.id.toString(), + customerName: user.name, + customerEmail: user.email, + customerAvatar: user.image, + }) + ); + } + } + }, + }, +}); /** * Identifies the profile the user should be logged into. diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index 9f451d5709778f..ba504222041816 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -13,6 +13,7 @@ "@calcom/trpc": "*", "@calcom/ui": "*", "bcryptjs": "^2.4.3", + "dub": "^0.35.0", "handlebars": "^4.7.7", "jose": "^4.13.1", "lru-cache": "^9.0.3", diff --git a/packages/features/ee/teams/lib/payments.ts b/packages/features/ee/teams/lib/payments.ts index 487f4de38846be..fb1512bc4c069e 100644 --- a/packages/features/ee/teams/lib/payments.ts +++ b/packages/features/ee/teams/lib/payments.ts @@ -79,6 +79,7 @@ export const generateTeamCheckoutSession = async ({ teamName, teamSlug, userId, + dubCustomerId: userId, // pass the userId during checkout creation for sales conversion tracking: https://d.to/conversions/stripe }, }); return session; @@ -173,6 +174,7 @@ export const purchaseTeamOrOrgSubscription = async (input: { subscription_data: { metadata: { teamId, + dubCustomerId: userId, }, }, }); diff --git a/packages/features/package.json b/packages/features/package.json index 31de0ab73dad26..7f3d5d659287b3 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -13,6 +13,7 @@ "@calcom/ui": "*", "@lexical/react": "^0.9.0", "@tanstack/react-table": "^8.9.3", + "@vercel/functions": "^1.4.0", "framer-motion": "^10.12.8", "lexical": "^0.9.0", "react-select": "^5.7.0", diff --git a/packages/features/settings/appDir/SettingsLayoutAppDir.tsx b/packages/features/settings/appDir/SettingsLayoutAppDir.tsx index fb2936b4b5a659..b7d750bb60ec5c 100644 --- a/packages/features/settings/appDir/SettingsLayoutAppDir.tsx +++ b/packages/features/settings/appDir/SettingsLayoutAppDir.tsx @@ -1,8 +1,7 @@ -import { getServerSession } from "next-auth"; import dynamic from "next/dynamic"; import React from "react"; -import { AUTH_OPTIONS } from "@calcom/features/auth/lib/next-auth-options"; +import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import { OrganizationRepository } from "@calcom/lib/server/repository/organization"; import type { SettingsLayoutProps } from "./SettingsLayoutAppDirClient"; @@ -14,7 +13,7 @@ const SettingsLayoutAppDirClient = dynamic(() => import("./SettingsLayoutAppDirC type SettingsLayoutAppDir = Omit; export default async function SettingsLayoutAppDir(props: SettingsLayoutAppDir) { - const session = await getServerSession(AUTH_OPTIONS); + const session = await getServerSessionForAppDir(); const userId = session?.user?.id ?? -1; const orgId = session?.user?.org?.id ?? -1; let currentOrg = null; diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx index a365da4fe5cf42..e9aa9fb1727897 100644 --- a/packages/features/shell/Shell.tsx +++ b/packages/features/shell/Shell.tsx @@ -42,6 +42,7 @@ import { APP_NAME, DESKTOP_APP_LINK, ENABLE_PROFILE_SWITCHER, + IS_CALCOM, IS_VISUAL_REGRESSION_TESTING, JOIN_COMMUNITY, ROADMAP, @@ -52,6 +53,7 @@ import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useFormbricks } from "@calcom/lib/formbricks-client"; import getBrandColours from "@calcom/lib/getBrandColours"; import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl"; +import { useCopy } from "@calcom/lib/hooks/useCopy"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useNotifications, ButtonState } from "@calcom/lib/hooks/useNotifications"; import useTheme from "@calcom/lib/hooks/useTheme"; @@ -927,6 +929,7 @@ function SideBarContainer({ bannersHeight, isPlatformUser = false }: SideBarCont } function SideBar({ bannersHeight, user }: SideBarProps) { + const { isCopied, copyToClipboard, resetCopyStatus } = useCopy(); const { t, isLocaleReady } = useLocale(); const orgBranding = useOrgBranding(); const pathname = usePathname(); @@ -960,12 +963,32 @@ function SideBar({ bannersHeight, user }: SideBarProps) { }, icon: "copy", }, + IS_CALCOM + ? { + name: "copy_referral_link", + href: "", + onClick: async (e: { preventDefault: () => void }) => { + e.preventDefault(); + const res = await fetch("/api/generate-referral-link", { + method: "POST", + }); + const { shortLink } = await res.json(); + copyToClipboard(shortLink); + + if (isCopied) { + showToast(t("link_copied"), "success"); + } + }, + icon: "copy", + } + : null, { name: "settings", href: user?.org ? `/settings/organizations/profile` : "/settings/my-account/profile", icon: "settings", }, - ]; + ].filter(Boolean) as NavigationItemType[]; + return (
+
+
+ ); +} + +export default VerifyEmailPage; diff --git a/apps/web/modules/auth/verify-view.tsx b/apps/web/modules/auth/verify-view.tsx new file mode 100644 index 00000000000000..327cefb2f4db38 --- /dev/null +++ b/apps/web/modules/auth/verify-view.tsx @@ -0,0 +1,248 @@ +"use client"; + +import { motion } from "framer-motion"; +import { signIn } from "next-auth/react"; +import Head from "next/head"; +import { usePathname, useRouter } from "next/navigation"; +import { useEffect, useRef, useState } from "react"; +import z from "zod"; + +import { classNames } from "@calcom/lib"; +import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants"; +import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; +import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; +import { trpc } from "@calcom/trpc/react"; +import type { inferSSRProps } from "@calcom/types/inferSSRProps"; +import { Button, showToast } from "@calcom/ui"; +import { Icon } from "@calcom/ui"; + +import Loader from "@components/Loader"; + +import type { getServerSideProps } from "@server/lib/auth/verify/getServerSideProps"; + +export type PageProps = inferSSRProps; + +async function sendVerificationLogin(email: string, username: string) { + await signIn("email", { + email: email.toLowerCase(), + username: username.toLowerCase(), + redirect: false, + callbackUrl: WEBAPP_URL || "https://app.cal.com", + }) + .then(() => { + showToast("Verification email sent", "success"); + }) + .catch((err) => { + showToast(err, "error"); + }); +} + +function useSendFirstVerificationLogin({ + email, + username, +}: { + email: string | undefined; + username: string | undefined; +}) { + const sent = useRef(false); + useEffect(() => { + if (!email || !username || sent.current) { + return; + } + (async () => { + await sendVerificationLogin(email, username); + sent.current = true; + })(); + }, [email, username]); +} + +const querySchema = z.object({ + stripeCustomerId: z.string().optional(), + sessionId: z.string().optional(), + t: z.string().optional(), +}); + +const PaymentFailedIcon = () => ( +
+ +
+); + +const PaymentSuccess = () => ( +
+ + + + + + + +
+); + +const MailOpenIcon = () => ( +
+ +
+); + +export default function Verify(props: PageProps) { + const searchParams = useCompatSearchParams(); + const pathname = usePathname(); + const router = useRouter(); + const routerQuery = useRouterQuery(); + const { t, sessionId, stripeCustomerId } = querySchema.parse(routerQuery); + const [secondsLeft, setSecondsLeft] = useState(30); + const { data } = trpc.viewer.public.stripeCheckoutSession.useQuery( + { + stripeCustomerId, + checkoutSessionId: sessionId, + }, + { + enabled: !!stripeCustomerId || !!sessionId, + staleTime: Infinity, + } + ); + useSendFirstVerificationLogin({ email: data?.customer?.email, username: data?.customer?.username }); + // @note: check for t=timestamp and apply disabled state and secondsLeft accordingly + // to avoid refresh to skip waiting 30 seconds to re-send email + useEffect(() => { + const lastSent = new Date(parseInt(`${t}`)); + // @note: This double round() looks ugly but it's the only way I came up to get the time difference in seconds + const difference = Math.round(Math.round(new Date().getTime() - lastSent.getTime()) / 1000); + if (difference < 30) { + // If less than 30 seconds, set the seconds left to 30 - difference + setSecondsLeft(30 - difference); + } else { + // else set the seconds left to 0 and disabled false + setSecondsLeft(0); + } + }, [t]); + // @note: here we make sure each second is decremented if disabled up to 0. + useEffect(() => { + if (secondsLeft > 0) { + const interval = setInterval(() => { + if (secondsLeft > 0) { + setSecondsLeft(secondsLeft - 1); + } + }, 1000); + return () => clearInterval(interval); + } + }, [secondsLeft]); + + if (!data) { + // Loading state + return ; + } + const { valid, hasPaymentFailed, customer } = data; + if (!valid) { + throw new Error("Invalid session or customer id"); + } + + if (!stripeCustomerId && !sessionId) { + return
Invalid Link
; + } + + return ( +
+ + + {/* @note: Ternary can look ugly ant his might be extracted later but I think at 3 it's not yet worth + it or too hard to read. */} + {hasPaymentFailed + ? "Your payment failed" + : sessionId + ? "Payment successful!" + : `Verify your email | ${APP_NAME}`} + + +
+
+ {hasPaymentFailed ? : sessionId ? : } +

+ {hasPaymentFailed + ? "Your payment failed" + : sessionId + ? "Payment successful!" + : "Check your Inbox"} +

+ {hasPaymentFailed && ( +

Your account has been created, but your premium has not been reserved.

+ )} +

+ We have sent an email to {customer?.email} with a link to activate your account.{" "} + {hasPaymentFailed && + "Once you activate your account you will be able to try purchase your premium username again or select a different one."} +

+
+ +
+
+
+

Don’t seen an email?

+ +
+
+
+ ); +} diff --git a/apps/web/pages/auth/verify-email-change.tsx b/apps/web/pages/auth/verify-email-change.tsx index 378c9be03bdc11..0013dc3593a36a 100644 --- a/apps/web/pages/auth/verify-email-change.tsx +++ b/apps/web/pages/auth/verify-email-change.tsx @@ -1,96 +1,9 @@ -"use client"; - -import type { GetServerSidePropsContext } from "next"; -import { useSession } from "next-auth/react"; -import { useRouter } from "next/navigation"; -import { useEffect } from "react"; -import { Toaster } from "react-hot-toast"; -import { z } from "zod"; - -import { WEBAPP_URL } from "@calcom/lib/constants"; -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { showToast } from "@calcom/ui"; - import PageWrapper from "@components/PageWrapper"; -interface PageProps { - token: string; - updateSession: string; - updatedEmail: string; -} - -function VerifyEmailChange(props: PageProps) { - const { update } = useSession(); - const { t, isLocaleReady } = useLocale(); - const router = useRouter(); - - useEffect(() => { - async function updateSessionAndDisplayToast() { - await update({ email: props.updatedEmail }); - if (isLocaleReady) { - showToast(t("verify_email_change_success_toast", { email: props.updatedEmail }), "success"); - } - router.push("/event-types"); - } - if (props.updateSession) { - updateSessionAndDisplayToast(); - } else { - if (isLocaleReady) { - showToast(t("verify_email_change_failure_toast"), "error"); - } - } - // We only need this to run on inital mount. These props can't and won't change due to it being fetched serveside. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - return ( -
- -
- ); -} - -const tokenSchema = z.object({ - token: z.string(), -}); - -export async function getServerSideProps(context: GetServerSidePropsContext) { - const { token } = tokenSchema.parse(context.query); - - if (!token) { - return { - notFound: true, - }; - } - - const params = new URLSearchParams({ - token, - }); - - const response = await fetch(`${WEBAPP_URL}/api/auth/verify-email?${params.toString()}`, { - method: "POST", - }); - - if (!response.ok) { - return { - props: { - updateSession: false, - token, - updatedEmail: false, - }, - }; - } - - const data = await response.json(); - - return { - props: { - updateSession: true, - token, - updatedEmail: data.updatedEmail ?? null, - }, - }; -} +import type { PageProps } from "~/auth/verify-email-change-view"; +import VerifyEmailChange from "~/auth/verify-email-change-view"; -export default VerifyEmailChange; -VerifyEmailChange.PageWrapper = PageWrapper; +const Page = (props: PageProps) => ; +Page.PageWrapper = PageWrapper; +export default Page; +export { getServerSideProps } from "@server/lib/auth/verify-email-change/getServerSideProps"; diff --git a/apps/web/pages/auth/verify-email.tsx b/apps/web/pages/auth/verify-email.tsx index 370dc41e3f65d6..beaa5c47c423bf 100644 --- a/apps/web/pages/auth/verify-email.tsx +++ b/apps/web/pages/auth/verify-email.tsx @@ -1,63 +1,7 @@ -"use client"; - -import { useSession } from "next-auth/react"; -import { useRouter } from "next/navigation"; -import { useEffect } from "react"; - -import { APP_NAME } from "@calcom/lib/constants"; -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { trpc } from "@calcom/trpc"; -import useEmailVerifyCheck from "@calcom/trpc/react/hooks/useEmailVerifyCheck"; -import { Button, EmptyScreen, showToast } from "@calcom/ui"; - import PageWrapper from "@components/PageWrapper"; -function VerifyEmailPage() { - const { data } = useEmailVerifyCheck(); - const { data: session } = useSession(); - const router = useRouter(); - const { t, isLocaleReady } = useLocale(); - const mutation = trpc.viewer.auth.resendVerifyEmail.useMutation(); - - useEffect(() => { - if (data?.isVerified) { - router.replace("/getting-started"); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [data?.isVerified]); - if (!isLocaleReady) { - return null; - } - return ( -
-
-
- { - showToast(t("send_email"), "success"); - mutation.mutate(); - }}> - {t("resend_email")} - - } - /> -
-
-
- ); -} - -export default VerifyEmailPage; +import VerifyEmail from "~/auth/verify-email-view"; -VerifyEmailPage.PageWrapper = PageWrapper; +const Page = () => ; +Page.PageWrapper = PageWrapper; +export default Page; diff --git a/apps/web/pages/auth/verify.tsx b/apps/web/pages/auth/verify.tsx index 24c96f018ad06d..9f25d00e2f6f8b 100644 --- a/apps/web/pages/auth/verify.tsx +++ b/apps/web/pages/auth/verify.tsx @@ -1,250 +1,9 @@ -"use client"; - -import { motion } from "framer-motion"; -import { signIn } from "next-auth/react"; -import Head from "next/head"; -import { usePathname, useRouter } from "next/navigation"; -import { useEffect, useRef, useState } from "react"; -import z from "zod"; - -import { classNames } from "@calcom/lib"; -import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants"; -import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; -import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; -import { trpc } from "@calcom/trpc/react"; -import type { inferSSRProps } from "@calcom/types/inferSSRProps"; -import { Button, showToast } from "@calcom/ui"; -import { Icon } from "@calcom/ui"; - -import Loader from "@components/Loader"; import PageWrapper from "@components/PageWrapper"; -import { getServerSideProps } from "@server/lib/auth/verify/getServerSideProps"; - -async function sendVerificationLogin(email: string, username: string) { - await signIn("email", { - email: email.toLowerCase(), - username: username.toLowerCase(), - redirect: false, - callbackUrl: WEBAPP_URL || "https://app.cal.com", - }) - .then(() => { - showToast("Verification email sent", "success"); - }) - .catch((err) => { - showToast(err, "error"); - }); -} - -function useSendFirstVerificationLogin({ - email, - username, -}: { - email: string | undefined; - username: string | undefined; -}) { - const sent = useRef(false); - useEffect(() => { - if (!email || !username || sent.current) { - return; - } - (async () => { - await sendVerificationLogin(email, username); - sent.current = true; - })(); - }, [email, username]); -} - -const querySchema = z.object({ - stripeCustomerId: z.string().optional(), - sessionId: z.string().optional(), - t: z.string().optional(), -}); - -const PaymentFailedIcon = () => ( -
- -
-); - -const PaymentSuccess = () => ( -
- - - - - - - -
-); - -const MailOpenIcon = () => ( -
- -
-); - -export default function Verify(props: inferSSRProps) { - const searchParams = useCompatSearchParams(); - const pathname = usePathname(); - const router = useRouter(); - const routerQuery = useRouterQuery(); - const { t, sessionId, stripeCustomerId } = querySchema.parse(routerQuery); - const [secondsLeft, setSecondsLeft] = useState(30); - const { data } = trpc.viewer.public.stripeCheckoutSession.useQuery( - { - stripeCustomerId, - checkoutSessionId: sessionId, - }, - { - enabled: !!stripeCustomerId || !!sessionId, - staleTime: Infinity, - } - ); - useSendFirstVerificationLogin({ email: data?.customer?.email, username: data?.customer?.username }); - // @note: check for t=timestamp and apply disabled state and secondsLeft accordingly - // to avoid refresh to skip waiting 30 seconds to re-send email - useEffect(() => { - const lastSent = new Date(parseInt(`${t}`)); - // @note: This double round() looks ugly but it's the only way I came up to get the time difference in seconds - const difference = Math.round(Math.round(new Date().getTime() - lastSent.getTime()) / 1000); - if (difference < 30) { - // If less than 30 seconds, set the seconds left to 30 - difference - setSecondsLeft(30 - difference); - } else { - // else set the seconds left to 0 and disabled false - setSecondsLeft(0); - } - }, [t]); - // @note: here we make sure each second is decremented if disabled up to 0. - useEffect(() => { - if (secondsLeft > 0) { - const interval = setInterval(() => { - if (secondsLeft > 0) { - setSecondsLeft(secondsLeft - 1); - } - }, 1000); - return () => clearInterval(interval); - } - }, [secondsLeft]); - - if (!data) { - // Loading state - return ; - } - const { valid, hasPaymentFailed, customer } = data; - if (!valid) { - throw new Error("Invalid session or customer id"); - } - - if (!stripeCustomerId && !sessionId) { - return
Invalid Link
; - } - - return ( -
- - - {/* @note: Ternary can look ugly ant his might be extracted later but I think at 3 it's not yet worth - it or too hard to read. */} - {hasPaymentFailed - ? "Your payment failed" - : sessionId - ? "Payment successful!" - : `Verify your email | ${APP_NAME}`} - - -
-
- {hasPaymentFailed ? : sessionId ? : } -

- {hasPaymentFailed - ? "Your payment failed" - : sessionId - ? "Payment successful!" - : "Check your Inbox"} -

- {hasPaymentFailed && ( -

Your account has been created, but your premium has not been reserved.

- )} -

- We have sent an email to {customer?.email} with a link to activate your account.{" "} - {hasPaymentFailed && - "Once you activate your account you will be able to try purchase your premium username again or select a different one."} -

-
- -
-
-
-

Don’t seen an email?

- -
-
-
- ); -} +import type { PageProps } from "~/auth/verify-view"; +import Verify from "~/auth/verify-view"; -export { getServerSideProps }; -Verify.PageWrapper = PageWrapper; +const Page = (props: PageProps) => ; +Page.PageWrapper = PageWrapper; +export default Page; +export { getServerSideProps } from "@server/lib/auth/verify/getServerSideProps"; diff --git a/apps/web/server/lib/auth/verify-email-change/getServerSideProps.tsx b/apps/web/server/lib/auth/verify-email-change/getServerSideProps.tsx new file mode 100644 index 00000000000000..70183604a40444 --- /dev/null +++ b/apps/web/server/lib/auth/verify-email-change/getServerSideProps.tsx @@ -0,0 +1,52 @@ +import type { GetServerSidePropsContext } from "next"; +import { z } from "zod"; + +import { WEBAPP_URL } from "@calcom/lib/constants"; + +const tokenSchema = z.object({ + token: z.string(), +}); + +export async function getServerSideProps(context: GetServerSidePropsContext) { + const parsed = tokenSchema.safeParse(context.query); + if (!parsed.success) { + return { + notFound: true, + } as const; + } + const { token } = parsed.data; + + if (!token) { + return { + notFound: true, + } as const; + } + + const params = new URLSearchParams({ + token, + }); + + const response = await fetch(`${WEBAPP_URL}/api/auth/verify-email?${params.toString()}`, { + method: "POST", + }); + + if (!response.ok) { + return { + props: { + updateSession: false, + token, + updatedEmail: false, + }, + }; + } + + const data = await response.json(); + + return { + props: { + updateSession: true, + token, + updatedEmail: data.updatedEmail ?? null, + }, + }; +} diff --git a/packages/lib/server/repository/stripe.ts b/packages/lib/server/repository/stripe.ts new file mode 100644 index 00000000000000..f8507ee13ec68c --- /dev/null +++ b/packages/lib/server/repository/stripe.ts @@ -0,0 +1,62 @@ +import stripe from "@calcom/app-store/stripepayment/lib/server"; +import { + ZStripeCheckoutSessionInputSchema, + type TStripeCheckoutSessionInputSchema, +} from "@calcom/trpc/server/routers/publicViewer/stripeCheckoutSession.schema"; + +export class StripeRepository { + static async getCheckoutSession(input: TStripeCheckoutSessionInputSchema) { + const { checkoutSessionId, stripeCustomerId } = input; + + // Moved the following data checks to superRefine + ZStripeCheckoutSessionInputSchema.parse(input); + + let customerId: string; + let isPremiumUsername = false; + let hasPaymentFailed = false; + if (checkoutSessionId) { + try { + const session = await stripe.checkout.sessions.retrieve(checkoutSessionId); + if (typeof session.customer !== "string") { + return { + valid: false, + }; + } + customerId = session.customer; + isPremiumUsername = true; + hasPaymentFailed = session.payment_status !== "paid"; + } catch (e) { + return { + valid: false, + }; + } + } else { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + customerId = stripeCustomerId!; + } + + try { + const customer = await stripe.customers.retrieve(customerId); + if (customer.deleted) { + return { + valid: false, + }; + } + + return { + valid: true, + hasPaymentFailed, + isPremiumUsername, + customer: { + username: customer.metadata.username, + email: customer.metadata.email, + stripeCustomerId: customerId, + }, + }; + } catch (e) { + return { + valid: false, + }; + } + } +} diff --git a/packages/trpc/server/routers/publicViewer/stripeCheckoutSession.handler.ts b/packages/trpc/server/routers/publicViewer/stripeCheckoutSession.handler.ts index 6ff5ac1aa61c9c..6c6465ebb471a2 100644 --- a/packages/trpc/server/routers/publicViewer/stripeCheckoutSession.handler.ts +++ b/packages/trpc/server/routers/publicViewer/stripeCheckoutSession.handler.ts @@ -1,65 +1,13 @@ -import stripe from "@calcom/app-store/stripepayment/lib/server"; +import { StripeRepository } from "@calcom/lib/server/repository/stripe"; import type { TStripeCheckoutSessionInputSchema } from "./stripeCheckoutSession.schema"; -import { ZStripeCheckoutSessionInputSchema } from "./stripeCheckoutSession.schema"; type StripeCheckoutSessionOptions = { input: TStripeCheckoutSessionInputSchema; }; export const stripeCheckoutSessionHandler = async ({ input }: StripeCheckoutSessionOptions) => { - const { checkoutSessionId, stripeCustomerId } = input; - - // Moved the following data checks to superRefine - ZStripeCheckoutSessionInputSchema.parse(input); - - let customerId: string; - let isPremiumUsername = false; - let hasPaymentFailed = false; - if (checkoutSessionId) { - try { - const session = await stripe.checkout.sessions.retrieve(checkoutSessionId); - if (typeof session.customer !== "string") { - return { - valid: false, - }; - } - customerId = session.customer; - isPremiumUsername = true; - hasPaymentFailed = session.payment_status !== "paid"; - } catch (e) { - return { - valid: false, - }; - } - } else { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - customerId = stripeCustomerId!; - } - - try { - const customer = await stripe.customers.retrieve(customerId); - if (customer.deleted) { - return { - valid: false, - }; - } - - return { - valid: true, - hasPaymentFailed, - isPremiumUsername, - customer: { - username: customer.metadata.username, - email: customer.metadata.email, - stripeCustomerId: customerId, - }, - }; - } catch (e) { - return { - valid: false, - }; - } + return await StripeRepository.getCheckoutSession(input); }; export default stripeCheckoutSessionHandler; From e3b478f5b13e44fe9a7630e74c44af47e213a849 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 13 Sep 2024 20:34:03 +0400 Subject: [PATCH 34/40] fix: get slot logic for v1 API (#16620) * fix faulty slug match * Allow team event slot * pass it to getSchedule --------- Co-authored-by: Keith Williams --- apps/api/v1/pages/api/slots/_get.ts | 5 ++- apps/web/test/lib/getSchedule.test.ts | 29 +++++++------ .../utils/bookingScenario/bookingScenario.ts | 2 +- packages/lib/server/repository/user.ts | 41 +++++++++---------- .../trpc/server/routers/viewer/slots/util.ts | 1 + 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/apps/api/v1/pages/api/slots/_get.ts b/apps/api/v1/pages/api/slots/_get.ts index e4323d0037378e..16dc7f8aaf82cd 100644 --- a/apps/api/v1/pages/api/slots/_get.ts +++ b/apps/api/v1/pages/api/slots/_get.ts @@ -27,12 +27,13 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { isColdStart = false; } - const { usernameList, ...rest } = req.query; + const { usernameList, isTeamEvent, ...rest } = req.query; + const parsedIsTeamEvent = String(isTeamEvent).toLowerCase() === "true"; let slugs = usernameList; if (!Array.isArray(usernameList)) { slugs = usernameList ? [usernameList] : undefined; } - const input = getScheduleSchema.parse({ usernameList: slugs, ...rest }); + const input = getScheduleSchema.parse({ usernameList: slugs, isTeamEvent: parsedIsTeamEvent, ...rest }); const timeZoneSupported = input.timeZone ? isSupportedTimeZone(input.timeZone) : false; const availableSlots = await getAvailableSlots({ ctx: await createContext({ req, res }), input }); const slotsInProvidedTimeZone = timeZoneSupported diff --git a/apps/web/test/lib/getSchedule.test.ts b/apps/web/test/lib/getSchedule.test.ts index 4946c304f6582a..d8f87e846cffef 100644 --- a/apps/web/test/lib/getSchedule.test.ts +++ b/apps/web/test/lib/getSchedule.test.ts @@ -1526,21 +1526,20 @@ describe("getSchedule", () => { }); const scenario = await createBookingScenario( - getScenarioData({ - eventTypes: [ - { - id: 1, - slotInterval: 45, - length: 45, - users: [ - { - id: 101, - }, - ], - }, - ], - organizer, - }) + getScenarioData( + { + eventTypes: [ + { + id: 1, + slotInterval: 45, + length: 45, + userId: 101, + }, + ], + organizer, + }, + { id: org.id } + ) ); const { dateString: plus1DateString } = getDate({ dateIncrement: 1 }); diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts index 7f35c254c9f505..b186aa8050d620 100644 --- a/apps/web/test/utils/bookingScenario/bookingScenario.ts +++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts @@ -145,6 +145,7 @@ export type InputEventType = { length?: number; offsetStart?: number; slotInterval?: number; + userId?: number; minimumBookingNotice?: number; /** * These user ids are `ScenarioData["users"]["id"]` @@ -1249,7 +1250,6 @@ export function getScenarioData( ]; }); } - eventTypes.forEach((eventType) => { if ( eventType.users?.filter((eventTypeUser) => { diff --git a/packages/lib/server/repository/user.ts b/packages/lib/server/repository/user.ts index e42e2025c5fad1..924fd3d57f7e02 100644 --- a/packages/lib/server/repository/user.ts +++ b/packages/lib/server/repository/user.ts @@ -175,27 +175,26 @@ export class UserRepository { organization: getParsedTeam(profile.organization), })) : null; - - const where = profiles - ? { - // Get UserIds from profiles - id: { - in: profiles.map((profile) => profile.user.id), - }, - } - : { - username: { - in: usernameList, - }, - ...(orgSlug - ? { - organization: whereClauseForOrgWithSlugOrRequestedSlug(orgSlug), - } - : { - organization: null, - }), - }; - + const where = + profiles && profiles.length > 0 + ? { + // Get UserIds from profiles + id: { + in: profiles.map((profile) => profile.user.id), + }, + } + : { + username: { + in: usernameList, + }, + ...(orgSlug + ? { + organization: whereClauseForOrgWithSlugOrRequestedSlug(orgSlug), + } + : { + organization: null, + }), + }; return { where, profiles }; } diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts index 73c3732d21ede9..1ddc26e4030b40 100644 --- a/packages/trpc/server/routers/viewer/slots/util.ts +++ b/packages/trpc/server/routers/viewer/slots/util.ts @@ -113,6 +113,7 @@ async function getEventTypeId({ organizationDetails ?? { currentOrgDomain: null, isValidOrgDomain: false } ); } + if (!userId && !teamId) throw new TRPCError({ code: "NOT_FOUND" }); const eventType = await prisma.eventType.findFirst({ where: { slug: eventTypeSlug, From d72900d164575de739d80bbcac9e479ecaf7a1a1 Mon Sep 17 00:00:00 2001 From: Rajiv Sahal Date: Fri, 13 Sep 2024 22:47:44 +0530 Subject: [PATCH 35/40] hide platform tab from navigation when team not setup (#16630) Co-authored-by: Peer Richelsen --- packages/features/shell/Shell.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx index 6bf594c2dab1fd..461c5cb44aa6e7 100644 --- a/packages/features/shell/Shell.tsx +++ b/packages/features/shell/Shell.tsx @@ -544,7 +544,7 @@ function UserDropdown({ small }: UserDropdownProps) { )} - {!isPlatformPages && ( + {!isPlatformPages && isPlatformUser && ( Date: Fri, 13 Sep 2024 20:45:59 +0300 Subject: [PATCH 36/40] chore: rewrite imports of prisma enums to @calcom/prisma/enums (#16633) --- .../features/ee/workflows/lib/allowDisablingStandardEmails.ts | 3 +-- .../templates/whatsapp/whatsappEventCancelledTemplate.ts | 3 +-- .../templates/whatsapp/whatsappEventCompletedTemplate.ts | 3 +-- .../templates/whatsapp/whatsappEventReminderTemplate.ts | 3 +-- .../templates/whatsapp/whatsappEventRescheduledTemplate.ts | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/features/ee/workflows/lib/allowDisablingStandardEmails.ts b/packages/features/ee/workflows/lib/allowDisablingStandardEmails.ts index 28a7556b76c92c..ec301e55d6ee87 100644 --- a/packages/features/ee/workflows/lib/allowDisablingStandardEmails.ts +++ b/packages/features/ee/workflows/lib/allowDisablingStandardEmails.ts @@ -1,5 +1,4 @@ -import { WorkflowTriggerEvents } from "@calcom/prisma/client"; -import { WorkflowActions } from "@calcom/prisma/enums"; +import { WorkflowActions, WorkflowTriggerEvents } from "@calcom/prisma/enums"; import type { Workflow } from "./types"; diff --git a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCancelledTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCancelledTemplate.ts index 8a34c5619667fb..074afca5a24ce2 100644 --- a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCancelledTemplate.ts +++ b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCancelledTemplate.ts @@ -1,7 +1,6 @@ -import { WorkflowActions } from "@prisma/client"; - import dayjs from "@calcom/dayjs"; import { TimeFormat } from "@calcom/lib/timeFormat"; +import { WorkflowActions } from "@calcom/prisma/enums"; export const whatsappEventCancelledTemplate = ( isEditingMode: boolean, diff --git a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCompletedTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCompletedTemplate.ts index a1cdf807ae14c1..c45c3e68f624a9 100644 --- a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCompletedTemplate.ts +++ b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventCompletedTemplate.ts @@ -1,7 +1,6 @@ -import { WorkflowActions } from "@prisma/client"; - import dayjs from "@calcom/dayjs"; import { TimeFormat } from "@calcom/lib/timeFormat"; +import { WorkflowActions } from "@calcom/prisma/enums"; export const whatsappEventCompletedTemplate = ( isEditingMode: boolean, diff --git a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventReminderTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventReminderTemplate.ts index f5f1b22411a360..906e60dc6170e9 100644 --- a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventReminderTemplate.ts +++ b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventReminderTemplate.ts @@ -1,7 +1,6 @@ -import { WorkflowActions } from "@prisma/client"; - import dayjs from "@calcom/dayjs"; import { TimeFormat } from "@calcom/lib/timeFormat"; +import { WorkflowActions } from "@calcom/prisma/enums"; export const whatsappReminderTemplate = ( isEditingMode: boolean, diff --git a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventRescheduledTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventRescheduledTemplate.ts index 1e7ff1ce75d646..b6b8bff0d452f7 100644 --- a/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventRescheduledTemplate.ts +++ b/packages/features/ee/workflows/lib/reminders/templates/whatsapp/whatsappEventRescheduledTemplate.ts @@ -1,7 +1,6 @@ -import { WorkflowActions } from "@prisma/client"; - import dayjs from "@calcom/dayjs"; import { TimeFormat } from "@calcom/lib/timeFormat"; +import { WorkflowActions } from "@calcom/prisma/enums"; export const whatsappEventRescheduledTemplate = ( isEditingMode: boolean, From b84099aec0b11725839a135804aed4eb453420d5 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:14:33 +0100 Subject: [PATCH 37/40] fix: use correct redirect url for google oauth when using overlay calendar (#16623) --- packages/platform/atoms/booker/BookerWebWrapper.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/platform/atoms/booker/BookerWebWrapper.tsx b/packages/platform/atoms/booker/BookerWebWrapper.tsx index ac3a272e248529..e5948c2ff93928 100644 --- a/packages/platform/atoms/booker/BookerWebWrapper.tsx +++ b/packages/platform/atoms/booker/BookerWebWrapper.tsx @@ -20,7 +20,7 @@ import { useVerifyEmail } from "@calcom/features/bookings/Booker/components/hook import { useBookerStore, useInitializeBookerStore } from "@calcom/features/bookings/Booker/store"; import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event"; import { useBrandColors } from "@calcom/features/bookings/Booker/utils/use-brand-colors"; -import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants"; +import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR, WEBAPP_URL } from "@calcom/lib/constants"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; import { BookerLayouts } from "@calcom/prisma/zod-utils"; @@ -188,11 +188,10 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => { router.push("/apps/categories/calendar"); }} onClickOverlayContinue={() => { - const currentUrl = new URL(window.location.href); - currentUrl.pathname = "/login/"; - currentUrl.searchParams.set("callbackUrl", window.location.pathname); - currentUrl.searchParams.set("overlayCalendar", "true"); - router.push(currentUrl.toString()); + const newUrl = new URL(`${WEBAPP_URL}/login`); + newUrl.searchParams.set("callbackUrl", window.location.pathname); + newUrl.searchParams.set("overlayCalendar", "true"); + router.push(newUrl.toString()); }} onOverlaySwitchStateChange={onOverlaySwitchStateChange} sessionUsername={session?.user.username} From e3e2bc804a3224f50568fc27ce77bc38e1591a9c Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Sat, 14 Sep 2024 00:17:24 +0200 Subject: [PATCH 38/40] chore: added IS_EUROPE for signup (#16639) --- apps/web/pages/signup.tsx | 29 +++++++++++++++++------------ packages/lib/constants.ts | 4 ++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx index 233a13cc05c35f..60c6d8eb02f75f 100644 --- a/apps/web/pages/signup.tsx +++ b/apps/web/pages/signup.tsx @@ -23,6 +23,7 @@ import { APP_NAME, URL_PROTOCOL_REGEX, IS_CALCOM, + IS_EUROPE, WEBAPP_URL, CLOUDFLARE_SITE_ID, WEBSITE_PRIVACY_POLICY_URL, @@ -295,23 +296,27 @@ export default function Signup({ return ( <> - {IS_CALCOM && COOKIE_CONSENT && process.env.NEXT_PUBLIC_GTM_ID ? ( + {IS_CALCOM && (!IS_EUROPE || COOKIE_CONSENT) ? ( <> -