fix: namespace References are not always rendering

close #3620
pull/3634/head
Tienson Qin 2021-12-28 15:08:14 +08:00
parent 8d03ebf862
commit 2e54aabc3e
2 changed files with 5 additions and 5 deletions

View File

@ -19,10 +19,10 @@
parent-routes (db-model/get-page-namespace-routes repo page) parent-routes (db-model/get-page-namespace-routes repo page)
pages (->> (concat namespace-pages parent-routes) pages (->> (concat namespace-pages parent-routes)
(distinct) (distinct)
(sort-by :block/name)
(map (fn [page] (map (fn [page]
(or (:block/original-name page) (:block/name page)))) (or (:block/original-name page) (:block/name page))))
(map #(string/split % "/")) (map #(string/split % "/")))
(sort))
page-namespace (db-model/get-page-namespace repo page) page-namespace (db-model/get-page-namespace repo page)
page-namespace (util/get-page-original-name page-namespace)] page-namespace (util/get-page-original-name page-namespace)]
(cond (cond
@ -55,5 +55,5 @@
{} {}
page)))) page))))
(interpose [:span.mx-2.opacity-30 "/"]))])] (interpose [:span.mx-2.opacity-30 "/"]))])]
{:default-collapsed? true {:default-collapsed? false
:title-trigger? true})]))) :title-trigger? true})])))

View File

@ -118,8 +118,8 @@
(let [id (second ref)] (let [id (second ref)]
(or (contains? block-ids id) (or (contains? block-ids id)
(db/entity [:block/uuid id]))) (db/entity [:block/uuid id])))
(and (map? ref) (contains? ref :block/journal?)) :else
(db/entity [:block/name (ref :block/name)]))) refs))] true)) refs))]
(map (fn [item] (map (fn [item]
(update item :block/refs keep-block-ref-f)) (update item :block/refs keep-block-ref-f))
data))) data)))