mirror of
https://github.com/zadam/trilium.git
synced 2024-09-21 08:06:03 +08:00
fix sync status
This commit is contained in:
parent
623200b92b
commit
f6dd1110e8
|
@ -126,27 +126,29 @@ export default class SyncStatusWidget extends BasicWidget {
|
|||
});
|
||||
|
||||
this.syncState = 'in-progress';
|
||||
this.allChangesPushed = false;
|
||||
this.lastSyncedPush = message.lastSyncedPush;
|
||||
}
|
||||
else if (message.type === 'sync-push-in-progress') {
|
||||
this.syncState = 'in-progress';
|
||||
this.allChangesPushed = false;
|
||||
this.lastSyncedPush = message.lastSyncedPush;
|
||||
}
|
||||
else if (message.type === 'sync-finished') {
|
||||
// this gives user a chance to see the toast in case of fast sync finish
|
||||
setTimeout(() => toastService.closePersistent('sync'), 1000);
|
||||
|
||||
this.syncState = 'connected';
|
||||
this.lastSyncedPush = message.lastSyncedPush;
|
||||
}
|
||||
else if (message.type === 'sync-failed') {
|
||||
this.syncState = 'disconnected';
|
||||
this.lastSyncedPush = message.lastSyncedPush;
|
||||
}
|
||||
else if (message.type === 'frontend-update') {
|
||||
const {lastSyncedPush} = message.data;
|
||||
|
||||
this.allChangesPushed = lastSyncedPush === ws.getMaxKnownEntityChangeSyncId();
|
||||
this.lastSyncedPush = message.data.lastSyncedPush;
|
||||
}
|
||||
|
||||
this.allChangesPushed = this.lastSyncedPush === ws.getMaxKnownEntityChangeSyncId();
|
||||
|
||||
if (['unknown', 'in-progress'].includes(this.syncState)) {
|
||||
this.showIcon(this.syncState);
|
||||
} else {
|
||||
|
|
|
@ -50,7 +50,9 @@ function addNoteReorderingEntityChange(parentNoteId, sourceId) {
|
|||
function moveEntityChangeToTop(entityName, entityId) {
|
||||
const ec = sql.getRow(`SELECT * FROM entity_changes WHERE entityName = ? AND entityId = ?`, [entityName, entityId]);
|
||||
|
||||
insertEntityChange(entityName, entityId, ec.hash, ec.isErased, ec.utcDateChanged, ec.sourceId, ec.isSynced);
|
||||
const localEntityChange = insertEntityChange(entityName, entityId, ec.hash, ec.isErased, ec.utcDateChanged, ec.sourceId, ec.isSynced);
|
||||
|
||||
cls.addEntityChange(localEntityChange);
|
||||
}
|
||||
|
||||
function addEntityChangesForSector(entityName, sector) {
|
||||
|
|
|
@ -334,6 +334,7 @@ function getEntityChangesRecords(entityChanges) {
|
|||
const entity = getEntityChangeRow(entityChange.entityName, entityChange.entityId);
|
||||
|
||||
if (entityChange.entityName === 'options' && !entity.isSynced) {
|
||||
// if non-synced entities should count towards "lastSyncedPush"
|
||||
records.push({entityChange});
|
||||
|
||||
continue;
|
||||
|
@ -358,7 +359,8 @@ function getLastSyncedPull() {
|
|||
}
|
||||
|
||||
function setLastSyncedPull(entityChangeId) {
|
||||
optionService.setOption('lastSyncedPull', entityChangeId);
|
||||
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes
|
||||
sql.execute("UPDATE options SET value = ? WHERE name = ?", [entityChangeId, 'lastSyncedPull']);
|
||||
}
|
||||
|
||||
function getLastSyncedPush() {
|
||||
|
@ -372,7 +374,8 @@ function getLastSyncedPush() {
|
|||
function setLastSyncedPush(entityChangeId) {
|
||||
ws.setLastSyncedPush(entityChangeId);
|
||||
|
||||
optionService.setOption('lastSyncedPush', entityChangeId);
|
||||
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes
|
||||
sql.execute("UPDATE options SET value = ? WHERE name = ?", [entityChangeId, 'lastSyncedPush']);
|
||||
}
|
||||
|
||||
function getMaxEntityChangeId() {
|
||||
|
|
|
@ -127,19 +127,19 @@ function sendTransactionEntityChangesToAllClients() {
|
|||
}
|
||||
|
||||
function syncPullInProgress() {
|
||||
sendMessageToAllClients({ type: 'sync-pull-in-progress' });
|
||||
sendMessageToAllClients({ type: 'sync-pull-in-progress', lastSyncedPush });
|
||||
}
|
||||
|
||||
function syncPushInProgress() {
|
||||
sendMessageToAllClients({ type: 'sync-push-in-progress' });
|
||||
sendMessageToAllClients({ type: 'sync-push-in-progress', lastSyncedPush });
|
||||
}
|
||||
|
||||
function syncFinished() {
|
||||
sendMessageToAllClients({ type: 'sync-finished' });
|
||||
sendMessageToAllClients({ type: 'sync-finished', lastSyncedPush });
|
||||
}
|
||||
|
||||
function syncFailed() {
|
||||
sendMessageToAllClients({ type: 'sync-failed' });
|
||||
sendMessageToAllClients({ type: 'sync-failed', lastSyncedPush });
|
||||
}
|
||||
|
||||
function setLastSyncedPush(entityChangeId) {
|
||||
|
|
Loading…
Reference in a new issue