Scheduling infrastructure for absolutely everyone.
perf: stop merging routers twice. (#21538)
sean-brydon08e35e4698bc
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsxindex e44e739c3f8..058a0c7d912 100644--- a/apps/web/components/booking/BookingListItem.tsx+++ b/apps/web/components/booking/BookingListItem.tsx@@ -131,7 +131,7 @@ function BookingListItem(booking: BookingItemProps) {};});- const noShowMutation = trpc.viewer.markNoShow.useMutation({+ const noShowMutation = trpc.viewer.loggedInViewerRouter.markNoShow.useMutation({onSuccess: async (data) => {showToast(data.message, "success");// Invalidate and refetch the bookings query to update the UI@@ -938,7 +938,7 @@ const Attendee = (attendeeProps: AttendeeProps & NoShowProps) => {const [openDropdown, setOpenDropdown] = useState(false);const { copyToClipboard, isCopied } = useCopy();- const noShowMutation = trpc.viewer.markNoShow.useMutation({+ const noShowMutation = trpc.viewer.loggedInViewerRouter.markNoShow.useMutation({onSuccess: async (data) => {showToast(data.message, "success");utils.viewer.bookings.invalidate();@@ -1030,7 +1030,7 @@ const GroupedAttendees = (groupedAttendeeProps: GroupedAttendeeProps) => {};});const { t } = useLocale();- const noShowMutation = trpc.viewer.markNoShow.useMutation({+ const noShowMutation = trpc.viewer.loggedInViewerRouter.markNoShow.useMutation({onSuccess: async (data) => {showToast(t(data.message), "success");},@@ -1133,7 +1133,7 @@ const NoShowAttendeesDialog = ({})));- const noShowMutation = trpc.viewer.markNoShow.useMutation({+ const noShowMutation = trpc.viewer.loggedInViewerRouter.markNoShow.useMutation({onSuccess: async (data) => {const newValue = data.attendees[0];setNoShowAttendees((old) =>diff --git a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsxindex 1a8c82b5626..f61d1e5d710 100644--- a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx+++ b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx@@ -44,7 +44,7 @@ const obtainNewUsernameChangeCondition = ({}: {userIsPremium: boolean;isNewUsernamePremium: boolean;- stripeCustomer: RouterOutputs["viewer"]["stripeCustomer"] | undefined;+ stripeCustomer: RouterOutputs["viewer"]["loggedInViewerRouter"]["stripeCustomer"] | undefined;}) => {if (!userIsPremium && isNewUsernamePremium) {return UsernameChangeStatusEnum.UPGRADE;@@ -72,7 +72,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {const [markAsError, setMarkAsError] = useState(false);const recentAttemptPaymentStatus = searchParams?.get("recentAttemptPaymentStatus");const [openDialogSaveUsername, setOpenDialogSaveUsername] = useState(false);- const { data: stripeCustomer } = trpc.viewer.stripeCustomer.useQuery();+ const { data: stripeCustomer } = trpc.viewer.loggedInViewerRouter.stripeCustomer.useQuery();const isCurrentUsernamePremium =user && user.metadata && hasKeyInMetadata(user, "isPremium") ? !!user.metadata.isPremium : false;const [isInputUsernamePremium, setIsInputUsernamePremium] = useState(false);diff --git a/apps/web/modules/auth/oauth2/authorize-view.tsx b/apps/web/modules/auth/oauth2/authorize-view.tsxindex 945fac9f23f..a7734d215c0 100644--- a/apps/web/modules/auth/oauth2/authorize-view.tsx+++ b/apps/web/modules/auth/oauth2/authorize-view.tsx@@ -9,10 +9,10 @@ import { APP_NAME } from "@calcom/lib/constants";import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";import { useLocale } from "@calcom/lib/hooks/useLocale";import { trpc } from "@calcom/trpc/react";-import { Icon } from "@calcom/ui/components/icon";-import { Select } from "@calcom/ui/components/form";import { Avatar } from "@calcom/ui/components/avatar";import { Button } from "@calcom/ui/components/button";+import { Select } from "@calcom/ui/components/form";+import { Icon } from "@calcom/ui/components/icon";export default function Authorize() {const { t } = useLocale();@@ -39,7 +39,8 @@ export default function Authorize() {});- const { data, isPending: isPendingProfiles } = trpc.viewer.teamsAndUserProfilesQuery.useQuery();+ const { data, isPending: isPendingProfiles } =+ trpc.viewer.loggedInViewerRouter.teamsAndUserProfilesQuery.useQuery();const generateAuthCodeMutation = trpc.viewer.oAuth.generateAuthCode.useMutation({onSuccess: (data) => {diff --git a/apps/web/modules/connect-and-join/connect-and-join-view.tsx b/apps/web/modules/connect-and-join/connect-and-join-view.tsxindex 634a1b9743b..d1de5dbe141 100644--- a/apps/web/modules/connect-and-join/connect-and-join-view.tsx+++ b/apps/web/modules/connect-and-join/connect-and-join-view.tsx@@ -26,7 +26,7 @@ function ConnectAndJoin() {const session = useSession();const isUserPartOfOrg = session.status === "authenticated" && !!session.data.user?.org;- const mutation = trpc.viewer.connectAndJoin.useMutation({+ const mutation = trpc.viewer.loggedInViewerRouter.connectAndJoin.useMutation({onSuccess: (res) => {if (res.meetingUrl && !res.isBookingAlreadyAcceptedBySomeoneElse) {router.push(res.meetingUrl);diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsxindex b747972efae..fec0c78c713 100644--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx@@ -259,7 +259,7 @@ export const InfiniteEventTypeList = ({const [privateLinkCopyIndices, setPrivateLinkCopyIndices] = useState<Record<string, number>>({});const utils = trpc.useUtils();- const mutation = trpc.viewer.eventTypeOrder.useMutation({+ const mutation = trpc.viewer.loggedInViewerRouter.eventTypeOrder.useMutation({onError: async (err) => {console.error(err.message);// REVIEW: Should we invalidate the entire router or just the `getByViewer` query?diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsxindex 04b81535451..c5352692c43 100644--- a/apps/web/modules/settings/my-account/profile-view.tsx+++ b/apps/web/modules/settings/my-account/profile-view.tsx@@ -121,7 +121,7 @@ const ProfileView = () => {}},});- const unlinkConnectedAccountMutation = trpc.viewer.unlinkConnectedAccount.useMutation({+ const unlinkConnectedAccountMutation = trpc.viewer.loggedInViewerRouter.unlinkConnectedAccount.useMutation({onSuccess: async (res) => {showToast(t(res.message), "success");utils.viewer.me.invalidate();@@ -131,7 +131,7 @@ const ProfileView = () => {},});- const addSecondaryEmailMutation = trpc.viewer.addSecondaryEmail.useMutation({+ const addSecondaryEmailMutation = trpc.viewer.loggedInViewerRouter.addSecondaryEmail.useMutation({onSuccess: (res) => {setShowSecondaryEmailModalOpen(false);setNewlyAddedSecondaryEmail(res?.data?.email);diff --git a/apps/web/pages/api/trpc/loggedInViewerRouter/[trpc].ts b/apps/web/pages/api/trpc/loggedInViewerRouter/[trpc].tsnew file mode 100644index 00000000000..2e44c1f966e--- /dev/null+++ b/apps/web/pages/api/trpc/loggedInViewerRouter/[trpc].ts@@ -0,0 +1,4 @@+import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";+import { loggedInViewerRouter } from "@calcom/trpc/server/routers/loggedInViewer/_router";++export default createNextApiHandler(loggedInViewerRouter);diff --git a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsxindex 100ef043eee..8f586caeb61 100644--- a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx+++ b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx@@ -52,7 +52,7 @@ export default function RoutingForms({ appUrl }: { appUrl: string }) {const utils = trpc.useUtils();const [parent] = useAutoAnimate<HTMLUListElement>();- const mutation = trpc.viewer.routingFormOrder.useMutation({+ const mutation = trpc.viewer.loggedInViewerRouter.routingFormOrder.useMutation({onError: async (err) => {console.error(err.message);await utils.viewer.appRoutingForms.forms.cancel();diff --git a/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx b/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsxindex 36a1c8bc1b2..aa68971a0ed 100644--- a/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx+++ b/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx@@ -13,7 +13,9 @@ export function CreateButtonWithTeamsList(includeOrg?: boolean;}) {- const query = trpc.viewer.teamsAndUserProfilesQuery.useQuery({ includeOrg: props.includeOrg });+ const query = trpc.viewer.loggedInViewerRouter.teamsAndUserProfilesQuery.useQuery({+ includeOrg: props.includeOrg,+ });if (!query.data) return null;const teamsAndUserProfiles: Option[] = query.datadiff --git a/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx b/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsxindex 2db6c2062e8..37e4f1b43e7 100644--- a/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx+++ b/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx@@ -22,11 +22,13 @@ vi.mock("next/navigation", async (importOriginal) => {const runtimeMock = async (data: Array<any>) => {const updatedTrpc = {viewer: {- teamsAndUserProfilesQuery: {- useQuery() {- return {- data: data,- };+ loggedInViewerRouter: {+ teamsAndUserProfilesQuery: {+ useQuery() {+ return {+ data: data,+ };+ },},},},@@ -51,18 +53,20 @@ describe("Create Button Tests", () => {vi.mock("@calcom/trpc/react", () => ({trpc: {viewer: {- teamsAndUserProfilesQuery: {- useQuery() {- return {- data: [- {- teamId: 1,- name: "test",- slug: "create-button-test",- image: "image",- },- ],- };+ loggedInViewerRouter: {+ teamsAndUserProfilesQuery: {+ useQuery() {+ return {+ data: [+ {+ teamId: 1,+ name: "test",+ slug: "create-button-test",+ image: "image",+ },+ ],+ };+ },},},},diff --git a/packages/features/notifications/WebPushContext.tsx b/packages/features/notifications/WebPushContext.tsxindex 82f5c9f3f0a..f2715042901 100644--- a/packages/features/notifications/WebPushContext.tsx+++ b/packages/features/notifications/WebPushContext.tsx@@ -27,8 +27,10 @@ export function WebPushProvider({ children }: ProviderProps) {const [isLoading, setIsLoading] = useState(false);const [isSubscribed, setIsSubscribed] = useState(false);- const { mutate: addSubscription } = trpc.viewer.addNotificationsSubscription.useMutation();- const { mutate: removeSubscription } = trpc.viewer.removeNotificationsSubscription.useMutation();+ const { mutate: addSubscription } =+ trpc.viewer.loggedInViewerRouter.addNotificationsSubscription.useMutation();+ const { mutate: removeSubscription } =+ trpc.viewer.loggedInViewerRouter.removeNotificationsSubscription.useMutation();useEffect(() => {if (!("serviceWorker" in navigator)) return;diff --git a/packages/trpc/react/shared.ts b/packages/trpc/react/shared.tsindex 57a19e79312..981680e55e1 100644--- a/packages/trpc/react/shared.ts+++ b/packages/trpc/react/shared.ts@@ -1,6 +1,7 @@export * from "@trpc/react-query/shared";export const ENDPOINTS = [+ "loggedInViewerRouter","admin","apiKeys","appRoutingForms",diff --git a/packages/trpc/server/routers/viewer/_router.tsx b/packages/trpc/server/routers/viewer/_router.tsxindex a10c7b710b1..9dcff85ce29 100644--- a/packages/trpc/server/routers/viewer/_router.tsx+++ b/packages/trpc/server/routers/viewer/_router.tsx@@ -4,7 +4,7 @@ import { userAdminRouter } from "@calcom/features/ee/users/server/trpc-router";import { featureFlagRouter } from "@calcom/features/flags/server/router";import { insightsRouter } from "@calcom/features/insights/server/trpc-router";-import { mergeRouters, router } from "../../trpc";+import { router } from "../../trpc";import { loggedInViewerRouter } from "../loggedInViewer/_router";import { publicViewerRouter } from "../publicViewer/_router";import { timezonesRouter } from "../publicViewer/timezones/_router";@@ -32,7 +32,7 @@ import { oAuthRouter } from "./oAuth/_router";import { oooRouter } from "./ooo/_router";import { viewerOrganizationsRouter } from "./organizations/_router";import { paymentsRouter } from "./payments/_router";-// import { permissionsRouter } from "./pbac/_router";+import { permissionsRouter } from "./pbac/_router";import { routingFormsRouter } from "./routing-forms/_router";import { slotsRouter } from "./slots/_router";import { ssoRouter } from "./sso/_router";@@ -41,50 +41,47 @@ import { travelSchedulesRouter } from "./travelSchedules/_router";import { webhookRouter } from "./webhook/_router";import { workflowsRouter } from "./workflows/_router";-export const viewerRouter = mergeRouters(+export const viewerRouter = router({loggedInViewerRouter,-- router({- apps: appsRouter,- me: meRouter,- public: publicViewerRouter,- auth: authRouter,- deploymentSetup: deploymentSetupRouter,- bookings: bookingsRouter,- calendars: calendarsRouter,- calVideo: calVideoRouter,- credentials: credentialsRouter,- eventTypes: eventTypesRouter,- availability: availabilityRouter,- teams: viewerTeamsRouter,- timezones: timezonesRouter,- organizations: viewerOrganizationsRouter,- delegationCredential: delegationCredentialRouter,- webhook: webhookRouter,- apiKeys: apiKeysRouter,- slots: slotsRouter,- workflows: workflowsRouter,- saml: ssoRouter,- dsync: dsyncRouter,- i18n: i18nRouter,- insights: insightsRouter,- payments: paymentsRouter,- filterSegments: filterSegmentsRouter,- // pbac: permissionsRouter,- // NOTE: Add all app related routes in the bottom till the problem described in @calcom/app-store/trpc-routers.ts is solved.- // After that there would just one merge call here for all the apps.- appRoutingForms: app_RoutingForms,- appBasecamp3: app_Basecamp3,- features: featureFlagRouter,- users: userAdminRouter,- oAuth: oAuthRouter,- googleWorkspace: googleWorkspaceRouter,- admin: adminRouter,- attributes: attributesRouter,- highPerf: highPerfRouter,- routingForms: routingFormsRouter,- credits: creditsRouter,- ooo: oooRouter,- travelSchedules: travelSchedulesRouter,- })-);+ apps: appsRouter,+ me: meRouter,+ public: publicViewerRouter,+ auth: authRouter,+ deploymentSetup: deploymentSetupRouter,+ bookings: bookingsRouter,+ calendars: calendarsRouter,+ calVideo: calVideoRouter,+ credentials: credentialsRouter,+ eventTypes: eventTypesRouter,+ availability: availabilityRouter,+ teams: viewerTeamsRouter,+ timezones: timezonesRouter,+ organizations: viewerOrganizationsRouter,+ delegationCredential: delegationCredentialRouter,+ webhook: webhookRouter,+ apiKeys: apiKeysRouter,+ slots: slotsRouter,+ workflows: workflowsRouter,+ saml: ssoRouter,+ dsync: dsyncRouter,+ i18n: i18nRouter,+ insights: insightsRouter,+ payments: paymentsRouter,+ filterSegments: filterSegmentsRouter,+ pbac: permissionsRouter,+ // NOTE: Add all app related routes in the bottom till the problem described in @calcom/app-store/trpc-routers.ts is solved.+ // After that there would just one merge call here for all the apps.+ appRoutingForms: app_RoutingForms,+ appBasecamp3: app_Basecamp3,+ features: featureFlagRouter,+ users: userAdminRouter,+ oAuth: oAuthRouter,+ googleWorkspace: googleWorkspaceRouter,+ admin: adminRouter,+ attributes: attributesRouter,+ highPerf: highPerfRouter,+ routingForms: routingFormsRouter,+ credits: creditsRouter,+ ooo: oooRouter,+ travelSchedules: travelSchedulesRouter,+});