From 40d8f34e8da466bb7b40a637df892c01429ebb06 Mon Sep 17 00:00:00 2001 From: Alan Daniel <45767683+stylessh@users.noreply.github.com> Date: Fri, 12 Jan 2024 07:10:04 -0400 Subject: [PATCH 1/4] chore: rename 'reason' to 'cancellationReason' to match the api params schema (#13178) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- apps/api/pages/api/bookings/[id]/_delete.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/pages/api/bookings/[id]/_delete.ts b/apps/api/pages/api/bookings/[id]/_delete.ts index d67a9bb4df..451c8d05d4 100644 --- a/apps/api/pages/api/bookings/[id]/_delete.ts +++ b/apps/api/pages/api/bookings/[id]/_delete.ts @@ -33,7 +33,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform * type: boolean * description: Delete all remaining bookings * - in: query - * name: reason + * name: cancellationReason * required: false * schema: * type: string From 619ccf406587b5c4e97bf1b90f10be566bbab407 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 12 Jan 2024 11:12:57 +0000 Subject: [PATCH 2/4] New Crowdin translations by Github Action --- apps/web/public/static/locales/ru/common.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web/public/static/locales/ru/common.json b/apps/web/public/static/locales/ru/common.json index e255d31362..8262543836 100644 --- a/apps/web/public/static/locales/ru/common.json +++ b/apps/web/public/static/locales/ru/common.json @@ -56,6 +56,7 @@ "a_refund_failed": "Возврат не удался", "awaiting_payment_subject": "Ожидание оплаты: {{title}} на {{date}}", "meeting_awaiting_payment": "Ваша встреча ожидает оплаты", + "dark_theme_contrast_error": "Темный цвет темы не проходит проверку на контрастность. Мы рекомендуем вам изменить этот цвет, чтобы ваши кнопки были более заметны.", "help": "Помощь", "price": "Цена", "paid": "Оплачено", From fbc3f7b51fd325ddfc9dc13fdeb6db1645ec9452 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Sat, 13 Jan 2024 00:19:40 +1300 Subject: [PATCH 3/4] fix: correctly use eventTriggers parsed and use Array.from (#13193) Co-authored-by: Keith Williams --- apps/api/pages/api/webhooks/[id]/_patch.ts | 10 ++++++++-- apps/api/pages/api/webhooks/_post.ts | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/api/pages/api/webhooks/[id]/_patch.ts b/apps/api/pages/api/webhooks/[id]/_patch.ts index faba47d863..0a9b63f0de 100644 --- a/apps/api/pages/api/webhooks/[id]/_patch.ts +++ b/apps/api/pages/api/webhooks/[id]/_patch.ts @@ -69,7 +69,12 @@ import { schemaWebhookEditBodyParams, schemaWebhookReadPublic } from "~/lib/vali export async function patchHandler(req: NextApiRequest) { const { prisma, query, userId, isAdmin } = req; const { id } = schemaQueryIdAsString.parse(query); - const { eventTypeId, userId: bodyUserId, ...data } = schemaWebhookEditBodyParams.parse(req.body); + const { + eventTypeId, + userId: bodyUserId, + eventTriggers, + ...data + } = schemaWebhookEditBodyParams.parse(req.body); const args: Prisma.WebhookUpdateArgs = { where: { id }, data }; if (eventTypeId) { @@ -88,7 +93,8 @@ export async function patchHandler(req: NextApiRequest) { } if (args.data.eventTriggers) { - args.data.eventTriggers = [...new Set(args.data.eventTriggers)]; + const eventTriggersSet = new Set(eventTriggers); + args.data.eventTriggers = Array.from(eventTriggersSet); } const result = await prisma.webhook.update(args); diff --git a/apps/api/pages/api/webhooks/_post.ts b/apps/api/pages/api/webhooks/_post.ts index 9647a11738..e08d59d29d 100644 --- a/apps/api/pages/api/webhooks/_post.ts +++ b/apps/api/pages/api/webhooks/_post.ts @@ -66,7 +66,12 @@ import { schemaWebhookCreateBodyParams, schemaWebhookReadPublic } from "~/lib/va */ async function postHandler(req: NextApiRequest) { const { userId, isAdmin, prisma } = req; - const { eventTypeId, userId: bodyUserId, ...body } = schemaWebhookCreateBodyParams.parse(req.body); + const { + eventTypeId, + userId: bodyUserId, + eventTriggers, + ...body + } = schemaWebhookCreateBodyParams.parse(req.body); const args: Prisma.WebhookCreateArgs = { data: { id: uuidv4(), ...body } }; // If no event type, we assume is for the current user. If admin we run more checks below... @@ -88,7 +93,8 @@ async function postHandler(req: NextApiRequest) { } if (args.data.eventTriggers) { - args.data.eventTriggers = [...new Set(args.data.eventTriggers)]; + const eventTriggersSet = new Set(eventTriggers); + args.data.eventTriggers = Array.from(eventTriggersSet); } const data = await prisma.webhook.create(args); From 782127a9936be9905a47c79eb39299ff2832d386 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Fri, 12 Jan 2024 12:42:31 +0000 Subject: [PATCH 4/4] v3.6.4 --- 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 ac0b8fb91c..e63635ef6f 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@calcom/web", - "version": "3.6.3", + "version": "3.6.4", "private": true, "scripts": { "analyze": "ANALYZE=true next build",