From 3c324e0a3c82c1465b3f5d2e9ae353eaa7874179 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Mon, 14 Jun 2021 17:00:18 +0200
Subject: [PATCH] add tags filter in LibraryList & LibraryMap

---
 src/pages/library/LibraryList.vue | 9 +++++----
 src/pages/library/LibraryMap.vue  | 8 +++++---
 src/store/utils.js                | 8 +++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/pages/library/LibraryList.vue b/src/pages/library/LibraryList.vue
index 4fed2bf..77349fb 100644
--- a/src/pages/library/LibraryList.vue
+++ b/src/pages/library/LibraryList.vue
@@ -18,10 +18,9 @@
 </template>
 
 <script>
-// FIXME let events bubble
 import { mapGetters } from 'vuex'
 
-import { searchInNode } from '@/store/utils'
+import { searchInNode, tagsInNode } from '@/store/utils'
 import { NodeView } from '@/components/nodes'
 
 
@@ -33,14 +32,16 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['orderedTextsDepart', 'search']),
+    ...mapGetters(['orderedTextsDepart', 'search', 'tags']),
 
     filteredNodes () {
       if (!this.orderedTextsDepart) return {}
       const nodesGroups = {}
       const search = this.search.toLowerCase()
       Object.entries(this.orderedTextsDepart).forEach(([char, nodes]) => {
-        const filteredNodes = nodes.filter(node => searchInNode(search, node))
+        const filteredNodes = nodes
+          .filter(node => tagsInNode(this.tags, node.tags))
+          .filter(node => searchInNode(search, node))
         if (filteredNodes.length) {
           nodesGroups[char] = filteredNodes
         }
diff --git a/src/pages/library/LibraryMap.vue b/src/pages/library/LibraryMap.vue
index 311d705..4f1484f 100644
--- a/src/pages/library/LibraryMap.vue
+++ b/src/pages/library/LibraryMap.vue
@@ -21,7 +21,7 @@ import { randomUniform } from 'd3'
 import { forceSimulation, forceCollide, forceManyBody } from 'd3-force'
 import { mapGetters } from 'vuex'
 
-import { searchInNode } from '@/store/utils'
+import { searchInNode, tagsInNode } from '@/store/utils'
 import { MapZoom } from '@/components/layouts'
 import { NodeView } from '@/components/nodes'
 
@@ -42,13 +42,15 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['search']),
+    ...mapGetters(['search', 'tags']),
 
     filteredNodes () {
       if (!this.nodes) return
       const search = this.search.toLowerCase()
       this.nodes.forEach(node => {
-        Object.assign(node, { hidden: !searchInNode(search, node.data) })
+        Object.assign(node, {
+          hidden: !(tagsInNode(this.tags, node.data.tags) && searchInNode(search, node.data))
+        })
       })
       return this.nodes
     }
diff --git a/src/store/utils.js b/src/store/utils.js
index b0300b8..e506b6e 100644
--- a/src/store/utils.js
+++ b/src/store/utils.js
@@ -124,10 +124,16 @@ export function searchInNode (search, node) {
     if (key === 'authors') {
       match = node[key].some(author => author.name.toLowerCase().includes(search))
     } else {
-      console.log(node[key].toLowerCase(), search)
       match = node[key].toLowerCase().includes(search)
     }
     if (match) return true
   }
   return false
 }
+
+
+export function tagsInNode (tags, nodeTags) {
+  if (tags.length === 0) return true
+  if (!nodeTags || nodeTags.length === 0) return false
+  return tags.every(tag => nodeTags.some(nodeTag => nodeTag.name === tag))
+}