other changes to make app more predictable.

This commit is contained in:
Bryce Covert
2020-05-02 07:12:26 -07:00
parent e162f06c75
commit 532e35bb50
14 changed files with 85 additions and 85 deletions

View File

@@ -5,6 +5,7 @@
[reagent.core :as reagent]
[goog.string :as gstring]
[clojure.spec.alpha :as s]
[vimsical.re-frame.cofx.inject :as inject]
[auto-ap.views.components.sorter :refer [sorted-column]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
@@ -33,6 +34,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)
@@ -40,24 +42,23 @@
(re-frame/reg-event-fx
::params-change
[with-user]
(fn [{:keys [user db]}[_ ]]
(let [new-params @(re-frame/subscribe [::params])]
(when (not= (::last-params db) new-params)
{:db (-> db
(assoc-in [:status :loading] true)
(assoc-in [::last-params] new-params))
:graphql {:token user
:query-obj {:venia/queries [[:payment_page
@(re-frame/subscribe [::params])
[[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]]
:date [:vendor [:name :id]] [:client [:name :id]]]]
:total
:start
:end]]]}
:on-success [::received]
:on-error [::events/page-failed]}}))))
[with-user (re-frame/inject-cofx ::inject/sub [::params])]
(fn [{:keys [user db ::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 [[:payment_page
params
[[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]]
:date [:vendor [:name :id]] [:client [:name :id]]]]
:total
:start
:end]]]}
:on-success [::received]
:on-error [::events/page-failed]}})))
(re-frame/reg-event-fx
::void-check
@@ -95,7 +96,7 @@
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::payment-page)}))
(defn content []
(let [current-client @(re-frame/subscribe [::subs/client])]
(let [params @(re-frame/subscribe [::params])]
[:div
[:h1.title "Payments"]
[table/table {:id :payments