transaction rules are testable not whilst editing.

This commit is contained in:
Bryce Covert
2019-06-05 19:33:41 -07:00
parent 7ac17c9cbc
commit 197397649c
6 changed files with 129 additions and 50 deletions

View File

@@ -4,6 +4,7 @@
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.pages.admin.rules.table :as table]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]
[auto-ap.views.pages.admin.rules.form :as form]
[auto-ap.views.pages.admin.rules.common :refer [default-read]]
[auto-ap.views.utils :refer [dispatch-event with-user]]
@@ -109,4 +110,4 @@
:main [rules-content]
:right-side-bar [appearing-side-bar {:visible? active?}
[form/form {:rule-saved [::edit-completed]}]]
:bottom [form/test-results-modal]}]))
:bottom [results-modal/test-results-modal]}]))

View File

@@ -11,11 +11,13 @@
[auto-ap.views.components.layouts :as layouts]
[auto-ap.views.components.typeahead :refer [typeahead-entity]]
[auto-ap.views.pages.admin.rules.common :refer [default-read]]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]
[auto-ap.views.utils :refer [date->str date-picker dispatch-event standard with-user]]
[cljs-time.core :as c]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[re-frame.core :as re-frame]))
[re-frame.core :as re-frame]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]))
;; SUBS
@@ -83,10 +85,7 @@
[:bank-account [:name]]
:description-original]]}]}))
(re-frame/reg-sub
::test-results
(fn [db]
(::test-results db)))
;; EVENTS
@@ -179,9 +178,7 @@
[(forms/triggers-stop-loading ::form)]
(fn [{:keys [db]} [_ result]]
(println result)
{:db (assoc db ::test-results (:test-transaction-rule result))
:dispatch [::events/modal-status ::test-results {:visible? true}]}))
{:dispatch [::results-modal/opening (:test-transaction-rule result) false]}))
@@ -311,24 +308,3 @@
[:a.button.is-medium.is-fullwidth.is-outlined {:on-click (dispatch-event [::test-clicked])} "Test Rule"]]
[:div.column
[submit-button "Save"]]]])])
(defn test-results-modal []
(when (:visible? @(re-frame/subscribe [::subs/modal-state ::test-results]))
[modal {:title "Rule results"
:hide-event [::events/modal-status ::test-results {:visible? false}]}
[:table.table.is-fullwidth.compact
[:tr
[:th "Client"]
[:th "Bank Account"]
[:th "Description"]
[:th "Date"]
[:th "Amount"]]
(for [{:keys [id client bank-account description-original date amount]} @(re-frame/subscribe [::test-results])]
^{:key id}
[:tr
[:td (:name client)]
[:td (:name bank-account)]
[:td description-original]
[:td (when date (date->str date))]
[:td amount]])]]))

View File

@@ -0,0 +1,54 @@
(ns auto-ap.views.pages.admin.rules.results-modal
(:require [auto-ap.events :as events]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :refer [modal]]
[auto-ap.views.utils :refer [date->str]]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::test-results
(fn [db]
(::test-results db)))
(re-frame/reg-sub
::runnable?
(fn [db]
(::runnable? db)))
(re-frame/reg-event-fx
::opening
(fn [{:keys [db]} [_ results runnable?]]
{:db (-> db
(assoc ::test-results results)
(assoc ::runnable? runnable?))
:dispatch [::events/modal-status ::test-results {:visible? true}]}))
(defn test-results-modal []
(let [runnable @(re-frame/subscribe [::runnable?])]
(when (:visible? @(re-frame/subscribe [::subs/modal-state ::test-results]))
[modal {:title "Rule results"
:hide-event [::events/modal-status ::test-results {:visible? false}]}
[:table.table.is-fullwidth.compact
[:tr
(when runnable
[:th {:style {:width "2em"}}])
[:th "Client"]
[:th "Bank Account"]
[:th "Description"]
[:th "Date"]
[:th "Amount"]]
(for [{:keys [id client bank-account description-original date amount]} @(re-frame/subscribe [::test-results])]
^{:key id}
[:tr
(when runnable
[:td
[:input.checkbox {:type "checkbox"}]])
[:td (:name client)]
[:td (:name bank-account)]
[:td description-original]
[:td (when date (date->str date))]
[:td amount]])]])))

View File

@@ -1,11 +1,37 @@
(ns auto-ap.views.pages.admin.rules.table
(:require [auto-ap.subs :as subs]
[auto-ap.views.utils :refer [dispatch-event ->$]]
[auto-ap.views.utils :refer [dispatch-event ->$ with-user]]
[auto-ap.views.pages.admin.rules.form :as form]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]
[auto-ap.views.components.sorter :refer [sorted-column]]
[re-frame.core :as re-frame]))
(re-frame/reg-event-fx
::run-clicked
[with-user]
(fn [{:keys [user db]} [_ which]]
{:graphql
{:token user
:query-obj {:venia/operation {:operation/type :query
:operation/name "RunTransactionRule"}
:venia/queries [{:query/data [:run-transaction-rule
{:transaction-rule-id (:id which)}
[:id
:date
:amount
[:client [:name]]
[:bank-account [:name]]
:description-original]]}]}
:on-success [::succeeded-run]
#_#_:on-error [:forms/save-error ::form]}}))
(re-frame/reg-event-fx
::succeeded-run
(fn [{:keys [db]} [_ result]]
{:dispatch [::results-modal/opening (:run-transaction-rule result) true]}))
(defn table [{:keys [id rule-page on-params-change params status]}]
(let [opc (fn [p]
(on-params-change (merge @params p )))]
@@ -42,7 +68,7 @@
"Description"]
#_[sorted-column {:on-sort opc
:style {:width "8em" :cursor "pointer"}
:style {:width "8em" :cukjsor "pointer"}
:class "has-text-right"
:sort-key "amount-gte"
:sort-by sort-by
@@ -63,7 +89,7 @@
:sort-by sort-by
:asc asc}
"Note"]
[:th {:style {:width "6em"}}
[:th {:style {:width "9em"}}
]]]
[:tbody
(if (:loading @status)
@@ -90,4 +116,6 @@
"")]
[:td note]
[:td
[:a.button {:on-click (dispatch-event [::form/editing r])} [:span.icon [:i.fa.fa-pencil]]]]]))]]]))))
[:div.buttons
[:a.button {:on-click (dispatch-event [::run-clicked r])} [:span.icon [:i.fa.fa-play]]]
[:a.button {:on-click (dispatch-event [::form/editing r])} [:span.icon [:i.fa.fa-pencil]]]]]]))]]]))))