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

Merge pull request #766 from asmsuechan/improve-search

Browse Source 
Context search
This commit is contained in:
SuenagaRyota
2017-08-05 22:56:31 +09:00
committed by GitHub
parent f32ac81f84 886d7b7227
commit 85217a7171
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
browser/lib/search.js
View File

@@ -1,7 +1,6 @@
import _ from 'lodash' import _ from 'lodash'
export default function searchFromNotes (data, search) { export default function searchFromNotes (notes, search) {
let notes = data.noteMap.map((note) => note)
if (search.trim().length === 0) return [] if (search.trim().length === 0) return []
let searchBlocks = search.split(' ') let searchBlocks = search.split(' ')
searchBlocks.forEach((block) => { searchBlocks.forEach((block) => {

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

@@ -246,7 +246,7 @@ class NoteList extends React.Component {
if (searchInputText === '') { if (searchInputText === '') {
router.push('/home') router.push('/home')
} }
return searchFromNotes(this.props.data, searchInputText) return searchFromNotes(this.notes, searchInputText)
} }
if (location.pathname.match(/\/trashed/)) { if (location.pathname.match(/\/trashed/)) {

6
tests/lib/search-test.js
View File

@@ -5,7 +5,7 @@ import _ from 'lodash'
const pickContents = (notes) => notes.map((note) => { return note.content }) const pickContents = (notes) => notes.map((note) => { return note.content })
let noteList = { noteMap: [] } let notes = []
let note1, note2 let note1, note2
test.before(t => { test.before(t => {
@@ -14,7 +14,7 @@ test.before(t => {
note1 = dummyNote(data1) note1 = dummyNote(data1)
note2 = dummyNote(data2) note2 = dummyNote(data2)
noteList.noteMap = [note1, note2] notes = [note1, note2]
}) })
test('it can find notes by tags or words', t => { test('it can find notes by tags or words', t => {
@@ -30,7 +30,7 @@ test('it can find notes by tags or words', t => {
testCases.forEach((testCase) => { testCases.forEach((testCase) => {
const [input, expectedContents] = testCase const [input, expectedContents] = testCase
const results = searchFromNotes(noteList, input) const results = searchFromNotes(notes, input)
t.true(_.isEqual(pickContents(results).sort(), expectedContents.sort())) t.true(_.isEqual(pickContents(results).sort(), expectedContents.sort()))
}) })
}) })