Merge pull request BoostIO#100 from BoostIO/data-api-refactor

Data api refactoring

Author: Rokt33r

browser/finder/NoteItem.js

@@ -34,7 +34,7 @@ class NoteItem extends React.Component {
           ? 'root--active'
           : 'root'
         }
-        key={note.uniqueKey}
+        key={note.storage + '-' + note.key}
         onClick={(e) => this.handleClick(e)}
       >
         <div styleName='border'/>

browser/finder/NoteList.js

@@ -64,7 +64,7 @@ class NoteList extends React.Component {
         return (
           <NoteItem
             note={note}
-            key={`${note.storage}-${note.folder}-${note.key}`}
+            key={`${note.storage}-${note.key}`}
             storage={storage}
             folder={folder}
             isActive={index === _index}

browser/lib/Mutable.js

@@ -0,0 +1,87 @@
+class MutableMap {
+  constructor (iterable) {
+    this._map = new Map(iterable)
+  }
+
+  get (...args) {
+    return this._map.get(...args)
+  }
+
+  set (...args) {
+    return this._map.set(...args)
+  }
+
+  delete (...args) {
+    return this._map.delete(...args)
+  }
+
+  has (...args) {
+    return this._map.has(...args)
+  }
+
+  clear (...args) {
+    return this._map.clear(...args)
+  }
+
+  forEach (...args) {
+    return this._map.forEach(...args)
+  }
+
+  [Symbol.iterator] () {
+    return this._map[Symbol.iterator]()
+  }
+
+  map (cb) {
+    let result = []
+    for (let [key, value] of this._map) {
+      result.push(cb(value, key))
+    }
+    return result
+  }
+}
+
+class MutableSet {
+  constructor (iterable) {
+    if (iterable instanceof MutableSet) {
+      this._set = new Set(iterable._set)
+    } else {
+      this._set = new Set(iterable)
+    }
+  }
+
+  add (...args) {
+    return this._set.add(...args)
+  }
+
+  delete (...args) {
+    return this._set.delete(...args)
+  }
+
+  forEach (...args) {
+    return this._set.forEach(...args)
+  }
+
+  [Symbol.iterator] () {
+    return this._set[Symbol.iterator]()
+  }
+
+  map (cb) {
+    let result = []
+    this._set.forEach(function (value, key) {
+      result.push(cb(value, key))
+    })
+
+    return result
+  }
+
+  toJS () {
+    return Array.from(this._set)
+  }
+}
+
+const Mutable = {
+  Map: MutableMap,
+  Set: MutableSet
+}
+
+module.exports = Mutable

browser/lib/keygen.js

@@ -2,6 +2,6 @@ const crypto = require('crypto')
 const _ = require('lodash')
 
 module.exports = function (length) {
-  if (!_.isFinite(length)) length = 6
+  if (!_.isFinite(length)) length = 10
   return crypto.randomBytes(length).toString('hex')
 }

browser/main/Detail/FolderSelect.js

@@ -184,12 +184,12 @@ class FolderSelect extends React.Component {
   }
 
   render () {
-    let { className, storages, value } = this.props
+    let { className, data, value } = this.props
     let splitted = value.split('-')
     let storageKey = splitted.shift()
     let folderKey = splitted.shift()
     let options = []
-    storages.forEach((storage, index) => {
+    data.storageMap.forEach((storage, index) => {
       storage.folders.forEach((folder) => {
         options.push({
           storage: storage,