fix(rtc): remove occurrences of :block/left

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

@@ -9,6 +9,7 @@
             [frontend.worker.rtc.remote-update :as r.remote-update]
             [frontend.worker.rtc.ws2 :as ws]
             [logseq.common.missionary-util :as c.m]
+            [logseq.db :as ldb]
             [missionary.core :as m]))
 
 (def ^:private transit-w (transit/writer :json))
@@ -167,9 +168,9 @@
     (when-let [block-uuid
                (some (comp :block-uuid second) [move-op update-op update-page-op])]
       (when-let [block (d/entity @conn [:block/uuid block-uuid])]
-        (let [left-uuid (some-> block :block/left :block/uuid)
+        (let [left-uuid (:block/uuid (ldb/get-left-sibling block))
               parent-uuid (some-> block :block/parent :block/uuid)]
-          (when parent-uuid ; whiteboard blocks don't have :block/left
+          (when parent-uuid
             ;; remote-move-op
             (when move-op
               (local-block-ops->remote-ops-aux :move-op

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

@@ -26,7 +26,7 @@
 (def block-pos-schema
   ":sibling:  sibling of target-block(:target-uuid)
   :child: child of target-block(:target-uuid)
-  :no-order: this block doesn't have :block/left attr"
+  :no-order: this block doesn't have :block/order attr"
   [:enum :sibling :child :no-order])
 
 

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

@@ -29,7 +29,7 @@
                  (when (seq datoms)
                    (reduce
                     (fn [r datom]
-                      (when (and (contains? #{:block/parent :block/left} (:a datom))
+                      (when (and (contains? #{:block/parent} (:a datom))
                                  (not (pos-int? (:v datom))))
                         (throw (ex-info "invalid block data" {:datom datom})))
                       (if (contains? db-schema/card-many-attributes (:a datom))
@@ -81,7 +81,6 @@
    (fn [block]
      (let [db-id            (:db/id block)
            block-parent     (:db/id (:block/parent block))
-           block-left       (:db/id (:block/left block))
            block-alias      (map :db/id (:block/alias block))
            block-tags       (map :db/id (:block/tags block))
            block-type       (keep block-type-kw->str (:block/type block))
@@ -92,7 +91,6 @@
            block-link       (:db/id (:block/link block))]
        (cond-> (assoc block :db/id (str db-id))
          block-parent      (assoc :block/parent (str block-parent))
-         block-left        (assoc :block/left (str block-left))
          (seq block-alias) (assoc :block/alias (map str block-alias))
          (seq block-tags)  (assoc :block/tags (map str block-tags))
          (seq block-type)  (assoc :block/type block-type)

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

@@ -71,7 +71,7 @@
                  (mapv (fn [block-uuid]
                          ;; add block/content block/format to satisfy the normal-block schema
                          {:block/uuid block-uuid
-                          ;; NOTE: block without :block/left
+                          ;; NOTE: block without :block/order
                           ;; must be `logseq.db.frontend.malli-schema.closed-value-block`
                           :block/type #{"closed value"}})
                        block-uuids)
@@ -298,7 +298,6 @@
               (-> (apply dissoc block [:block/tx-id
                                        :block/uuid
                                        :block/updated-at
-                                       :block/left
                                        :block/created-at
                                        :block/format
                                        :db/id
@@ -309,7 +308,7 @@
       children-blocks))))
 
 (defn- check-block-pos
-  "NOTE: some blocks don't have :block/left (e.g. whiteboard blocks)"
+  "NOTE: some blocks don't have :block/order (e.g. whiteboard blocks)"
   [db block-uuid remote-parents remote-left-uuid]
   (let [local-b (d/entity db [:block/uuid block-uuid])
         remote-parent-uuid (first remote-parents)]
@@ -318,7 +317,7 @@
       :not-exist
 
       (not= [remote-left-uuid remote-parent-uuid]
-            [(:block/uuid (:block/left local-b)) (:block/uuid (:block/parent local-b))])
+            [(:block/uuid (ldb/get-left-sibling local-b)) (:block/uuid (:block/parent local-b))])
       :wrong-pos
 
       :else nil)))