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

enhance: validate export EDN for most export types

Browse Source 
and error explicitly if they can't import. This is much better
for the user so they aren't finding out later that EDN is invalid
on import. Added both to the export menu and to export EDN commands that
aren't graph-wide. Related to
https://github.com/logseq/db-test/issues/549
This commit is contained in:
Gabriel Horner
2025-12-02 13:50:09 -05:00
parent 748690b16d
commit 134dc0f2a8
4 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/frontend/components/export.cljs
View File

@@ -20,7 +20,8 @@
[logseq.db :as ldb]
[logseq.shui.ui :as shui]
[promesa.core :as p]
[rum.core :as rum]))
[rum.core :as rum]
[logseq.db.sqlite.export :as sqlite-export]))
(rum/defcs auto-backup < rum/reactive
{:init (fn [state]
@@ -177,9 +178,18 @@
:selected-nodes
{:node-ids (mapv #(vector :block/uuid %) root-block-uuids-or-page-uuid)}
{})]
(state/<invoke-db-worker :thread-api/export-edn
(state/get-current-repo)
(merge {:export-type export-type} export-args))))
(p/let [export-edn (state/<invoke-db-worker :thread-api/export-edn
(state/get-current-repo)
(merge {:export-type export-type} export-args))]
;; Don't validate :block for now b/c it requires more setup
(if (#{:page :selected-nodes} export-type)
(if-let [error (:error (sqlite-export/validate-export export-edn))]
(do
(js/console.log "Invalid export EDN:")
(pprint/pprint export-edn)
{:export-edn-error error})
export-edn)
export-edn))))
(defn- get-zoom-level
[page-uuid]
@@ -283,7 +293,8 @@
:on-click #(do (reset! *export-block-type :edn)
(p/let [result (<export-edn-helper top-level-uuids export-type)
pull-data (with-out-str (pprint/pprint result))]
(when-not (:export-edn-error result)
(if (:export-edn-error result)
(notification/show! (:export-edn-error result) :error)
(reset! *content pull-data))))))])
(if (= :png tp)
[:div.flex.items-center.justify-center.relative