+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>
278 lines
8.1 KiB
TypeScript
278 lines
8.1 KiB
TypeScript
import type { DehydratedState } from "@tanstack/react-query";
|
|
import type { GetServerSideProps } from "next";
|
|
import { encode } from "querystring";
|
|
import type { z } from "zod";
|
|
|
|
import { handleUserRedirection } from "@calcom/features/booking-redirect/handle-user";
|
|
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
|
|
import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
|
|
import { getUsernameList } from "@calcom/lib/defaultEvents";
|
|
import logger from "@calcom/lib/logger";
|
|
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
import { stripMarkdown } from "@calcom/lib/stripMarkdown";
|
|
import prisma from "@calcom/prisma";
|
|
import { RedirectType, type EventType, type User } from "@calcom/prisma/client";
|
|
import { baseEventTypeSelect } from "@calcom/prisma/selects";
|
|
import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
|
|
import type { UserProfile } from "@calcom/types/UserProfile";
|
|
|
|
import { getTemporaryOrgRedirect } from "@lib/getTemporaryOrgRedirect";
|
|
import type { EmbedProps } from "@lib/withEmbedSsr";
|
|
|
|
import { ssrInit } from "@server/lib/ssr";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["[[pages/[user]]]"] });
|
|
export type UserPageProps = {
|
|
trpcState: DehydratedState;
|
|
profile: {
|
|
name: string;
|
|
image: string;
|
|
theme: string | null;
|
|
brandColor: string;
|
|
darkBrandColor: string;
|
|
organization: {
|
|
requestedSlug: string | null;
|
|
slug: string | null;
|
|
id: number | null;
|
|
} | null;
|
|
allowSEOIndexing: boolean;
|
|
username: string | null;
|
|
};
|
|
users: (Pick<User, "away" | "name" | "username" | "bio" | "verified" | "avatarUrl"> & {
|
|
profile: UserProfile;
|
|
})[];
|
|
themeBasis: string | null;
|
|
markdownStrippedBio: string;
|
|
safeBio: string;
|
|
entity: {
|
|
isUnpublished?: boolean;
|
|
orgSlug?: string | null;
|
|
name?: string | null;
|
|
};
|
|
eventTypes: ({
|
|
descriptionAsSafeHTML: string;
|
|
metadata: z.infer<typeof EventTypeMetaDataSchema>;
|
|
} & Pick<
|
|
EventType,
|
|
| "id"
|
|
| "title"
|
|
| "slug"
|
|
| "length"
|
|
| "hidden"
|
|
| "lockTimeZoneToggleOnBookingPage"
|
|
| "requiresConfirmation"
|
|
| "requiresBookerEmailVerification"
|
|
| "price"
|
|
| "currency"
|
|
| "recurringEvent"
|
|
>)[];
|
|
} & EmbedProps;
|
|
|
|
export const getEventTypesWithHiddenFromDB = async (userId: number) => {
|
|
const eventTypes = await prisma.eventType.findMany({
|
|
where: {
|
|
AND: [
|
|
{
|
|
teamId: null,
|
|
},
|
|
{
|
|
OR: [
|
|
{
|
|
userId,
|
|
},
|
|
{
|
|
users: {
|
|
some: {
|
|
id: userId,
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
orderBy: [
|
|
{
|
|
position: "desc",
|
|
},
|
|
{
|
|
id: "asc",
|
|
},
|
|
],
|
|
select: {
|
|
...baseEventTypeSelect,
|
|
metadata: true,
|
|
},
|
|
});
|
|
// map and filter metadata, exclude eventType entirely when faulty metadata is found.
|
|
// report error to exception so we don't lose the error.
|
|
return eventTypes.reduce<typeof eventTypes>((eventTypes, eventType) => {
|
|
const parsedMetadata = EventTypeMetaDataSchema.safeParse(eventType.metadata);
|
|
if (!parsedMetadata.success) {
|
|
log.error(parsedMetadata.error);
|
|
return eventTypes;
|
|
}
|
|
eventTypes.push({
|
|
...eventType,
|
|
metadata: parsedMetadata.data,
|
|
});
|
|
return eventTypes;
|
|
}, []);
|
|
};
|
|
|
|
export const getServerSideProps: GetServerSideProps<UserPageProps> = async (context) => {
|
|
const ssr = await ssrInit(context);
|
|
const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
|
|
const usernameList = getUsernameList(context.query.user as string);
|
|
const isOrgContext = isValidOrgDomain && currentOrgDomain;
|
|
const dataFetchStart = Date.now();
|
|
let outOfOffice = false;
|
|
|
|
if (usernameList.length === 1) {
|
|
const result = await handleUserRedirection({ username: usernameList[0] });
|
|
if (result && result.outOfOffice) {
|
|
outOfOffice = true;
|
|
}
|
|
if (result && result.redirect?.destination) {
|
|
return result;
|
|
}
|
|
}
|
|
|
|
if (!isOrgContext) {
|
|
// If there is no org context, see if some redirect is setup due to org migration
|
|
const redirect = await getTemporaryOrgRedirect({
|
|
slugs: usernameList,
|
|
redirectType: RedirectType.User,
|
|
eventTypeSlug: null,
|
|
currentQuery: context.query,
|
|
});
|
|
|
|
if (redirect) {
|
|
return redirect;
|
|
}
|
|
}
|
|
|
|
const usersInOrgContext = await UserRepository.findUsersByUsername({
|
|
usernameList,
|
|
orgSlug: isValidOrgDomain ? currentOrgDomain : null,
|
|
});
|
|
|
|
const usersWithoutAvatar = usersInOrgContext.map((user) => {
|
|
const { avatar: _1, ...rest } = user;
|
|
return rest;
|
|
});
|
|
|
|
const isDynamicGroup = usersWithoutAvatar.length > 1;
|
|
log.debug(safeStringify({ usersInOrgContext, isValidOrgDomain, currentOrgDomain, isDynamicGroup }));
|
|
|
|
if (isDynamicGroup) {
|
|
const destinationUrl = `/${usernameList.join("+")}/dynamic`;
|
|
log.debug(`Dynamic group detected, redirecting to ${destinationUrl}`);
|
|
return {
|
|
redirect: {
|
|
permanent: false,
|
|
destination: destinationUrl,
|
|
},
|
|
} as {
|
|
redirect: {
|
|
permanent: false;
|
|
destination: string;
|
|
};
|
|
};
|
|
}
|
|
|
|
const users = usersWithoutAvatar.map((user) => ({
|
|
...user,
|
|
avatar: `/${user.username}/avatar.png`,
|
|
}));
|
|
|
|
const isNonOrgUser = (user: { profile: UserProfile }) => {
|
|
return !user.profile?.organization;
|
|
};
|
|
|
|
const isThereAnyNonOrgUser = users.some(isNonOrgUser);
|
|
|
|
if (!users.length || (!isValidOrgDomain && !isThereAnyNonOrgUser)) {
|
|
return {
|
|
notFound: true,
|
|
} as {
|
|
notFound: true;
|
|
};
|
|
}
|
|
|
|
const [user] = users; //to be used when dealing with single user, not dynamic group
|
|
|
|
const profile = {
|
|
name: user.name || user.username || "",
|
|
image: user.avatar,
|
|
theme: user.theme,
|
|
brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
|
|
avatarUrl: user.avatarUrl,
|
|
darkBrandColor: user.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
|
|
allowSEOIndexing: user.allowSEOIndexing ?? true,
|
|
username: user.username,
|
|
organization: user.profile.organization,
|
|
};
|
|
|
|
const eventTypesWithHidden = await getEventTypesWithHiddenFromDB(user.id);
|
|
const dataFetchEnd = Date.now();
|
|
if (context.query.log === "1") {
|
|
context.res.setHeader("X-Data-Fetch-Time", `${dataFetchEnd - dataFetchStart}ms`);
|
|
}
|
|
const eventTypesRaw = eventTypesWithHidden.filter((evt) => !evt.hidden);
|
|
|
|
const eventTypes = eventTypesRaw.map((eventType) => ({
|
|
...eventType,
|
|
metadata: EventTypeMetaDataSchema.parse(eventType.metadata || {}),
|
|
descriptionAsSafeHTML: markdownToSafeHTML(eventType.description),
|
|
}));
|
|
|
|
// if profile only has one public event-type, redirect to it
|
|
if (eventTypes.length === 1 && context.query.redirect !== "false" && !outOfOffice) {
|
|
// Redirect but don't change the URL
|
|
const urlDestination = `/${user.profile.username}/${eventTypes[0].slug}`;
|
|
const { query } = context;
|
|
const urlQuery = new URLSearchParams(encode(query));
|
|
|
|
return {
|
|
redirect: {
|
|
permanent: false,
|
|
destination: `${urlDestination}?${urlQuery}`,
|
|
},
|
|
};
|
|
}
|
|
|
|
const safeBio = markdownToSafeHTML(user.bio) || "";
|
|
|
|
const markdownStrippedBio = stripMarkdown(user?.bio || "");
|
|
const org = usersWithoutAvatar[0].profile.organization;
|
|
|
|
return {
|
|
props: {
|
|
users: users.map((user) => ({
|
|
name: user.name,
|
|
username: user.username,
|
|
bio: user.bio,
|
|
avatarUrl: user.avatarUrl,
|
|
away: usernameList.length === 1 ? outOfOffice : user.away,
|
|
verified: user.verified,
|
|
profile: user.profile,
|
|
})),
|
|
entity: {
|
|
isUnpublished: org?.slug === null,
|
|
orgSlug: currentOrgDomain,
|
|
name: org?.name ?? null,
|
|
},
|
|
eventTypes,
|
|
safeBio,
|
|
profile,
|
|
// Dynamic group has no theme preference right now. It uses system theme.
|
|
themeBasis: user.username,
|
|
trpcState: ssr.dehydrate(),
|
|
markdownStrippedBio,
|
|
},
|
|
};
|
|
};
|