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

fix: db import of blocks with namespaced tags are only tagged

Browse Source 
with child leaf tag. Fixes two tags issue reported in
https://github.com/logseq/db-test/issues/7#issuecomment-2463162620
This commit is contained in:
Gabriel Horner
2024-11-18 16:49:21 -05:00
parent bb98ec1004
commit 3469dfd65d
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
deps/graph-parser/src/logseq/graph_parser/exporter.cljs vendored
View File

@@ -144,6 +144,21 @@
[k]
(and (qualified-keyword? k) (= "logseq.class" (namespace k))))
(defn- convert-tags-to-classes
"Handles converting tags to classes and any post processing of it e.g.
cleaning :block/tags when a block is tagged with a namespace page"
[tags db per-file-state user-options all-idents]
;; vec needed is needed so that tags are built in order
(let [tags' (vec (keep #(if (logseq-class-ident? %)
%
(convert-tag-to-class db % per-file-state user-options all-idents))
tags))]
;; Only associate leaf child tag with block as other tags are only used to define tag parents.
;; This assumes that extract/extract returns :block/tags with their leaf child first and then its parents
(if-let [child-tag (and (some :block/namespace tags) (first tags'))]
[child-tag]
tags')))
(defn- update-page-tags
[block db user-options per-file-state all-idents]
(if (seq (:block/tags block))
@@ -156,12 +171,7 @@
set)]
(cond-> block
true
(update :block/tags
(fn [tags]
;; Don't lazy load as this needs to build before the page does
(vec (keep #(if (logseq-class-ident? %)
%
(convert-tag-to-class db % per-file-state user-options all-idents)) tags))))
(update :block/tags convert-tags-to-classes db per-file-state user-options all-idents)
(seq page-tags)
(merge {:logseq.property/page-tags page-tags})))
block))
@@ -205,12 +215,7 @@
(remove convert-tag?')
(map #(add-uuid-to-page-map % (:page-names-to-uuids per-file-state)))))
true
(update :block/tags
(fn [tags]
(vec (keep #(if (logseq-class-ident? %)
%
(convert-tag-to-class db % per-file-state user-options all-idents))
tags))))))
(update :block/tags convert-tags-to-classes db per-file-state user-options all-idents)))
block)]
block'))