fixed warnings.
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
(ns auto-ap.views.pages.data-page
|
||||
(:require [auto-ap.status :as status]
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.utils :refer [deep-merge replace-by]]
|
||||
[re-frame.core :as re-frame]))
|
||||
(:require
|
||||
[auto-ap.status :as status]
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.utils :refer [deep-merge replace-by]]
|
||||
[auto-ap.views.utils :as u]
|
||||
[re-frame.core :as re-frame]))
|
||||
|
||||
(re-frame/reg-sub
|
||||
::checked
|
||||
@@ -68,7 +70,7 @@
|
||||
(re-frame/subscribe [::table-params id])
|
||||
(re-frame/subscribe [::additional-params id])])
|
||||
(fn [[client filters table-params additional-params]]
|
||||
(let [query-params (auto-ap.views.utils/query-params)]
|
||||
(let [query-params (u/query-params)]
|
||||
(cond-> {}
|
||||
client (assoc :client-id (:id client))
|
||||
(seq query-params) (merge query-params)
|
||||
@@ -80,7 +82,7 @@
|
||||
::received
|
||||
(fn [{:keys [db]} [_ id data]]
|
||||
(let [uri-params (dissoc @(re-frame/subscribe [::params id]) :client-id)
|
||||
current-uri-params (auto-ap.views.utils/query-params)]
|
||||
current-uri-params (u/query-params)]
|
||||
(cond-> {:db (-> db (assoc-in [::data id] data)
|
||||
(assoc :query-params uri-params))}
|
||||
(not= uri-params current-uri-params) (assoc :set-uri-params uri-params)))))
|
||||
@@ -130,13 +132,13 @@
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::table-params-changed
|
||||
(fn [{:keys [db]} [_ which params :as z]]
|
||||
(fn [{:keys [db]} [_ which params]]
|
||||
{:db (update-in db [::table-params which] merge params)}))
|
||||
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::additional-params-changed
|
||||
(fn [{:keys [db]} [_ which params :as z]]
|
||||
(fn [{:keys [db]} [_ which params]]
|
||||
{:db (-> db
|
||||
(update-in [::additional-params which] merge params)
|
||||
(assoc-in [::table-params which :start] 0))}))
|
||||
@@ -158,7 +160,7 @@
|
||||
::filter
|
||||
(fn [[_ id]]
|
||||
[(re-frame/subscribe [::filters id])])
|
||||
(fn [[filters] [_ id which]]
|
||||
(fn [[filters] [_ _ which]]
|
||||
(get filters which)))
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user