Browse Source

fix: unify block/name sanity

Junyi Du 3 years ago
parent
commit
8bc20e76b8

+ 1 - 1
src/main/frontend/components/block.cljs

@@ -469,7 +469,7 @@
   [{:keys [html-export? redirect-page-name label children contents-page? preview?] :as config} page]
   (when-let [page-name-in-block (:block/name page)]
     (let [page-name-in-block (util/remove-boundary-slashes page-name-in-block)
-          page-name (util/page-query-sanity page-name-in-block)
+          page-name (util/page-name-sanity-lc page-name-in-block)
           page-entity (db/entity [:block/name page-name])
           redirect-page-name (or (and (= :org (state/get-preferred-format))
                                       (:org-mode/insert-file-link? (state/get-config))

+ 2 - 2
src/main/frontend/handler/extract.cljs

@@ -118,7 +118,7 @@
                                                    tags (if (string? tags) [tags] tags)
                                                    tags (remove string/blank? tags)]
                                                (swap! ref-tags set/union (set tags))
-                                               (map (fn [tag] {:block/name (util/page-name-sanity (string/lower-case tag))
+                                               (map (fn [tag] {:block/name (util/page-name-sanity-lc tag)
                                                               :block/original-name tag})
                                                  tags)))))
           pages (->> (concat
@@ -127,7 +127,7 @@
                       (map
                         (fn [page]
                           {:block/original-name page
-                           :block/name (util/page-name-sanity (string/lower-case page))})
+                           :block/name (util/page-name-sanity-lc page)})
                         @ref-tags))
                      ;; remove block references
                      (remove vector?))

+ 2 - 2
src/main/frontend/util.cljc

@@ -1148,10 +1148,10 @@
       (string/replace #"[\\#|%]+" "_")
       (normalize)))
 
-(defn page-query-sanity
+(defn page-name-sanity-lc
   "Sanitize the query string for a page"
   [s]
-  (normalize (string/lower-case s)))
+  (page-name-sanity (string/lower-case s)))
 
 (defn get-page-original-name
   [page]