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

chore: remove <update-property fn

pull/11196/head
Tienson Qin 2024-03-29 21:18:40 +08:00
parent 81ed7cea0e
commit 6e66677da1
3 changed files with 59 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/frontend/components/property.cljs
View File

@ -247,9 +247,10 @@
[:div.col-span-3.flex.flex-row.items-center.gap-2
(icon-component/icon-picker icon-value
{:on-chosen (fn [_e icon]
(db-property-handler/<update-property!
(db-property-handler/upsert-property!
(state/get-current-repo)
(:db/ident property)
(:block/schema property)
{:properties {:logseq.property/icon icon}}))})
(when icon-value
@ -585,8 +586,9 @@
{:on-chosen
(fn [_e icon]
(when icon
(p/let [_ (db-property-handler/<update-property! repo
(p/let [_ (db-property-handler/upsert-property! repo
(:db/ident property)
(:block/schema property)
{:properties {:logseq.property/icon icon}})]
(shui/popup-hide! id))))}))]

6
src/main/frontend/components/property/util.cljs
View File

@ -7,8 +7,8 @@
[property property-name property-schema]
(when (or (not= (:block/original-name property) property-name)
(not= (:block/schema property) property-schema))
(db-property-handler/<update-property!
(db-property-handler/upsert-property!
(state/get-current-repo)
(:db/ident property)
{:property-name property-name
:property-schema property-schema})))
property-schema
{:property-name property-name})))

40
src/main/frontend/handler/db_based/property.cljs
View File

@ -105,21 +105,28 @@
:db/cardinality cardinality})))
(defn upsert-property!
[repo property-id schema {:keys [property-name]}]
[repo property-id schema {:keys [property-name properties]}]
(let [db-ident (or property-id (db-property/get-db-ident-from-name property-name))
property (db/entity db-ident)
k-name (or (:block/original-name property) (name property-name))]
(if property
type (get-in property [:block/schema :type])
type-changed? (and type (:type schema) (not= type (:type schema)))]
(when-not type-changed?
(cond
property
(let [tx-data (->>
(conj
[(outliner-core/block-with-updated-at
[(merge
(outliner-core/block-with-updated-at
{:db/ident db-ident
:block/schema schema})]
:block/schema schema})
properties)]
(update-schema property schema))
(remove nil?))]
(db/transact! repo tx-data {:outliner-op :save-block}))
:else
(let [k-name (or (:block/original-name property) (and property-name (name property-name)))]
(db/transact! repo [(sqlite-util/build-new-property k-name schema {:db-ident db-ident})]
{:outliner-op :new-property}))))
{:outliner-op :new-property}))))))
(defn validate-property-value
[schema value]
@ -253,27 +260,6 @@
(assoc :block/tags [:logseq.class/task]))]
(db/transact! repo [block] {:outliner-op :save-block})))))))))))
(defn <update-property!
[repo property-id {:keys [property-name property-schema properties]}]
(assert (keyword? property-id) (str "property-id " property-id " is not a keyword"))
(when-let [property (db/entity property-id)]
(p/let [type (get-in property [:block/schema :type])
type-changed? (and type (:type property-schema) (not= type (:type property-schema)))
property-values (db-async/<get-block-property-values repo property-id)]
(when (or (not type-changed?)
;; only change type if property hasn't been used yet
(and (not (ldb/built-in? property)) (empty? property-values)))
(let [tx-data (cond-> (merge {:db/ident property-id} properties)
property-name (merge
{:block/original-name property-name})
property-schema (assoc :block/schema
;; a property must have a :type when making schema changes
(merge {:type :default}
property-schema))
true outliner-core/block-with-updated-at)]
(db/transact! repo [tx-data]
{:outliner-op :save-block}))))))
(defn class-add-property!
[repo class-uuid property-id]
(when-let [class (db/entity repo [:block/uuid class-uuid])]