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

fix: replace refs with content when deleting a object tag

pull/11433/head
Tienson Qin 2024-07-22 21:25:02 +08:00
parent cada6e2d9b
commit d84639a655
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/db/src/logseq/db/frontend/content.cljs vendored
View File

@ -17,17 +17,21 @@
common-util/uuid-pattern
")")))
(defn block-id->special-id-ref
[id]
(str page-ref/left-brackets
page-ref-special-chars
id
page-ref/right-brackets))
(defn special-id-ref->page
"Convert special id ref backs to page name using refs."
[content refs]
(reduce
(fn [content ref]
(if (:block/name ref)
(if (:block/title ref)
(-> content
(string/replace (str page-ref/left-brackets
page-ref-special-chars
(:block/uuid ref)
page-ref/right-brackets)
(string/replace (block-id->special-id-ref (:block/uuid ref))
(:block/title ref))
(string/replace
(str "#" page-ref-special-chars

14
deps/db/src/logseq/db/frontend/delete_blocks.cljs vendored
View File

@ -2,10 +2,12 @@
"Delete refs/macros when deleting blocks"
(:require [logseq.common.util :as common-util]
[logseq.common.util.block-ref :as block-ref]
[logseq.common.util.page-ref :as page-ref]
[datascript.core :as d]
[clojure.string :as string]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.db.sqlite.util :as sqlite-util]))
[logseq.db.sqlite.util :as sqlite-util]
[logseq.db.frontend.content :as db-content]))
(defn- build-retracted-tx [retracted-blocks]
(->> (for [block retracted-blocks]
@ -13,10 +15,18 @@
(mapcat (fn [ref]
(let [id (:db/id ref)
block-content (:block/title block)
new-content (some-> (:block/title ref)
new-content (some-> (:block/raw-title ref)
(string/replace (re-pattern (common-util/format "(?i){{embed \\(\\(%s\\)\\)\\s?}}" (str (:block/uuid block))))
block-content)
(string/replace (block-ref/->block-ref (str (:block/uuid block)))
block-content)
;; Replace object
(string/replace (db-content/block-id->special-id-ref (:block/uuid block))
block-content)
;; Replace non-object
(string/replace (page-ref/->page-ref (str (:block/uuid block)))
block-content))
tx (cond->
[[:db/retract (:db/id ref) :block/refs (:db/id block)]