public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

Difference home and searched notes from trashed units

Browse Source
This commit is contained in:
Сергей Иванов
2018-07-04 16:09:49 +03:00
parent c69be54655
commit 4a3602099a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
browser/main/Detail/index.js
View File

@@ -38,30 +38,43 @@ class Detail extends React.Component {
render () { render () {
const { location, data, params, config } = this.props const { location, data, params, config } = this.props
let note = null let note = null
function differenceWithTrashed (notes) {
const trashedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey))
return _.differenceWith(notes, trashedNotes, (note, trashed) => note.key === trashed.key)
}
if (location.query.key != null) { if (location.query.key != null) {
const noteKey = location.query.key const noteKey = location.query.key
let displayedNotes = [] let displayedNotes = []
if (location.pathname.match(/\/home/) || location.pathname.match(/alltags/)) { if (location.pathname.match(/\/home/) || location.pathname.match(/alltags/)) {
displayedNotes = data.noteMap.map(note => note) const allNotes = data.noteMap.map(note => note)
displayedNotes = differenceWithTrashed(allNotes)
} }
if (location.pathname.match(/\/starred/)) { if (location.pathname.match(/\/starred/)) {
displayedNotes = data.starredSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey)) displayedNotes = data.starredSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey))
} }
if (location.pathname.match(/\/searched/)) { if (location.pathname.match(/\/searched/)) {
const searchStr = params.searchword const searchStr = params.searchword
const allNotes = data.noteMap.map(note => note) const allNotes = data.noteMap.map(note => note)
displayedNotes = searchStr === undefined || searchStr === '' ? allNotes const searchedNotes = searchStr === undefined || searchStr === '' ? allNotes
: searchFromNotes(allNotes, searchStr) : searchFromNotes(allNotes, searchStr)
displayedNotes = differenceWithTrashed(searchedNotes)
} }
if (location.pathname.match(/\/trashed/)) { if (location.pathname.match(/\/trashed/)) {
displayedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey)) displayedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey))
} }
if (location.pathname.match(/\/tags/)) { if (location.pathname.match(/\/tags/)) {
const listOfTags = params.tagname.split(' ') const listOfTags = params.tagname.split(' ')
displayedNotes = data.noteMap.map(note => note).filter(note => const searchedNotes = data.noteMap.map(note => note).filter(note =>
listOfTags.every(tag => note.tags.includes(tag)) listOfTags.every(tag => note.tags.includes(tag))
) )
displayedNotes = differenceWithTrashed(searchedNotes)
} }
const noteKeys = displayedNotes.map(note => note.key) const noteKeys = displayedNotes.map(note => note.key)