From 11437524e46195c331b26eeeaadff627686c642f Mon Sep 17 00:00:00 2001 From: Jonas Daniels Date: Sat, 14 Sep 2024 17:10:18 -0700 Subject: [PATCH] [Update] Replace redirect with notFound for 404 handling (#4596) --- apps/dashboard/src/app/(dashboard)/(chain)/utils.ts | 4 ++-- apps/dashboard/src/app/team/[team_slug]/(team)/layout.tsx | 5 ++--- .../[project_slug]/connect/account-abstraction/page.tsx | 4 ++-- .../[team_slug]/[project_slug]/connect/analytics/page.tsx | 2 +- .../[project_slug]/connect/in-app-wallets/page.tsx | 2 +- .../app/team/[team_slug]/[project_slug]/connect/pay/page.tsx | 2 +- .../src/app/team/[team_slug]/[project_slug]/layout.tsx | 4 ++-- apps/dashboard/src/app/team/page.tsx | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/utils.ts b/apps/dashboard/src/app/(dashboard)/(chain)/utils.ts index 38f574b04..71636cdf8 100644 --- a/apps/dashboard/src/app/(dashboard)/(chain)/utils.ts +++ b/apps/dashboard/src/app/(dashboard)/(chain)/utils.ts @@ -1,6 +1,6 @@ import "server-only"; -import { redirect } from "next/navigation"; +import { notFound } from "next/navigation"; import type { ChainCTAProps } from "./[chain_id]/(chainPage)/components/server/cta-card"; import zeroGCTA from "./temp-assets/0gCTA.png"; import zeroGBanner from "./temp-assets/0gLabsBanner.png"; @@ -89,7 +89,7 @@ export async function getChain( ]); if (!chain.data) { - redirect("/404"); + notFound(); } return { ...chain.data, diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/layout.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/layout.tsx index 40c10cbfa..6e9597165 100644 --- a/apps/dashboard/src/app/team/[team_slug]/(team)/layout.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/(team)/layout.tsx @@ -1,7 +1,7 @@ import { getProjects } from "@/api/projects"; import { getTeams } from "@/api/team"; import { TabPathLinks } from "@/components/ui/tabs"; -import { redirect } from "next/navigation"; +import { notFound } from "next/navigation"; import { TeamHeader } from "../../components/TeamHeader/TeamHeader"; export default async function TeamLayout(props: { @@ -18,8 +18,7 @@ export default async function TeamLayout(props: { ); if (!team) { - // not a valid team, redirect back to 404 - redirect("/404"); + notFound(); } return ( diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx index b9c86580d..319285f6a 100644 --- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx @@ -11,14 +11,14 @@ export default async function Page(props: { const project = await getProject(team_slug, project_slug); if (!project) { - return notFound(); + notFound(); } // THIS IS A WORKAROUND - project does not have `services` info - so we fetch APIKey object. const apiKey = await getAPIKey(project.id); if (!apiKey) { - return notFound(); + notFound(); } return ( diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/analytics/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/analytics/page.tsx index 25c0d5a1e..f3bed65aa 100644 --- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/analytics/page.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/analytics/page.tsx @@ -15,7 +15,7 @@ export default async function Page(props: { ); if (!project) { - return notFound(); + notFound(); } return ( diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx index 5e19d5cbc..c8df5d61e 100644 --- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx @@ -17,7 +17,7 @@ export default async function Page(props: { ); if (!project) { - return notFound(); + notFound(); } const TRACKING_CATEGORY = "team/in-app-wallets"; diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/pay/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/pay/page.tsx index 76f16fac3..9b98cf577 100644 --- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/pay/page.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/pay/page.tsx @@ -15,7 +15,7 @@ export default async function Page(props: { ); if (!project) { - return notFound(); + notFound(); } return ( diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx index 367cac87a..2e27f95d0 100644 --- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx +++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx @@ -1,7 +1,7 @@ import { getProjects } from "@/api/projects"; import { getTeams } from "@/api/team"; import { TabPathLinks } from "@/components/ui/tabs"; -import { redirect } from "next/navigation"; +import { notFound, redirect } from "next/navigation"; import { TeamHeader } from "../../components/TeamHeader/TeamHeader"; export default async function TeamLayout(props: { @@ -14,7 +14,7 @@ export default async function TeamLayout(props: { if (!team) { // not a valid team, redirect back to 404 - redirect("/404"); + notFound(); } const teamsAndProjects = await Promise.all( diff --git a/apps/dashboard/src/app/team/page.tsx b/apps/dashboard/src/app/team/page.tsx index 2b9009a94..1f15a2b89 100644 --- a/apps/dashboard/src/app/team/page.tsx +++ b/apps/dashboard/src/app/team/page.tsx @@ -1,5 +1,5 @@ import { getTeams } from "@/api/team"; -import { redirect } from "next/navigation"; +import { notFound, redirect } from "next/navigation"; export default async function TeamRootPage() { // get all teams, then go to the first team @@ -7,7 +7,7 @@ export default async function TeamRootPage() { const firstTeam = teams[0]; if (!firstTeam) { - return redirect("/404"); + notFound(); } redirect(`/team/${firstTeam.slug}`); }