Explorar o código

fix query builder not starting

Also fix hidden properties showing up in property dropdown of query
builder
Gabriel Horner %!s(int64=2) %!d(string=hai) anos
pai
achega
11991a0919

+ 2 - 1
.clj-kondo/config.edn

@@ -78,9 +78,10 @@
              frontend.handler.notification notification
              frontend.handler.page page-handler
              frontend.handler.file-based.property file-property
-             frontend.handler.file-based.property.util property
+             frontend.handler.file-based.property.util property-util
              frontend.handler.plugin plugin-handler
              frontend.handler.plugin-config plugin-config-handler
+             frontend.handler.property.util pu
              frontend.handler.query.builder query-builder
              frontend.handler.repo repo-handler
              frontend.handler.repo-config repo-config-handler

+ 1 - 1
src/main/frontend/components/query/builder.cljs

@@ -39,7 +39,7 @@
    (component-select/select (merge
                              {:items items
                               :on-chosen on-chosen
-                              :extract-fn nil}
+                              :extract-fn identity}
                              options))))
 
 (defn append-tree!

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

@@ -1191,10 +1191,11 @@ independent of format as format specific heading characters are stripped"
     (map #(:block/original-name (db-utils/entity %)) ids)))
 
 (defn get-all-properties
+  "Returns a seq of property name strings"
   []
   (if (react/db-graph?)
     (db-based-get-all-properties)
-    (file-based-get-all-properties)))
+    (map name (file-based-get-all-properties))))
 
 (defn- property-value-for-refs-and-text
   "Given a property value's refs and full text, determines the value to

+ 7 - 8
src/main/frontend/search.cljs

@@ -16,7 +16,9 @@
             [promesa.core :as p]
             [clojure.set :as set]
             [datascript.core :as d]
-            [frontend.handler.file-based.property.util :as property-util]))
+            [frontend.handler.file-based.property.util :as property-util]
+            [frontend.config :as config]
+            [logseq.graph-parser.property :as gp-property]))
 
 (defn get-engine
   [repo]
@@ -183,13 +185,10 @@
 
 (defn get-all-properties
   []
-  (->> (db-model/get-all-properties)
-       (remove (property-util/hidden-properties))
-       ;; Complete full keyword except the ':'
-       (map (fn [property]
-              (if (keyword? property)
-                (subs (str property) 1)
-                property)))))
+  (let [hidden-props (if (config/db-based-graph? (state/get-current-repo))
+                       (set (map name gp-property/db-hidden-built-in-properties))
+                       (set (map name (property-util/hidden-properties))))]
+    (remove hidden-props (db-model/get-all-properties))))
 
 (defn property-search
   ([q]