diff --git a/package.json b/package.json index b8ebf0c3a..1df452ebd 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "13.6.1", + "electron": "13.6.2", "electron-builder": "22.13.1", "electron-packager": "15.4.0", "electron-rebuild": "3.2.3", diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js index 4daefbe92..38fc34499 100644 --- a/src/services/entity_changes.js +++ b/src/services/entity_changes.js @@ -7,12 +7,10 @@ const becca = require("../becca/becca"); let maxEntityChangeId = 0; -function addEntityChange(origEntityChange, keepOriginalId = false) { +function addEntityChange(origEntityChange) { const ec = {...origEntityChange}; - if (!keepOriginalId) { - delete ec.id; - } + delete ec.id; ec.sourceId = ec.sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId(); ec.isSynced = ec.isSynced ? 1 : 0; diff --git a/src/services/sync_update.js b/src/services/sync_update.js index 7abc737b9..934517202 100644 --- a/src/services/sync_update.js +++ b/src/services/sync_update.js @@ -54,7 +54,7 @@ function updateNormalEntity(remoteEntityChange, entity) { sql.execute(`DELETE FROM ${remoteEntityChange.entityName} WHERE ${primaryKey} = ?`, remoteEntityChange.entityId); - entityChangesService.addEntityChange(remoteEntityChange, true); + entityChangesService.addEntityChange(remoteEntityChange); }); return true; @@ -71,7 +71,7 @@ function updateNormalEntity(remoteEntityChange, entity) { sql.transactional(() => { sql.replace(remoteEntityChange.entityName, entity); - entityChangesService.addEntityChange(remoteEntityChange, true); + entityChangesService.addEntityChange(remoteEntityChange); }); return true; @@ -86,7 +86,7 @@ function updateNoteReordering(entityChange, entity) { sql.execute("UPDATE branches SET notePosition = ? WHERE branchId = ?", [entity[key], key]); } - entityChangesService.addEntityChange(entityChange, true); + entityChangesService.addEntityChange(entityChange); }); return true;