From f0e80e77eebf927d7372cc0cb5f1e5f79fe11eaf Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Wed, 15 Oct 2025 20:35:40 +0800
Subject: [PATCH] fix(rtc): don't re-create page if property or tag exists
 already

---
 .../frontend/worker/rtc/remote_update.cljs    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/frontend/worker/rtc/remote_update.cljs b/src/main/frontend/worker/rtc/remote_update.cljs
index d6be910bbc..74d293e1d6 100644
--- a/src/main/frontend/worker/rtc/remote_update.cljs
+++ b/src/main/frontend/worker/rtc/remote_update.cljs
@@ -566,16 +566,18 @@ so need to pull earlier remote-data from websocket."})
     (doseq [{:keys [self _page-name]
              title :block/title
              :as op-value} update-page-ops]
-      (let [create-opts {:uuid self
-                         :old-db-id (@worker-state/*deleted-block-uuid->db-id self)}
-            [_ page-name page-uuid] (worker-page/rtc-create-page! conn config
-                                                                  (ldb/read-transit-str title)
-                                                                  create-opts)]
-        ;; TODO: current page-create fn is buggy, even provide :uuid option, it will create-page with different uuid,
-        ;; if there's already existing same name page
-        (assert (= page-uuid self) {:page-name page-name :page-uuid page-uuid :should-be self})
-        (assert (some? (d/entity @conn [:block/uuid page-uuid])) {:page-uuid page-uuid :page-name page-name})
-        (update-block-attrs repo conn self op-value)))))
+      (let [db-ident (:db/ident op-value)]
+        (when-not (and db-ident (d/entity @conn db-ident)) ; property or class exists
+          (let [create-opts {:uuid self
+                             :old-db-id (@worker-state/*deleted-block-uuid->db-id self)}
+                [_ page-name page-uuid] (worker-page/rtc-create-page! conn config
+                                                                      (ldb/read-transit-str title)
+                                                                      create-opts)]
+            ;; TODO: current page-create fn is buggy, even provide :uuid option, it will create-page with different uuid,
+            ;; if there's already existing same name page
+            (assert (= page-uuid self) {:page-name page-name :page-uuid page-uuid :should-be self})
+            (assert (some? (d/entity @conn [:block/uuid page-uuid])) {:page-uuid page-uuid :page-name page-name})
+            (update-block-attrs repo conn self op-value)))))))
 
 (defn- ensure-refed-blocks-exist
   "Ensure refed-blocks from remote existing in client"