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

Unapproving a collection works

Browse Source
This commit is contained in:
Bryce Covert
2020-03-30 08:18:28 -07:00
parent add1dc6fcb
commit 86ed52f44c
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -166,8 +166,7 @@
(defn unapprove [ids] (defn unapprove [ids]
(doseq [x (partition-all 1000 ids)] (doseq [x (partition-all 1000 ids)]
@(d/transact (d/connect uri) @(d/transact (d/connect uri)
(doto (mapv (fn [i] (mapv (fn [i]
{:db/id i {:db/id i
:transaction/approval-status :transaction-approval-status/unapproved}) :transaction/approval-status :transaction-approval-status/unapproved})
x) x))))
println))))

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

@@ -34,7 +34,7 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::manual-import-completed ::manual-import-completed
(fn [{:keys [db]} [_ {:keys [imported errors]}]] (fn [{:keys [db]} [_ {:keys [imported errors]}]]
{:dispatch [::params-change {}] {:dispatch [::params-change (::params db)]
:db (-> db :db (-> db
(assoc-in [::notification :message] (str "Successfully imported " imported " transactions")) (assoc-in [::notification :message] (str "Successfully imported " imported " transactions"))
(assoc-in [::notification :errors] errors))})) (assoc-in [::notification :errors] errors))}))
@@ -65,13 +65,25 @@
:end]]]} :end]]]}
:on-success [::received]}})) :on-success [::received]}}))
(re-frame/reg-event-fx
::transactions-mounted
(fn [{:keys [db]} [_ params]]
(let [already-mounted? (and (db ::params)
(db ::transaction-page))
params-changed? (not= (db ::params)
(update db ::params merge params))]
(if (and already-mounted? (not params-changed?))
{}
{:dispatch [::params-change (merge (::params db ) params) ]}))))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::unapprove-all ::unapprove-all
(fn [cofx [_ params]] (fn [cofx [_ params]]
{:db (-> (:db cofx) {:db (-> (:db cofx)
(assoc-in [:status :loading] true) (assoc-in [:status :loading] true))
(assoc-in [::params] params))
:graphql {:token (-> cofx :db :user) :graphql {:token (-> cofx :db :user)
:query-obj :query-obj
{:venia/operation {:operation/type :mutation {:venia/operation {:operation/type :mutation
@@ -90,7 +102,8 @@
::received ::received
(fn [db [_ data]] (fn [db [_ data]]
(-> db (-> db
(update ::transaction-page merge (first (:transaction-page data))) (update ::transaction-page merge (or (first (:transaction-page data))
(first (:unapprove-transactions data))))
(assoc-in [:status :loading] false)))) (assoc-in [:status :loading] false))))
(re-frame/reg-event-db (re-frame/reg-event-db
@@ -192,7 +205,7 @@
:on-params-change (fn [params] :on-params-change (fn [params]
(re-frame/dispatch [::params-change params]))}] (re-frame/dispatch [::params-change params]))}]
])) ]))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {:approval-status approval-status}]) })) {:component-will-mount #(re-frame/dispatch-sync [::transactions-mounted {:approval-status approval-status}]) }))
(def main-content {nil (content {:approval-status nil}) (def main-content {nil (content {:approval-status nil})
:unapproved (content {:approval-status :unapproved}) :unapproved (content {:approval-status :unapproved})

2
src/cljs/auto_ap/views/pages/transactions/table.cljs
View File

@@ -93,7 +93,7 @@
[:tr [:tr
[:td {:col-span 5} [:td {:col-span 5}
[:i.fa.fa-spin.fa-spinner]]] [:i.fa.fa-spin.fa-spinner]]]
(for [{:keys [client account vendor payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:transactions @transaction-page)] (for [{:keys [client account vendor approval-status payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:transactions @transaction-page)]
^{:key id} ^{:key id}
[:tr {:class (:class i)} [:tr {:class (:class i)}
(when-not selected-client (when-not selected-client