fix: whiteboard not working because of properties

src/main/frontend/components/page.cljs

@@ -420,11 +420,16 @@
   (rum/local false ::hover?)
   (rum/local false ::configuring?)
   {:init (fn [state]
-           (assoc state ::title-value (atom (nth (:rum/args state) 1))))}
-  [state page-name title {:keys [fmt-journal? preview?]}]
-  (when title
+           (let [page-name (first (:rum/args state))
+                 original-name (if page-name
+                                 (:block/origina-name (db/entity [:block/name (util/page-name-sanity-lc page-name)]))
+                                 "")]
+             (assoc state ::title-value (atom original-name))))}
+  [state page-name {:keys [fmt-journal? preview?]}]
+  (when page-name
     (let [page (when page-name (db/entity [:block/name page-name]))
           page (db/sub-block (:db/id page))
+          title (:block/original-name page)
           icon (pu/lookup (:block/properties page) :icon)
           *hover? (::hover? state)
           *title-value (get state ::title-value)
@@ -757,10 +762,10 @@
                                    (page-mouse-leave e *control-show?))}
                 (page-blocks-collapse-control title *control-show? *all-collapsed?)])
              (when-not whiteboard?
-               (page-title page-name title {:journal? journal?
-                                            :fmt-journal? fmt-journal?
-                                            :built-in-property? built-in-property?
-                                            :preview? preview?}))
+               (page-title page-name {:journal? journal?
+                                      :fmt-journal? fmt-journal?
+                                      :built-in-property? built-in-property?
+                                      :preview? preview?}))
              (when (not config/publishing?)
                (when config/lsp-enabled?
                  [:div.flex.flex-row

src/main/frontend/components/whiteboard.cljs

@@ -273,10 +273,7 @@
                             e
                             (content/page-title-custom-context-menu-content page-name))
                            (state/set-state! :page-title/context nil))}
