From 4652410dfbc7d4ea927b8be75992c5be4091c469 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel@logseq.com>
Date: Fri, 15 Mar 2024 13:57:16 -0400
Subject: [PATCH] fix: Add choices for existing values

for url many and number many properties
---
 .../components/property/closed_value.cljs     | 32 +++++++++----------
 .../frontend/handler/db_based/property.cljs   |  5 ++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/frontend/components/property/closed_value.cljs b/src/main/frontend/components/property/closed_value.cljs
index 706c0a30a..19cb46ac1 100644
--- a/src/main/frontend/components/property/closed_value.cljs
+++ b/src/main/frontend/components/property/closed_value.cljs
@@ -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"))]))
diff --git a/src/main/frontend/handler/db_based/property.cljs b/src/main/frontend/handler/db_based/property.cljs
index 40ceb0f84..bcc2f2474 100644
--- a/src/main/frontend/handler/db_based/property.cljs
+++ b/src/main/frontend/handler/db_based/property.cljs
@@ -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})