clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: edn import: keep block uuid; remove redundant last block

Browse Source 
fix: json import uuid failure

enhance: improve get-all-referenced-blocks-uuid query
This commit is contained in:
Junyi Du
2022-06-09 22:16:13 +08:00
parent 0cdacc35e2
commit 47f5c650f9
6 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/frontend/handler/editor.cljs
View File

@@ -943,7 +943,8 @@
(save-block-if-changed! block new-content))))))))
(defn set-blocks-id!
"Persist block uuid to file if not exists"
"Persist block uuid to file if the uuid is valid, and it's not persisted in file.
Accepts a list of uuids."
[block-ids]
(let [block-ids (remove nil? block-ids)
col (map (fn [block-id]
@@ -1958,7 +1959,8 @@
(edit-last-block-after-inserted! result))))))
(defn- block-tree->blocks
[tree-vec format]
"keep-uuid? - maintain the existing :uuid in tree vec"
[tree-vec format keep-uuid?]
(->> (outliner-core/tree-vec-flatten tree-vec)
(map (fn [block]
(let [content (:content block)
@@ -1967,15 +1969,18 @@
(property/insert-properties format content props))
ast (mldoc/->edn content* (gp-mldoc/default-config format))
blocks (block/extract-blocks ast content* true format)
fst-block (first blocks)]
fst-block (first blocks)
fst-block (if (and keep-uuid? (uuid? (:uuid block)))
(assoc fst-block :block/uuid (:uuid block))
fst-block)]
(assert fst-block "fst-block shouldn't be nil")
(assoc fst-block :block/level (:block/level block)))))))
(defn insert-block-tree
"`tree-vec`: a vector of blocks.
A block element: {:content :properties :children [block-1, block-2, ...]}"
[tree-vec format {:keys [target-block] :as opts}]
(let [blocks (block-tree->blocks tree-vec format)
[tree-vec format {:keys [target-block keep-uuid?] :as opts}]
(let [blocks (block-tree->blocks tree-vec format keep-uuid?)
page-id (:db/id (:block/page target-block))
blocks (gp-block/with-parent-and-left page-id blocks)]
(paste-blocks