clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-24 04:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: consistently create sanitized property ident

Browse Source 
for new properties. Also made build-new-property easier to
use by making property name optional
This commit is contained in:
Gabriel Horner
2024-04-05 16:55:40 -04:00
parent 3793cf6d81
commit 009e5b6d62
8 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/src/logseq/tasks/db_graph/create_graph.cljs
View File

@@ -68,7 +68,7 @@
(->> properties
(map
(fn [[prop-name val]]
[(db-property/get-db-ident-from-name (name prop-name))
[(db-property/user-property-ident-from-name (name prop-name))
;; set indicates a :many value
(if (set? val)
(set (map #(translate-property-value % uuid-maps) val))
@@ -105,7 +105,7 @@
(defn- build-property-refs [properties property-db-ids]
(mapv
(fn [prop-name]
(db-property/get-db-ident-from-name (name prop-name)))
(db-property/user-property-ident-from-name (name prop-name)))
(keys properties)))
(def current-db-id (atom 0))
@@ -168,7 +168,7 @@
(mapcat
(fn [[prop-name]]
(if (get-in properties [prop-name :closed-values])
(let [db-ident (db-property/get-db-ident-from-name (name prop-name))]
(let [db-ident (db-property/user-property-ident-from-name (name prop-name))]
(db-property-util/build-closed-values
db-ident
prop-name
@@ -178,14 +178,13 @@
:property-attributes
{:db/id (or (property-db-ids (name prop-name))
(throw (ex-info "No :db/id for property" {:property prop-name})))}}))
[(let [db-ident (keyword "user.property" (name prop-name))]
(merge
(sqlite-util/build-new-property db-ident prop-name (get-in properties [prop-name :block/schema]))
{:db/id (or (property-db-ids (name prop-name))
(throw (ex-info "No :db/id for property" {:property prop-name})))}
(when-let [props (not-empty (get-in properties [prop-name :properties]))]
(assoc (->block-properties-tx props uuid-maps)
:block/refs (build-property-refs props property-db-ids)))))]))
[(merge
(sqlite-util/build-new-property prop-name (get-in properties [prop-name :block/schema]))
{:db/id (or (property-db-ids (name prop-name))
(throw (ex-info "No :db/id for property" {:property prop-name})))}
(when-let [props (not-empty (get-in properties [prop-name :properties]))]
(assoc (->block-properties-tx props uuid-maps)
:block/refs (build-property-refs props property-db-ids))))]))
property-uuids))
pages-and-blocks-tx
(vec