gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases 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

18
src/public/app/services/tree_cache.js
View File

@ -164,8 +164,16 @@ class TreeCache {
this.addResp(resp); this.addResp(resp);
for (const note of resp.notes) { appContext.triggerEvent('notesReloaded', {noteIds});
if (note.type === 'search') { }
async loadSearchNote(noteId) {
const note = await this.getNote(noteId);
if (!note || note.type !== 'search') {
return;
}
const searchResultNoteIds = await server.get('search-note/' + note.noteId); const searchResultNoteIds = await server.get('search-note/' + note.noteId);
if (!Array.isArray(searchResultNoteIds)) { if (!Array.isArray(searchResultNoteIds)) {
@ -178,7 +186,7 @@ class TreeCache {
treeCache.notes[note.noteId].childToBranch = {}; treeCache.notes[note.noteId].childToBranch = {};
} }
const branches = resp.branches.filter(b => b.noteId === note.noteId || b.parentNoteId === note.noteId); const branches = [...note.getBranches(), ...note.getChildBranches()];
searchResultNoteIds.forEach((resultNoteId, index) => branches.push({ searchResultNoteIds.forEach((resultNoteId, index) => branches.push({
// branchId should be repeatable since sometimes we reload some notes without rerendering the tree // branchId should be repeatable since sometimes we reload some notes without rerendering the tree
@ -198,10 +206,6 @@ class TreeCache {
treeCache.notes[note.noteId].searchResultsLoaded = true; treeCache.notes[note.noteId].searchResultsLoaded = true;
} }
}
appContext.triggerEvent('notesReloaded', {noteIds});
}
/** @return {NoteShort[]} */ /** @return {NoteShort[]} */
getNotesFromCache(noteIds, silentNotFoundError = false) { getNotesFromCache(noteIds, silentNotFoundError = false) {

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

@ -472,7 +472,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
return; return;
} }
data.result = treeCache.reloadNotes([noteId]).then(() => { data.result = treeCache.loadSearchNote(noteId).then(() => {
const note = treeCache.getNoteFromCache(noteId); const note = treeCache.getNoteFromCache(noteId);
let childNoteIds = note.getChildNoteIds(); 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() { async refreshResultsCommand() {
try { try {
await treeCache.reloadNotes([this.noteId]); await treeCache.loadSearchNote(this.noteId);
} }
catch (e) { catch (e) {
toastService.showError(e.message); toastService.showError(e.message);