Feature/ Manage Booking Questions (#6560)

* WIP

* Create Booking Questions builder

* Renaming things

* wip

* wip

* Implement Add Guests and other fixes

* Fixes after testing

* Fix wrong status code 404

* Fixes

* Lint fixes

* Self review comments addressed

* More self review comments addressed

* Feedback from zomars

* BugFixes after testing

* More fixes discovered during review

* Update packages/lib/hooks/useHasPaidPlan.ts

Co-authored-by: Omar López <[email protected]>

* More fixes discovered during review

* Update packages/ui/components/form/inputs/Input.tsx

Co-authored-by: Omar López <[email protected]>

* More fixes discovered during review

* Update packages/features/bookings/lib/getBookingFields.ts

Co-authored-by: sean-brydon <[email protected]>

* More PR review fixes

* Hide label using labelSrOnly

* Fix Carinas feedback and implement 2 workflows thingy

* Misc fixes

* Fixes from Loom comments and PR

* Fix a lint errr

* Fix cancellation reason

* Fix regression in edit due to name conflict check

* Update packages/features/form-builder/FormBuilder.tsx

Co-authored-by: Carina Wollendorfer <[email protected]>

* Fix options not set when default value is used

* Restoring reqBody to avoid uneeded conflicts with main

* Type fix

* Update apps/web/components/booking/pages/BookingPage.tsx

Co-authored-by: Omar López <[email protected]>

* Update packages/features/form-builder/FormBuilder.tsx

Co-authored-by: Omar López <[email protected]>

* Update apps/web/components/booking/pages/BookingPage.tsx

Co-authored-by: Omar López <[email protected]>

* Apply suggestions from code review

Co-authored-by: Omar López <[email protected]>

* Show fields but mark them disabled

* Apply suggestions from code review

Co-authored-by: Omar López <[email protected]>

* More comments

* Fix booking success page crash when a booking doesnt have newly added required fields response

* Dark theme asterisk not visible

* Make location required in zodSchema as was there in production

* Linting

* Remove _metadata.ts files for apps that have config.json

* Revert "Remove _metadata.ts files for apps that have config.json"

This reverts commit d79bdd336cf312a30a8943af94c059947bd91ccd.

* Fix lint error

* Fix missing condition for samlSPConfig

* Delete unexpectedly added file

* yarn.lock change not required

* fix types

* Make checkboxes rounded

* Fix defaultLabel being stored as label due to SSR rendering

* Shaved 16kb from booking page

* Explicit types for profile

* Show payment value only if price is greater than 0

* Fix type error

* Add back inferred types as they are failing

* Fix duplicate label on number

---------

Co-authored-by: zomars <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
Co-authored-by: Carina Wollendorfer <[email protected]>
Co-authored-by: Efraín Rochín <[email protected]>
This commit is contained in:
authored and GitHub committed 2023-03-02 11:15:28 -07:00
1 parent 51bf613621
commit 517cfde5b8
58 files changed
+2921 -1463

No files matched your search

@@ -8,6 +8,7 @@ import getAppKeysFromSlug from "@calcom/app-store/_utils/getAppKeysFromSlug";
import { DailyLocationType } from "@calcom/app-store/locations";
import { stripeDataSchema } from "@calcom/app-store/stripepayment/lib/server";
import getApps from "@calcom/app-store/utils";
import { updateEvent } from "@calcom/core/CalendarManager";
import { validateBookingLimitOrder } from "@calcom/lib";
import { CAL_URL } from "@calcom/lib/constants";
import getEventTypeById from "@calcom/lib/getEventTypeById";
@@ -416,6 +417,7 @@ export const eventTypesRouter = router({
}),
create: authedProcedure.input(createEventTypeInput).mutation(async ({ ctx, input }) => {
const { schedulingType, teamId, ...rest } = input;
const userId = ctx.user.id;
// Get Users default conferncing app
@@ -537,11 +539,15 @@ export const eventTypesRouter = router({
userId,
// eslint-disable-next-line
teamId,
bookingFields,
...rest
} = input;
ensureUniqueBookingFields(bookingFields);
const data: Prisma.EventTypeUpdateInput = {
...rest,
bookingFields,
metadata: rest.metadata === null ? Prisma.DbNull : rest.metadata,
};
data.locations = locations ?? undefined;
@@ -786,6 +792,7 @@ export const eventTypesRouter = router({
recurringEvent: recurringEvent || undefined,
bookingLimits: bookingLimits ?? undefined,
metadata: metadata === null ? Prisma.DbNull : metadata,
bookingFields: eventType.bookingFields === null ? Prisma.DbNull : eventType.bookingFields,
};
const newEventType = await ctx.prisma.eventType.create({ data });
@@ -823,3 +830,19 @@ export const eventTypesRouter = router({
}
}),
});
function ensureUniqueBookingFields(fields: z.infer<typeof EventTypeUpdateInput>["bookingFields"]) {
if (!fields) {
return;
}
fields.reduce((discoveredFields, field) => {
if (discoveredFields[field.name]) {
throw new TRPCError({
code: "BAD_REQUEST",
message: `Duplicate booking field name: ${field.name}`,
});
}
discoveredFields[field.name] = true;
return discoveredFields;
}, {} as Record<string, true>);
}
@@ -10,6 +10,11 @@ import {
} from "@prisma/client";
import { z } from "zod";
import {
SMS_REMINDER_NUMBER_FIELD,
getSmsReminderNumberField,
getSmsReminderNumberSource,
} from "@calcom/features/bookings/lib/getBookingFields";
import type { WorkflowType } from "@calcom/features/ee/workflows/components/WorkflowListPage";
// import dayjs from "@calcom/dayjs";
import {
@@ -32,6 +37,7 @@ import {
verifyPhoneNumber,
sendVerificationCode,
} from "@calcom/features/ee/workflows/lib/reminders/verifyPhoneNumber";
import { upsertBookingField, removeBookingField } from "@calcom/features/eventtypes/lib/bookingFieldsManager";
import { IS_SELF_HOSTED, SENDER_ID, CAL_URL } from "@calcom/lib/constants";
import { SENDER_NAME } from "@calcom/lib/constants";
import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
@@ -547,6 +553,7 @@ export const workflowsRouter = router({
scheduled: boolean;
}[]
>[] = [];
removedEventTypes.forEach((eventTypeId) => {
const reminderToDelete = ctx.prisma.workflowReminder.findMany({
where: {
@@ -567,9 +574,17 @@ export const workflowsRouter = router({
scheduled: true,
},
});
remindersToDeletePromise.push(reminderToDelete);
});
for (const removedEventType of removedEventTypes) {
await removeSmsReminderFieldForBooking({
workflowId: id,
eventTypeId: removedEventType,
});
}
const remindersToDelete = await Promise.all(remindersToDeletePromise);
//cancel workflow reminders for all bookings from event types that got disabled
@@ -703,6 +718,16 @@ export const workflowsRouter = router({
});
}
for (const eventTypeId of activeOn) {
await upsertSmsReminderFieldForBooking({
workflowId: id,
isSmsReminderNumberRequired: input.steps.some(
(s) => s.action === WorkflowActions.SMS_ATTENDEE && s.numberRequired
),
eventTypeId,
});
}
userWorkflow.steps.map(async (oldStep) => {
const newStep = steps.filter((s) => s.id === oldStep.id)[0];
const remindersFromStep = await ctx.prisma.workflowReminder.findMany({
@@ -1268,6 +1293,9 @@ action === WorkflowActions.EMAIL_ADDRESS*/
},
],
},
include: {
steps: true,
},
});
if (!eventTypeWorkflow)
@@ -1291,6 +1319,16 @@ action === WorkflowActions.EMAIL_ADDRESS*/
eventTypeId,
},
});
await removeBookingField(
{
name: "smsReminderNumber",
},
{
id: "" + workflowId,
type: "workflow",
},
eventTypeId
);
} else {
await ctx.prisma.workflowsOnEventTypes.create({
data: {
@@ -1298,6 +1336,16 @@ action === WorkflowActions.EMAIL_ADDRESS*/
eventTypeId,
},
});
const isSmsReminderNumberRequired = eventTypeWorkflow.steps.some((step) => {
return step.action === WorkflowActions.SMS_ATTENDEE && step.numberRequired;
});
await upsertSmsReminderFieldForBooking({
workflowId,
isSmsReminderNumberRequired,
eventTypeId,
});
}
}),
sendVerificationCode: authedProcedure
@@ -1463,3 +1511,41 @@ action === WorkflowActions.EMAIL_ADDRESS*/
};
}),
});
async function upsertSmsReminderFieldForBooking({
workflowId,
eventTypeId,
isSmsReminderNumberRequired,
}: {
workflowId: number;
isSmsReminderNumberRequired: boolean;
eventTypeId: number;
}) {
await upsertBookingField(
getSmsReminderNumberField(),
getSmsReminderNumberSource({
workflowId,
isSmsReminderNumberRequired,
}),
eventTypeId
);
}
async function removeSmsReminderFieldForBooking({
workflowId,
eventTypeId,
}: {
workflowId: number;
eventTypeId: number;
}) {
await removeBookingField(
{
name: SMS_REMINDER_NUMBER_FIELD,
},
{
id: "" + workflowId,
type: "workflow",
},
eventTypeId
);
}