+1








12466fb064
* Add profile table Copy to profile table Update schema Migrations * wip * Get switcher working * Add organization seeder * wip * Remove dead code * Fix unit tests * relevantProfile -> profile * cache bust * One more comment * Squash migrations * Copy to profile table * Update schema * Fix existing user invite flow * Add profile table * Copy to profile table * Update schema * Format * Add profile table Copy to profile table Update schema Migrations * Format * wip Get switcher working Add organization seeder wip Remove dead code Fix unit tests relevantProfile -> profile cache bust One more comment Squash migrations Copy to profile table Update schema Fix existing user invite flow Add profile table Copy to profile table Update schema chore: small improvements to signup (#13227) * removed features on mobile, better background color * nit * dark mode nits New Crowdin translations by Github Action fix: event reschedule workflow trigger (#13122) * fix event reschedule workflow trigger * uncomment previously failed test * review fix --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> chore: added community support to help (#13213) refactor: Abstract `handleSeats` from `handleNewBooking` (#12062) * Refactor createBooking * Type fix * Abstract handleSeats * Create Invitee type * Create OrganizerUser type * Abstract addVideoCallDataToEvt * Abstract createLoggerWithEventDetails * Abstract `handleAppStatus` from handler * Create ReqAppsStatus type * Move `deleteMeeting` and `getCalendar` * Set parameters for `handleSeats` * Typescript refactor * Change function params from req * Type fix --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Erik <erik@erosemberg.com> fix: Dynamic group booking org-migration redirect (#13223) * fix: Dynamic group booking redirect * Fix flaky private team test test: Check availability tab and all your functions (teste2e-availability) (#12434) * add changes * add changes * add changes * add changes * Requested changes * Change way to grab element --------- Co-authored-by: gitstart-calcom <gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> fix: Reschedule a cancelled booking (#13170) * fix: Reschedule a cancelled booking * canceled instead of cancelled --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> v3.7.0 test: In Team Event type when location is Organizer Default App and U… (#12939) * test: In Team Event type when location is Organizer Default App and User Metadata is emoty * chore: use variable * fix: type error test: add test for invalid cal video (#13103) * test: add test for invalid cal video * chore: add confirm * chore: fix type error * chore: update code * test: add unit test * chore: type error * chore * chore: type * chore: fix test * chore --------- Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> chore: add error message for no availability (#13230) * chore: add error message for no default user availability * chore: check only availability * chore: change message * chore: add eventType fix: Team revert with members (#13228) refactor: Refactor seats logic (#12905) * Refactor createBooking * Type fix * Abstract handleSeats * Create Invitee type * Create OrganizerUser type * Abstract addVideoCallDataToEvt * Abstract createLoggerWithEventDetails * Abstract `handleAppStatus` from handler * Create ReqAppsStatus type * Move `deleteMeeting` and `getCalendar` * Set parameters for `handleSeats` * Typescript refactor * Change function params from req * Type fix * Move handleSeats * Abstract lastAttendeeDeleteBooking * Create function for rescheduling seated events * Fix imports on reschedule seats function * Fix imports * Import handleSeats function * Fix rescheduleUid type * Refactor owner reschedule to new time slot * Refactor combine two booking times together * Reschedule as an attendee * Refactor createNewSeat * Remove old handleSeats * Remove lastAttendeeDeleteBooking from handleNewBooking * Test for new attendee right params are passed * Unit test params for reschedule * Typo fix * Clean up * Create new seat test * Test when attendee already signs up for booking * Type fix * Test reschedule move attendee to existing booking * On reschedule create new booking * Test on last attendee cancel booking * Owner reschedule to new time slot * Owner rescheduling, merge two bookings together * Test: when merging more than available seats, then fail * Test: fail when event is full * Remove duplicate E2E tests * Clean up * Rename `addVideoCallDataToEvt` to `addVideoCallDataToEvent` * Refactor `calcAppsStatus` * Assign `evt` to resutl of `addVideoCallDataToEvent` * Use prisma.transaction when moving attendees * Clean create seat call * Use ErrorCode enum * Use attendeeRescheduledSeatedBooking function * Await function * Prevent double triggering of workflows * Use inviteeToAdd in createNewSeat * Remove unused error code * Remove old handleSeats file * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix * Type fix --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Erik <erik@erosemberg.com> feat: Allow admins to filter bookings only by attendee emails (#13236) * chore: Allow admins to filter bookings only by attendee emails * Fix type error Fixed [CAL-2930] Org branding isnt centered in shell #13225 (#13237) Add profile table Copy to profile table Update schema Migrations Format * wip * Add profile relation everywhere * Fix schema * Fix invite handler * Add profileId during eventTypec reation * Get dashboard working with profile relatioon * Add workflow create repository * Add profileId to host * Add profileId to credential table * Add destinationCalendar repository * Add profileId to membership * Revert all profile related changes * Add acme and dunder * Fix membership profileId usgae * Various fixes * Some renaming * Fix failing tests * Debugging next-aut * Consolidate migrations * Testing fixes * Fix unit tests * Self review feedback * PR feedback * Fix orgMigration as well * Add profile schema and copy users to it * Remove migrations from here * Fix type issues * Fix type error after main merge * Remove movedFromUserId * Add missing migration file * Self review addressed * Joe's review addressed * Fix profile switcher --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
188 lines
7.2 KiB
TypeScript
188 lines
7.2 KiB
TypeScript
"use client";
|
|
|
|
import classNames from "classnames";
|
|
import type { InferGetServerSidePropsType } from "next";
|
|
import Link from "next/link";
|
|
import { useSearchParams } from "next/navigation";
|
|
import { Toaster } from "react-hot-toast";
|
|
|
|
import {
|
|
sdkActionManager,
|
|
useEmbedNonStylesConfig,
|
|
useEmbedStyles,
|
|
useIsEmbed,
|
|
} from "@calcom/embed-core/embed-iframe";
|
|
import { EventTypeDescriptionLazy as EventTypeDescription } from "@calcom/features/eventtypes/components";
|
|
import EmptyPage from "@calcom/features/eventtypes/components/EmptyPage";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
|
|
import useTheme from "@calcom/lib/hooks/useTheme";
|
|
import { HeadSeo, UnpublishedEntity, UserAvatar } from "@calcom/ui";
|
|
import { ArrowRight, Verified } from "@calcom/ui/components/icon";
|
|
|
|
import { type getServerSideProps } from "./users-public-view.getServerSideProps";
|
|
|
|
export function UserPage(props: InferGetServerSidePropsType<typeof getServerSideProps>) {
|
|
const { users, profile, eventTypes, markdownStrippedBio, entity } = props;
|
|
const searchParams = useSearchParams();
|
|
|
|
const [user] = users; //To be used when we only have a single user, not dynamic group
|
|
useTheme(profile.theme);
|
|
const { t } = useLocale();
|
|
|
|
const isBioEmpty = !user.bio || !user.bio.replace("<p><br></p>", "").length;
|
|
|
|
const isEmbed = useIsEmbed(props.isEmbed);
|
|
const eventTypeListItemEmbedStyles = useEmbedStyles("eventTypeListItem");
|
|
const shouldAlignCentrallyInEmbed = useEmbedNonStylesConfig("align") !== "left";
|
|
const shouldAlignCentrally = !isEmbed || shouldAlignCentrallyInEmbed;
|
|
const {
|
|
// So it doesn't display in the Link (and make tests fail)
|
|
user: _user,
|
|
orgSlug: _orgSlug,
|
|
redirect: _redirect,
|
|
...query
|
|
} = useRouterQuery();
|
|
|
|
const isRedirect = searchParams?.get("redirected") === "true" || false;
|
|
const fromUserNameRedirected = searchParams?.get("username") || "";
|
|
/*
|
|
const telemetry = useTelemetry();
|
|
useEffect(() => {
|
|
if (top !== window) {
|
|
//page_view will be collected automatically by _middleware.ts
|
|
telemetry.event(telemetryEventTypes.embedView, collectPageParameters("/[user]"));
|
|
}
|
|
}, [telemetry, router.asPath]); */
|
|
|
|
if (entity?.isUnpublished) {
|
|
return (
|
|
<div className="flex h-full min-h-[100dvh] items-center justify-center">
|
|
<UnpublishedEntity {...entity} />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const isEventListEmpty = eventTypes.length === 0;
|
|
|
|
return (
|
|
<>
|
|
<HeadSeo
|
|
title={profile.name}
|
|
description={markdownStrippedBio}
|
|
meeting={{
|
|
title: markdownStrippedBio,
|
|
profile: { name: `${profile.name}`, image: user.avatarUrl || null },
|
|
users: [{ username: `${user.username}`, name: `${user.name}` }],
|
|
}}
|
|
nextSeoProps={{
|
|
noindex: !profile.allowSEOIndexing,
|
|
nofollow: !profile.allowSEOIndexing,
|
|
}}
|
|
/>
|
|
|
|
<div className={classNames(shouldAlignCentrally ? "mx-auto" : "", isEmbed ? "max-w-3xl" : "")}>
|
|
<main
|
|
className={classNames(
|
|
shouldAlignCentrally ? "mx-auto" : "",
|
|
isEmbed ? "border-booker border-booker-width bg-default rounded-md border" : "",
|
|
"max-w-3xl px-4 py-24"
|
|
)}>
|
|
{isRedirect && (
|
|
<div className="mb-8 rounded-md bg-blue-100 p-4 dark:border dark:bg-transparent dark:bg-transparent">
|
|
<h2 className="text-default mb-2 text-sm font-semibold dark:text-white">
|
|
{t("user_redirect_title", {
|
|
username: fromUserNameRedirected,
|
|
})}{" "}
|
|
🏝️
|
|
</h2>
|
|
<p className="text-default text-sm">
|
|
{t("user_redirect_description", {
|
|
profile: {
|
|
username: user.username,
|
|
},
|
|
username: fromUserNameRedirected,
|
|
})}{" "}
|
|
😄
|
|
</p>
|
|
</div>
|
|
)}
|
|
<div className="mb-8 text-center">
|
|
<UserAvatar
|
|
size="xl"
|
|
user={{
|
|
avatarUrl: user.avatarUrl,
|
|
profile: user.profile,
|
|
name: profile.name,
|
|
username: profile.username,
|
|
}}
|
|
/>
|
|
<h1 className="font-cal text-emphasis my-1 text-3xl" data-testid="name-title">
|
|
{profile.name}
|
|
{user.verified && (
|
|
<Verified className=" mx-1 -mt-1 inline h-6 w-6 fill-blue-500 text-white dark:text-black" />
|
|
)}
|
|
</h1>
|
|
{!isBioEmpty && (
|
|
<>
|
|
<div
|
|
className=" text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
|
|
dangerouslySetInnerHTML={{ __html: props.safeBio }}
|
|
/>
|
|
</>
|
|
)}
|
|
</div>
|
|
|
|
<div
|
|
className={classNames("rounded-md ", !isEventListEmpty && "border-subtle border")}
|
|
data-testid="event-types">
|
|
{user.away ? (
|
|
<div className="overflow-hidden rounded-sm border ">
|
|
<div className="text-muted p-8 text-center">
|
|
<h2 className="font-cal text-default mb-2 text-3xl">😴{` ${t("user_away")}`}</h2>
|
|
<p className="mx-auto max-w-md">{t("user_away_description") as string}</p>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
eventTypes.map((type) => (
|
|
<div
|
|
key={type.id}
|
|
style={{ display: "flex", ...eventTypeListItemEmbedStyles }}
|
|
className="bg-default border-subtle dark:bg-muted dark:hover:bg-emphasis hover:bg-muted group relative border-b first:rounded-t-md last:rounded-b-md last:border-b-0">
|
|
<ArrowRight className="text-emphasis absolute right-4 top-4 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100" />
|
|
{/* Don't prefetch till the time we drop the amount of javascript in [user][type] page which is impacting score for [user] page */}
|
|
<div className="block w-full p-5">
|
|
<Link
|
|
prefetch={false}
|
|
href={{
|
|
pathname: `/${user.username}/${type.slug}`,
|
|
query,
|
|
}}
|
|
passHref
|
|
onClick={async () => {
|
|
sdkActionManager?.fire("eventTypeSelected", {
|
|
eventType: type,
|
|
});
|
|
}}
|
|
data-testid="event-type-link">
|
|
<div className="flex flex-wrap items-center">
|
|
<h2 className=" text-default pr-2 text-sm font-semibold">{type.title}</h2>
|
|
</div>
|
|
<EventTypeDescription eventType={type} isPublic={true} shortenDescription />
|
|
</Link>
|
|
</div>
|
|
</div>
|
|
))
|
|
)}
|
|
</div>
|
|
|
|
{isEventListEmpty && <EmptyPage name={profile.name || "User"} />}
|
|
</main>
|
|
<Toaster position="bottom-right" />
|
|
</div>
|
|
</>
|
|
);
|
|
}
|
|
|
|
export default UserPage;
|