Browse Source

fix: property value names in developer cmd

and in readable-properties fn
Gabriel Horner 1 year ago
parent
commit
fa4b47d16b

+ 7 - 0
deps/db/src/logseq/db/frontend/property.cljs

@@ -220,6 +220,13 @@
   (or (:block/original-name ent)
       (:block/content ent)))
 
+(defn get-property-value-name
+  "Gets a readable name for the property value of a ref type property. Different
+   than closed-value-name as there implementation will likely differ"
+  [ent]
+  (or (:block/original-name ent)
+      (:block/content ent)))
+
 (defn get-closed-value-entity-by-name
   "Given a property, finds one of its closed values by name or nil if none
   found. Works for all closed value types"

+ 4 - 12
src/main/frontend/handler/common/developer.cljs

@@ -6,22 +6,18 @@
             [frontend.handler.notification :as notification]
             [frontend.ui :as ui]
             [frontend.util.page :as page-util]
-            [frontend.handler.db-based.property.util :as db-pu]
             [frontend.format.mldoc :as mldoc]
             [frontend.config :as config]
             [frontend.persist-db :as persist-db]
             [promesa.core :as p]
-            [datascript.impl.entity :as de]))
+            [datascript.impl.entity :as de]
+            [logseq.db.frontend.property :as db-property]))
 
 ;; Fns used between menus and commands
 (defn show-entity-data
   [eid]
   (let [result* (db/pull eid)
         entity (db/entity eid)
-        ;; handles page uuids and closed values w/o knowing type
-        get-uuid-prop-value (fn [v]
-                              (or (db-pu/get-property-name v)
-                                  (:block/content (db/entity [:block/uuid v]))))
         result (cond-> result*
                  (and (seq (:block/properties entity)) (config/db-based-graph? (state/get-current-repo)))
                  (assoc :block.debug/properties
@@ -30,13 +26,9 @@
                                     [k
                                      (cond
                                        (de/entity? v)
-                                       (:block/original-name v)
+                                       (db-property/get-property-value-name v)
                                        (and (set? v) (every? de/entity? v))
-                                       (set (map :block/original-name v))
-                                       (and (set? v) (uuid? (first v)))
-                                       (set (map get-uuid-prop-value v))
-                                       (uuid? v)
-                                       (get-uuid-prop-value v)
+                                       (set (map db-property/get-property-value-name v))
                                        :else
                                        v)]))
                              (into {})))

+ 3 - 8
src/main/frontend/handler/db_based/property/util.cljs

@@ -22,14 +22,9 @@
   [properties]
   (->> properties
        (map (fn [[k v]]
-              (let [prop-ent (db-utils/entity k)
-                    readable-property-val
-                    #(if (seq (:property/closed-values prop-ent)) ; closed values
-                       (when-let [block (db-utils/entity [:block/uuid %])]
-                         (db-property/closed-value-name block))
-                       %)]
+              (let [prop-ent (db-utils/entity k)]
                 [(-> prop-ent :block/original-name keyword)
                 (if (set? v)
-                  (set (map readable-property-val v))
-                  (readable-property-val v))])))
+                  (set (map db-property/get-property-value-name v))
+                  (db-property/get-property-value-name v))])))
        (into {})))