clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 03:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: history replace

Browse Source
This commit is contained in:
Konstantinos Kaloutas
2023-03-08 14:34:31 +02:00
committed by Gabriel Horner
parent a345f434e3
commit acd41f71dd
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/frontend/handler/whiteboard.cljs
View File

@@ -83,7 +83,7 @@
(util/time-ms))}))
(defn- compute-tx
[^js app ^js tl-page new-id-nonces db-id-nonces page-name]
[^js app ^js tl-page new-id-nonces db-id-nonces page-name transact?]
(let [assets (js->clj-keywordize (.getCleanUpAssets app))
new-shapes (.-shapes tl-page)
shapes-index (map #(gobj/get % "id") new-shapes)
@@ -119,7 +119,7 @@
(map #(shape->block % page-name))
(map with-timestamps))
:delete-blocks deleted-shapes-tx
:metadata {:whiteboard/transact? true
:metadata {:whiteboard/transact? transact?
:data {:page-name page-name
:deleted-shapes deleted-shapes
:new-shapes created-shapes
@@ -127,7 +127,7 @@
:prev-changed-blocks prev-changed-blocks}}}))
(defonce *last-shapes-nonce (atom {}))
(defn transact-tldr-delta! [page-name ^js app]
(defn transact-tldr-delta! [page-name ^js app replace?]
(let [tl-page ^js (second (first (.-pages app)))
shapes (.-shapes ^js tl-page)
new-id-nonces (set (map (fn [shape]
@@ -139,7 +139,7 @@
(set (->> (model/get-whiteboard-id-nonces repo page-name)
(map #(update % :id str)))))
{:keys [page-block upserted-blocks delete-blocks metadata]}
(compute-tx app tl-page new-id-nonces db-id-nonces page-name)
(compute-tx app tl-page new-id-nonces db-id-nonces page-name (not replace?))
tx-data (concat delete-blocks [page-block] upserted-blocks)
new-shapes (get-in metadata [:data :new-shapes])
metadata' (cond