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: graph parser tests

Browse Source
This commit is contained in:
Tienson Qin
2024-12-10 15:53:56 +08:00
parent 87caca8c68
commit a2a08ef647
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1246,6 +1246,25 @@
[(:block/name %) (date-time-util/journal-day->ms journal-day)]))
(into {})))
(defn- remove-alias-if-equals-to-page-name
[pages]
(let [[page alias] (some (fn [page] (when (and (:block/namespace page) (:block/alias page))
[page (:block/alias page)])) pages)
page-last-part (when page (common-util/page-name-sanity-lc (ns-util/get-last-part (:block/name page))))
self-alias? (and (seq alias) (some #(= page-last-part (:block/name %)) alias))]
(if self-alias?
(->> pages
(remove (fn [p]
(= (:block/name p) page-last-part)))
(map (fn [p]
(if (= (:block/uuid p) (:block/uuid page))
(-> page
(dissoc :block/alias)
(update :block/properties dissoc :alias)
(update :block/properties-text-values dissoc :alias))
p))))
pages)))
(defn add-file-to-db-graph
"Parse file and save parsed data to the given db graph. Options available:
@@ -1263,11 +1282,12 @@
:as *options}]
(let [options (assoc *options :notify-user notify-user :log-fn log-fn)
{:keys [pages blocks]} (extract-pages-and-blocks @conn file content options)
pages' (remove-alias-if-equals-to-page-name pages)
tx-options (merge (build-tx-options options)
{:journal-created-ats (build-journal-created-ats pages)})
{:journal-created-ats (build-journal-created-ats pages')})
old-properties (keys @(get-in options [:import-state :property-schemas]))
;; Build page and block txs
{:keys [pages-tx page-properties-tx per-file-state existing-pages]} (build-pages-tx conn pages blocks tx-options)
{:keys [pages-tx page-properties-tx per-file-state existing-pages]} (build-pages-tx conn pages' blocks tx-options)
whiteboard-pages (->> pages-tx
;; support old and new whiteboards
(filter ldb/whiteboard?)