Make db/query react aliases consistent

These namespaces had conflicting aliases which led to confusing reading

.clj-kondo/config.edn

@@ -14,7 +14,9 @@
              datascript.transit dt
              datascript.db ddb
              lambdaisland.glogi log
-             frontend.db.query-dsl query-dsl}}}
+             frontend.db.query-dsl query-dsl
+             frontend.db.react react
+             frontend.db.query-react query-react}}}
 
  :hooks {:analyze-call {rum.core/defc hooks.rum/defc
                          rum.core/defcs hooks.rum/defcs}}

src/main/frontend/db/query_custom.cljs

@@ -1,7 +1,7 @@
 (ns frontend.db.query-custom
   "Handles executing custom queries a.k.a. advanced queries"
   (:require [frontend.state :as state]
-            [frontend.db.query-react :as react]
+            [frontend.db.query-react :as query-react]
             [frontend.db.query-dsl :as query-dsl]
             [frontend.db.model :as model]
             [frontend.db.rules :as rules]
@@ -47,4 +47,4 @@
      (if (or (list? (:query query'))
              (not= :find (first (:query query')))) ; dsl query
        (query-dsl/custom-query repo query' query-opts)
-       (react/react-query repo (add-rules-to-query query') query-opts)))))
+       (query-react/react-query repo (add-rules-to-query query') query-opts)))))

src/main/frontend/db/query_dsl.cljs

@@ -8,7 +8,7 @@
             [clojure.walk :as walk]
             [frontend.date :as date]
             [frontend.db.model :as model]
-            [frontend.db.query-react :as react]
+            [frontend.db.query-react :as query-react]
             [frontend.db.utils :as db-utils]
             [frontend.db.rules :as rules]
             [frontend.template :as template]
@@ -586,7 +586,7 @@ Some bindings in this fn:
                                      identity)
                     transform-fn (comp sort-by random-samples)]
                 (try
-                  (react/react-query repo
+                  (query-react/react-query repo
                                      {:query query
                                       :query-string query-string
                                       :rules rules}
@@ -605,7 +605,7 @@ Some bindings in this fn:
     (let [query-string (template/resolve-dynamic-template! (pr-str (:query query-m)))
           {:keys [query sort-by blocks? rules]} (parse query-string)]
       (when-let [query (query-wrapper query blocks?)]
-        (react/react-query repo
+        (query-react/react-query repo
                            (merge
                             query-m
                             {:query query

src/main/frontend/db_mixins.cljs

@@ -1,13 +1,13 @@
 (ns frontend.db-mixins
-  (:require [frontend.db.react :as db]))
+  (:require [frontend.db.react :as react]))
 
 (def query
   {:wrap-render
    (fn [render-fn]
      (fn [state]
-       (binding [db/*query-component* (:rum/react-component state)]
+       (binding [react/*query-component* (:rum/react-component state)]
          (render-fn state))))
    :will-unmount
    (fn [state]
-     (db/remove-query-component! (:rum/react-component state))
+     (react/remove-query-component! (:rum/react-component state))
      state)})

src/main/frontend/extensions/srs.cljs

@@ -1,7 +1,7 @@
 (ns frontend.extensions.srs
   (:require [frontend.template :as template]
             [frontend.db.query-dsl :as query-dsl]
-            [frontend.db.query-react :as react]
+            [frontend.db.query-react :as query-react]
             [frontend.util :as util]
             [frontend.util.property :as property]
             [frontend.util.drawer :as drawer]
@@ -259,7 +259,7 @@
                             query
                             [query]))]
        (when-let [query (query-dsl/query-wrapper query* true)]
-         (let [result (react/react-query repo
+         (let [result (query-react/react-query repo
                                          {:query query
                                           :rules (or rules [])}
                                          (merge

src/main/frontend/handler.cljs

@@ -7,7 +7,7 @@
             [frontend.db :as db]
             [frontend.db-schema :as db-schema]
             [frontend.db.conn :as conn]
-            [frontend.db.react :as db-react]
+            [frontend.db.react :as react]
             [frontend.error :as error]
             [frontend.handler.command-palette :as command-palette]
             [frontend.handler.common :as common-handler]
@@ -221,7 +221,7 @@
        (notification/show! "Sorry, it seems that your browser doesn't support IndexedDB, we recommend to use latest Chrome(Chromium) or Firefox(Non-private mode)." :error false)
        (state/set-indexedb-support! false)))
 
-    (db-react/run-custom-queries-when-idle!)
+    (react/run-custom-queries-when-idle!)
 
     (events/run!)
 

src/test/frontend/db/query_custom_test.cljs

@@ -2,14 +2,14 @@
   (:require [cljs.test :refer [deftest is use-fixtures]]
             [frontend.test.helper :as test-helper :refer [load-test-files]]
             [frontend.db.query-custom :as query-custom]
-            [frontend.db.react :as db-react]))
+            [frontend.db.react :as react]))
 
 (use-fixtures :each {:before test-helper/start-test-db!
                      :after test-helper/destroy-test-db!})
 
 (defn- custom-query
   [query]
-  (db-react/clear-query-state!)
+  (react/clear-query-state!)
   (when-let [result (query-custom/custom-query test-helper/test-db query {})]
     (map first (deref result))))
 

src/test/frontend/test/fixtures.cljs

@@ -3,7 +3,7 @@
             [frontend.config :as config]
             [frontend.db-schema :as db-schema]
             [frontend.db.conn :as conn]
-            [frontend.db.react :as db-react]
+            [frontend.db.react :as react]
             [frontend.state :as state]))
 
 (defn load-test-env
@@ -12,9 +12,9 @@
 
 (defn react-components
   [f]
-  (reset! db-react/query-state {})
+  (reset! react/query-state {})
   (let [r (f)]
-    (reset! db-react/query-state {})
+    (reset! react/query-state {})
     r))
 
 (defn- reset-datascript