Browse Source

Rules must be present for srs since it uses the same dsl-query helper

Closes #4497 and #4500
Gabriel Horner 3 years ago
parent
commit
2286ef71bc
2 changed files with 10 additions and 10 deletions
  1. 2 4
      src/main/frontend/db/query_dsl.cljs
  2. 8 6
      src/main/frontend/extensions/srs.cljs

+ 2 - 4
src/main/frontend/db/query_dsl.cljs

@@ -524,7 +524,7 @@ Some bindings in this fn:
               form
 
               (string? result)
-              result
+              (string/trim result)
 
               :else
               (let [result (when (seq result)
@@ -571,7 +571,6 @@ Some bindings in this fn:
     (let [query-string (template/resolve-dynamic-template! query-string)]
       (when-not (string/blank? query-string)
         (let [{:keys [query rules sort-by blocks? sample] :as result} (parse query-string)
-              query (if (string? query) (string/trim query) query)
               full-text-query? (and (string? result)
                                     (not (string/includes? result " ")))]
           (if full-text-query?
@@ -604,8 +603,7 @@ Some bindings in this fn:
   [repo query-m query-opts]
   (when (seq (:query query-m))
     (let [query-string (template/resolve-dynamic-template! (pr-str (:query query-m)))
-          {:keys [query sort-by blocks? rules]} (parse query-string)
-          query (if (string? query) (string/trim query) query)]
+          {:keys [query sort-by blocks? rules]} (parse query-string)]
       (when-let [query (query-wrapper query blocks?)]
         (react/react-query repo
                            (merge

+ 8 - 6
src/main/frontend/extensions/srs.cljs

@@ -253,21 +253,23 @@
                        :or {use-cache? true}}]
    (when (string? query-string)
      (let [query-string (template/resolve-dynamic-template! query-string)
-           {:keys [query sort-by]} (query-dsl/parse query-string)
+           {:keys [query sort-by rules]} (query-dsl/parse query-string)
            query* (concat [['?b :block/refs [:block/name card-hash-tag]]]
                           (if (coll? (first query))
                             query
                             [query]))]
        (when-let [query (query-dsl/query-wrapper query* true)]
          (let [result (react/react-query repo
-                                         {:query query}
+                                         {:query query
+                                          :rules (or rules [])
+                                          :throw-exception true}
                                          (merge
                                           {:use-cache? use-cache?}
                                           (cond->
-                                            (when sort-by
-                                              {:transform-fn sort-by})
-                                            disable-reactive?
-                                            (assoc :disable-reactive? true))))]
+                                           (when sort-by
+                                             {:transform-fn sort-by})
+                                           disable-reactive?
+                                           (assoc :disable-reactive? true))))]
            (when result
              (flatten (util/react result)))))))))