Explorar o código

Merge branch 'master' into enhance/mobile-silk

Tienson Qin hai 4 meses
pai
achega
9f9bd6bc14

+ 5 - 4
src/main/frontend/worker/rtc/client.cljs

@@ -193,12 +193,13 @@
 
 (defmethod local-block-ops->remote-ops-aux :update-page-op
   [_ & {:keys [db block-uuid *remote-ops]}]
-  (when-let [{page-name :block/name title :block/title}
+  (when-let [{page-name :block/name title :block/title db-ident :db/ident}
              (d/entity db [:block/uuid block-uuid])]
     (swap! *remote-ops conj
-           [:update-page {:block-uuid block-uuid
-                          :page-name page-name
-                          :block/title (or title page-name)}])))
+           [:update-page (cond-> {:block-uuid block-uuid
+                                  :page-name page-name
+                                  :block/title (or title page-name)}
+                           db-ident (assoc :db/ident db-ident))])))
 
 (defmethod local-block-ops->remote-ops-aux :remove-op
   [_ & {:keys [db remove-op *remote-ops]}]

+ 1 - 0
src/main/frontend/worker/rtc/malli_schema.cljs

@@ -43,6 +43,7 @@
     [:cat :keyword
      [:map
       [:block-uuid :uuid]
+      [:db/ident {:optional true} :keyword]
       [:page-name :string]
       [:block/title :string]]]]
    [:remove-page