update validate-no-left-conflict

src/main/frontend/components/page.cljs

@@ -406,6 +406,17 @@
          [:h1.title {:style {:margin-left -2}}
           title]]))))
 
+(def need-update-sync-status (atom false))
+
+(rum/defc sync-status < rum/reactive []
+  (let [_ (rum/react need-update-sync-status)]
+    [:div.cursor.w-2.h-2.sync-status.mr-2
+     {:class (if (yjs/current-page-syncing?)
+               "bg-green-600"
+               "bg-orange-400")
+      :style {:border-radius "50%"
+              :margin-top 2}}]))
+
 ;; A page is just a logical block
 (rum/defcs page < rum/reactive
   [state {:keys [repo page-name preview?] :as option}]
@@ -465,16 +476,13 @@
                     (plugins/hook-ui-slot :page-head-actions-slotted nil)
                     (plugins/hook-ui-items :pagebar))
 
-                  [:div.cursor.w-2.h-2.sync-status.mr-2
-                   {:class (if (yjs/current-page-syncing?)
-                             "bg-green-600"
-                             "bg-orange-400")
-                    :style {:border-radius "50%"
-                            :margin-top 2}}]
+                  (sync-status)
 
                   [:a.opacity-60.hover:opacity-100.page-op.mr-1
                    {:title "Sync current page"
-                    :on-click #(yjs/sync-current-page!)}
+                    :on-click (fn []
+                                (yjs/sync-current-page!)
+                                (swap! need-update-sync-status not))}
                    svg/refresh]])])
             [:div
              (when (and block? (not sidebar?))

src/main/frontend/modules/outliner/yjs.cljs

@@ -1045,9 +1045,11 @@ return [2 3]
   "ensure no left-id conflict"
   (let [blocks (db/get-page-blocks-no-cache page-name)
         id->left-map (mapv
-                      (fn [block] [(str (:block/uuid block)) (:db/id (:block/left block))])
+                      (fn [block] [(str (:block/uuid block))
+                                   [(:db/id (:block/left block))
+                                    (:db/id (:block/parent block))]])
                       blocks)
         grouped (group-by second id->left-map)
-        conflict (some (fn [s] (> (count (second s)) 1)) grouped)]
-    (assert (nil? conflict)
-            (str "left-id conflict: " conflict))))
+        conflict (some (fn [s] (and (> (count (second s)) 1) s)) grouped)]
+    (assert (not conflict)
+            (str "left-id conflict: " (seq conflict)))))