notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Should improve perf somewhat

Browse Source
This commit is contained in:
Bryce Covert
2020-05-02 08:09:26 -07:00
parent 532e35bb50
commit 5643b98b13
6 changed files with 116 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/cljs/auto_ap/views/pages/ledger.cljs
View File

@@ -2,6 +2,7 @@
(:require [auto-ap.events :as events] (:require [auto-ap.events :as events]
[auto-ap.forms :as forms] [auto-ap.forms :as forms]
[auto-ap.subs :as subs] [auto-ap.subs :as subs]
[vimsical.re-frame.cofx.inject :as inject]
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]] [auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]] [auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.routes :as routes] [auto-ap.routes :as routes]
@@ -15,7 +16,7 @@
[auto-ap.utils :refer [replace-by]] [auto-ap.utils :refer [replace-by]]
[auto-ap.views.pages.transactions.manual :as manual] [auto-ap.views.pages.transactions.manual :as manual]
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf active-when]] [auto-ap.views.utils :refer [bind-field date->str dispatch-event nf active-when with-user]]
[goog.string :as gstring] [goog.string :as gstring]
[re-frame.core :as re-frame] [re-frame.core :as re-frame]
[reagent.core :as reagent])) [reagent.core :as reagent]))
@@ -26,52 +27,62 @@
(fn [db] (fn [db]
(-> db ::ledger-page))) (-> db ::ledger-page)))
(re-frame/reg-sub
::last-params
(fn [db]
(-> db ::last-params)))
(re-frame/reg-sub (re-frame/reg-sub
::params ::params
:<- [::last-params]
:<- [::subs/client] :<- [::subs/client]
:<- [::side-bar/filter-params] :<- [::side-bar/filter-params]
:<- [::table/table-params] :<- [::table/table-params]
(fn [[client filter-params table-params]] (fn [[last-params client filter-params table-params]]
(cond-> {} (println "HERE?")
client (assoc :client-id (:id client)) (let [params (cond-> {}
(seq filter-params) (merge filter-params) client (assoc :client-id (:id client))
(seq table-params) (merge @(re-frame/subscribe [::table/table-params]))))) (seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))]
(when (not= params last-params)
(re-frame/dispatch [::params-change]))
params)))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::params-change ::params-change
(fn [cofx [_]] [with-user (re-frame/inject-cofx ::inject/sub [::params])]
(let [new-params @(re-frame/subscribe [::params])] (fn [{:keys [user ::params db]} [_]]
(when (not= (::last-params (:db cofx)) new-params) (println "execute")
{:db (-> (:db cofx) {:db (-> db
(assoc-in [::last-params] new-params) (assoc-in [::last-params] params)
(assoc-in [:status :loading] true)) (assoc-in [:status :loading] true))
:graphql {:token (-> cofx :db :user) :graphql {:token user
:query-obj {:venia/queries [[:ledger-page :query-obj {:venia/queries [[:ledger-page
new-params params
[[:journal-entries [:id [[:journal-entries [:id
:source :source
:amount :amount
:note :note
:cleared-against :cleared-against
[:vendor [:vendor
[:name :id]] [:name :id]]
[:client [:client
[:name :id]] [:name :id]]
[:line-items [:line-items
[:id :debit :credit :location [:id :debit :credit :location
[:account [:id]]]] [:account [:id]]]]
:date]] :date]]
:total :total
:start :start
:end]]]} :end]]]}
:on-success [::received]}})))) :on-success [::received]}}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::unmounted ::unmounted
(fn [{:keys [db]} _] (fn [{:keys [db]} _]
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::ledger-page)})) {:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::ledger-page)}))
(re-frame/reg-event-db (re-frame/reg-event-db
::received ::received
(fn [db [_ data]] (fn [db [_ data]]
@@ -85,21 +96,19 @@
[:div [:div
[:h1.title "Ledger"] [:h1.title "Ledger"]
[table/table {:id :ledger [table/table {:id :ledger
:params (re-frame/subscribe [::params])
:ledger-page (re-frame/subscribe [::ledger-page]) :ledger-page (re-frame/subscribe [::ledger-page])
:status (re-frame/subscribe [::subs/status]) :status (re-frame/subscribe [::subs/status])}]
:on-params-change (fn [params]
(re-frame/dispatch [::params-change params]))}]
[manual/modal {:import-completed [::manual-import-completed ]}]])) [manual/modal {:import-completed [::manual-import-completed ]}]]))
(defn ledger-page [] (defn ledger-page []
(reagent/create-class (reagent/create-class
{:display-name "ledger-page" {:display-name "ledger-page"
:component-did-mount #(re-frame/dispatch [::params-change {}])
:component-will-unmount #(re-frame/dispatch [::unmounted]) :component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render :reagent-render
(fn [] (fn []
[side-bar-layout (let [params @(re-frame/subscribe [::params])]
{:side-bar [ledger-side-bar] [side-bar-layout
:main [ledger-content]}])})) {:side-bar [ledger-side-bar]
:main [ledger-content]}]))}))

