fix: remove last {{query reference seen in db graphs

Also fix return val of previous commit

deps/common/src/logseq/common/util.cljs

@@ -233,7 +233,7 @@
      (reader/read-string opts content)
      (catch :default e
        (log/error :parse/read-string-failed e)
-       {}))))
+       nil))))
 
 (defn safe-read-map-string
   "Reads an edn map string and returns {} if it fails to parse"

src/main/frontend/components/query.cljs

@@ -168,9 +168,8 @@
               :result result
               :group-by-page? (query-result/get-group-by-page q {:table? table?})}]
     (if (:custom-query? config)
-      [:code (if dsl-query?
-               (util/format "{{query %s}}" query)
-               "{{query hidden}}")]
+      ;; Don't display recursive results when query blocks are a query result
+      [:code (if dsl-query? (str "Results for " (pr-str query)) "Advanced query results")]
       (when-not (and built-in? (empty? result))
         [:div.custom-query (get config :attr {})
          (when (and (not db-based?) (not built-in?))

src/main/frontend/db/query_dsl.cljs

@@ -646,7 +646,7 @@ Some bindings in this fn:
     {:block/_parent ...}])
 
 (defn query
-  "Runs a dsl query with query as a string. Primary use is from '{{query }}'"
+  "Runs a dsl query with query as a string. Primary use is from '/query' or '{{query }}'"
   ([repo query-string]
    (query repo query-string {}))
   ([repo query-string query-opts]
@@ -705,8 +705,6 @@ Some bindings in this fn:
   (string/includes? query' (str "(" filter-name)))
 
 (comment
-  ;; {{query (and (page-property foo bar) [[hello]])}}
-
   (query "(and [[foo]] [[bar]])")
 
   (query "(or [[foo]] [[bar]])")