Cleanup, prettify

browser/components/TagListItem.js

@@ -9,7 +9,9 @@ import CSSModules from 'browser/lib/CSSModules'
 /**
 * @param {string} name
 * @param {Function} handleClickTagListItem
+* @param {Function} handleClickNarrowToTag
 * @param {bool} isActive
+* @param {bool} isRelated
 */
 
 const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, isActive, isRelated, count}) => (

browser/main/NoteList/index.js

@@ -346,9 +346,7 @@ class NoteList extends React.Component {
       const listOfTags = params.tagname.split(' ')
       return data.noteMap.map(note => {
         return note
-      }).filter(note => {
+      }).filter(note => listOfTags.every(tag => note.tags.includes(tag)))
-        return listOfTags.every((tag) => note.tags.includes(tag))
-      })
     }
 
     return this.getContextNotes()

browser/main/SideNav/index.js

@@ -146,9 +146,9 @@ class SideNav extends React.Component {
   tagListComponent () {
     const { data, location, config } = this.props
     const relatedTags = this.getRelatedTags(this.getActiveTags(location.pathname), data.noteMap)
-    let tagList = _.sortBy(data.tagNoteMap.map((tag, name) => {
+    let tagList = _.sortBy(data.tagNoteMap.map(
-      return { name, size: tag.size, related: relatedTags.has(name) }
+      (tag, name) => ({ name, size: tag.size, related: relatedTags.has(name) })
-    }), ['name'])
+    ), ['name'])
     if (config.sortTagsBy === 'COUNTER') {
       tagList = _.sortBy(tagList, item => (0 - item.size))
     }
@@ -170,35 +170,29 @@ class SideNav extends React.Component {
   }
 
   getRelatedTags (activeTags, noteMap) {
-    if (activeTags.length == 0) {
+    if (activeTags.length === 0) {
       return new Set()
     }
-    const relatedNotes = noteMap.map(note => {
+    const relatedNotes = noteMap.map(
-      return {key: note.key, tags: note.tags}
+      note => ({key: note.key, tags: note.tags})
-    }).filter((note) => {
+    ).filter(
-      return activeTags.every((tag) => note.tags.includes(tag))
+      note => activeTags.every(tag => note.tags.includes(tag))
-    })
+    )
     let relatedTags = new Set()
-    relatedNotes.forEach(note => {
+    relatedNotes.forEach(note => note.tags.map(tag => relatedTags.add(tag)))
-      note.tags.map(tag => {
-        relatedTags.add(tag)
-      })
-    })
     return relatedTags
   }
 
   getTagActive (path, tag) {
-    const pathTag = this.getActiveTags(path)
+    return this.getActiveTags(path).includes(tag)
-    return pathTag.includes(tag)
   }
 
   getActiveTags (path) {
     const pathSegments = path.split('/')
     const tags = pathSegments[pathSegments.length - 1]
-    if (tags === 'alltags') {
+    return (tags === 'alltags')
-      return []
+      ? []
-    }
+      : tags.split(' ')
-    return tags.split(' ')
   }
 
   handleClickTagListItem (name) {
@@ -220,16 +214,15 @@ class SideNav extends React.Component {
     })
   }
 
-  handleClickNarrowToTag (name) {
+  handleClickNarrowToTag (tag) {
     const { router } = this.context
     const { location } = this.props
     let listOfTags = this.getActiveTags(location.pathname)
-    if (listOfTags.includes(name)) {
+    const indexOfTag = listOfTags.indexOf(tag)
-      listOfTags = listOfTags.filter(function (currentTag) {
+    if (indexOfTag > -1) {
-        return name !== currentTag
+      listOfTags.splice(indexOfTag, 1)
-      })
     } else {
-      listOfTags.push(name)
+      listOfTags.push(tag)
     }
     router.push(`/tags/${listOfTags.join(' ')}`)
   }