3
src/cljs/auto_ap/views/pages/ledger/side_bar.cljs
View File

@@ -35,8 +35,7 @@
[which val] (if (= 3 (count params)) [which val] (if (= 3 (count params))
[(into [a] b) c] [(into [a] b) c]
[[a] b])] [[a] b])]
{:dispatch [:auto-ap.views.pages.ledger/params-change] {:db (assoc-in db (into [::filters] which) val)})))
:db (assoc-in db (into [::filters] which) val)})))
(defn ledger-side-bar [] (defn ledger-side-bar []
(let [ap @(re-frame/subscribe [::subs/active-page]) (let [ap @(re-frame/subscribe [::subs/active-page])

3
src/cljs/auto_ap/views/pages/ledger/table.cljs
View File

@@ -16,8 +16,7 @@
::params-changed ::params-changed
[(re-frame/path [::table-params])] [(re-frame/path [::table-params])]
(fn [{table-params :db} [_ params :as z]] (fn [{table-params :db} [_ params :as z]]
{:db (merge table-params params) {:db (merge table-params params)}))
:dispatch [:auto-ap.views.pages.ledger/params-change]}))
(defn table [{:keys [id ledger-page status vendors check-boxes checked on-check-changed expense-event]}] (defn table [{:keys [id ledger-page status vendors check-boxes checked on-check-changed expense-event]}]
(fn [{:keys [id ledger-page status vendors checked status?] (fn [{:keys [id ledger-page status vendors checked status?]

22
src/cljs/auto_ap/views/pages/payments.cljs
View File

@@ -28,17 +28,25 @@
(fn [db] (fn [db]
(-> db ::payment-page))) (-> db ::payment-page)))
(re-frame/reg-sub
::last-params
(fn [db]
(-> db ::last-params)))
(re-frame/reg-sub (re-frame/reg-sub
::params ::params
:<- [::last-params]
:<- [::subs/client] :<- [::subs/client]
:<- [::side-bar/filter-params] :<- [::side-bar/filter-params]
:<- [::table/table-params] :<- [::table/table-params]
(fn [[client filter-params table-params]] (fn [[last-params client filter-params table-params]]
(re-frame/dispatch [::params-change]) (let [params (cond-> {}
(cond-> {} client (assoc :client-id (:id client))
client (assoc :client-id (:id client)) (seq filter-params) (merge filter-params)
(seq filter-params) (merge filter-params) (seq table-params) (merge table-params))]
(seq table-params) (merge @(re-frame/subscribe [::table/table-params]))))) (when (not= last-params params)
(re-frame/dispatch [::params-change]))
params)))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::params-change ::params-change
@@ -104,11 +112,9 @@
:status (re-frame/subscribe [::subs/status]) :status (re-frame/subscribe [::subs/status])
:void-event [::void-check]}]])) :void-event [::void-check]}]]))
(defn payments-page [] (defn payments-page []
(reagent/create-class (reagent/create-class
{:display-name "payments-page" {:display-name "payments-page"
:component-did-mount #(re-frame/dispatch [::params-change {}])
:component-will-unmount #(re-frame/dispatch [::unmounted]) :component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render :reagent-render
(fn [] (fn []

44
src/cljs/auto_ap/views/pages/transactions.cljs
View File

@@ -48,34 +48,41 @@
(fn [db] (fn [db]
(-> db ::transaction-page))) (-> db ::transaction-page)))
(re-frame/reg-sub
::last-params
(fn [db]
(::last-params db)))
(re-frame/reg-sub (re-frame/reg-sub
::params ::params
:<- [::last-params]
:<- [::subs/client] :<- [::subs/client]
:<- [::side-bar/filter-params] :<- [::side-bar/filter-params]
:<- [::table/table-params] :<- [::table/table-params]
(fn [[client filter-params table-params]] (fn [[last-params client filter-params table-params]]
(re-frame/dispatch [::params-change]) (let [params (cond-> {}
(cond-> {} client (assoc :client-id (:id client))
client (assoc :client-id (:id client)) (seq filter-params) (merge filter-params)
(seq filter-params) (merge filter-params) (seq table-params) (merge table-params))]
(seq table-params) (merge @(re-frame/subscribe [::table/table-params]))))) (when (not= last-params params)
(re-frame/dispatch [::params-change]))
params)))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::params-change ::params-change
[with-user (re-frame/inject-cofx ::inject/sub [::params])] [with-user (re-frame/inject-cofx ::inject/sub [::params])]
(fn [{:keys [user db ] ::keys [params]} _] (fn [{:keys [user db ] ::keys [params]} _]
(when (not= (::last-params db) params) {:db (-> db
{:db (-> db (assoc-in [:status :loading] true)
(assoc-in [:status :loading] true) (assoc-in [::last-params] params))
(assoc-in [::last-params] params)) :graphql {:token user
:graphql {:token user :query-obj {:venia/queries [[:transaction_page
:query-obj {:venia/queries [[:transaction_page params
params [[:transactions transaction-read]
[[:transactions transaction-read] :total
:total :start
:start :end]]]}
:end]]]} :on-success [::received]}}))
:on-success [::received]}})))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::unapprove-all ::unapprove-all
@@ -148,7 +155,6 @@
(defn transactions-page [{:keys [approval-status]}] (defn transactions-page [{:keys [approval-status]}]
(reagent/create-class (reagent/create-class
{:display-name "transaction-page" {:display-name "transaction-page"
:component-did-mount #(re-frame/dispatch [::params-change {}])
:component-will-unmount #(re-frame/dispatch [::unmounted]) :component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render :reagent-render
(fn [] (fn []

44
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -65,17 +65,26 @@
(fn [db] (fn [db]
(-> db ::check-results))) (-> db ::check-results)))
(re-frame/reg-sub
::last-params
(fn [db]
(-> db ::last-params)))
(re-frame/reg-sub (re-frame/reg-sub
::params ::params
:<- [::last-params]
:<- [::subs/client] :<- [::subs/client]
:<- [::side-bar/filter-params] :<- [::side-bar/filter-params]
:<- [::table/table-params] :<- [::table/table-params]
(fn [[client filter-params table-params]] (fn [[last-params client filter-params table-params]]
(re-frame/dispatch [::params-change]) (let [params (cond-> {:import-status "imported"}
(cond-> {:import-status "imported"} client (assoc :client-id (:id client))
client (assoc :client-id (:id client)) (seq filter-params) (merge filter-params)
(seq filter-params) (merge filter-params) (seq table-params) (merge table-params))]
(seq table-params) (merge @(re-frame/subscribe [::table/table-params]))))) (when (not= params last-params)
(println "DISPATCHING" params last-params)
(re-frame/dispatch [::params-change]))
params)))
(re-frame/reg-event-db (re-frame/reg-event-db
::invoice-updated ::invoice-updated
@@ -84,20 +93,19 @@
[::invoice-page :invoices] [::invoice-page :invoices]
replace-by :id (assoc invoice :class "live-added")))) replace-by :id (assoc invoice :class "live-added"))))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::params-change ::params-change
[with-user (re-frame/inject-cofx ::inject/sub [::params])] [with-user (re-frame/inject-cofx ::inject/sub [::params])]
(fn [{::keys [params] :as cofx} _] (fn [{::keys [params] :as cofx} _]
(when (not= params (::last-params (:db cofx))) (println "params" params)
{:db (-> (:db cofx) {:db (-> (:db cofx)
(assoc-in [:status :loading] true) (assoc-in [:status :loading] true)
(assoc-in [::last-params] params)) (assoc-in [::last-params] params))
:graphql {:token (-> cofx :db :user) :graphql {:token (-> cofx :db :user)
:query-obj (table/query params ) :query-obj (table/query params )
:on-success [::received] :on-success [::received]
:on-error [::events/page-failed]}}))) :on-error [::events/page-failed]}}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::unmounted ::unmounted
@@ -622,13 +630,11 @@
:checked checked :checked checked
:on-check-changed (fn [which invoice] :on-check-changed (fn [which invoice]
(re-frame/dispatch [::toggle-check which invoice])) (re-frame/dispatch [::toggle-check which invoice]))
:expense-event [::expense-accounts-dialog/change-expense-accounts]}] :expense-event [::expense-accounts-dialog/change-expense-accounts]}]]))
]))
(defn unpaid-invoices-page [params] (defn unpaid-invoices-page [params]
(r/create-class (r/create-class
{:display-name "invoices-page" {:display-name "invoices-page"
:component-did-mount #(re-frame/dispatch [::params-change])
:component-will-unmount #(re-frame/dispatch [::unmounted]) :component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render :reagent-render
(fn [] (fn []