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

fixed loading of parent to froca when e.g. sharing (cloning into not yet loaded _share parent)

Browse source
This commit is contained in:
zadam 2023-03-29 23:16:45 +02:00
parent e70cca4736
commit 72b1cc4d89
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/public/app/services/froca_updater.js
View file

@ -14,7 +14,7 @@ async function processEntityChanges(entityChanges) {
if (ec.entityName === 'notes') { if (ec.entityName === 'notes') {
processNoteChange(loadResults, ec); processNoteChange(loadResults, ec);
} else if (ec.entityName === 'branches') { } else if (ec.entityName === 'branches') {
processBranchChange(loadResults, ec); await processBranchChange(loadResults, ec);
} else if (ec.entityName === 'attributes') { } else if (ec.entityName === 'attributes') {
processAttributeChange(loadResults, ec); processAttributeChange(loadResults, ec);
} else if (ec.entityName === 'note_reordering') { } else if (ec.entityName === 'note_reordering') {
@ -105,7 +105,7 @@ function processNoteChange(loadResults, ec) {
} }
} }
function processBranchChange(loadResults, ec) { async function processBranchChange(loadResults, ec) {
if (ec.isErased && ec.entityId in froca.branches) { if (ec.isErased && ec.entityId in froca.branches) {
utils.reloadFrontendApp(`${ec.entityName} ${ec.entityId} is erased, need to do complete reload.`); utils.reloadFrontendApp(`${ec.entityName} ${ec.entityId} is erased, need to do complete reload.`);
return; return;
@ -139,7 +139,15 @@ function processBranchChange(loadResults, ec) {
loadResults.addBranch(ec.entityId, ec.componentId); loadResults.addBranch(ec.entityId, ec.componentId);
const childNote = froca.notes[ec.entity.noteId]; const childNote = froca.notes[ec.entity.noteId];
const parentNote = froca.notes[ec.entity.parentNoteId]; let parentNote = froca.notes[ec.entity.parentNoteId];
if (childNote && !parentNote) {
// a branch cannot exist without the parent
// a note loaded into froca has to also contain all its ancestors
// this problem happened e.g. in sharing where _share was hidden and thus not loaded
// sharing meant cloning into _share, which crashed because _share was not loaded
parentNote = await froca.getNote(ec.entity.parentNoteId);
}
if (branch) { if (branch) {
branch.update(ec.entity); branch.update(ec.entity);