other changes to make app more predictable.
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
[auto-ap.subs :as subs]
|
||||
[bidi.bidi :as bidi]
|
||||
[auto-ap.routes :as routes]
|
||||
[vimsical.re-frame.cofx.inject :as inject]
|
||||
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
|
||||
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
|
||||
[auto-ap.views.components.number-filter :refer [number-filter]]
|
||||
@@ -19,7 +20,7 @@
|
||||
[auto-ap.views.pages.transactions.common :refer [transaction-read]]
|
||||
[auto-ap.utils :refer [replace-by]]
|
||||
[auto-ap.views.pages.transactions.manual :as manual]
|
||||
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker active-when]]
|
||||
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker active-when with-user]]
|
||||
[goog.string :as gstring]
|
||||
[re-frame.core :as re-frame]
|
||||
[auto-ap.views.pages.transactions.side-bar :as side-bar]
|
||||
@@ -53,6 +54,7 @@
|
||||
:<- [::side-bar/filter-params]
|
||||
:<- [::table/table-params]
|
||||
(fn [[client filter-params table-params]]
|
||||
(re-frame/dispatch [::params-change])
|
||||
(cond-> {}
|
||||
client (assoc :client-id (:id client))
|
||||
(seq filter-params) (merge filter-params)
|
||||
@@ -60,20 +62,20 @@
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
(fn [cofx [_ params]]
|
||||
(let [new-params @(re-frame/subscribe [::params])]
|
||||
(when (not= (::last-params (:db cofx)) new-params)
|
||||
{:db (-> (:db cofx)
|
||||
(assoc-in [:status :loading] true)
|
||||
(assoc-in [::last-params] new-params))
|
||||
:graphql {:token (-> cofx :db :user)
|
||||
:query-obj {:venia/queries [[:transaction_page
|
||||
new-params
|
||||
[[:transactions transaction-read]
|
||||
:total
|
||||
:start
|
||||
:end]]]}
|
||||
:on-success [::received]}}))))
|
||||
[with-user (re-frame/inject-cofx ::inject/sub [::params])]
|
||||
(fn [{:keys [user db ] ::keys [params]} _]
|
||||
(when (not= (::last-params db) params)
|
||||
{:db (-> db
|
||||
(assoc-in [:status :loading] true)
|
||||
(assoc-in [::last-params] params))
|
||||
:graphql {:token user
|
||||
:query-obj {:venia/queries [[:transaction_page
|
||||
params
|
||||
[[:transactions transaction-read]
|
||||
:total
|
||||
:start
|
||||
:end]]]}
|
||||
:on-success [::received]}})))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::unapprove-all
|
||||
@@ -151,6 +153,7 @@
|
||||
:reagent-render
|
||||
(fn []
|
||||
(let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])
|
||||
params @(re-frame/subscribe [::params]) ;; Keep to make sure it doens'nt get disposed
|
||||
ap @(re-frame/subscribe [::subs/active-page])]
|
||||
[side-bar-layout
|
||||
{:side-bar [side-bar/side-bar]
|
||||
|
||||
Reference in New Issue
Block a user