recalculate maxEntityChangeId after rollbacked transaction

src/public/app/widgets/dialogs/recent_changes.js

@@ -95,9 +95,9 @@ export default class RecentChangesDialog extends BasicWidget {
 
                                     this.$widget.modal('hide');
 
-                                    setTimeout(() => {
+                                    await ws.waitForMaxKnownEntityChangeId();
+
                                     appContext.tabManager.getActiveContext().setNote(change.noteId);
-                                    }, 1000);
                                 }
                             });
 

src/services/entity_changes.js

@@ -136,6 +136,10 @@ function fillAllEntityChanges() {
     });
 }
 
+function recalculateMaxEntityChangeId() {
+    maxEntityChangeId = sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes");
+}
+
 module.exports = {
     addNoteReorderingEntityChange,
     moveEntityChangeToTop,
@@ -143,5 +147,6 @@ module.exports = {
     addEntityChangeWithInstanceId,
     fillAllEntityChanges,
     addEntityChangesForSector,
-    getMaxEntityChangeId: () => maxEntityChangeId
+    getMaxEntityChangeId: () => maxEntityChangeId,
+    recalculateMaxEntityChangeId
 };

src/services/sql.js

@@ -256,6 +256,9 @@ function transactional(func) {
             require('../becca/becca_loader').load();
         }
 
+        // the maxEntityChangeId has been incremented during failed transaction, need to recalculate
+        require('./entity_changes').recalculateMaxEntityChangeId();
+
         throw e;
     }
 }