fix: Add choices for existing values

for url many and number many properties
pull/11055/head
Gabriel Horner 2024-03-15 13:57:16 -04:00
parent 148f2f7b16
commit 4652410dfb
2 changed files with 20 additions and 17 deletions

View File

@ -217,23 +217,23 @@
:on-chosen (fn [chosen]
(p/let [closed-value (<upsert-closed-value! property {:value chosen})]
(swap! *property-schema update :values (fnil conj []) closed-value)))})
(let [values (->> values
(map second)
(remove uuid?)
(remove string/blank?)
distinct)]
(if (seq values)
(add-existing-values property *property-schema values opts)
(let [values' (->> (if (= :many (get-in property [:block/schema :cardinality]))
(mapcat second values)
(map second values))
(remove uuid?)
(remove string/blank?)
distinct)]
(if (seq values')
(add-existing-values property *property-schema values' opts)
(item-config
property
nil
(assoc opts :on-save
(fn [value icon description]
(p/let [closed-value (<upsert-closed-value! property {:value value
:description description
:icon icon})]
(swap! *property-schema update :values (fnil conj []) closed-value))))))))))
property
nil
(assoc opts :on-save
(fn [value icon description]
(p/let [closed-value (<upsert-closed-value! property {:value value
:description description
:icon icon})]
(swap! *property-schema update :values (fnil conj []) closed-value))))))))))
{:content-props {:class "w-auto"}})))}
(ui/icon "plus" {:size 16})
"Add choice"))]))

View File

@ -793,7 +793,10 @@
{:db/id id
:block/properties (dissoc properties property-id)}
{:db/id id
:block/properties (assoc properties property-id (get value->block-id value))})))
:block/properties (assoc properties property-id
(if (set? value)
(set (map value->block-id value))
(get value->block-id value)))})))
block-values))]
(db/transact! (state/get-current-repo) tx-data
{:outliner-op :insert-blocks})