From 4c0754b455fb77fb68fdeb474777a8c348d7fffb Mon Sep 17 00:00:00 2001
From: Niko Lindroos <niko.j.makela@gmail.com>
Date: Mon, 27 Mar 2023 17:33:48 +0300
Subject: [PATCH] fix: dynamic pages to return null when document is not found

LIIKUNTA-441.

Return null to fix SSR rendering when the getSTaticProps returns with notFound: true.
This is null-checker fix is needed only with fallback: true -option on,
but should not be needed at all. The fallback: 'blocking' hides the issue
and makes it all work better.
---
 apps/events-helsinki/src/pages/articles/[...slug].tsx  | 4 ++++
 apps/events-helsinki/src/pages/pages/[...slug].tsx     | 4 ++++
 apps/hobbies-helsinki/src/pages/articles/[...slug].tsx | 4 ++++
 apps/hobbies-helsinki/src/pages/pages/[...slug].tsx    | 5 +++++
 apps/sports-helsinki/src/pages/articles/[...slug].tsx  | 4 ++++
 apps/sports-helsinki/src/pages/pages/[...slug].tsx     | 5 +++++
 6 files changed, 26 insertions(+)

diff --git a/apps/events-helsinki/src/pages/articles/[...slug].tsx b/apps/events-helsinki/src/pages/articles/[...slug].tsx
index 742ec549e..dd536b019 100644
--- a/apps/events-helsinki/src/pages/articles/[...slug].tsx
+++ b/apps/events-helsinki/src/pages/articles/[...slug].tsx
@@ -56,6 +56,10 @@ const NextCmsArticle: NextPage<{
 
   const { footerMenu } = useContext(NavigationContext);
 
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!article) return null;
+
   return (
     <MatomoWrapper>
       <RHHCPage
diff --git a/apps/events-helsinki/src/pages/pages/[...slug].tsx b/apps/events-helsinki/src/pages/pages/[...slug].tsx
index b67837093..d9320ebd9 100644
--- a/apps/events-helsinki/src/pages/pages/[...slug].tsx
+++ b/apps/events-helsinki/src/pages/pages/[...slug].tsx
@@ -51,6 +51,10 @@ const NextCmsPage: NextPage<{
   const { footerMenu } = useContext(NavigationContext);
   const { t: appTranslation } = useAppEventsTranslation();
 
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!page) return null;
+
   return (
     <MatomoWrapper>
       <HCRCPage
diff --git a/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx b/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx
index 5a79d1354..4479f04fe 100644
--- a/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx
+++ b/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx
@@ -54,6 +54,10 @@ const NextCmsArticle: NextPage<{
   const { t: appTranslation } = useAppHobbiesTranslation();
   const { footerMenu } = useContext(NavigationContext);
 
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!article) return null;
+
   return (
     <MatomoWrapper>
       <RHHCPage
diff --git a/apps/hobbies-helsinki/src/pages/pages/[...slug].tsx b/apps/hobbies-helsinki/src/pages/pages/[...slug].tsx
index 215edf2e2..022c26332 100644
--- a/apps/hobbies-helsinki/src/pages/pages/[...slug].tsx
+++ b/apps/hobbies-helsinki/src/pages/pages/[...slug].tsx
@@ -50,6 +50,11 @@ const NextCmsPage: NextPage<{
   } = useConfig();
   const { footerMenu } = useContext(NavigationContext);
   const { t: appTranslation } = useAppHobbiesTranslation();
+
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!page) return null;
+
   return (
     <MatomoWrapper>
       <HCRCPage
diff --git a/apps/sports-helsinki/src/pages/articles/[...slug].tsx b/apps/sports-helsinki/src/pages/articles/[...slug].tsx
index 5d277833a..4d4a49686 100644
--- a/apps/sports-helsinki/src/pages/articles/[...slug].tsx
+++ b/apps/sports-helsinki/src/pages/articles/[...slug].tsx
@@ -54,6 +54,10 @@ const NextCmsArticle: NextPage<{
   const { t: appTranslation } = useAppSportsTranslation();
   const { footerMenu } = useContext(NavigationContext);
 
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!article) return null;
+
   return (
     <MatomoWrapper>
       <RHHCPage
diff --git a/apps/sports-helsinki/src/pages/pages/[...slug].tsx b/apps/sports-helsinki/src/pages/pages/[...slug].tsx
index 0619a744a..972fc5247 100644
--- a/apps/sports-helsinki/src/pages/pages/[...slug].tsx
+++ b/apps/sports-helsinki/src/pages/pages/[...slug].tsx
@@ -50,6 +50,11 @@ const NextCmsPage: NextPage<{
   } = useConfig();
   const { footerMenu } = useContext(NavigationContext);
   const { t: appTranslation } = useAppSportsTranslation();
+
+  // FIXME: Return null to fix SSR rendering for notFound-page.
+  // This is needed only with fallback: true, but should not be needed at all.
+  if (!page) return null;
+
   return (
     <MatomoWrapper>
       <HCRCPage