greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: invalid placeholder for :date and :page

pull/11177/head
Gabriel Horner 2024-04-26 09:22:46 -04:00
parent 81c267ed58
commit 1b3b3afd32
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/db/src/logseq/db/frontend/malli_schema.cljs vendored
View File

@ -68,9 +68,13 @@
(contains? (set (:values schema))
(:block/uuid (d/entity db val)))))
validate-fn')]
(if (= (get-in property [:block/schema :cardinality]) :many)
(if (= (:cardinality schema) :many)
(every? validate-fn'' property-val)
(or (validate-fn'' property-val) (= :logseq.property/empty-placeholder property-val)))))
(or (validate-fn'' property-val)
(if (= :db.type/ref (:db/valueType property))
(and (integer? property-val)
(= :logseq.property/empty-placeholder (:db/ident (d/entity db property-val))))
(= :logseq.property/empty-placeholder property-val))))))
(defn update-properties-in-schema
"Needs to be called on the DB schema to add the datascript db to it"
@ -84,11 +88,12 @@
"Prepares properties in entities to be validated by DB schema"
[db ents]
(mapv
#(if-let [pair (some->> (:property/pair-property %) (d/entity db))]
#(if-let [property (some->> (:property/pair-property %) (d/entity db))]
(assoc % :property-tuple
[(hash-map :block/schema (select-keys (:block/schema pair) [:type :cardinality :values])
:db/ident (:db/ident pair))
(get % (:db/ident pair))])
[(assoc (select-keys property [:db/ident :db/valueType])
:block/schema
(select-keys (:block/schema property) [:type :cardinality :values]))
(get % (:db/ident property))])
%)
ents))