fix: db graph queries no longer need collapse logic

{{query is no longer used with query changes starting in #11540

src/main/frontend/handler/editor.cljs

@@ -9,7 +9,6 @@
             [frontend.db :as db]
             [frontend.db.async :as db-async]
             [frontend.db.model :as db-model]
-            [frontend.db.query-dsl :as query-dsl]
             [frontend.db.utils :as db-utils]
             [frontend.diff :as diff]
             [frontend.extensions.pdf.utils :as pdf-utils]
@@ -3349,24 +3348,6 @@
            (mldoc/block-with-title? first-elem-type))
          true)))
 
-(defn- valid-dsl-query-block?
-  "Whether block has a valid dsl query."
-  [block repo]
-  (if (config/db-based-graph? repo)
-    (when-let [title (:block/title block)]
-      (string/includes? title "{{query"))
-    (->> (:block/macros (db/entity (:db/id block)))
-         (some (fn [macro]
-                 (let [properties (:block/properties macro)
-                       macro-name (:logseq.macro-name properties)
-                       macro-arguments (:logseq.macro-arguments properties)]
-                   (when-let [query-body (and (= "query" macro-name) (not-empty (string/join " " macro-arguments)))]
-                     (seq (:query
-                           (try
-                             (query-dsl/parse-query query-body)
-                             (catch :default _e
-                               nil)))))))))))
-
 (defn- valid-custom-query-block?
   "Whether block has a valid custom query."
   [block]
@@ -3394,7 +3375,7 @@
                                   (remove db-property/db-attribute-properties)
                                   (remove #(outliner-property/property-with-other-position? (db/entity %))))]
            (or (if ignore-children? false (db-model/has-children? block-id))
-               (valid-dsl-query-block? block repo)
+               (and (not db-based?) (file-editor-handler/valid-dsl-query-block? block))
                (valid-custom-query-block? block)
                (and db-based? (ldb/class-instance? (db/entity :logseq.class/Query) block))
                (and db-based?

src/main/frontend/handler/file_based/editor.cljs

@@ -5,6 +5,7 @@
             [frontend.commands :as commands]
             [frontend.format.block :as block]
             [frontend.db :as db]
+            [frontend.db.query-dsl :as query-dsl]
             [frontend.format.mldoc :as mldoc]
             [frontend.state :as state]
             [frontend.modules.outliner.op :as outliner-op]
@@ -211,3 +212,18 @@
                  block-ids)
         col (remove nil? col)]
     (file-property-handler/batch-set-block-property-aux! col)))
+
+(defn valid-dsl-query-block?
+  "Whether block has a valid dsl query."
+  [block]
+  (->> (:block/macros (db/entity (:db/id block)))
+       (some (fn [macro]
+               (let [properties (:block/properties macro)
+                     macro-name (:logseq.macro-name properties)
+                     macro-arguments (:logseq.macro-arguments properties)]
+                 (when-let [query-body (and (= "query" macro-name) (not-empty (string/join " " macro-arguments)))]
+                   (seq (:query
+                         (try
+                           (query-dsl/parse-query query-body)
+                           (catch :default _e
+                             nil))))))))))