Ignore conflicted records CREATE+existing_not_null during resolve

brave · Oct 21, 2019 · 92884d9 · 92884d9
1 parent 286884d
commit 92884d9
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/client/recordUtil.js b/client/recordUtil.js
@@ -285,6 +285,16 @@ module.exports.resolveRecords = (recordsAndExistingObjects) => {
       normalizeBookmark(item[1])
     }
   })
+
+  // Remove obvious conflicting records
+  for (var i = recordsAndExistingObjects.length - 1; i >= 0; --i) {
+    if (recordsAndExistingObjects[i] && recordsAndExistingObjects[i][0]) {
+      if (recordsAndExistingObjects[i][0].action === proto.actions.CREATE && recordsAndExistingObjects[i][1]) {
+        recordsAndExistingObjects.splice(i, 1)
+      }
+    }
+  }
+
   const merged = mergeRecords(recordsAndExistingObjects)
   merged.forEach(([record, existingObject]) => {
     const resolved = this.resolve(record, existingObject)