fix(rtc): lost first block's rtc-ops when paste multiple blocks (2)

- add more tests
- consider more cases

Author: RCmerci

src/main/frontend/worker/rtc/gen_client_op.cljs

@@ -7,23 +7,19 @@
             [logseq.db.frontend.property :as db-property]))
 
 (defn remove-conflict-same-block-datoms
-  "remove conflict entity-datoms for same-block(same block/uuid) in same-entity-datoms-coll.
-  merge
-  [[[182 :block/uuid block-uuid1 1 false], ...]
-   [[183 :block/uuid block-uuid1 1 true], ...]]
-  into
-  [[[183 :block/uuid block-uuid1 1 true], ...]]
-"
+  "remove conflict entity-datoms for same-block(same block/uuid) in same-entity-datoms-coll."
   [same-entity-datoms-coll]
   (let [entity-info (map (fn [datoms]
                            (let [first-datom (first datoms)
                                  e           (nth first-datom 0)
                                  t           (nth first-datom 3)
-                                 uuid        (some (fn [d]
+                                 uuid-datom  (some (fn [d]
                                                      (when (keyword-identical? :block/uuid (nth d 1))
-                                                       (nth d 2)))
-                                                   datoms)]
-                             {:e e :t t :uuid uuid :datoms datoms}))
+                                                       d))
+                                                   datoms)
+                                 uuid        (when uuid-datom (nth uuid-datom 2))
+                                 added?      (when uuid-datom (nth uuid-datom 4))]
+                             {:e e :t t :uuid uuid :added? added? :datoms datoms}))
                          same-entity-datoms-coll)
         uuid-groups (group-by :uuid (filter :uuid entity-info))
         loser-eids  (reduce
@@ -32,7 +28,9 @@
                          (reduce
                           (fn [acc* [_t infos*]]
                             (if (> (count infos*) 1)
-                              (let [sorted-infos (sort-by :e > infos*)
+                              (let [sorted-infos (sort-by (fn [x] [(if (:added? x) 1 0) (:e x)])
+                                                          (fn [a b] (compare b a))
+                                                          infos*)
                                     losers       (rest sorted-infos)]
                                 (into acc* (map :e losers)))
                               acc*))

src/test/frontend/worker/rtc/gen_client_op_test.cljs

@@ -228,4 +228,13 @@
           result      (subject/remove-conflict-same-block-datoms same-entity-datoms-coll)]
       (is (= 2 (count result)))
       (is (= datoms-1 (first result)))
-      (is (= datoms-3 (second result))))))
+      (is (= datoms-3 (second result)))))
+
+  (testing "remove conflict entity-datoms should prefer add over retract"
+    (let [block-uuid1 #uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+          datoms-1    [[100 :block/uuid block-uuid1 1 true]]
+          datoms-2    [[101 :block/uuid block-uuid1 1 false]]
+          same-entity-datoms-coll [datoms-1 datoms-2]
+          result      (subject/remove-conflict-same-block-datoms same-entity-datoms-coll)]
+      (is (= 1 (count result)))
+      (is (= datoms-1 (first result))))))