fix: minor page name sanitization bugs when searching

pull/3822/head
Junyi Du 2022-01-10 15:31:38 +08:00 committed by Tienson Qin
parent ebd8e94c23
commit 44545fe8bd
2 changed files with 4 additions and 4 deletions

View File

@ -199,8 +199,7 @@
:page :page
[:span {:data-page-ref data} [:span {:data-page-ref data}
(when alias (when alias
(let [target-entity (db/get-page alias) (let [target-original-name (model/get-page-original-name alias)]
target-original-name (util/get-page-original-name target-entity)]
[:span.mr-2.text-sm.font-medium.mb-2 (str "Alias -> " target-original-name)])) [:span.mr-2.text-sm.font-medium.mb-2 (str "Alias -> " target-original-name)]))
(search-result-item "Page" (highlight-exact-query data search-q))] (search-result-item "Page" (highlight-exact-query data search-q))]
@ -295,7 +294,8 @@
:search [:div.flex-row.flex.search-item.font-medium :search [:div.flex-row.flex.search-item.font-medium
svg/search svg/search
[:span.ml-2 data]] [:span.ml-2 data]]
:page (search-result-item "Page" data) :page (let [original-name (model/get-page-original-name data)]
(search-result-item "Page" original-name))
nil))}))]) nil))}))])
(rum/defcs search-modal < rum/reactive (rum/defcs search-modal < rum/reactive

View File

@ -167,7 +167,7 @@
(let [pages (->> (db/sub-key-value :recent/pages) (let [pages (->> (db/sub-key-value :recent/pages)
(remove string/blank?) (remove string/blank?)
(filter string?) (filter string?)
(map (fn [page] {:lowercase (string/lower-case page) (map (fn [page] {:lowercase (util/safe-page-name-sanity-lc page)
:page page})) :page page}))
(util/distinct-by :lowercase) (util/distinct-by :lowercase)
(map :page))] (map :page))]