rails-markup 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665bd02a5e8830d8565296c7623f4136513a61a2c1574e68c0c2b6802daf7ea2
-  data.tar.gz: fd6290208722a52ecc255f3d01cdf017de31010157f6c67cc4386423e848eb98
+  metadata.gz: 34e44f1b30e4c51432e862ee09efd9d1f72e906a41e0e38f9c7553267f737d6f
+  data.tar.gz: '0909684467d87ed6a1248657ea2fc0e120956b66203c55b47750e74b57971bcb'
 SHA512:
-  metadata.gz: 32afe3f8d8ea940731cde32f9524738189ca7d54b1bc1d124adc8888adb9fce35347647bc5844ca15dac6c918a546cef2d9ca048e0901e98ebc87f17db34ec4e
-  data.tar.gz: 2c173c2623816601f0cc5ab730960cc035f2523a14adad0de4d130163f358d47562959f8fbd6c4b9e2e2ea9a0442e6d711dc6ba35070d89ae7d23e17c6cb2b15
+  metadata.gz: ea571e4c90037645f9f81ddc6e95710ffd6333addee88f6b43b3352ee8be8bcf9afb9b4d0d2868965f30825c370bf668a6e3a61e7fe345c6ae2469e8e205216c
+  data.tar.gz: ec0f2ff1ae946b95e7e6c6a7c0fb90429faa8bab7e8cbe30763a09440056760ab9049aed14b296a36c52095f9c1eae5d45941c6a1ccae8bcc346e5f12d03a5d3

data/app/assets/javascripts/rails_markup/toolbar.js

@@ -1197,6 +1197,8 @@
 
         if (result.kind === "success") {
           if (!this._outboxEntryMatches(snapshot)) {
+            const supersedingDelete = this._advanceSupersedingDeleteBaseRevision(snapshot, result.data);
+            if (supersedingDelete === "failed") break;
             clientIds.push(clientId);
             continue;
           }
@@ -1242,6 +1244,25 @@
       }
     },
 
+    _advanceSupersedingDeleteBaseRevision(snapshot, server) {
+      const current = this.outbox[snapshot.clientId];
+      const supersedesUpsert = snapshot.type === "upsert"
+        && current?.type === "delete"
+        && current.clientId === snapshot.clientId
+        && Number.isInteger(current.revision)
+        && current.revision > snapshot.revision
+        && Number.isInteger(server?.revision);
+      if (!supersedesUpsert) return "not-applicable";
+
+      const tombstone = this._immutableCopy(current);
+      const committed = this._commitLocalStateChange(() => {
+        if (!this._outboxEntryMatches(tombstone)) return;
+        const baseRevision = Number.isInteger(tombstone.baseRevision) ? tombstone.baseRevision : 0;
+        this.outbox[snapshot.clientId].baseRevision = Math.max(baseRevision, server.revision);
+      });
+      return committed ? "advanced" : "failed";
+    },
+
     async _sendOutboxEntry(snapshot) {
       const request = this._sameOriginMutationRequest(`/annotations/${encodeURIComponent(snapshot.clientId)}`);
       if (!request) return { kind: "auth", message: "Sync unavailable: endpoint must be same-origin" };
@@ -1434,12 +1455,20 @@
             if (annotation) annotation.syncState = "failed";
             return;
           }
+          if (!annotation) {
+            entry.syncState = "failed";
+            return;
+          }
+          // Recreate once from the complete desired browser state. Replaying a
+          // narrow edit delta onto a new row can omit required fields and lose
+          // the user's annotation to a permanent validation failure.
+          annotation.dirtyFields = this._legacyDirtyFields(annotation);
+          entry.annotation = this._desiredState(annotation);
+          entry.dirtyFields = annotation.dirtyFields.slice();
           entry.baseRevision = 0;
           entry.missingConflictRebased = true;
-          if (annotation) {
-            annotation.serverId = null;
-            annotation.serverRevision = 0;
-          }
+          annotation.serverId = null;
+          annotation.serverRevision = 0;
           resolution = "retry";
           return;
         }

data/lib/rails_markup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMarkup
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-markup
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - InventList