Browse Source

fix: page delete

Tienson Qin 1 year ago
parent
commit
2a262d4766

+ 4 - 4
src/main/frontend/worker/handler/page.cljs

@@ -231,11 +231,11 @@
               tx-data (concat truncate-blocks-tx-data delete-page-tx delete-file-tx)]
 
           (ldb/transact! conn tx-data
-                         (cond-> {:outliner-op :delete-page :persist-op? persist-op?}
+                         (cond-> {:outliner-op :delete-page
+                                  :deleted-page page-name
+                                  :persist-op? persist-op?}
                            file-path
-                           (assoc
-                            :deleted-page page-name
-                            :file-path file-path)))
+                           (assoc :file-path file-path)))
 
           (when (fn? ok-handler) (ok-handler))
 

+ 5 - 2
src/main/frontend/worker/pipeline.cljs

@@ -93,8 +93,11 @@
                                     {:db/id db-id
                                      :block/tx-id tx-id})) updated-blocks)
                            (remove nil?))))
-            tx-report' (ldb/transact! conn replace-tx {:replace? true
-                                                       :pipeline-replace? true})
+            tx-report' (or
+                        (when (seq replace-tx)
+                          (ldb/transact! conn replace-tx {:replace? true
+                                                          :pipeline-replace? true}))
+                        tx-report)
             full-tx-data (concat (:tx-data tx-report) fix-tx-data (:tx-data tx-report'))
             final-tx-report (assoc tx-report' :tx-data full-tx-data)
             affected-query-keys (when-not (:importing? context)