From df3195fc1e9fce473155c195d6d5600369e8de1b Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Thu, 12 Oct 2017 17:48:57 +0900
Subject: [PATCH] Refactor getContextNotes()

---
 browser/main/NoteList/index.js | 31 +++++++++++--------------------
 browser/main/TopBar/index.js   |  4 ++--
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 3e301da2..3f57fdc9 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -93,7 +93,6 @@ class NoteList extends React.Component {
     if (this.notes.length > 0 && location.query.key == null) {
       let { router } = this.context
       if (!location.pathname.match(/\/searched/)) this.contextNotes = this.getContextNotes()
-      console.log(this.contextNotes)
       router.replace({
         pathname: location.pathname,
         query: {
@@ -266,28 +265,20 @@ class NoteList extends React.Component {
 
   // get notes in the current folder
   getContextNotes () {
-    let { data, params } = this.props
-    let storageKey = params.storageKey
-    let folderKey = params.folderKey
-    let storage = data.storageMap.get(storageKey)
-    if (storage == null) return []
+    const { data, params } = this.props
+    const storageKey = params.storageKey
+    const folderKey = params.folderKey
+    const storage = data.storageMap.get(storageKey)
+    if (storage === undefined) return []
 
-    let folder = _.find(storage.folders, {key: folderKey})
-    if (folder == null) {
-      let storageNoteSet = data.storageNoteMap
-        .get(storage.key)
-      if (storageNoteSet == null) storageNoteSet = []
-      return storageNoteSet
-        .map((uniqueKey) => data.noteMap.get(uniqueKey))
+    const folder = _.find(storage.folders, {key: folderKey})
+    if (folder === undefined) {
+      const storageNoteSet = data.storageNoteMap.get(storage.key) || []
+      return storageNoteSet.map((uniqueKey) => data.noteMap.get(uniqueKey))
     }
 
-    let folderNoteKeyList = data.folderNoteMap
-      .get(storage.key + '-' + folder.key)
-
-    return folderNoteKeyList != null
-      ? folderNoteKeyList
-        .map((uniqueKey) => data.noteMap.get(uniqueKey))
-      : []
+    const folderNoteKeyList = data.folderNoteMap.get(`${storage.key}-${folder.key}`) || []
+    return folderNoteKeyList.map((uniqueKey) => data.noteMap.get(uniqueKey))
   }
 
   handleNoteClick (e, uniqueKey) {
diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js
index 89ab1688..83bfd582 100644
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -58,6 +58,7 @@ class TopBar extends React.Component {
   }
 
   handleKeyUp (e) {
+    const { router } = this.context
     // reset states
     this.setState({
       isConfirmTranslation: false
@@ -68,7 +69,6 @@ class TopBar extends React.Component {
       this.setState({
         isConfirmTranslation: true
       })
-      let { router } = this.context
       router.push('/searched')
       this.setState({
         search: this.refs.searchInput.value
@@ -77,8 +77,8 @@ class TopBar extends React.Component {
   }
 
   handleSearchChange (e) {
+    const { router } = this.context
     if (this.state.isAlphabet || this.state.isConfirmTranslation) {
-      let { router } = this.context
       router.push('/searched')
     } else {
       e.preventDefault()