made ledger table updated.

This commit is contained in:
Bryce Covert
2020-08-05 08:07:41 -07:00
parent 0fd8d4a1c1
commit e0222bac48
4 changed files with 86 additions and 167 deletions

View File

@@ -2,7 +2,6 @@
(:require [auto-ap.events :as events]
[auto-ap.forms :as forms]
[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.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.routes :as routes]
@@ -19,7 +18,9 @@
[auto-ap.views.utils :refer [bind-field date->str dispatch-event nf active-when with-user]]
[goog.string :as gstring]
[re-frame.core :as re-frame]
[reagent.core :as reagent]))
[reagent.core :as reagent]
[auto-ap.status :as status]
[vimsical.re-frame.fx.track :as track]))
(re-frame/reg-sub
@@ -27,35 +28,26 @@
(fn [db]
(-> db ::ledger-page)))
(re-frame/reg-sub
::last-params
(fn [db]
(-> db ::last-params)))
(re-frame/reg-sub
::params
:<- [::last-params]
:<- [::subs/client]
:<- [::side-bar/filter-params]
:<- [::table/table-params]
(fn [[last-params client filter-params table-params]]
(let [params (cond-> {}
client (assoc :client-id (:id client))
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))]
(when (not= params last-params)
(re-frame/dispatch [::params-change]))
params)))
(fn [[client filter-params table-params]]
(cond-> {}
client (assoc :client-id (:id client))
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))))
(re-frame/reg-event-fx
::params-change
[with-user (re-frame/inject-cofx ::inject/sub [::params])]
(fn [{:keys [user ::params db]} [_]]
{:db (-> db
(assoc-in [::last-params] params)
(assoc-in [:status :loading] true))
:graphql {:token user
[with-user]
(fn [{:keys [user db]} [_ params]]
{:graphql {:token user
:owns-state {:single ::page}
:query-obj {:venia/queries [[:ledger-page
params
[[:journal-entries [:id
@@ -80,22 +72,29 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
{:db (dissoc db ::last-params ::table/table-params ::side-bar/filters ::ledger-page)}))
{:db (dissoc db ::table/table-params ::side-bar/filters ::ledger-page)
::track/dispose {:id ::params}}))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
{::track/register {:id ::params
:subscription [::params]
:event-fn (fn [params] [::params-change params])}}))
(re-frame/reg-event-db
::received
(fn [db [_ data]]
(-> db
(assoc ::ledger-page (:ledger-page data))
(assoc-in [:status :loading] false))))
(assoc ::ledger-page (:ledger-page data)))))
(defn ledger-content []
(let [current-client @(re-frame/subscribe [::subs/client])]
[:div
[:h1.title "Ledger"]
[table/table {:id :ledger
:ledger-page (re-frame/subscribe [::ledger-page])
:status (re-frame/subscribe [::subs/status])}]
:ledger-page @(re-frame/subscribe [::ledger-page])
:status @(re-frame/subscribe [::status/single ::page])}]
[manual/modal {:import-completed [::manual-import-completed ]}]]))
@@ -103,6 +102,7 @@
(let [user (re-frame/subscribe [::subs/user])]
(reagent/create-class
{:display-name "ledger-page"
:component-did-mount #(re-frame/dispatch [::mounted])
:component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render
(fn []