gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 19:19:03 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

protection against recursive expansion of search notes

Browse Source
This commit is contained in:
zadam 2020-05-02 12:16:48 +02:00
parent fe53e2351c
commit 3466a19397
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,17 @@ export default class NoteTreeWidget extends TabAwareWidget {
} }
}, },
lazyLoad: (event, data) => { lazyLoad: (event, data) => {
const noteId = data.node.data.noteId; const {noteId, noteType} = data.node.data;
if (noteType === 'search') {
const notePath = treeService.getNotePath(data.node.getParent());
// this is a search cycle (search note is a descendant of its own search result)
if (notePath.includes(noteId)) {
data.result = [];
return;
}
}
data.result = treeCache.getNote(noteId).then(note => this.prepareChildren(note)); data.result = treeCache.getNote(noteId).then(note => this.prepareChildren(note));
}, },
@ -452,17 +462,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
extraClasses: this.getExtraClasses(note), extraClasses: this.getExtraClasses(note),
icon: this.getIcon(note), icon: this.getIcon(note),
refKey: note.noteId, refKey: note.noteId,
lazy: true,
folder: await this.isFolder(note),
expanded: branch.isExpanded || hoistedNoteId === note.noteId, expanded: branch.isExpanded || hoistedNoteId === note.noteId,
key: utils.randomString(12) // this should prevent some "duplicate key" errors key: utils.randomString(12) // this should prevent some "duplicate key" errors
}; };
const childBranches = await this.getChildBranches(note);
node.folder = childBranches.length > 0
|| note.type === 'search'
node.lazy = node.folder && !node.expanded;
if (node.folder && node.expanded) { if (node.folder && node.expanded) {
node.children = await this.prepareChildren(note); node.children = await this.prepareChildren(note);
} }
@ -470,6 +475,17 @@ export default class NoteTreeWidget extends TabAwareWidget {
return node; return node;
} }
async isFolder(note) {
if (note.type === 'search') {
return true;
}
else {
const childBranches = await this.getChildBranches(note);
return childBranches.length > 0;
}
}
async prepareNormalNoteChildren(parentNote) { async prepareNormalNoteChildren(parentNote) {
utils.assertArguments(parentNote); utils.assertArguments(parentNote);
@ -680,7 +696,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
let foundChildNode = this.findChildNode(parentNode, childNoteId); let foundChildNode = this.findChildNode(parentNode, childNoteId);
if (!foundChildNode) { // note might be recently created so we'll force reload and try again if (!foundChildNode) { // note might be recently created so we'll force reload and try again
parentNode.lazy = true;
await parentNode.load(true); await parentNode.load(true);
foundChildNode = this.findChildNode(parentNode, childNoteId); foundChildNode = this.findChildNode(parentNode, childNoteId);
@ -723,8 +738,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
node.data.isProtected = note.isProtected; node.data.isProtected = note.isProtected;
node.data.noteType = note.type; node.data.noteType = note.type;
node.folder = (await this.getChildBranches(note)).length > 0 node.folder = await this.isFolder(note);
|| note.type === 'search';
node.icon = this.getIcon(note); node.icon = this.getIcon(note);
node.extraClasses = this.getExtraClasses(note); node.extraClasses = this.getExtraClasses(note);
node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
@ -783,7 +797,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
async refreshSearch() { async refreshSearch() {
const activeNode = this.getActiveNode(); const activeNode = this.getActiveNode();
activeNode.lazy = true;
activeNode.load(true); activeNode.load(true);
activeNode.setExpanded(true); activeNode.setExpanded(true);
@ -847,7 +860,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
} }
} }
node.remove(); if (node.getParent()) {
node.remove();
}
noteIdsToUpdate.add(branch.parentNoteId); noteIdsToUpdate.add(branch.parentNoteId);
} }
@ -877,7 +892,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
for (const noteId of noteIdsToReload) { for (const noteId of noteIdsToReload) {
for (const node of this.getNodesByNoteId(noteId)) { for (const node of this.getNodesByNoteId(noteId)) {
node.lazy = true;
await node.load(true); await node.load(true);
this.updateNode(node); this.updateNode(node);