fix: handle empty resources and improve FAQ data mapping

CodeForAfrica · Jan 28, 2025 · a0d83f8 · a0d83f8
1 parent 3f1947a
commit a0d83f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/apps/promisetracker/src/lib/wp/index.js b/apps/promisetracker/src/lib/wp/index.js
@@ -181,7 +181,7 @@ function wp(site) {
     });
     const resource = resources[0];
     if (isEmpty(resource)) {
-      return undefined;
+      return null;
     }
 
     /* eslint  no-underscore-dangle: off */
@@ -349,13 +349,15 @@ function wp(site) {
             pageWithPosts = page;
           }
           const posts =
-            pageWithPosts?.posts?.map((post) => ({
-              image: post.thumbnail_image,
-              description: post.content.replace(/(<([^>]+)>)/gi, ""),
-              date: formatDate(post.date),
-              slug: post.slug,
-              title: post.title,
-            })) || null;
+            pageWithPosts?.posts
+              ?.filter((post) => !!post)
+              ?.map((post) => ({
+                image: post.thumbnail_image,
+                description: post.content.replace(/(<([^>]+)>)/gi, ""),
+                date: formatDate(post.date),
+                slug: post.slug,
+                title: post.title,
+              })) || null;
           return posts;
         })();
       },

diff --git a/apps/promisetracker/src/pages/faq.page.js b/apps/promisetracker/src/pages/faq.page.js
@@ -85,9 +85,10 @@ export async function getStaticProps({ locale }) {
   const backend = backendFn();
   const site = await backend.sites().current;
   const page = await wp().pages({ slug: "faq", locale }).first;
-  const faqs = page.faqs
-    .reduce((arr, e) => arr.concat(e.questions_answers), [])
-    .map((faq) => ({ title: faq.question, summary: faq.answer }));
+  const faqs =
+    page?.faqs
+      ?.reduce((arr, e) => arr.concat(e.questions_answers), [])
+      ?.map((faq) => ({ title: faq.question, summary: faq.answer })) ?? [];
   const languageAlternates = _.languageAlternates("/faq");
 
   return {