Scheduling infrastructure for absolutely everyone.
fix: hide team members details when hideOrganizerEmail is enabled (#26833)
Anik Dhabal Babua8d559d331b7
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsxindex 9303e862f27..c617ae115f5 100644--- a/apps/web/components/booking/BookingListItem.tsx+++ b/apps/web/components/booking/BookingListItem.tsx@@ -431,6 +431,9 @@ function BookingListItem(booking: BookingItemProps) {currentEmail={userEmail}bookingUid={booking.uid}isBookingInPast={isBookingInPast}+ hideOrganizerEmail={booking.eventType?.hideOrganizerEmail}+ organizerEmail={booking.user?.email}+ eventTypeHosts={booking.eventType?.hosts}/>)}{isCancelled && booking.rescheduled && (@@ -686,14 +689,20 @@ interface UserProps {const FirstAttendee = ({user,currentEmail,+ hideOrganizerEmail,}: {user: UserProps;currentEmail: string | null | undefined;+ hideOrganizerEmail?: boolean;}) => {const { t } = useLocale();- return user.email === currentEmail ? (- <div className="inline-block">{t("you")}</div>- ) : (+ if (user.email === currentEmail) {+ return <div className="inline-block">{t("you")}</div>;+ }+ if (hideOrganizerEmail) {+ return <span className="inline-block">{user.name || ""}</span>;+ }+ return (<akey={user.email}className="hover:text-blue-500"@@ -709,8 +718,26 @@ type NoShowProps = {isBookingInPast: boolean;};-const Attendee = (attendeeProps: BookingAttendee & NoShowProps) => {- const { email, name, bookingUid, isBookingInPast, noShow, phoneNumber, user } = attendeeProps;+const Attendee = (+ attendeeProps: BookingAttendee &+ NoShowProps & {+ hideOrganizerEmail?: boolean;+ organizerEmail?: string | null;+ eventTypeHosts?: Array<{ user: { email: string } | null }> | null;+ }+) => {+ const {+ email,+ name,+ bookingUid,+ isBookingInPast,+ noShow,+ phoneNumber,+ user,+ hideOrganizerEmail,+ organizerEmail,+ eventTypeHosts,+ } = attendeeProps;const { t } = useLocale();const utils = trpc.useUtils();@@ -718,17 +745,22 @@ const Attendee = (attendeeProps: BookingAttendee & NoShowProps) => {const { copyToClipboard, isCopied } = useCopy();const noShowMutation = trpc.viewer.loggedInViewerRouter.markNoShow.useMutation({- onSuccess: async (data) => {- showToast(data.message, "success");- await utils.viewer.bookings.invalidate();- },- onError: (err) => {- showToast(err.message, "error");- },- });+ onSuccess: async (data) => {+ showToast(data.message, "success");+ await utils.viewer.bookings.invalidate();+ },+ onError: (err) => {+ showToast(err.message, "error");+ },+ });const displayName = user?.name || name || user?.email || email;+ const isTeamMemberOrHost =+ email === organizerEmail ||+ eventTypeHosts?.some((host) => host.user?.email === email);+ const shouldHideEmail = hideOrganizerEmail && isTeamMemberOrHost;+return (<Dropdown open={openDropdown} onOpenChange={setOpenDropdown}><DropdownMenuTrigger asChild>@@ -747,7 +779,7 @@ const Attendee = (attendeeProps: BookingAttendee & NoShowProps) => {</DropdownMenuTrigger><DropdownMenuPortal><DropdownMenuContent>- {!isSmsCalEmail(email) && (+ {!isSmsCalEmail(email) && !shouldHideEmail && (<DropdownMenuItem className="focus:outline-none"><DropdownItemStartIcon="mail"@@ -993,21 +1025,34 @@ const DisplayAttendees = ({currentEmail,bookingUid,isBookingInPast,+ hideOrganizerEmail,+ organizerEmail,+ eventTypeHosts,}: {attendees: BookingAttendee[];user: UserProps | null;currentEmail?: string | null;bookingUid: string;isBookingInPast: boolean;+ hideOrganizerEmail?: boolean;+ organizerEmail?: string | null;+ eventTypeHosts?: Array<{ user: { email: string } | null }> | null;}) => {const { t } = useLocale();attendees.sort((a, b) => a.id - b.id);return (<div className="text-emphasis text-sm" onClick={(e) => e.stopPropagation()}>- {user && <FirstAttendee user={user} currentEmail={currentEmail} />}+ {user && <FirstAttendee user={user} currentEmail={currentEmail} hideOrganizerEmail={hideOrganizerEmail} />}{attendees.length > 1 ? <span>, </span> : <span> {t("and")} </span>}- <Attendee {...attendees[0]} bookingUid={bookingUid} isBookingInPast={isBookingInPast} />+ <Attendee+ {...attendees[0]}+ bookingUid={bookingUid}+ isBookingInPast={isBookingInPast}+ hideOrganizerEmail={hideOrganizerEmail}+ organizerEmail={organizerEmail}+ eventTypeHosts={eventTypeHosts}+ />{attendees.length > 1 && (<><div className="text-emphasis inline-block text-sm"> {t("and")} </div>@@ -1015,7 +1060,14 @@ const DisplayAttendees = ({<Tooltipcontent={attendees.slice(1).map((attendee) => (<p key={attendee.email}>- <Attendee {...attendee} bookingUid={bookingUid} isBookingInPast={isBookingInPast} />+ <Attendee+ {...attendee}+ bookingUid={bookingUid}+ isBookingInPast={isBookingInPast}+ hideOrganizerEmail={hideOrganizerEmail}+ organizerEmail={organizerEmail}+ eventTypeHosts={eventTypeHosts}+ /></p>))}>{isBookingInPast ? (@@ -1025,7 +1077,14 @@ const DisplayAttendees = ({)}</Tooltip>) : (- <Attendee {...attendees[1]} bookingUid={bookingUid} isBookingInPast={isBookingInPast} />+ <Attendee+ {...attendees[1]}+ bookingUid={bookingUid}+ isBookingInPast={isBookingInPast}+ hideOrganizerEmail={hideOrganizerEmail}+ organizerEmail={organizerEmail}+ eventTypeHosts={eventTypeHosts}+ />)}</>)}diff --git a/apps/web/modules/bookings/components/BookingDetailsSheet.tsx b/apps/web/modules/bookings/components/BookingDetailsSheet.tsxindex b6bef505af3..e7495cd94e1 100644--- a/apps/web/modules/bookings/components/BookingDetailsSheet.tsx+++ b/apps/web/modules/bookings/components/BookingDetailsSheet.tsx@@ -466,13 +466,17 @@ function WhoSection({ booking }: { booking: BookingOutput }) {<div className="min-w-0 flex-1"><div className="flex items-center gap-2"><p className="text-emphasis truncate text-sm leading-[1.2]">- {booking.user.name || booking.user.email}+ {booking.eventType?.hideOrganizerEmail+ ? booking.user.name || t("organizer")+ : booking.user.name || booking.user.email}</p><Badge variant="purple" size="sm" className="capitalize">{t("host")}</Badge></div>- <p className="text-default truncate text-sm leading-[1.2]">{booking.user.email}</p>+ {!booking.eventType?.hideOrganizerEmail && (+ <p className="text-default truncate text-sm leading-[1.2]">{booking.user.email}</p>+ )}</div></div>)}diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsxindex ac69b79bbef..c65aaf48e44 100644--- a/apps/web/modules/bookings/views/bookings-single-view.tsx+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx@@ -642,21 +642,30 @@ export default function Success(props: PageProps) {)}</div>)}- {bookingInfo?.attendees.map((attendee) => (- <div key={attendee.name + attendee.email} className="mb-3 last:mb-0">- {attendee.name && (- <p data-testid={`attendee-name-${attendee.name}`}>{attendee.name}</p>- )}- {attendee.phoneNumber && (- <p data-testid={`attendee-phone-${attendee.phoneNumber}`}>- {attendee.phoneNumber}- </p>- )}- {!isSmsCalEmail(attendee.email) && (- <p data-testid={`attendee-email-${attendee.email}`}>{attendee.email}</p>- )}- </div>- ))}+ {bookingInfo?.attendees.map((attendee) => {+ // Check if attendee is a team member/host (for round robin scenarios)+ const isTeamMemberOrHost =+ eventType.hosts?.some((host) => host.user.email === attendee.email) ||+ eventType.users?.some((user) => user.email === attendee.email);+ const shouldHideEmail =+ bookingInfo.eventType?.hideOrganizerEmail && isTeamMemberOrHost;++ return (+ <div key={attendee.name + attendee.email} className="mb-3 last:mb-0">+ {attendee.name && (+ <p data-testid={`attendee-name-${attendee.name}`}>{attendee.name}</p>+ )}+ {attendee.phoneNumber && (+ <p data-testid={`attendee-phone-${attendee.phoneNumber}`}>+ {attendee.phoneNumber}+ </p>+ )}+ {!isSmsCalEmail(attendee.email) && !shouldHideEmail && (+ <p data-testid={`attendee-email-${attendee.email}`}>{attendee.email}</p>+ )}+ </div>+ );+ })}</div></>)}diff --git a/packages/emails/src/components/WhoInfo.tsx b/packages/emails/src/components/WhoInfo.tsxindex 5ebde366d9c..52a5db7a5ec 100644--- a/packages/emails/src/components/WhoInfo.tsx+++ b/packages/emails/src/components/WhoInfo.tsx@@ -36,7 +36,12 @@ export function WhoInfo(props: { calEvent: CalendarEvent; t: TFunction }) {email={props.calEvent.hideOrganizerEmail ? "" : props.calEvent.organizer.email}/>{props.calEvent.team?.members.map((member) => (- <PersonInfo key={member.name} name={member.name} role={t("team_member")} email={member?.email} />+ <PersonInfo+ key={member.name}+ name={member.name}+ role={t("team_member")}+ email={props.calEvent.hideOrganizerEmail ? "" : member?.email}+ />))}{props.calEvent.attendees.map((attendee) => (<PersonInfodiff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.tsindex f5bfc8caf35..15b9a500c15 100644--- a/packages/lib/CalEventParser.ts+++ b/packages/lib/CalEventParser.ts@@ -55,7 +55,11 @@ export const getWho = (const teamMembers = calEvent.team?.members? calEvent.team.members- .map((member) => `${member.name} - ${t("team_member")}\n${member.email}`)+ .map((member) =>+ calEvent.hideOrganizerEmail+ ? `${member.name} - ${t("team_member")}`+ : `${member.name} - ${t("team_member")}\n${member.email}`+ ).join("\n"): [];