fixes.
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
[auto-ap.views.components.paginator :refer [paginator]]
|
||||
[auto-ap.views.components.sorter :refer [sorted-column]]
|
||||
[auto-ap.views.pages.ledger.table :as table]
|
||||
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar]]
|
||||
[auto-ap.views.pages.ledger.side-bar :refer [ledger-side-bar] :as side-bar]
|
||||
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
|
||||
|
||||
[auto-ap.utils :refer [replace-by]]
|
||||
@@ -27,18 +27,24 @@
|
||||
|
||||
(re-frame/reg-sub
|
||||
::params
|
||||
(fn [db]
|
||||
(-> db (::params {}))))
|
||||
:<- [::subs/client]
|
||||
:<- [::side-bar/filter-params]
|
||||
:<- [::table/table-params]
|
||||
(fn [[client filter-params table-params]]
|
||||
(cond-> {}
|
||||
client (assoc :client-id (:id client))
|
||||
(seq filter-params) (merge filter-params)
|
||||
(seq table-params) (merge @(re-frame/subscribe [::table/table-params])))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
(fn [cofx [_ params]]
|
||||
{:db (-> (:db cofx)
|
||||
(assoc-in [:status :loading] true)
|
||||
(assoc-in [::params] params))
|
||||
(assoc-in [:status :loading] true))
|
||||
:graphql {:token (-> cofx :db :user)
|
||||
:query-obj {:venia/queries [[:ledger-page
|
||||
(assoc params :client-id (:id @(re-frame/subscribe [::subs/client])))
|
||||
@(re-frame/subscribe [::params])
|
||||
|
||||
[[:journal-entries [:id
|
||||
:source
|
||||
:amount
|
||||
@@ -64,7 +70,7 @@
|
||||
(assoc ::ledger-page (:ledger-page data))
|
||||
(assoc-in [:status :loading] false))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
#_(re-frame/reg-event-db
|
||||
::change-selected-bank-account
|
||||
(fn [db [_ key value]]
|
||||
(let [[key] key
|
||||
@@ -95,6 +101,6 @@
|
||||
|
||||
(defn ledger-page []
|
||||
[side-bar-layout
|
||||
{:side-bar [ledger-side-bar]
|
||||
{:side-bar [ledger-side-bar]
|
||||
:main [ledger-content]}])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user