Browse Source

fix: hls page name in page ref

Junyi Du 2 years ago
parent
commit
07fb4e64c0

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

@@ -58,6 +58,7 @@
             [frontend.template :as template]
             [frontend.ui :as ui]
             [frontend.util :as util]
+            [frontend.extensions.pdf.utils :as pdf-utils]
             [frontend.util.clock :as clock]
             [frontend.util.drawer :as drawer]
             [frontend.util.property :as property]
@@ -599,12 +600,16 @@
          (let [original-name (util/get-page-original-name page-entity)
                s (cond untitled?
                        (t :untitled)
+                       
+                       ;; The page-name-in-block generated by the auto-complete is not page-name-sanitized
+                       (string/starts-with? page-name "hls__")
+                       (pdf-utils/fix-local-asset-pagename page-name)
 
                        (not= (util/safe-page-name-sanity-lc original-name) page-name-in-block)
                        page-name-in-block ;; page-name-in-block might be overrided (legacy))
 
                        :else
-                       (pdf-assets/human-page-name original-name))
+                       (util/trim-safe page-name))
                _ (when-not page-entity (js/console.warn "page-inner's page-entity is nil, given page-name: " page-name
                                                         " page-name-in-block: " page-name-in-block))]
            (if tag? (str "#" s) s))))]))

+ 0 - 8
src/main/frontend/extensions/pdf/assets.cljs

@@ -298,11 +298,3 @@
 
          (ui/icon "maximize")]]
        [:img {:src asset-path}]])))
-
-(defn human-page-name
-  [page-name]
-  (cond
-    (string/starts-with? page-name "hls__")
-    (pdf-utils/fix-local-asset-pagename page-name)
-
-    :else (util/trim-safe page-name)))