refactor: filtering is now cumulative

gatsbyjs · Jun 22, 2018 · 866bd6d · 866bd6d
1 parent 1788a2f
commit 866bd6d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/www/gatsby-node.js b/www/gatsby-node.js
@@ -144,11 +144,13 @@ exports.createPages = ({ graphql, actions }) => {
           edge => {
             const slug = _.get(edge, `node.fields.slug`)
             const draft = _.get(edge, `node.frontmatter.draft`)
-            if (!slug) return
+            if (!slug) return undefined
 
             if (_.includes(slug, `/blog/`) && !draft) {
               return edge
             }
+
+            return undefined
           }
         )
 

diff --git a/www/src/views/showcase/filtered-showcase.js b/www/src/views/showcase/filtered-showcase.js
@@ -16,14 +16,17 @@ import presets, { colors } from "../../utils/presets"
 import URLQuery from "../../components/url-query"
 
 const filterByCategories = (list, categories) => {
-  let items = list
+  const items = list.reduce((aggregated, edge) => {
+    if (edge.node.categories) {
+      if (edge.node.categories.filter(c => categories.includes(c)).length) {
+        aggregated.push(edge)
+      }
 
-  items = items.filter(
-    ({ node }) =>
-      node.categories &&
-      node.categories.filter(c => categories.includes(c)).length ===
-        categories.length
-  )
+      return aggregated
+    }
+
+    return aggregated
+  }, [])
 
   return items
 }