zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-16 12:08:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

load search result only on explicit action (expand node, execute search), #1759

Browse source
This commit is contained in:
zadam 2021-03-18 21:05:43 +01:00
parent 59e8cb8c8b
commit 6edc6e2825
3 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/public/app/services/tree_cache.js
View file

@ -164,43 +164,47 @@ class TreeCache {
this.addResp(resp);
for (const note of resp.notes) {
if (note.type === 'search') {
const searchResultNoteIds = await server.get('search-note/' + note.noteId);
appContext.triggerEvent('notesReloaded', {noteIds});
}
if (!Array.isArray(searchResultNoteIds)) {
throw new Error(`Search note ${note.noteId} failed: ${searchResultNoteIds}`);
}
async loadSearchNote(noteId) {
const note = await this.getNote(noteId);
// reset all the virtual branches from old search results
if (note.noteId in treeCache.notes) {
treeCache.notes[note.noteId].children = [];
treeCache.notes[note.noteId].childToBranch = {};
}
const branches = resp.branches.filter(b => b.noteId === note.noteId || b.parentNoteId === note.noteId);
searchResultNoteIds.forEach((resultNoteId, index) => branches.push({
// branchId should be repeatable since sometimes we reload some notes without rerendering the tree
branchId: "virt-" + note.noteId + '-' + resultNoteId,
noteId: resultNoteId,
parentNoteId: note.noteId,
notePosition: (index + 1) * 10,
fromSearchNote: true
}));
// update this note with standard (parent) branches + virtual (children) branches
this.addResp({
notes: [note],
branches,
attributes: []
});
treeCache.notes[note.noteId].searchResultsLoaded = true;
}
if (!note || note.type !== 'search') {
return;
}
appContext.triggerEvent('notesReloaded', {noteIds});
const searchResultNoteIds = await server.get('search-note/' + note.noteId);
if (!Array.isArray(searchResultNoteIds)) {
throw new Error(`Search note ${note.noteId} failed: ${searchResultNoteIds}`);
}
// reset all the virtual branches from old search results
if (note.noteId in treeCache.notes) {
treeCache.notes[note.noteId].children = [];
treeCache.notes[note.noteId].childToBranch = {};
}
const branches = [...note.getBranches(), ...note.getChildBranches()];
searchResultNoteIds.forEach((resultNoteId, index) => branches.push({
// branchId should be repeatable since sometimes we reload some notes without rerendering the tree
branchId: "virt-" + note.noteId + '-' + resultNoteId,
noteId: resultNoteId,
parentNoteId: note.noteId,
notePosition: (index + 1) * 10,
fromSearchNote: true
}));
// update this note with standard (parent) branches + virtual (children) branches
this.addResp({
notes: [note],
branches,
attributes: []
});
treeCache.notes[note.noteId].searchResultsLoaded = true;
}
/** @return {NoteShort[]} */

2
src/public/app/widgets/note_tree.js
View file

@ -472,7 +472,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
return;
}
data.result = treeCache.reloadNotes([noteId]).then(() => {
data.result = treeCache.loadSearchNote(noteId).then(() => {
const note = treeCache.getNoteFromCache(noteId);
let childNoteIds = note.getChildNoteIds();

2
src/public/app/widgets/type_property_widgets/search_definition.js
View file

@ -265,7 +265,7 @@ export default class SearchDefinitionWidget extends TabAwareWidget {
async refreshResultsCommand() {
try {
await treeCache.reloadNotes([this.noteId]);
await treeCache.loadSearchNote(this.noteId);
}
catch (e) {
toastService.showError(e.message);