Scheduling infrastructure for absolutely everyone.
Revert "fix: revert app router error pages (#18696)" (#18714)
Benny Joo9e5665f2fb88
diff --git a/apps/web/app/error.tsx b/apps/web/app/error.tsxindex b804d677acb..0dd34475ecb 100644--- a/apps/web/app/error.tsx+++ b/apps/web/app/error.tsx@@ -1,64 +1,59 @@"use client";-/**- * Typescript class based component for custom-error- * @link https://nextjs.org/docs/advanced-features/custom-error-page- */-import type { NextPage } from "next";-import type { ErrorProps } from "next/error";+import { captureException } from "@sentry/nextjs";import React from "react";+import { getErrorFromUnknown } from "@calcom/lib/errors";import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import { redactError } from "@calcom/lib/redactError";import { ErrorPage } from "@components/error/error-page";-type NextError = Error & { digest?: string };--// Ref: https://nextjs.org/docs/app/api-reference/file-conventions/error#props-export type DefaultErrorProps = {- error: NextError;- reset: () => void; // A function to reset the error boundary-};--type AugmentedError = NextError | HttpError | null;--type CustomErrorProps = {- err?: AugmentedError;- statusCode?: number;- message?: string;-} & Omit<ErrorProps, "err" | "statusCode">;-const log = logger.getSubLogger({ prefix: ["[error]"] });-const CustomError: NextPage<DefaultErrorProps> = (props) => {- const { error } = props;- let errorObject: CustomErrorProps = {- message: error.message,- err: error,- };+export type ErrorProps = {+ error: Error;+ reset?: () => void;+};- if (error instanceof HttpError) {- const redactedError = redactError(error);- errorObject = {- statusCode: error.statusCode,- title: redactedError.name,- message: redactedError.message,- err: {- ...redactedError,- ...error,- },+export default function Error({ error }: ErrorProps) {+ React.useEffect(() => {+ log.error(error);++ // Log the error to Sentry+ captureException(error);+ }, [error]);++ const processedError = React.useMemo(() => {+ const err = getErrorFromUnknown(error);++ if (err instanceof HttpError) {+ const redactedError = redactError(err);+ return {+ statusCode: err.statusCode,+ title: redactedError.name,+ name: redactedError.name,+ message: redactedError.message,+ url: err.url,+ method: err.method,+ cause: err.cause,+ };+ }++ return {+ statusCode: 500,+ title: "Internal Server Error",+ name: "Internal Server Error",+ message: "An unexpected error occurred.",};- }-- // `error.digest` property contains an automatically generated hash of the error that can be used to match the corresponding error in server-side logs- log.debug(`${error?.toString() ?? JSON.stringify(error)}`);- log.info("errorObject: ", errorObject);+ }, [error]);return (- <ErrorPage statusCode={errorObject.statusCode} error={errorObject.err} message={errorObject.message} />+ <ErrorPage+ statusCode={processedError.statusCode}+ error={processedError}+ message={processedError.message}+ />);-};--export default CustomError;+}diff --git a/apps/web/app/global-error.tsx b/apps/web/app/global-error.tsxindex ecf7247dbb5..df022ffbb18 100644--- a/apps/web/app/global-error.tsx+++ b/apps/web/app/global-error.tsx@@ -2,9 +2,10 @@import { type NextPage } from "next";-import CustomError, { type DefaultErrorProps } from "./error";+import CustomError from "./error";+import type { ErrorProps } from "./error";-export const GlobalError: NextPage<DefaultErrorProps> = (props) => {+export const GlobalError: NextPage<ErrorProps> = (props) => {return (<html><body>diff --git a/apps/web/app/not-found.tsx b/apps/web/app/not-found.tsxindex a9a4bb5c925..95a9a8c97ec 100644--- a/apps/web/app/not-found.tsx+++ b/apps/web/app/not-found.tsx@@ -1,12 +1,246 @@-import React from "react";+import { _generateMetadata, getTranslate } from "app/_utils";+import { WithLayout } from "app/layoutHOC";+import { headers } from "next/headers";+import Link from "next/link";++import {+ getOrgDomainConfigFromHostname,+ subdomainSuffix,+} from "@calcom/features/ee/organizations/lib/orgDomains";+import { DOCS_URL, IS_CALCOM, WEBSITE_URL } from "@calcom/lib/constants";+import { Icon } from "@calcom/ui";++enum PageType {+ ORG = "ORG",+ TEAM = "TEAM",+ USER = "USER",+ OTHER = "OTHER",+}++function getPageInfo(pathname: string, host: string) {+ const { isValidOrgDomain, currentOrgDomain } = getOrgDomainConfigFromHostname({ hostname: host });+ const [routerUsername] = pathname?.replace("%20", "-").split(/[?#]/) ?? [];+ if (!routerUsername || (isValidOrgDomain && currentOrgDomain)) {+ return {+ username: currentOrgDomain ?? "",+ pageType: PageType.ORG,+ url: `${WEBSITE_URL}/signup?callbackUrl=settings/organizations/new%3Fslug%3D${+ currentOrgDomain?.replace("/", "") ?? ""+ }`,+ };+ }++ const splitPath = routerUsername.split("/");+ if (splitPath[1] === "team" && splitPath.length === 3) {+ return {+ username: splitPath[2],+ pageType: PageType.TEAM,+ url: `${WEBSITE_URL}/signup?callbackUrl=settings/teams/new%3Fslug%3D${splitPath[2].replace("/", "")}`,+ };+ }++ return {+ username: routerUsername,+ pageType: PageType.USER,+ url: `${WEBSITE_URL}/signup?username=${routerUsername.replace("/", "")}`,+ };+}++async function NotFound() {+ const t = await getTranslate();+ const headersList = headers();+ const host = headersList.get("x-forwarded-host") ?? "";+ const pathname = headersList.get("x-pathname") ?? "";++ // This makes more sense after full migration to App Router+ // if (!pathname) {+ // redirect("/500");+ // }++ const { username, pageType, url } = getPageInfo(pathname, host);+ const isBookingSuccessPage = pathname?.startsWith("/booking");+ const isSubpage = pathname?.includes("/", 2) || isBookingSuccessPage;+ const isInsights = pathname?.startsWith("/insights");++ const links = [+ {+ title: t("enterprise"),+ description: "Learn more about organizations and subdomains in our enterprise plan.",+ icon: "shield" as const,+ href: `${WEBSITE_URL}/enterprise`,+ },+ {+ title: t("documentation"),+ description: t("documentation_description"),+ icon: "file-text" as const,+ href: DOCS_URL,+ },+ {+ title: t("blog"),+ description: t("blog_description"),+ icon: "book-open" as const,+ href: `${WEBSITE_URL}/blog`,+ },+ ];++ /**+ * If we're on 404 and the route is insights it means it is disabled+ * TODO: Abstract this for all disabled features+ **/+ if (isInsights) {+ return (+ <div className="min-h-screen bg-white px-4" data-testid="404-page">+ <main className="mx-auto max-w-xl pb-6 pt-16 sm:pt-24">+ <div className="text-center">+ <p className="text-sm font-semibold uppercase tracking-wide text-black">{t("error_404")}</p>+ <h1 className="font-cal mt-2 text-4xl font-extrabold text-gray-900 sm:text-5xl">+ {t("feature_currently_disabled") ?? "Feature is currently disabled"}+ </h1>+ </div>+ <div className="mt-12">+ <div className="mt-8">+ <Link href={WEBSITE_URL} className="text-base font-medium text-black hover:text-gray-500">+ {t("or_go_back_home")}+ <span aria-hidden="true"> →</span>+ </Link>+ </div>+ </div>+ </main>+ </div>+ );+ }-const NotFound = () => {return (- <div data-testid="404-page">- <h1>404 - Page Not Found</h1>- <p>Sorry, the page you are looking for does not exist.</p>+ <div className="bg-default min-h-screen px-4" data-testid="404-page">+ <main className="mx-auto max-w-xl pb-6 pt-16 sm:pt-24">+ <div className="text-center">+ <p className="text-emphasis text-sm font-semibold uppercase tracking-wide">{t("error_404")}</p>+ <h1 className="font-cal text-emphasis mt-2 text-4xl font-extrabold sm:text-5xl">+ {isBookingSuccessPage ? "Booking not found" : t("page_doesnt_exist")}+ </h1>+ {isSubpage && pageType !== PageType.TEAM ? (+ <span className="mt-2 inline-block text-lg">{t("check_spelling_mistakes_or_go_back")}</span>+ ) : IS_CALCOM ? (+ <a target="_blank" href={url} className="mt-2 inline-block text-lg" rel="noreferrer">+ {t(`404_the_${pageType.toLowerCase()}`)}++ {username ? (+ <>+ <strong className="text-blue-500">{username}</strong> {t("is_still_available")}{" "}+ <span className="text-blue-500">{t("register_now")}</span>.+ </>+ ) : null}+ </a>+ ) : (+ <span className="mt-2 inline-block text-lg">+ {t(`404_the_${pageType.toLowerCase()}`)}{" "}+ {username ? (+ <>+ <strong className="text-lgtext-green-500 mt-2 inline-block">{username}</strong>{" "}+ {t("is_still_available")}+ </>+ ) : null}+ </span>+ )}+ </div>+ <div className="mt-12">+ {((!isSubpage && IS_CALCOM) || pageType === PageType.ORG || pageType === PageType.TEAM) && (+ <ul role="list" className="my-4">+ <li className="border-2 border-green-500 px-4 py-2">+ <a+ href={url}+ target="_blank"+ className="relative flex items-start space-x-4 py-6 rtl:space-x-reverse"+ rel="noreferrer">+ <div className="flex-shrink-0">+ <span className="flex h-12 w-12 items-center justify-center rounded-lg bg-green-50">+ <Icon name="check" className="h-6 w-6 text-green-500" aria-hidden="true" />+ </span>+ </div>+ <div className="min-w-0 flex-1">+ <h3 className="text-emphasis text-base font-medium">+ <span className="focus-within:ring-empthasis rounded-sm focus-within:ring-2 focus-within:ring-offset-2">+ <span className="focus:outline-none">+ <span className="absolute inset-0" aria-hidden="true" />+ {t("register")}{" "}+ <strong className="text-green-500">{`${+ pageType === PageType.TEAM ? `${new URL(WEBSITE_URL).host}/team/` : ""+ }${username}${pageType === PageType.ORG ? `.${subdomainSuffix()}` : ""}`}</strong>+ </span>+ </span>+ </h3>+ <p className="text-subtle text-base">{t(`404_claim_entity_${pageType.toLowerCase()}`)}</p>+ </div>+ <div className="flex-shrink-0 self-center">+ <Icon name="chevron-right" className="text-muted h-5 w-5" aria-hidden="true" />+ </div>+ </a>+ </li>+ </ul>+ )}+ <h2 className="text-subtle text-sm font-semibold uppercase tracking-wide">{t("popular_pages")}</h2>+ <ul role="list" className="border-subtle divide-subtle divide-y">+ {links+ .filter((_, idx) => pageType === PageType.ORG || idx !== 0)+ .map((link, linkIdx) => (+ <li key={linkIdx} className="px-4 py-2">+ <a+ href={link.href}+ className="relative flex items-start space-x-4 py-6 rtl:space-x-reverse">+ <div className="flex-shrink-0">+ <span className="bg-muted flex h-12 w-12 items-center justify-center rounded-lg">+ <Icon name={link.icon} className="text-default h-6 w-6" aria-hidden="true" />+ </span>+ </div>+ <div className="min-w-0 flex-1">+ <h3 className="text-emphasis text-base font-medium">+ <span className="focus-within:ring-empthasis rounded-sm focus-within:ring-2 focus-within:ring-offset-2">+ <span className="absolute inset-0" aria-hidden="true" />+ {link.title}+ </span>+ </h3>+ <p className="text-subtle text-base">{link.description}</p>+ </div>+ <div className="flex-shrink-0 self-center">+ <Icon name="chevron-right" className="text-muted h-5 w-5" aria-hidden="true" />+ </div>+ </a>+ </li>+ ))}+ </ul>+ <div className="mt-8">+ <Link href={WEBSITE_URL} className="hover:text-subtle text-emphasis text-base font-medium">+ {t("or_go_back_home")}+ <span aria-hidden="true"> →</span>+ </Link>+ </div>+ </div>+ </main></div>);+}++export const generateMetadata = async () => {+ const headersList = headers();+ const pathname = headersList.get("x-pathname") ?? "";+ const isInsights = pathname?.startsWith("/insights");++ const metadata = await _generateMetadata(+ (t) =>+ isInsights+ ? t("feature_currently_disabled") ?? "Feature is currently disabled"+ : t("404_page_not_found"),+ (t) => t("404_page_not_found")+ );+ return {+ ...metadata,+ robots: {+ index: false,+ follow: false,+ },+ };};-export default NotFound;+export default WithLayout({+ ServerPage: NotFound,+});