public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-17 11:41:44 +00:00
Code Issues Releases Wiki Activity

embed navigating, filterring to notelist

Browse Source
This commit is contained in:
Dick Choi
2016-07-15 10:34:52 +09:00
parent 0ccfd36a83
commit 4f45ba1680
1 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
browser/main/NoteList/index.js
View File

@@ -7,8 +7,6 @@ import _ from 'lodash'
class NoteList extends React.Component { class NoteList extends React.Component {
constructor (props) { constructor (props) {
super(props) super(props)
// this.focusHandler = (e) => this.focus()
} }
componentDidMount () { componentDidMount () {
@@ -34,11 +32,8 @@ class NoteList extends React.Component {
// Auto scroll // Auto scroll
if (_.isString(location.query.key)) { if (_.isString(location.query.key)) {
let splitted = location.query.key.split('/')
let repoKey = splitted[0]
let noteKey = splitted[1]
let targetIndex = _.findIndex(this.notes, (note) => { let targetIndex = _.findIndex(this.notes, (note) => {
return repoKey === note.storage && noteKey === note.key return note.uniqueKey === location.query.key
}) })
if (targetIndex > -1) { if (targetIndex > -1) {
let list = this.refs.root let list = this.refs.root
@@ -66,11 +61,9 @@ class NoteList extends React.Component {
} }
let { router } = this.context let { router } = this.context
let { location } = this.props let { location } = this.props
let splitted = location.query.key.split('-')
let repoKey = splitted[0]
let noteKey = splitted[1]
let targetIndex = _.findIndex(this.notes, (note) => { let targetIndex = _.findIndex(this.notes, (note) => {
return repoKey === note.storage && noteKey === note.key return note.uniqueKey === location.query.key
}) })
if (targetIndex === 0) { if (targetIndex === 0) {
@@ -93,11 +86,9 @@ class NoteList extends React.Component {
} }
let { router } = this.context let { router } = this.context
let { location } = this.props let { location } = this.props
let splitted = location.query.key.split('-')
let repoKey = splitted[0]
let noteKey = splitted[1]
let targetIndex = _.findIndex(this.notes, (note) => { let targetIndex = _.findIndex(this.notes, (note) => {
return repoKey === note._repository.key && noteKey === note.key return note.uniqueKey === location.query.key
}) })
if (targetIndex === this.notes.length - 1) { if (targetIndex === this.notes.length - 1) {
@@ -140,7 +131,6 @@ class NoteList extends React.Component {
// if (e.keyCode === 69) { // if (e.keyCode === 69) {
// e.preventDefault() // e.preventDefault()
// remote.getCurrentWebContents().send('detail-edit')
// } // }
// if (e.keyCode === 83) { // if (e.keyCode === 83) {
@@ -160,37 +150,29 @@ class NoteList extends React.Component {
} }
getNotes () { getNotes () {
let { repositories, params, location } = this.props let { storages, notes, params, location } = this.props
let repositoryKey = params.repositoryKey
let folderKey = params.folderKey
if (location.pathname.match(/\/home/)) { if (location.pathname.match(/\/home/)) {
return repositories return notes
.reduce((sum, repository) => {
return sum.concat(repository.notes)
}, [])
} }
if (location.pathname.match(/\/starred/)) { if (location.pathname.match(/\/starred/)) {
return repositories return notes
.reduce((sum, repository) => { .filter((note) => note.isStarred)
return sum.concat(repository.starred
.map((starredKey) => {
return _.find(repository.notes, {key: starredKey})
})
.filter((note) => _.isObject(note)))
}, [])
} }
let repository = _.find(repositories, {key: repositoryKey}) let storageKey = params.storageKey
if (repository == null) return [] let folderKey = params.folderKey
let storage = _.find(storages, {key: storageKey})
if (storage == null) return []
let folder = _.find(repository.folders, {key: folderKey}) let folder = _.find(storage.folders, {key: folderKey})
if (folder == null) { if (folder == null) {
return repository.notes return notes
.filter((note) => note.storage === storageKey)
} }
return repository.notes return notes
.filter((note) => note.folder === folderKey) .filter((note) => note.folder === folderKey)
} }
@@ -210,11 +192,10 @@ class NoteList extends React.Component {
render () { render () {
let { location, storages, notes } = this.props let { location, storages, notes } = this.props
this.notes = notes this.notes = notes = this.getNotes()
// this.notes = this.getNotes() .sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
let noteList = notes let noteList = notes
.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
.map((note) => { .map((note) => {
let storage = _.find(storages, {key: note.storage}) let storage = _.find(storages, {key: note.storage})
let folder = _.find(storage.folders, {key: note.folder}) let folder = _.find(storage.folders, {key: note.folder})