Merge pull request #16231 from cagov/jbum-post-patch-2

Modified get-posts to ignore null entries.
cagov · Jul 17, 2024 · f837a23 · f837a23
2 parents f5690ce + 7f1b5de
commit f837a23
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/src/js/eleventy/event-list/get-posts.js b/src/js/eleventy/event-list/get-posts.js
@@ -1,5 +1,5 @@
 const fs = require("fs");
-const config = require("../../../../config");
+const config = require("../../../../config/index.js");
 
 /**
  * Checks for a match between two sets of categories.
@@ -12,7 +12,7 @@ const categoryMatchBetween = (componentCategories, postCategories) => {
     category.replace("-", " ")
   );
   const intersection = postCategories.filter((category) =>
-    category != null && unsluggedCategories.includes(category.toLowerCase())
+    (category != null && unsluggedCategories.includes(category.toLowerCase()))
   );
   return intersection.length > 0;
 };
@@ -43,20 +43,21 @@ const getEventsByCategory = (categoryString, count = 5) => {
     }
   });
 
-  const postsToReturn = wordPressArray
-    .sort((a, b) => {
-      try {
-        // @TODO TEST EVENTS -
-        const aDate = a.data.event.startDate;
-        const bDate = b.data.event.startDate;
-        return new Date(aDate) - new Date(bDate);
-      } catch (error) {
-        console.error("missing date value");
-        return 0; // Trying no difference to skip sort values.
-      }
-    })
-    .slice(-count)
-    .reverse();
+  // this was unused
+  // const postsToReturn = wordPressArray
+  //   .sort((a, b) => {
+  //     try {
+  //       // @TODO TEST EVENTS -
+  //       const aDate = a.data.event.startDate;
+  //       const bDate = b.data.event.startDate;
+  //       return new Date(aDate) - new Date(bDate);
+  //     } catch (error) {
+  //       console.error("missing date value");
+  //       return 0; // Trying no difference to skip sort values.
+  //     }
+  //   })
+  //   .slice(-count)
+  //   .reverse();
 
     const today = new Date();
     const tomorrow = new Date(today);
@@ -72,6 +73,7 @@ const getEventsByCategory = (categoryString, count = 5) => {
         console.error("missing date value");
         return a;
       }
+      return a;
     });
 
   return postsToReturnRecent;

diff --git a/src/js/eleventy/post-list/get-posts.js b/src/js/eleventy/post-list/get-posts.js
@@ -11,7 +11,7 @@ const categoryMatchBetween = (componentCategories, postCategories) => {
     category.replace("-", " ")
   );
   const intersection = postCategories.filter((category) =>
-    unsluggedCategories.includes(category.toLowerCase())
+    (category != null && unsluggedCategories.includes(category.toLowerCase()))
   );
   return intersection.length > 0;
 };