瀏覽代碼

chore: rename pdf specific properties to logseq.property.pdf

also remove deleted property ns
Gabriel Horner 1 年之前
父節點
當前提交
35e6ad120d

+ 10 - 11
deps/db/src/logseq/db/frontend/property.cljs

@@ -72,12 +72,16 @@
                                       :hide? true}}
    :logseq.property/hl-type {:schema {:type :keyword
                                       :hide? true}}
-   :logseq.property/hl-page {:schema {:type :number
-                                      :hide? true}}
-   :logseq.property/hl-stamp {:schema {:type :number
-                                       :hide? true}}
    :logseq.property/hl-color {:schema {:type :default
                                        :hide? true}}
+   :logseq.property.pdf/hl-page {:schema {:type :number
+                                          :hide? true}}
+   :logseq.property.pdf/hl-stamp {:schema {:type :number
+                                           :hide? true}}
+   :logseq.property.pdf/file
+   {:schema {:type :default :hide? true :public? true :view-context :page}}
+   :logseq.property.pdf/file-path
+   {:schema {:type :default :hide? true :public? true :view-context :page}}
    :logseq.property/order-list-type {:name :logseq.order-list-type
                                      :schema {:type :default
                                               :hide? true}}
@@ -144,11 +148,7 @@
                                              {:type :checkbox
                                               :hide? true
                                               :view-context :page
-                                              :public? true}}
-   :logseq.property.pdf/file
-   {:schema {:type :default :hide? true :public? true :view-context :page}}
-   :logseq.property.pdf/file-path
-   {:schema {:type :default :hide? true :public? true :view-context :page}}))
+                                              :public? true}}))
 
 (def built-in-properties
   (->> built-in-properties*
@@ -171,8 +171,7 @@
         "All db attribute properties are configured in built-in-properties")
 
 (def logseq-property-namespaces
-  #{"logseq.property" "logseq.property.table" "logseq.property.tldraw"
-    "logseq.property.pdf" "logseq.task"})
+  #{"logseq.property" "logseq.property.tldraw" "logseq.property.pdf" "logseq.task"})
 
 (defn logseq-property?
   "Determines if keyword is a logseq property"

+ 2 - 2
deps/publishing/src/logseq/publishing/db.cljs

@@ -16,9 +16,9 @@
                            #(:block/content (get %1 %2))
                            #(get %1 (keyword (name %2))))]
       (when-some [uuid (:block/uuid block)]
-        (when-some [stamp (prop-lookup-fn props :logseq.property/hl-stamp)]
+        (when-some [stamp (prop-lookup-fn props :logseq.property.pdf/hl-stamp)]
           (let [group-key      (string/replace-first (:block/original-name page) #"^hls__" "")
-                hl-page        (prop-lookup-fn props :logseq.property/hl-page)
+                hl-page        (prop-lookup-fn props :logseq.property.pdf/hl-page)
                 encoded-chars? (boolean (re-find #"(?i)%[0-9a-f]{2}" group-key))
                 group-key      (if encoded-chars? (js/encodeURI group-key) group-key)]
             (str "./assets/" group-key "/" (str hl-page "_" uuid "_" stamp ".png"))))))))

+ 2 - 2
src/main/frontend/components/block.cljs

@@ -1948,12 +1948,12 @@
 
                       [:span.hl-page
                        [:strong.forbid-edit (str "P" (or
-                                                      (pu/lookup properties :logseq.property/hl-page)
+                                                      (pu/lookup properties :logseq.property.pdf/hl-page)
                                                       "?"))]
                        [:label.blank " "]]
 
                       (when (and area?
-                                 (pu/lookup properties :logseq.property/hl-stamp))
+                                 (pu/lookup properties :logseq.property.pdf/hl-stamp))
                         (pdf-assets/area-display t))])]
        (remove-nils
         (concat

+ 4 - 4
src/main/frontend/extensions/pdf/assets.cljs

@@ -130,7 +130,7 @@
 (defn update-hl-block!
   [highlight]
   (when-let [block (db-model/get-block-by-uuid (:id highlight))]
-    (doseq [[k v] {(pu/get-pid :logseq.property/hl-stamp)
+    (doseq [[k v] {(pu/get-pid :logseq.property.pdf/hl-stamp)
                    (if (area-highlight? highlight)
                      (get-in highlight [:content :image])
                      (js/Date.now))
@@ -200,11 +200,11 @@
                  wrap-props #(if-let [stamp (:image content)]
                                (assoc %
                                       (pu/get-pid :logseq.property/hl-type) :area
-                                      (pu/get-pid :logseq.property/hl-stamp) stamp)
+                                      (pu/get-pid :logseq.property.pdf/hl-stamp) stamp)
                                %)
                  props (cond->
                         {(pu/get-pid :logseq.property/ls-type)  :annotation
-                         (pu/get-pid :logseq.property/hl-page)  page
+                         (pu/get-pid :logseq.property.pdf/hl-page)  page
                          (pu/get-pid :logseq.property/hl-color) (:color properties)}
                          (not (config/db-based-graph? (state/get-current-repo)))
                           ;; force custom uuid
@@ -239,7 +239,7 @@
         page      (db-utils/pull (:db/id (:block/page block)))
         page-name (:block/original-name page)
         file-path (pu/get-block-property-value block :logseq.property.pdf/file-path)
-        hl-page   (pu/get-block-property-value block :logseq.property/hl-page)]
+        hl-page   (pu/get-block-property-value block :logseq.property.pdf/hl-page)]
     (when-let [target-key (and page-name (subs page-name 5))]
       (p/let [hls (resolve-hls-data-by-key$ target-key)
               hls (and hls (:highlights hls))]