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

fix: don't fix pages for whiteboards and hidden pages

Browse Source
This commit is contained in:
Tienson Qin
2024-01-09 16:04:03 +08:00
parent 879ae09fa2
commit 9f66e6d7e7
7 changed files with 41 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/frontend/db/conn.cljs
View File

@@ -90,16 +90,12 @@
(defn start!
([repo]
(start! repo {}))
([repo {:keys [listen-handler db-graph?]}]
([repo {:keys [listen-handler]}]
(let [db-name (datascript-db repo)
db-conn (ldb/start-conn :schema (get-schema repo) :create-default-pages? false)]
(swap! conns assoc db-name db-conn)
(when listen-handler
(listen-handler repo))
(when db-graph?
(transact! db-name [(kv :db/type "db")])
(transact! db-name [(kv :schema/version db-schema/version)]))
(ldb/create-default-pages! db-conn {:db-graph? db-graph?}))))
(listen-handler repo)))))
(defn destroy-all!
[]

3
src/main/frontend/handler/db_based/property.cljs
View File

@@ -738,6 +738,7 @@
page (get-property-hidden-page property)
page-tx (when-not (e/entity? page) page)
page-id (:block/uuid page)
values' (remove string/blank? values)
closed-value-blocks (map (fn [value]
(db-property-util/build-closed-value-block
(db/new-block-id)
@@ -745,7 +746,7 @@
[:block/uuid page-id]
property
{}))
(remove string/blank? values))
values')
value->block-id (zipmap
(map #(get-in % [:block/schema :value]) closed-value-blocks)
(map :block/uuid closed-value-blocks))

1
src/main/frontend/handler/draw.cljs
View File

@@ -29,7 +29,6 @@
(->
(p/do!
(create-draws-directory! repo)
(fs/write-file! repo repo-dir path data nil)
(db/transact! repo
[{:file/path path
:block/name (util/page-name-sanity-lc file)

27
src/main/frontend/worker/db/fix.cljs
View File

@@ -158,15 +158,18 @@
replace-tx? false}
:as _opts}]
(let [db @conn
transact-opts (if replace-tx? {:replace? true} {})
*fix-tx-data (atom [])]
(when fix-parent-left?
(loop-fix-conflicts conn page-id transact-opts *fix-tx-data))
(when fix-broken-chain?
(let [db' @conn
parent-left->es' (build-parent-left->es db page-id)
fix-broken-chain-tx (fix-broken-chain db' parent-left->es')]
(when (seq fix-broken-chain-tx)
(let [tx-data (:tx-data (ldb/transact! conn fix-broken-chain-tx transact-opts))]
(swap! *fix-tx-data (fn [old-data] (concat old-data tx-data)))))))
@*fix-tx-data))
page (d/entity db page-id)]
(when-not (or (ldb/whiteboard-page? db page)
(ldb/hidden-page? page))
(let [transact-opts (if replace-tx? {:replace? true} {})
*fix-tx-data (atom [])]
(when fix-parent-left?
(loop-fix-conflicts conn page-id transact-opts *fix-tx-data))
(when fix-broken-chain?
(let [db' @conn
parent-left->es' (build-parent-left->es db page-id)
fix-broken-chain-tx (fix-broken-chain db' parent-left->es')]
(when (seq fix-broken-chain-tx)
(let [tx-data (:tx-data (ldb/transact! conn fix-broken-chain-tx transact-opts))]
(swap! *fix-tx-data (fn [old-data] (concat old-data tx-data)))))))
@*fix-tx-data))))