Merge pull request #210 from mobeigi/fix-broken-redirects

Call payloadRedirect from both generateMetadata and handler
mobeigi · Oct 28, 2024 · 5df9cb7 · 5df9cb7
2 parents fcb7eb4 + 68d2ad7
commit 5df9cb7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/src/app/(frontend)/[...catchAll]/page.tsx b/app/src/app/(frontend)/[...catchAll]/page.tsx
@@ -14,7 +14,9 @@ export const generateMetadata = async ({
 };
 
 // Any route that isn't handled by other routes will end up here
-const CatchAllHandler = () => {
+const CatchAllHandler = async ({ params: paramsPromise }: { params: Promise<{ catchAll: string[] }> }) => {
+  const params = await paramsPromise;
+  await payloadRedirect({ currentUrl: joinUrl([...params.catchAll]) });
   notFound();
 };
 

diff --git a/app/src/app/(frontend)/blog/[...slug]/page.tsx b/app/src/app/(frontend)/blog/[...slug]/page.tsx
@@ -192,6 +192,8 @@ export const generateStaticParams = async () => {
 const BlogPostHandler = async ({ params: paramsPromise }: { params: Promise<{ slug: string[] }> }) => {
   const params = await paramsPromise;
 
+  await payloadRedirect({ currentUrl: joinUrl(['blog', ...params.slug]) });
+
   const post = await getPayloadPostFromParams({ params });
   if (!post) {
     notFound();

diff --git a/app/src/app/(frontend)/blog/category/[...slug]/page.tsx b/app/src/app/(frontend)/blog/category/[...slug]/page.tsx
@@ -21,7 +21,6 @@ export const revalidate = 900;
 /**
  * Data fetching
  */
-
 const getPayloadCategoryFromParams = ({ params }: { params: { slug: string[] } }) =>
   unstable_cache_safe(
     async (): Promise<PayloadCategory | null> => {
@@ -218,6 +217,8 @@ export const generateStaticParams = async () => {
 const CategoryDetailPageHandler = async ({ params: paramsPromise }: { params: Promise<{ slug: string[] }> }) => {
   const params = await paramsPromise;
 
+  await payloadRedirect({ currentUrl: joinUrl(['blog', 'category', ...params.slug]) });
+
   const payloadCategory = await getPayloadCategoryFromParams({ params });
   if (!payloadCategory) {
     notFound();