Bläddra i källkod

fix: get-page-alias-names takes page id instead of page name

Related to LOG-3180
Tienson Qin 1 år sedan
förälder
incheckning
de6ce64fba

+ 3 - 1
src/main/frontend/components/file_based/hierarchy.cljs

@@ -16,7 +16,9 @@
   [page]
   (when-let [page (or (text/get-nested-page-name page) page)]
     (let [repo (state/get-current-repo)
-          aliases (db/get-page-alias-names repo page)
+          page-entity (db/get-page page)
+          aliases (when-let [page-id (:db/id page-entity)]
+                    (db/get-page-alias-names repo page-id))
           all-page-names (conj aliases page)]
       (when-let [page (or (first (filter text/namespace-page? all-page-names))
                           (when (:block/_namespace (db/entity [:block/name (util/page-name-sanity-lc page)]))

+ 4 - 0
src/main/frontend/db/utils.cljs

@@ -25,6 +25,10 @@
   ([eid]
    (entity (state/get-current-repo) eid))
   ([repo-or-db eid]
+   (assert (or (number? eid)
+               (sequential? eid)
+               (keyword? eid))
+           (str "Invalid entity eid: " eid))
    (when eid
      (when-let [db (if (string? repo-or-db)
                    ;; repo

+ 2 - 3
src/main/frontend/handler/file_based/property/util.cljs

@@ -208,8 +208,7 @@
   "Adds aliases to a page when a page has aliases and is also an alias of other pages"
   [properties page-id]
   (let [repo (state/get-current-repo)
-        aliases (db/get-page-alias-names repo
-                                         (:block/name (db/pull page-id)))]
+        aliases (db/get-page-alias-names repo page-id)]
     (if (seq aliases)
       (if (:alias properties)
         (update properties :alias (fn [c]
@@ -234,4 +233,4 @@
     (if (seq properties-order)
       (keep (fn [k] (when (contains? properties k) [k (get properties k)]))
             (distinct properties-order))
-      properties*)))
+      properties*)))