Просмотр исходного кода

fix: graphs with existing Library page are imported

incorrectly and merged with new built-in page when :property-classes
option is used
Gabriel Horner 7 месяцев назад
Родитель
Сommit
471889729e

+ 4 - 1
deps/graph-parser/src/logseq/graph_parser/exporter.cljs

@@ -424,9 +424,12 @@
 (def all-built-in-names
   "All built-in properties and classes as a set of keywords"
   (set/union all-built-in-property-file-ids
+             ;; This should list all new pages introduced with db graph
              (set (->> db-class/built-in-classes
                        vals
-                       (map #(-> % :title string/lower-case keyword))))))
+                       (map :title)
+                       (concat ["Library"])
+                       (map #(-> % string/lower-case keyword))))))
 
 (def file-built-in-property-names
   "File-graph built-in property names that are supported. Expressed as set of keywords"

+ 2 - 1
deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs

@@ -591,7 +591,8 @@
   (p/let [file-graph-dir "test/resources/exporter-test-graph"
           files (mapv #(node-path/join file-graph-dir %)
                       ["journals/2024_02_23.md" "pages/url.md" "pages/Whiteboard___Tool.md"
-                       "pages/Whiteboard___Arrow_head_toggle.md"])
+                       "pages/Whiteboard___Arrow_head_toggle.md"
+                       "pages/Library.md"])
           conn (db-test/create-conn)
           _ (import-files-to-db files conn {:property-classes ["type"]})
           _ (@#'gp-exporter/export-class-properties conn conn)]

+ 1 - 0
deps/graph-parser/test/resources/exporter-test-graph/pages/Library.md

@@ -0,0 +1 @@
+type:: [[Class]]