diff --git a/packages/emails/src/components/ManageLink.tsx b/packages/emails/src/components/ManageLink.tsx index 7a42314724..fb0cc35631 100644 --- a/packages/emails/src/components/ManageLink.tsx +++ b/packages/emails/src/components/ManageLink.tsx @@ -1,4 +1,4 @@ -import { getCancelLink, getRescheduleLink, getBookingUrl } from "@calcom/lib/CalEventParser"; +import { getBookingUrl, getCancelLink, getRescheduleLink } from "@calcom/lib/CalEventParser"; import type { CalendarEvent, Person } from "@calcom/types/Calendar"; export function ManageLink(props: { calEvent: CalendarEvent; attendee: Person }) { @@ -11,8 +11,8 @@ export function ManageLink(props: { calEvent: CalendarEvent; attendee: Person }) const isOriginalAttendee = props.attendee.email === props.calEvent.attendees[0]?.email; const isOrganizer = props.calEvent.organizer.email === props.attendee.email; - const hasCancelLink = Boolean(cancelLink); - const hasRescheduleLink = Boolean(rescheduleLink); + const hasCancelLink = Boolean(cancelLink) && !props.calEvent.disableCancelling; + const hasRescheduleLink = Boolean(rescheduleLink) && !props.calEvent.disableRescheduling; const hasBookingLink = Boolean(bookingLink); const isRecurringEvent = props.calEvent.recurringEvent; const shouldDisplayRescheduleLink = Boolean(hasRescheduleLink && !isRecurringEvent); @@ -39,8 +39,7 @@ export function ManageLink(props: { calEvent: CalendarEvent; attendee: Person }) textAlign: "center", width: "100%", }}> - <>{t("need_to_make_a_change")} - + {(shouldDisplayRescheduleLink || hasCancelLink) && <>{t("need_to_make_a_change")}} {shouldDisplayRescheduleLink && ( { expect(event.title).toBe("Updated Event"); expect(event.type).toBe("existing-type"); }); + + it("should propagate disableCancelling and disableRescheduling", () => { + const event = new CalendarEventBuilder() + .withBasicDetails({ + bookerUrl: "https://cal.com/user/test-slug", + title: "Test Event", + startTime: mockStartTime, + endTime: mockEndTime, + additionalNotes: "Some notes", + }) + .withEventType({ + slug: "test-slug", + description: "Test description", + id: 123, + disableCancelling: true, + disableRescheduling: true, + }) + .build(); + + expect(event.disableCancelling).toBe(true); + expect(event.disableRescheduling).toBe(true); + }); }); diff --git a/packages/features/CalendarEventBuilder.ts b/packages/features/CalendarEventBuilder.ts index a4d9bae742..eb3abd2914 100644 --- a/packages/features/CalendarEventBuilder.ts +++ b/packages/features/CalendarEventBuilder.ts @@ -53,6 +53,8 @@ export class CalendarEventBuilder { seatsShowAttendees?: boolean | null; seatsShowAvailabilityCount?: boolean | null; customReplyToEmail?: string | null; + disableRescheduling?: boolean; + disableCancelling?: boolean; }) { this.event = { ...this.event, @@ -68,6 +70,8 @@ export class CalendarEventBuilder { seatsShowAttendees: eventType.seatsPerTimeSlot ? eventType.seatsShowAttendees : true, seatsShowAvailabilityCount: eventType.seatsPerTimeSlot ? eventType.seatsShowAvailabilityCount : true, customReplyToEmail: eventType.customReplyToEmail, + disableRescheduling: eventType.disableRescheduling ?? false, + disableCancelling: eventType.disableCancelling ?? false, }; return this; } diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index 203841180a..67d432a759 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -1129,6 +1129,8 @@ async function handler( seatsShowAttendees: eventType.seatsPerTimeSlot ? eventType.seatsShowAttendees : true, seatsShowAvailabilityCount: eventType.seatsPerTimeSlot ? eventType.seatsShowAvailabilityCount : true, customReplyToEmail: eventType.customReplyToEmail, + disableRescheduling: eventType.disableRescheduling ?? false, + disableCancelling: eventType.disableCancelling ?? false, }) .withOrganizer({ id: organizerUser.id, diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts index dc4db93820..80b3efc4c3 100644 --- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts +++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts @@ -23,6 +23,8 @@ export const getEventTypesFromDB = async (eventTypeId: number) => { disableGuests: true, restrictionScheduleId: true, useBookerTimezone: true, + disableRescheduling: true, + disableCancelling: true, users: { select: { credentials: { diff --git a/packages/lib/builders/CalendarEvent/builder.ts b/packages/lib/builders/CalendarEvent/builder.ts index 56c0555881..c0f070b248 100644 --- a/packages/lib/builders/CalendarEvent/builder.ts +++ b/packages/lib/builders/CalendarEvent/builder.ts @@ -147,6 +147,8 @@ export class CalendarEventBuilder implements ICalendarEventBuilder { destinationCalendar: true, hideCalendarNotes: true, hideCalendarEventDetails: true, + disableCancelling: true, + disableRescheduling: true, }, }); } catch (error) { diff --git a/packages/types/Calendar.d.ts b/packages/types/Calendar.d.ts index 656c7b6c0a..732caf0790 100644 --- a/packages/types/Calendar.d.ts +++ b/packages/types/Calendar.d.ts @@ -206,6 +206,8 @@ export interface CalendarEvent { iCalUID?: string | null; iCalSequence?: number | null; hideOrganizerEmail?: boolean; + disableCancelling?: boolean; + disableRescheduling?: boolean; // It has responses to all the fields(system + user) responses?: CalEventResponses | null;