clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-18 01:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dedupe node property choices

Browse Source
This commit is contained in:
Tienson Qin
2026-05-13 11:28:16 +08:00
parent 00964157b1
commit c8d00f5a7b
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/frontend/components/property/value.cljs
View File

@@ -672,6 +672,20 @@
:close-modal? false
k f'))))
(defn- add-initial-node-choice
[initial-choices new-choice]
(let [node-choice-match? (fn [choice]
(let [choice-value (:value choice)
new-value (:value new-choice)]
(or
(and (:db/id choice-value) (= (:db/id choice-value) (:db/id new-value)))
(and (:block/uuid choice-value) (= (:block/uuid choice-value) (:block/uuid new-value)))
(= choice-value new-value))))
initial-choices' (vec initial-choices)]
(if (some node-choice-match? initial-choices')
initial-choices'
(conj initial-choices' new-choice))))
(rum/defc ^:large-vars/cleanup-todo select-node < rum/static
[property
{:keys [block multiple-choices? dropdown? input-opts on-input add-new-choice! target] :as opts}
@@ -891,7 +905,7 @@
:built-in? false})]
(set-result! result))))
:add-new-choice! (fn [new-choice]
(set-initial-choices! (conj (vec initial-choices) new-choice))))
(set-initial-choices! (add-initial-node-choice initial-choices new-choice))))
repo (state/get-current-repo)
classes (:logseq.property/classes property)
class? (= :class (:logseq.property/type property))

28
src/test/frontend/components/property/value_test.cljs
View File

@@ -65,3 +65,31 @@
:block/uuid #uuid "11111111-1111-1111-1111-111111111111"}]
(is (= (:logseq.property/default-value property)
(#'property-value/resolved-property-value-for-render loaded-block property false)))))
(deftest add-initial-node-choice-dedupes-existing-db-id-test
(let [existing {:value {:db/id 100
:block/uuid #uuid "11111111-1111-1111-1111-111111111111"}
:label "Existing node"}
duplicate {:value {:db/id 100
:block/uuid #uuid "22222222-2222-2222-2222-222222222222"}
:label "Existing node"}]
(is (= [existing]
(#'property-value/add-initial-node-choice [existing] duplicate)))))
(deftest add-initial-node-choice-dedupes-existing-uuid-test
(let [existing {:value {:block/uuid #uuid "11111111-1111-1111-1111-111111111111"}
:label "Existing node"}
duplicate {:value {:block/uuid #uuid "11111111-1111-1111-1111-111111111111"}
:label "Existing node"}]
(is (= [existing]
(#'property-value/add-initial-node-choice [existing] duplicate)))))
(deftest add-initial-node-choice-keeps-distinct-node-with-same-label-test
(let [existing {:value {:db/id 100
:block/uuid #uuid "11111111-1111-1111-1111-111111111111"}
:label "Shared title"}
new-choice {:value {:db/id 101
:block/uuid #uuid "22222222-2222-2222-2222-222222222222"}
:label "Shared title"}]
(is (= [existing new-choice]
(#'property-value/add-initial-node-choice [existing] new-choice)))))