-       (page/page-title page-name
-                        [:span.text-lg
-                         (ui/icon "whiteboard" {:extension? true})]
-                        {:*configure-show? (atom false)})]
+       (page/page-title page-name {:*configure-show? (atom false)})]
 
       [:div.whiteboard-page-refs
        (references-count page-name
@@ -289,7 +286,7 @@
      (tldraw-app page-name block-id)]))
 
 (rum/defc whiteboard-route <
-(shortcut/mixin :shortcut.handler/whiteboard false)
+  (shortcut/mixin :shortcut.handler/whiteboard false)
   [route-match]
   (let [name (get-in route-match [:parameters :path :name])
         {:keys [block-id]} (get-in route-match [:parameters :query])]

src/main/frontend/db/model.cljs

@@ -1506,8 +1506,9 @@ independent of format as format specific heading characters are stripped"
   [repo page-name]
   (let [key (if (react/db-graph?)
               (:block/uuid (db-utils/entity [:block/name "logseq.tldraw.shape"]))
-              :logseq.tldraw.shape)]
-    (->> (get-page-blocks-no-cache repo page-name {:keys [:block/uuid :block/properties]})
+              :logseq.tldraw.shape)
+        page (db-utils/entity [:block/name (util/page-name-sanity-lc page-name)])]
+    (->> (:block/_page page)
          (keep (fn [{:block/keys [uuid properties]}]
                  (when-let [shape (get properties key)]
                    {:id (str uuid)

src/main/frontend/extensions/pdf/assets.cljs

@@ -192,15 +192,19 @@
            ref-block)
          (let [text       (:text content)
                wrap-props #(if-let [stamp (:image content)]
-                             (assoc % :hl-type :area :hl-stamp stamp)
+                             (assoc %
+                                    (pu/get-pid :hl-type) :area
+                                    (pu/get-pid :hl-stamp) stamp)
                              %)
+               props (cond->
+                      {(pu/get-pid :ls-type)  :annotation
+                       (pu/get-pid :hl-page)  page
+                       (pu/get-pid :hl-color) (:color properties)}
+                       (not (config/db-based-graph? (state/get-current-repo)))
+                       ;; force custom uuid
+                       (assoc (pu/get-pid :id) (str id)))
                properties (->>
-                           (wrap-props
-                            {:ls-type  :annotation
-                             :hl-page  page
-                             :hl-color (:color properties)
-                             ;; force custom uuid
-                             :id       (str id)})
+                           (wrap-props props)
                            (property-handler/replace-key-with-id! (state/get-current-repo)))]
            (when (string? text)
              (editor-handler/api-insert-new-block!

src/main/frontend/handler/db_based/property.cljs

@@ -413,12 +413,14 @@
   [m]
   (zipmap
    (map (fn [k]
-          (let [property-id (:block/uuid (db/entity [:block/name (util/page-name-sanity-lc (name k))]))]
-            (when-not property-id
-              (throw (ex-info "Property not exists yet"
-                              {:key k})))
-            property-id))
-     (keys m))
+          (if (uuid? k)
+            k
+            (let [property-id (:block/uuid (db/entity [:block/name (util/page-name-sanity-lc (name k))]))]
+             (when-not property-id
+               (throw (ex-info "Property not exists yet"
+                               {:key k})))
+             property-id)))
+        (keys m))
    (vals m)))
 
 (defn collapse-expand-property!

src/main/frontend/handler/property/util.cljs

@@ -7,7 +7,8 @@
             [logseq.db.property :as db-property]
             [logseq.graph-parser.util :as gp-util]
             [frontend.db :as db]
-            [clojure.set :as set]))
+            [clojure.set :as set]
+            [frontend.util :as util]))
 
 (defn lookup
   "Get the value of coll's (a map) `key`"
@@ -31,6 +32,14 @@
   [uuid]
   (:block/original-name (db/entity [:block/uuid uuid])))
 
+(defn get-pid
+  "Get a property's UUID given its name or key"
+  [property-name]
+  (let [repo (state/get-current-repo)]
+    (if (config/db-based-graph? repo)
+      (:block/uuid (db/entity [:block/name (util/page-name-sanity-lc (name property-name))]))
+      property-name)))
+
 (defn block->shape [block]
   (get-property block :logseq.tldraw.shape))
 

src/main/frontend/handler/whiteboard.cljs

@@ -30,8 +30,8 @@
 
 (defn shape->block [shape page-name]
   ;; FIXME: support whiteboard props for db graph
-  (let [properties {:ls-type :whiteboard-shape
-                    :logseq.tldraw.shape shape}
+  (let [properties {(pu/get-pid :ls-type) :whiteboard-shape
+                    (pu/get-pid :logseq.tldraw.shape) shape}
         block {:block/page {:block/name (util/page-name-sanity-lc page-name)}
                :block/parent {:block/name page-name}
                :block/properties properties}
@@ -41,8 +41,7 @@
 (defn- get-whiteboard-clj [page-name]
   (when (model/page-exists? page-name)
     (let [page-block (model/get-page page-name)
-          ;; fixme: can we use cache?
-          blocks (model/get-page-blocks-no-cache page-name)]
+          blocks (:block/_page page-block)]
       [page-block blocks])))
 
 (defn- build-shapes
@@ -77,14 +76,16 @@
         get-k #(gobj/get tldraw-page %)]
     {:block/name page-name
      :block/type "whiteboard"
-     ;; FIXME: support whiteboard props for db graph
-     :block/properties {:ls-type :whiteboard-page
-                        :logseq.tldraw.page {:id (get-k "id")
-                                             :name (get-k "name")
-                                             :bindings (js->clj-keywordize (get-k "bindings"))
-                                             :nonce (get-k "nonce")
-                                             :assets (js->clj-keywordize assets)
-                                             :shapes-index shapes-index}}
+     :block/properties {(pu/get-pid :ls-type)
+                        :whiteboard-page
+
+                        (pu/get-pid :logseq.tldraw.page)
+                        {:id (get-k "id")
+                         :name (get-k "name")
+                         :bindings (js->clj-keywordize (get-k "bindings"))
+                         :nonce (get-k "nonce")
+                         :assets (js->clj-keywordize assets)
+                         :shapes-index shapes-index}}
      :block/updated-at (util/time-ms)
      :block/created-at (or (:block/created-at page-entity)
                            (util/time-ms))}))
@@ -191,16 +192,14 @@
 
 (defn get-default-new-whiteboard-tx
   [page-name id]
-  (let [properties (->>
-                    {:ls-type :whiteboard-page,
-                     :logseq.tldraw.page
-                     {:id id,
-                      :name page-name,
-                      :ls-type :whiteboard-page,
-                      :bindings {},
-                      :nonce 1,
-                      :assets []}}
-                    (property-handler/replace-key-with-id! (state/get-current-repo)))]
+  (let [properties {(pu/get-pid :ls-type) :whiteboard-page,
+                    (pu/get-pid :logseq.tldraw.page)
+                    {:id id,
+                     :name page-name,
+                     :ls-type :whiteboard-page,
+                     :bindings {},
+                     :nonce 1,
+                     :assets []}}]
     [#:block{:uuid id
              :name (util/page-name-sanity-lc page-name),
              :original-name page-name