From 870f9e1e2e77a2e595960bd3dd911557cc5f277c Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sun, 20 Mar 2022 21:56:45 +0800 Subject: [PATCH] fix: remove nil from pull-many --- src/main/frontend/handler/block.cljs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/frontend/handler/block.cljs b/src/main/frontend/handler/block.cljs index 7d08ae84e..4459056d7 100644 --- a/src/main/frontend/handler/block.cljs +++ b/src/main/frontend/handler/block.cljs @@ -27,14 +27,15 @@ (defn filter-blocks [repo ref-blocks filters group-by-page?] - (let [ref-pages (->> (if group-by-page? - (mapcat last ref-blocks) - ref-blocks) - (mapcat (fn [b] (get-block-refs-with-children b))) - (concat (when group-by-page? (map first ref-blocks))) - (distinct) - (map :db/id) - (db/pull-many repo '[:db/id :block/name])) + (let [ref-pages-ids (->> (if group-by-page? + (mapcat last ref-blocks) + ref-blocks) + (mapcat (fn [b] (get-block-refs-with-children b))) + (concat (when group-by-page? (map first ref-blocks))) + (distinct) + (map :db/id) + (remove nil?)) + ref-pages (db/pull-many repo '[:db/id :block/name] ref-pages-ids) ref-pages (zipmap (map :block/name ref-pages) (map :db/id ref-pages)) exclude-ids (->> (map (fn [page] (get ref-pages page)) (get filters false)) (remove nil?)