Skip to content

Scheduling infrastructure for absolutely everyone.

feat: Setting for rescheduling past bookings (#18358)

Amit Sharma438a73b0cdf7
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 3ae610aad99..ee86420da8e 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -216,7 +216,7 @@ function BookingListItem(booking: BookingItemProps) {
];
const editBookingActions: ActionType[] = [
- ...(isBookingInPast
+ ...(isBookingInPast && !booking.eventType.allowReschedulingPastBookings
? []
: [
{
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
index 97e9cef7b01..13a95ac662c 100644
--- a/apps/web/lib/booking.ts
+++ b/apps/web/lib/booking.ts
@@ -37,6 +37,7 @@ export const getEventTypesFromDB = async (id: number) => {
price: true,
currency: true,
bookingFields: true,
+ allowReschedulingPastBookings: true,
disableGuests: true,
timeZone: true,
profile: {
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index fe3974642fb..ef6ac935bdb 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -57,6 +57,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
},
},
slug: true,
+ allowReschedulingPastBookings: true,
team: {
select: {
parentId: true,
@@ -131,7 +132,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
});
const isBookingInPast = booking.endTime && new Date(booking.endTime) < new Date();
- if (isBookingInPast) {
+ if (isBookingInPast && !eventType.allowReschedulingPastBookings) {
const destinationUrlSearchParams = new URLSearchParams();
const responses = bookingSeat ? getSafe<string>(bookingSeat.data, ["responses"]) : booking.responses;
const name = getSafe<string>(responses, ["name"]);
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index e2283033667..5cb9fe155c8 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -730,22 +730,23 @@ export default function Success(props: PageProps) {
</span>
<>
- {!props.recurringBookings && !isBookingInPast && (
- <span className="text-default inline">
- <span className="underline" data-testid="reschedule-link">
- <Link
- href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${
- currentUserEmail
- ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`
- : ""
- }`}
- legacyBehavior>
- {t("reschedule")}
- </Link>
+ {!props.recurringBookings &&
+ (!isBookingInPast || eventType.allowReschedulingPastBookings) && (
+ <span className="text-default inline">
+ <span className="underline" data-testid="reschedule-link">
+ <Link
+ href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${
+ currentUserEmail
+ ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`
+ : ""
+ }`}
+ legacyBehavior>
+ {t("reschedule")}
+ </Link>
+ </span>
+ <span className="mx-2">{t("or_lowercase")}</span>
</span>
- <span className="mx-2">{t("or_lowercase")}</span>
- </span>
- )}
+ )}
<button
data-testid="cancel"
diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts
index 09d365924b2..ead6f8de70e 100644
--- a/apps/web/playwright/reschedule.e2e.ts
+++ b/apps/web/playwright/reschedule.e2e.ts
@@ -50,6 +50,53 @@ test.describe("Reschedule Tests", async () => {
await booking.delete();
});
+ test("Should not show reschedule and request reschedule option if booking in past and disallowed", async ({
+ page,
+ users,
+ bookings,
+ }) => {
+ const user = await users.create();
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ const booking = await bookings.create(user.id, user.username, user.eventTypes[0].id!, {
+ status: BookingStatus.ACCEPTED,
+ startTime: dayjs().subtract(2, "day").toDate(),
+ endTime: dayjs().subtract(2, "day").add(30, "minutes").toDate(),
+ });
+
+ await prisma.eventType.update({
+ where: {
+ id: user.eventTypes[0].id,
+ },
+ data: {
+ allowReschedulingPastBookings: true,
+ },
+ });
+
+ await user.apiLogin();
+ await page.goto("/bookings/past");
+
+ await page.locator('[data-testid="edit_booking"]').nth(0).click();
+
+ await expect(page.locator('[data-testid="reschedule"]')).toBeVisible();
+ await expect(page.locator('[data-testid="reschedule_request"]')).toBeVisible();
+
+ await prisma.eventType.update({
+ where: {
+ id: user.eventTypes[0].id,
+ },
+ data: {
+ allowReschedulingPastBookings: false,
+ },
+ });
+
+ await page.reload();
+
+ await page.locator('[data-testid="edit_booking"]').nth(0).click();
+
+ await expect(page.locator('[data-testid="reschedule"]')).toBeHidden();
+ await expect(page.locator('[data-testid="reschedule_request"]')).toBeHidden();
+ });
+
test("Should display former time when rescheduling availability", async ({ page, users, bookings }) => {
const user = await users.create();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 4f90233a022..83190cb49c0 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -2907,6 +2907,8 @@
"attribute_weight_enabled_description": "By enabling weights, it would be possible to assign higher priority to certain attributes per user. The higher the weight, the higher the priority.",
"routed": "Routed",
"reassigned": "Reassigned",
+ "allow_rescheduling_past_events": "Allow rescheduling past events",
+ "allow_rescheduling_past_events_description": "Enabling this option allows for past events to be rescheduled",
"rerouted": "Rerouted",
"salesforce_assigned": "Salesforce assignment",
"router_position": "Router Position",
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index f8accfd4798..fd07df2763a 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -476,6 +476,7 @@ export const EventAdvancedTab = ({
const eventTypeColorLocked = shouldLockDisableProps("eventTypeColor");
const lockTimeZoneToggleOnBookingPageLocked = shouldLockDisableProps("lockTimeZoneToggleOnBookingPage");
const multiplePrivateLinksLocked = shouldLockDisableProps("multiplePrivateLinks");
+ const reschedulingPastBookingsLocked = shouldLockDisableProps("allowReschedulingPastBookings");
const { isLocked, ...eventNameLocked } = shouldLockDisableProps("eventName");
if (isManagedEventType) {
@@ -893,6 +894,21 @@ export const EventAdvancedTab = ({
/>
)}
/>
+ <Controller
+ name="allowReschedulingPastBookings"
+ render={({ field: { value, onChange } }) => (
+ <SettingsToggle
+ labelClassName={classNames("text-sm")}
+ toggleSwitchAtTheEnd={true}
+ switchContainerClassName={classNames("border-subtle rounded-lg border py-6 px-4 sm:px-6")}
+ title={t("allow_rescheduling_past_events")}
+ {...reschedulingPastBookingsLocked}
+ description={t("allow_rescheduling_past_events_description")}
+ checked={value}
+ onCheckedChange={(e) => onChange(e)}
+ />
+ )}
+ />
<Controller
name="eventTypeColor"
render={() => (
diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts
index 8a1061a78e9..9aeddef0b34 100644
--- a/packages/lib/defaultEvents.ts
+++ b/packages/lib/defaultEvents.ts
@@ -88,6 +88,7 @@ const commons = {
seatsShowAttendees: null,
seatsShowAvailabilityCount: null,
onlyShowFirstAvailableSlot: false,
+ allowReschedulingPastBookings: false,
id: 0,
hideCalendarNotes: false,
hideCalendarEventDetails: false,
diff --git a/packages/lib/server/eventTypeSelect.ts b/packages/lib/server/eventTypeSelect.ts
index 1afb1ad2c61..3c65195ff01 100644
--- a/packages/lib/server/eventTypeSelect.ts
+++ b/packages/lib/server/eventTypeSelect.ts
@@ -35,6 +35,7 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
afterEventBuffer: true,
seatsPerTimeSlot: true,
onlyShowFirstAvailableSlot: true,
+ allowReschedulingPastBookings: true,
seatsShowAttendees: true,
seatsShowAvailabilityCount: true,
scheduleId: true,
diff --git a/packages/lib/server/repository/eventType.ts b/packages/lib/server/repository/eventType.ts
index 9a52734ed1f..761f9da5f5d 100644
--- a/packages/lib/server/repository/eventType.ts
+++ b/packages/lib/server/repository/eventType.ts
@@ -501,6 +501,7 @@ export class EventTypeRepository {
onlyShowFirstAvailableSlot: true,
durationLimits: true,
assignAllTeamMembers: true,
+ allowReschedulingPastBookings: true,
assignRRMembersUsingSegment: true,
rrSegmentQueryValue: true,
isRRWeightsEnabled: true,
@@ -784,6 +785,7 @@ export class EventTypeRepository {
periodStartDate: true,
periodEndDate: true,
onlyShowFirstAvailableSlot: true,
+ allowReschedulingPastBookings: true,
periodCountCalendarDays: true,
rescheduleWithSameRoundRobinHost: true,
periodDays: true,
diff --git a/packages/lib/test/builder.ts b/packages/lib/test/builder.ts
index 2263f51e778..c2df9e83d03 100644
--- a/packages/lib/test/builder.ts
+++ b/packages/lib/test/builder.ts
@@ -146,6 +146,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
rrSegmentQueryValue: null,
autoTranslateDescriptionEnabled: false,
useEventLevelSelectedCalendars: false,
+ allowReschedulingPastBookings: false,
...eventType,
};
};
diff --git a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
index 8aa7d04755b..cb01a90f45d 100644
--- a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
+++ b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
@@ -90,6 +90,7 @@ export const useEventTypeForm = ({
requiresConfirmationForFreeEmail: eventType.requiresConfirmationForFreeEmail,
slotInterval: eventType.slotInterval,
minimumBookingNotice: eventType.minimumBookingNotice,
+ allowReschedulingPastBookings: eventType.allowReschedulingPastBookings,
metadata: eventType.metadata,
hosts: eventType.hosts.sort((a, b) => sortHosts(a, b, eventType.isRRWeightsEnabled)),
successRedirectUrl: eventType.successRedirectUrl || "",
diff --git a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
new file mode 100644
index 00000000000..71384956ca4
--- /dev/null
+++ b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventType" ADD COLUMN "allowReschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index f74af5f01d5..52cee38445c 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -166,6 +166,7 @@ model EventType {
fieldTranslations EventTypeTranslation[]
maxLeadThreshold Int?
selectedCalendars SelectedCalendar[]
+ allowReschedulingPastBookings Boolean @default(false)
/// @zod.custom(imports.eventTypeColor)
eventTypeColor Json?
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index 0475505e350..df77a724470 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -748,6 +748,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
assignAllTeamMembers: true,
isRRWeightsEnabled: true,
eventTypeColor: true,
+ allowReschedulingPastBookings: true,
rescheduleWithSameRoundRobinHost: true,
maxLeadThreshold: true,
};
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 9c5bf083e7e..a55186b1949 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -236,6 +236,7 @@ export async function getBookings({
seatsShowAttendees: true,
seatsShowAvailabilityCount: true,
eventTypeColor: true,
+ allowReschedulingPastBookings: true,
schedulingType: true,
length: true,
team: {
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 2da2a8bbf32..ff0a422dbe7 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -716,6 +716,7 @@ async function getExistingBookings(
seatsPerTimeSlot: true,
requiresConfirmationWillBlockSlot: true,
requiresConfirmation: true,
+ allowReschedulingPastBookings: true,
},
},
...(!!eventType?.seatsPerTimeSlot && {