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

fix: new property values invalid because of placeholder 

Also use cardinality in validation instead of previous hacky value-based
detection. Also disable closed-values generation so new graphs can
temporarily be valid
pull/11177/head
Gabriel Horner 2024-04-15 12:22:21 -04:00
parent f57b0f137e
commit 236a28764b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,11 @@
(defn- validate-property-value
"Validates the value in a property tuple. The property value can be one or
many of a value to validated"
[schema-fn [{:keys [type]} val]]
(if (and (or (sequential? val) (set? val))
(not= :coll type))
(every? schema-fn val)
(schema-fn val)))
[schema-fn [property property-val]]
;; (prn :validate-val property property-val)
(if (= (:cardinality property) :many)
(every? schema-fn property-val)
(or (schema-fn 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"
@ -78,7 +78,8 @@
(mapv
#(if-let [pair (some->> (:property/pair-property %) (d/entity db))]
(assoc % :property-tuple
[(select-keys (:block/schema pair) [:type :cardinality])
[(assoc (select-keys (:block/schema pair) [:type :cardinality])
:db/ident (:db/ident pair))
(get % (:db/ident pair))])
%)
ents))

3
deps/db/src/logseq/db/sqlite/create_graph.cljs vendored
View File

@ -17,7 +17,8 @@
(db-property-util/build-closed-values
db-ident
prop-name
{:db/ident db-ident :block/schema schema :closed-values closed-values}
;; FIXME: Re-enable closed-values when :default is done migrating to entity
{:db/ident db-ident :block/schema schema :closed-values [] #_closed-values}
{})
[(sqlite-util/build-new-property
db-ident