🐛 Fix preview for 404, 500 #2081 (#2131)

* 🐛 Fix preview for 404, 500 #2081 * 🚨 Fix issues from code ql #2081 * Remove comments #2081 * ✨ Add link option to text in 404 #2081
equinor · Mar 12, 2024 · 1bf3d65 · 1bf3d65
1 parent cf7b834
commit 1bf3d65
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/sanityv3/schemas/documents/404.ts b/sanityv3/schemas/documents/404.ts
@@ -13,7 +13,7 @@ const textContentType = configureBlockContent({
   h3: false,
   h4: false,
   externalLink: false,
-  internalLink: false,
+  internalLink: true,
   lists: false,
   attachment: false,
   smallText: false,

diff --git a/web/lib/queries/pageNotFound.ts b/web/lib/queries/pageNotFound.ts
@@ -1,3 +1,4 @@
+import markDefs from './common/blockEditorMarks'
 import { sameLang } from './common/langAndDrafts'
 
 export const pageNotFoundQuery = /* groq */ `
@@ -6,7 +7,7 @@ export const pageNotFoundQuery = /* groq */ `
     "documentTitle": seo.documentTitle,
     "metaDescription": seo.metaDescription,
     title,
-    text,
+    text[]{..., ${markDefs}},
     backgroundImage
   }
  `
diff --git a/web/pages/404.tsx b/web/pages/404.tsx
@@ -69,18 +69,21 @@ Custom404.getLayout = (page: AppProps) => {
   )
 }
 
-export const getStaticProps: GetStaticProps = async ({ locale = defaultLanguage.locale }) => {
+export const getStaticProps: GetStaticProps = async ({ locale = defaultLanguage.locale, preview = false }) => {
   const lang = getNameFromLocale(locale)
   const intl = await getIntl(locale, false)
 
   const queryParams = {
     lang,
   }
 
-  const { menuData, pageData, footerData } = await getComponentsData({
-    query: pageNotFoundQuery,
-    queryParams,
-  })
+  const { menuData, pageData, footerData } = await getComponentsData(
+    {
+      query: pageNotFoundQuery,
+      queryParams,
+    },
+    preview,
+  )
 
   return {
     props: {

diff --git a/web/pages/500.tsx b/web/pages/500.tsx
@@ -69,16 +69,19 @@ Custom500.getLayout = (page: AppProps) => {
   )
 }
 
-export const getStaticProps: GetStaticProps = async ({ locale = defaultLanguage.locale }) => {
+export const getStaticProps: GetStaticProps = async ({ locale = defaultLanguage.locale, preview = false }) => {
   const lang = getNameFromLocale(locale)
   const queryParams = {
     lang,
   }
 
-  const { menuData, pageData, footerData } = await getComponentsData({
-    query: internalServerErrorQuery,
-    queryParams,
-  })
+  const { menuData, pageData, footerData } = await getComponentsData(
+    {
+      query: internalServerErrorQuery,
+      queryParams,
+    },
+    preview,
+  )
 
   const intl = await getIntl(locale, false)
 

diff --git a/web/pages/api/preview.js b/web/pages/api/preview.js
@@ -34,6 +34,10 @@ export default function preview(req, res) {
     url = locale === 'no' ? `${baseUrl}/no/nyheter?preview` : `${baseUrl}/news?preview`
   } else if (Flags.HAS_MAGAZINE_INDEX && ['/magazineIndex', '/drafts.magazineIndex'].includes(pathname)) {
     url = locale === 'no' ? `${baseUrl}/no/magasin?preview` : `${baseUrl}/magazine?preview`
+  } else if (['/pageNotFound', '/drafts.pageNotFound'].includes(pathname)) {
+    url = `${baseUrl}${locale}/404?preview`
+  } else if (['/internalServerError', '/drafts.internalServerError'].includes(pathname)) {
+    url = `${baseUrl}${locale}/500?preview`
   } else {
     url = `${baseUrl}${locale}${pathname}`
   }