fix: update sites to handle unpublished entities

chapter-three · Jun 13, 2021 · 93dd678 · 93dd678 · vercel · Jun 13, 2021
1 parent c1fc90a
commit 93dd678
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/examples/example-blog/pages/[...slug].tsx b/examples/example-blog/pages/[...slug].tsx
@@ -38,7 +38,7 @@ export async function getStaticPaths(context) {
 export async function getStaticProps(context) {
   const page = await getResourceFromContext("node--page", context)
 
-  if (!page) {
+  if (!page?.status) {
     return {
       notFound: true,
     }

diff --git a/examples/example-blog/pages/blog/[...slug].tsx b/examples/example-blog/pages/blog/[...slug].tsx
@@ -62,6 +62,7 @@ export default function BlogPostPage({ post }) {
 export async function getStaticPaths(context) {
   let paths = await getPathsFromContext("node--article", context, {
     params: {
+      "filter[status]": "1",
       "fields[node--article]": "path,field_site",
     },
   })
@@ -86,6 +87,7 @@ export async function getStaticProps(context) {
 
   if (
     !post ||
+    !post.status ||
     !post.field_site?.some(({ id }) => id === process.env.DRUPAL_SITE_ID)
   ) {
     return {

diff --git a/examples/example-blog/pages/index.tsx b/examples/example-blog/pages/index.tsx
@@ -30,6 +30,7 @@ export async function getStaticProps(context) {
     context,
     {
       params: {
+        "filter[status]": "1",
         include: "field_image, uid",
         sort: "-created",
       },

diff --git a/examples/example-marketing/pages/[[...slug]].tsx b/examples/example-marketing/pages/[[...slug]].tsx
@@ -70,7 +70,7 @@ export async function getStaticProps(
     params,
   })
 
-  if (!page) {
+  if (!page?.status) {
     return {
       notFound: true,
     }
@@ -80,6 +80,6 @@ export async function getStaticProps(
     props: {
       page,
     },
-    revalidate: 60,
+    revalidate: 1,
   }
 }
diff --git a/examples/example-marketing/pages/blog.tsx b/examples/example-marketing/pages/blog.tsx
@@ -31,6 +31,7 @@ export async function getStaticProps(context) {
     context,
     {
       params: {
+        "filter[status]": "1",
         include: "field_image, uid",
         sort: "-created",
       },
@@ -45,6 +46,6 @@ export async function getStaticProps(context) {
     props: {
       articles,
     },
-    revalidate: 60,
+    revalidate: 1,
   }
 }
diff --git a/examples/example-marketing/pages/blog/[...slug].tsx b/examples/example-marketing/pages/blog/[...slug].tsx
@@ -70,7 +70,12 @@ export default function BlogPostPage({ post, preview }) {
 }
 
 export async function getStaticPaths(context) {
-  let paths = await getPathsFromContext("node--article", context)
+  let paths = await getPathsFromContext("node--article", context, {
+    params: {
+      "filter[status]": "1",
+      "fields[node--article]": "path,field_site",
+    },
+  })
 
   paths = paths.filter((entity) =>
     entity.field_site?.some(({ id }) => id === process.env.DRUPAL_SITE_ID)
@@ -92,6 +97,7 @@ export async function getStaticProps(context) {
 
   if (
     !post ||
+    !post.status ||
     !post.field_site?.some(({ id }) => id === process.env.DRUPAL_SITE_ID)
   ) {
     return {
@@ -103,6 +109,6 @@ export async function getStaticProps(context) {
     props: {
       post,
     },
-    revalidate: 60,
+    revalidate: 1,
   }
 }