From 851d96423b275ca7f22f21d752f8bc63d58a4f9d Mon Sep 17 00:00:00 2001 From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:24:19 +0200 Subject: [PATCH] chore: small changes for platform booker embed (#18159) --- .../bookings/components/event-meta/Members.tsx | 11 ++++++----- packages/platform/atoms/booker-embed/BookerEmbed.tsx | 5 ++++- .../platform/atoms/booker/BookerPlatformWrapper.tsx | 4 +++- .../platform/atoms/src/components/atoms-wrapper.tsx | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx index ef9bcb76a6..ad2c0207f1 100644 --- a/packages/features/bookings/components/event-meta/Members.tsx +++ b/packages/features/bookings/components/event-meta/Members.tsx @@ -39,11 +39,12 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe : [ { // We don't want booker to be able to see the list of other users or teams inside the embed - href: isEmbed - ? null - : entity.teamSlug - ? getTeamUrlSync({ orgSlug: entity.orgSlug, teamSlug: entity.teamSlug }) - : getBookerBaseUrlSync(entity.orgSlug), + href: + isEmbed || isPlatform + ? null + : entity.teamSlug + ? getTeamUrlSync({ orgSlug: entity.orgSlug, teamSlug: entity.teamSlug }) + : getBookerBaseUrlSync(entity.orgSlug), image: entity.logoUrl ?? profile.image ?? "", alt: entity.name ?? profile.name ?? "", title: entity.name ?? profile.name ?? "", diff --git a/packages/platform/atoms/booker-embed/BookerEmbed.tsx b/packages/platform/atoms/booker-embed/BookerEmbed.tsx index 2dffe6052e..ca5594d79e 100644 --- a/packages/platform/atoms/booker-embed/BookerEmbed.tsx +++ b/packages/platform/atoms/booker-embed/BookerEmbed.tsx @@ -6,12 +6,15 @@ import { BookerPlatformWrapper } from "../booker/BookerPlatformWrapper"; import { CalProvider } from "../cal-provider/CalProvider"; export const BookerEmbed = ( - props: BookerPlatformWrapperAtomPropsForIndividual | BookerPlatformWrapperAtomPropsForTeam + props: + | (BookerPlatformWrapperAtomPropsForIndividual & { organizationId?: undefined }) + | (BookerPlatformWrapperAtomPropsForTeam & { organizationId?: number }) ) => { return ( diff --git a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx index e4a1628870..a922e9c101 100644 --- a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx +++ b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx @@ -132,7 +132,9 @@ export const BookerPlatformWrapper = ( setSelectedDuration(props.duration ?? null); }, [props.duration]); - setOrg(props.entity?.orgSlug ?? null); + useEffect(() => { + setOrg(props.entity?.orgSlug ?? null); + }, [props.entity?.orgSlug]); const isDynamic = useMemo(() => { return getUsernameList(username ?? "").length > 1; diff --git a/packages/platform/atoms/src/components/atoms-wrapper.tsx b/packages/platform/atoms/src/components/atoms-wrapper.tsx index 70f7fc548d..dd8548c935 100644 --- a/packages/platform/atoms/src/components/atoms-wrapper.tsx +++ b/packages/platform/atoms/src/components/atoms-wrapper.tsx @@ -16,7 +16,7 @@ export const AtomsWrapper = ({ return (
+ className={classNames(`${CALCOM_ATOMS_WRAPPER_CLASS} m-0 w-auto bg-transparent p-0`, customClassName)}> {children}
);