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: imported tags aren't both a Page and a Tag

Browse Source 
imported tags should behave like app
This commit is contained in:
Gabriel Horner
2024-12-10 17:13:03 -05:00
committed by Tienson Qin
parent afab95f8fc
commit 596700c6a3
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1266,6 +1266,20 @@
p))))
pages)))
(defn- merge-pages-and-classes
"If a new tag is also in pages-tx, ensure that it only has one tag by removing
:logseq.class/Page from pages-tx"
[classes-tx pages-tx']
(if (seq classes-tx)
(let [class-map (into {} (map (juxt :block/uuid :block/title) classes-tx))]
(mapv (fn [page]
(if (some-> (get class-map (:block/uuid page))
(= (:block/title page)))
(update page :block/tags (fn [tags] (vec (remove #(= % :logseq.class/Page) tags))))
page))
pages-tx'))
pages-tx'))
(defn add-file-to-db-graph
"Parse file and save parsed data to the given db graph. Options available:
@@ -1308,8 +1322,9 @@
main-props-tx-report (d/transact! conn property-pages-tx {::new-graph? true})
classes-tx @(:classes-tx tx-options)
pages-tx'' (merge-pages-and-classes classes-tx pages-tx')
;; Build indices
pages-index (->> (map #(select-keys % [:block/uuid]) pages-tx')
pages-index (->> (map #(select-keys % [:block/uuid]) pages-tx'')
(concat (map #(select-keys % [:block/uuid]) classes-tx))
distinct)
block-ids (map (fn [block] {:block/uuid (:block/uuid block)}) blocks-tx)
@@ -1322,7 +1337,7 @@
blocks-index (set/union (set block-ids) (set block-refs-ids))
;; Order matters. pages-index and blocks-index needs to come before their corresponding tx for
;; uuids to be valid. Also upstream-properties-tx comes after blocks-tx to possibly override blocks
tx (concat whiteboard-pages pages-index page-properties-tx property-page-properties-tx pages-tx' classes-tx blocks-index blocks-tx)
tx (concat whiteboard-pages pages-index page-properties-tx property-page-properties-tx pages-tx'' classes-tx blocks-index blocks-tx)
tx' (common-util/fast-remove-nils tx)
;; _ (prn :tx-counts (map count (vector whiteboard-pages pages-index page-properties-tx property-page-properties-tx pages-tx' classes-tx blocks-index blocks-tx)))
;; _ (when (not (seq whiteboard-pages)) (cljs.pprint/pprint {#_:property-pages-tx #_property-pages-tx :tx tx'}))