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

froca should not keep any deleted notes

Browse Source
This commit is contained in:
zadam 2021-05-09 22:00:21 +02:00
parent d8d15b528e
commit 5d58520949
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/entities/note_short.js
View File

@ -61,8 +61,6 @@ class NoteShort {
this.type = row.type;
/** @param {string} content-type, e.g. "application/json" */
this.mime = row.mime;
/** @param {boolean} */
this.isDeleted = !!row.isDeleted;
}
addParent(parentNoteId, branchId) {

2
src/public/app/services/tree.js
View File

@ -72,7 +72,7 @@ async function resolveNotePathToSegments(notePath, hoistedNoteId = 'root', logEr
if (logErrors) {
const parent = froca.getNoteFromCache(parentNoteId);
console.log(utils.now(), `Did not find parent ${parentNoteId} (${parent ? parent.title : 'n/a'}) for child ${childNoteId} (${child.title}), available parents: ${parents.map(p => `${p.noteId} (${p.title})`)}`);
console.debug(utils.now(), `Did not find parent ${parentNoteId} (${parent ? parent.title : 'n/a'}) for child ${childNoteId} (${child.title}), available parents: ${parents.map(p => `${p.noteId} (${p.title})`)}. You can ignore this message as it is mostly harmless.`);
}
const someNotePath = getSomeNotePath(child, hoistedNoteId);

9
src/public/app/services/ws.js
View File

@ -219,8 +219,13 @@ async function processEntityChanges(entityChanges) {
const note = froca.notes[ec.entityId];
if (note) {
note.update(ec.entity);
loadResults.addNote(ec.entityId, ec.sourceId);
if (ec.entity.isDeleted) {
delete froca.notes[ec.entityId];
}
else {
note.update(ec.entity);
loadResults.addNote(ec.entityId, ec.sourceId);
}
}
}

4
src/services/ws.js
View File

@ -75,6 +75,10 @@ function sendMessageToAllClients(message) {
}
function fillInAdditionalProperties(entityChange) {
// most of these could be filled by becca
// the exception is isDeleted - in that case becca doesn't contain such entity at all
// this would have to be handled separately
// fill in some extra data needed by the frontend
if (entityChange.entityName === 'attributes') {
entityChange.entity = sql.getRow(`SELECT * FROM attributes WHERE attributeId = ?`, [entityChange.entityId]);