From dae7c66f23be822a35009303a718f878e857139c Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Tue, 23 Nov 2021 11:57:50 +0800 Subject: [PATCH] fix: page blanks when saving a block which has block refs --- src/main/frontend/db/model.cljs | 3 ++- src/main/frontend/modules/outliner/core.cljs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs index 320fbd955..f9b339674 100644 --- a/src/main/frontend/db/model.cljs +++ b/src/main/frontend/db/model.cljs @@ -1442,7 +1442,8 @@ [{:keys [repo pages empty-ref-f] :or {repo (state/get-current-repo) empty-ref-f (fn [page] (zero? (count (:block/_refs page))))}}] - (let [pages (or pages (get-pages repo)) + (let [pages (->> (or pages (get-pages repo)) + (remove nil?)) built-in-pages (set (map string/lower-case default-db/built-in-pages-names)) orphaned-pages (->> (map diff --git a/src/main/frontend/modules/outliner/core.cljs b/src/main/frontend/modules/outliner/core.cljs index af23da429..b9c4082fd 100644 --- a/src/main/frontend/modules/outliner/core.cljs +++ b/src/main/frontend/modules/outliner/core.cljs @@ -90,7 +90,8 @@ old-pages (->> (map :db/id old-refs) (db-model/get-entities-by-ids) (remove (fn [e] (contains? new-refs (:block/name e)))) - (map :block/name)) + (map :block/name) + (remove nil?)) orphaned-pages (db-model/get-orphaned-pages {:pages old-pages :empty-ref-f (fn [page] (let [refs (:block/_refs page)]