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

fix: typing marker creates tasks e.g. DOING

pull/11177/head
Gabriel Horner 2024-04-18 14:13:58 -04:00
parent a30f2bd650
commit 0372cb6e62
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deps/outliner/src/logseq/outliner/core.cljs vendored
View File

@ -20,6 +20,7 @@
[cljs.pprint :as pprint]
[logseq.common.marker :as common-marker]
[logseq.db.frontend.content :as db-content]
[logseq.db.frontend.property :as db-property]
[logseq.db.sqlite.create-graph :as sqlite-create-graph]))
(def ^:private block-map
@ -302,20 +303,22 @@
;; TODO: don't parse marker and deprecate typing marker to set status
(defn- db-marker-handle
[conn m]
[conn block-entity txs-state m]
(or
(let [marker (:block/marker m)
property (d/entity @conn :logseq.task/status)
matched-status-id (when marker
(->> (get-in property [:block/schema :values])
(some (fn [id]
(let [value-e (d/entity @conn [:block/uuid id])
value (get-in value-e [:block/schema :value])]
(when (= (string/lower-case marker) (string/lower-case value))
id))))))]
(some (fn [id]
(let [value-e (d/entity @conn [:block/uuid id])
value (get-in value-e [:block/schema :value])]
(when (= (string/lower-case marker) (string/lower-case value))
(:db/id value-e)))))))]
(when-let [pair (and marker (db-property/get-pair-e block-entity :logseq.task/status))]
(swap! txs-state into [[:db/retractEntity (:db/id pair)]]))
(cond-> m
matched-status-id
(assoc (:db/ident property) matched-status-id)
(update :block/properties conj (sqlite-util/build-property-pair (:db/ident property) matched-status-id))
matched-status-id
(update :block/content (fn [content]
@ -397,7 +400,7 @@
block-entity (d/entity db eid)
m (cond->> m
db-based?
(db-marker-handle conn))
(db-marker-handle conn block-entity txs-state))
m (if db-based?
(update m :block/tags (fn [tags]
(concat (keep :db/id (:block/tags block-entity))