Sfoglia il codice sorgente

fix: fn get-all-properties

rcmerci 2 anni fa
parent
commit
5fbcf70d32
1 ha cambiato i file con 7 aggiunte e 2 eliminazioni
  1. 7 2
      src/main/frontend/db/model.cljs

+ 7 - 2
src/main/frontend/db/model.cljs

@@ -1175,15 +1175,20 @@ independent of format as format specific heading characters are stripped"
 
 
 (defn get-all-properties
 (defn get-all-properties
   []
   []
-  (let [properties (d/q
+  (let [db (conn/get-db)
+        properties (d/q
                     '[:find [?p ...]
                     '[:find [?p ...]
                       :where
                       :where
                       [_ :block/properties ?p]]
                       [_ :block/properties ?p]]
-                    (conn/get-db))
+                    db)
         properties (remove (fn [m] (empty? m)) properties)]
         properties (remove (fn [m] (empty? m)) properties)]
     (->> (map keys properties)
     (->> (map keys properties)
          (apply concat)
          (apply concat)
          distinct
          distinct
+         (map (fn [k]
+                (if (and (string? k) (util/uuid-string? k))
+                  (keyword (:block/name (d/entity db [:block/uuid (uuid k)])))
+                  k)))
          sort)))
          sort)))
 
 
 (defn- property-value-for-refs-and-text
 (defn- property-value-for-refs-and-text