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

fix backend to frontend sync with waitForSyncId()

Browse Source
This commit is contained in:
zadam 2020-03-10 21:33:03 +01:00
parent bcbf1b79c3
commit e6e41adad0
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/javascripts/services/load_results.js
View File

@ -100,4 +100,14 @@ export default class LoadResults {
isOptionReloaded(name) {
this.options.includes(name);
}
isEmpty() {
return Object.keys(this.noteIdToSourceId).length > 0
|| this.branches.length > 0
|| this.attributes.length > 0
|| this.noteReorderings.length > 0
|| this.noteRevisions.length > 0
|| this.contentNoteIdToSourceId.length > 0
|| this.options.length > 0;
}
}

14
src/public/javascripts/services/ws.js
View File

@ -44,7 +44,7 @@ async function handleMessage(event) {
}
if (message.type === 'sync') {
const syncRows = message.data;
let syncRows = message.data;
lastPingTs = Date.now();
$outstandingSyncsCount.html(message.outstandingSyncs);
@ -90,6 +90,8 @@ function waitForSyncId(desiredSyncId) {
return Promise.resolve();
}
console.log("Waiting for", desiredSyncId, 'current is', lastProcessedSyncId);
return new Promise((res, rej) => {
syncIdReachedListeners.push({
desiredSyncId,
@ -322,13 +324,19 @@ async function processSyncRows(syncRows) {
});
syncRows.filter(sync => sync.entityName === 'options').forEach(sync => {
if (sync.entity.name === 'openTabs') {
return; // only noise
}
options.set(sync.entity.name, sync.entity.value);
loadResults.addOption(sync.entity.name);
});
const appContext = (await import("./app_context.js")).default;
appContext.triggerEvent('entitiesReloaded', {loadResults});
if (!loadResults.isEmpty()) {
const appContext = (await import("./app_context.js")).default;
appContext.triggerEvent('entitiesReloaded', {loadResults});
}
}
export default {

3
src/services/ws.js
View File

@ -98,8 +98,7 @@ async function fillInAdditionalProperties(sync) {
}
async function sendPing(client) {
const syncRows = cls.getSyncRows()
.filter(r => r.entityName !== 'recent_notes' && (r.entityName !== 'options' || r.entityId !== 'openTabs')); // only noise ...
const syncRows = cls.getSyncRows();
for (const sync of syncRows) {
try {