Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 10:55:55 +01:00
Code Issues Packages Projects Releases Activity

search (note) fixes

Browse Source
This commit is contained in:
azivner
2018-08-14 22:50:05 +02:00
parent 16535f6a73
commit ff5b84db10
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/public/javascripts/services/tree_builder.js
View File

@@ -74,12 +74,17 @@ async function prepareRealBranch(parentNote) {
async function prepareSearchBranch(note) {
const fullNote = await noteDetailService.loadNote(note.noteId);
const results = await server.get('search/' + encodeURIComponent(fullNote.jsonContent.searchString));
const results = (await server.get('search/' + encodeURIComponent(fullNote.jsonContent.searchString)))
.filter(res => res.noteId !== note.noteId); // this is necessary because title of the search note is often the same as the search text which would match and create circle
const noteIds = results.map(res => res.noteId);
console.log("result: ", results);
// force to load all the notes at once instead of one by one
await treeCache.getNotes(noteIds);
const notes = await treeCache.getNotes(noteIds);
console.log("NOTES", notes);
for (const result of results) {
const origBranch = await treeCache.getBranch(result.branchId);
@@ -95,6 +100,8 @@ async function prepareSearchBranch(note) {
treeCache.addBranch(branch);
}
console.log("fullNote", fullNote);
return await prepareRealBranch(fullNote);
}