From 2e54aabc3e87300766ffeb884a46a3873efb0cc6 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Tue, 28 Dec 2021 15:08:14 +0800 Subject: [PATCH] fix: namespace References are not always rendering close #3620 --- src/main/frontend/components/hierarchy.cljs | 6 +++--- src/main/frontend/handler/file.cljs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/frontend/components/hierarchy.cljs b/src/main/frontend/components/hierarchy.cljs index 020a74a27..1b3902501 100644 --- a/src/main/frontend/components/hierarchy.cljs +++ b/src/main/frontend/components/hierarchy.cljs @@ -19,10 +19,10 @@ parent-routes (db-model/get-page-namespace-routes repo page) pages (->> (concat namespace-pages parent-routes) (distinct) + (sort-by :block/name) (map (fn [page] (or (:block/original-name page) (:block/name page)))) - (map #(string/split % "/")) - (sort)) + (map #(string/split % "/"))) page-namespace (db-model/get-page-namespace repo page) page-namespace (util/get-page-original-name page-namespace)] (cond @@ -55,5 +55,5 @@ {} page)))) (interpose [:span.mx-2.opacity-30 "/"]))])] - {:default-collapsed? true + {:default-collapsed? false :title-trigger? true})]))) diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs index 8e10d6f2d..950befb22 100644 --- a/src/main/frontend/handler/file.cljs +++ b/src/main/frontend/handler/file.cljs @@ -118,8 +118,8 @@ (let [id (second ref)] (or (contains? block-ids id) (db/entity [:block/uuid id]))) - (and (map? ref) (contains? ref :block/journal?)) - (db/entity [:block/name (ref :block/name)]))) refs))] + :else + true)) refs))] (map (fn [item] (update item :block/refs keep-block-ref-f)) data)))