Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-05 21:05:55 +01:00
Code Issues Packages Projects Releases Activity

refactored entity reloading

Browse Source
This commit is contained in:
zadam
2020-01-29 20:14:02 +01:00
parent 976b2aa6f5
commit 439b45b0b8
7 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/public/javascripts/services/tree_cache.js
View File

@@ -129,6 +129,8 @@ class TreeCache {
return;
}
noteIds = Array.from(new Set(noteIds)); // make noteIds unique
const resp = await server.post('tree/load', { noteIds });
this.addResp(resp.notes, resp.branches, resp.attributes);
@@ -229,31 +231,40 @@ class TreeCache {
}
async processSyncRows(syncRows) {
const noteIdsToReload = [];
const loadResults = new LoadResults();
syncRows.filter(sync => sync.entityName === 'branches').forEach(sync => {
const branch = this.branches[sync.entityId];
// we assume that the cache contains the old branch state and we add also the old parentNoteId
// so that the old parent can also be updated
loadResults.addNote(branch.parentNoteId, sync.sourceId);
noteIdsToReload.push(sync.parentNoteId);
noteIdsToReload.push(sync.noteId);
// this should then contain new parentNoteId for which we should also update the cache
loadResults.addNote(sync.parentNoteId, sync.sourceId);
loadResults.addNote(sync.noteId, sync.sourceId);
loadResults.addBranch(sync.entityId, sync.sourceId);
});
syncRows.filter(sync => sync.entityName === 'notes').forEach(sync => loadResults.addNote(sync.entityId, sync.sourceId));
syncRows.filter(sync => sync.entityName === 'notes').forEach(sync => {
noteIdsToReload.push(sync.entityId);
syncRows.filter(sync => sync.entityName === 'note_reordering').forEach(sync => loadResults.addNote(sync.entityId, sync.sourceId));
loadResults.addNote(sync.entityId, sync.sourceId);
});
syncRows.filter(sync => sync.entityName === 'note_reordering').forEach(sync => {
noteIdsToReload.push(sync.entityId);
loadResults.addNoteReordering(sync.entityId, sync.sourceId);
});
// missing reloading the relation target note
syncRows.filter(sync => sync.entityName === 'attributes').forEach(sync => loadResults.addNote(sync.noteId, sync.sourceId));
syncRows.filter(sync => sync.entityName === 'attributes').forEach(sync => {
noteIdsToReload.push(sync.noteId);
await this.reloadNotes(loadResults.getNoteIds());
loadResults.addAttribute(sync.entityId, sync.sourceId);
});
await this.reloadNotes(noteIdsToReload);
const appContext = (await import('./app_context.js')).default;
appContext.trigger('notesReloaded', {loadResults});
appContext.trigger('entitiesReloaded', {loadResults});
}
}