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

merged.

Browse Source
This commit is contained in:
Bryce Covert
2022-04-27 06:39:48 -07:00
parent f09daf8ed2 96a796522c
commit d46254ade1
51 changed files with 1794 additions and 1691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/cljs/auto_ap/views/pages/admin/accounts.cljs
View File

@@ -4,7 +4,8 @@
[auto-ap.utils :refer [replace-by]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.pages.admin.accounts.side-bar :as side-bar]
[auto-ap.views.utils :refer [dispatch-event action-cell-width]]
[auto-ap.views.pages.admin.accounts.table :as table]
[auto-ap.views.utils :refer [dispatch-event action-cell-width with-user]]
[auto-ap.views.components.layouts
:refer
[appearing-side-bar side-bar-layout]]
@@ -15,96 +16,55 @@
[auto-ap.views.components.buttons :as buttons]
[reagent.core :as reagent]
[clojure.string :as str]
[vimsical.re-frame.fx.track :as track]))
[vimsical.re-frame.fx.track :as track]
[auto-ap.views.pages.data-page :as data-page]
[clojure.set :as set]
[auto-ap.effects.forward :as forward]))
(def default-read [:numeric-code :name :location :type :account_set :applicability :id [:client-overrides [:name [:client [:name :id]]]]])
(re-frame/reg-event-db
::edit-completed
(fn [db [_ edit-account]]
(-> db
(update :accounts replace-by :id (assoc edit-account :class "live-added")))))
(re-frame/reg-event-db
::table-params-changed
(fn [db [_ p]]
(assoc db ::table-params p)))
(re-frame/reg-event-fx
::params-change
(fn [db [_ p]]
{:set-uri-params p}))
(re-frame/reg-sub
::table-params
(fn [db]
(-> db ::table-params)))
(re-frame/reg-sub
::params
:<- [::table-params]
:<- [::side-bar/filter-params]
(fn [[table-params filter-params]]
(cond-> {}
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))))
[with-user]
(fn [{:keys [user]} [_ params]]
{:set-uri-params params
:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [{:query/data [:account_page
{:sort (:sort params)
:start (:start params 0)
:per-page (:per-page params)
:name-like (:name-like params)
:numeric-code (some-> params :numeric-code not-empty js/parseInt)}
[[:accounts default-read]
:total
:start
:end]]
:query/alias :result}]}
:on-success (fn [result]
[::data-page/received ::page
(set/rename-keys (:result result)
{:accounts :data})])}}))
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
{:db (dissoc db ::table-params ::side-bar/filter-params)
::track/dispose {:id ::params}}))
(fn [_ _]
{::track/dispose {:id ::params}
::forward/dispose [{:id ::updated}]}))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
(fn [_ _]
{::track/register {:id ::params
:subscription [::params]
:event-fn (fn [params] [::params-change params])}}))
(re-frame/reg-sub
::account-page
:<- [::params]
:<- [::subs/all-accounts]
(fn [[params all-accounts]]
(let [matching-accounts (cond->> all-accounts
(:name-like params) (filter #(str/includes? (str/lower-case (or (:name %) ""))
(str/lower-case (:name-like params))))
(not-empty (:code-like params)) (filter #(str/starts-with? (str (or (:numeric-code %) ""))
(str/lower-case (:code-like params)))))]
(assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) matching-accounts)
:data (grid/virtual-paginate (:start params)
(:per-page params)
(sort-by :numeric-code matching-accounts))))))
(defn accounts-table [{:keys [accounts]}]
(let [status @(re-frame/subscribe [::status/single ::page])
opc (fn [p]
(re-frame/dispatch [::table-params-changed p]))
params @(re-frame/subscribe [::params])]
[:div
[grid/grid {:status status
:on-params-change opc
:params params
:column-count 5}
[grid/controls accounts]
[grid/table {:fullwidth true}
[grid/header
[grid/row {}
[grid/header-cell {} "Code"]
[grid/header-cell {} "Name"]
[grid/header-cell {} "Type"]
[grid/header-cell {} "Location"]
[grid/header-cell {:style {:width (action-cell-width 1)}} ]]]
[grid/body
(for [{:keys [id numeric-code name type location class] :as account} (:data accounts)]
^{:key id}
[grid/row {:class (:class account) :id id}
[grid/cell {} numeric-code]
[grid/cell {} name]
[grid/cell {} type]
[grid/cell {} location]
[grid/cell {}
[buttons/fa-icon {:event [::account-form/editing account [::edit-completed]]
:icon "fa-pencil"}]]])]]]]))
:subscription [::data-page/params ::page]
:event-fn (fn [params] [::params-change params])}
::forward/register [{:id ::updated
:events #{::account-form/edited}
:event-fn (fn [[_ edited-account]]
[::data-page/updated-entity ::page (:upsert-account edited-account)])}]}))
(defn admin-accounts-content []
[:div
@@ -114,9 +74,8 @@
:class "is-primary"
:event [::account-form/editing
{:type :asset
:account-set "default"}
[::edit-completed]]}]]
[accounts-table {:accounts @(re-frame/subscribe [::account-page])}]])
:account-set "default"}]}]]
[table/accounts-table {:data-page ::page}]])
(defn admin-accounts-page []
(reagent/create-class
@@ -127,6 +86,6 @@
(fn []
(let [{:keys [active?]} @(re-frame/subscribe [::forms/form ::account-form/form])]
[side-bar-layout {:side-bar [admin-side-bar {}
[side-bar/accounts-side-bar]]
[side-bar/accounts-side-bar {:data-page ::page}]]
:main [admin-accounts-content]
:right-side-bar [appearing-side-bar {:visible? active?} [account-form/form ]]}]))}))

69
src/cljs/auto_ap/views/pages/admin/accounts/side_bar.cljs
View File

@@ -2,79 +2,24 @@
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [active-when dispatch-value-change]]))
[auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.pages.data-page :as data-page]))
(re-frame/reg-sub
::specific-filters
(fn [db ]
(::filters db nil)))
(re-frame/reg-sub
::filters
:<- [::specific-filters]
:<- [::subs/vendors-by-id]
:<- [::subs/query-params]
(fn [[specific-filters vendors-by-id query-params] ]
(let [url-filters (-> query-params
(select-keys #{:name-like :code-like})
(update :name-like #(some-> % str))
(update :code-like #(some-> % str)))]
(merge url-filters specific-filters ))))
(re-frame/reg-sub
::filter
:<- [::filters]
(fn [filters [_ which]]
(get filters which)))
(re-frame/reg-sub
::settled-filters
(fn [db ]
(::settled-filters db)))
(re-frame/reg-sub
::filter-params
:<- [::settled-filters]
:<- [::filters]
:<- [::subs/active-page]
(fn [[settled-filters filters ap ]]
(let [filters (or settled-filters filters)]
{:name-like (:name-like filters)
:code-like (:code-like filters)})))
(re-frame/reg-event-fx
::filters-settled
(fn [{:keys [db]} [_ & params]]
{:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
(re-frame/reg-event-fx
::filter-changed
(fn [{:keys [db]} [_ & params]]
(let [[a b c] params
[which val] (if (= 3 (count params))
[(into [a] b) c]
[[a] b])]
{:db (assoc-in db (into [::filters] which) val)
:dispatch-debounce {:event [::filters-settled]
:time 800
:key ::filters}})))
(defn accounts-side-bar []
(defn accounts-side-bar [{:keys [data-page]}]
[:div
[:p.menu-label "Name"]
[:div.field
[:div.control [:input.input {:placeholder "Food Cost"
:value @(re-frame/subscribe [::filter :name-like])
:on-change (dispatch-value-change [::filter-changed :name-like])} ]]]
:value @(re-frame/subscribe [::data-page/filter data-page :name-like])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :name-like])} ]]]
[:p.menu-label "Code"]
[:div.field
[:div.control [:input.input {:placeholder "11000"
:value @(re-frame/subscribe [::filter :code-like])
:on-change (dispatch-value-change [::filter-changed :code-like])}]]]])
:value @(re-frame/subscribe [::data-page/filter data-page :numeric-code])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :numeric-code])}]]]])

36
src/cljs/auto_ap/views/pages/admin/accounts/table.cljs Normal file
View File

@@ -0,0 +1,36 @@
(ns auto-ap.views.pages.admin.accounts.table
(:require
[auto-ap.status :as status]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.admin.accounts.form :as account-form]
[auto-ap.views.utils :refer [action-cell-width]]
[re-frame.core :as re-frame]
[auto-ap.views.pages.data-page :as data-page]))
(defn accounts-table [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])]
[:div
[grid/grid {:data-page data-page
:column-count 5}
[grid/controls data]
[grid/table {:fullwidth true}
[grid/header
[grid/row {}
[grid/header-cell {} "Code"]
[grid/header-cell {} "Name"]
[grid/header-cell {} "Type"]
[grid/header-cell {} "Location"]
[grid/header-cell {:style {:width (action-cell-width 1)}} ]]]
[grid/body
(for [{:keys [id numeric-code name type location class] :as account} (:data data)]
^{:key id}
[grid/row {:class (:class account) :id id}
[grid/cell {} numeric-code]
[grid/cell {} name]
[grid/cell {} type]
[grid/cell {} location]
[grid/cell {}
[buttons/fa-icon {:event [::account-form/editing account [::edit-completed]]
:icon "fa-pencil"}]]])]]]]))

51
src/cljs/auto_ap/views/pages/admin/rules.cljs
View File

@@ -1,26 +1,22 @@
(ns auto-ap.views.pages.admin.rules
(:require [auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.pages.admin.rules.side-bar :as 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]]
[vimsical.re-frame.cofx.inject :as inject]
[vimsical.re-frame.fx.track :as track]
[auto-ap.events :as events]
[auto-ap.utils :refer [replace-by merge-by]]
[re-frame.core :as re-frame]
[auto-ap.status :as status]
[auto-ap.effects.forward :as forward]
[auto-ap.views.pages.data-page :as data-page]
[clojure.set :as set]
[auto-ap.views.components.buttons :as buttons]))
(:require
[auto-ap.effects.forward :as forward]
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.layouts
:refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.pages.admin.rules.common :refer [default-read]]
[auto-ap.views.pages.admin.rules.form :as form]
[auto-ap.views.pages.admin.rules.side-bar :as side-bar]
[auto-ap.views.pages.admin.rules.table :as table]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[vimsical.re-frame.fx.track :as track]))
;; EVENTS
@@ -29,7 +25,7 @@
(re-frame/reg-event-fx
::params-change
[with-user ]
(fn [{:keys [db user] :as cofx} [_ params]]
(fn [{:keys [user]} [_ params]]
{:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [{:query/data [:transaction_rule_page
@@ -52,13 +48,13 @@
(re-frame/reg-event-fx
::new-rule-clicked
(fn [{:keys [db]} _]
(fn [_ _]
{:dispatch [::form/adding {:client @(re-frame/subscribe [::subs/client])}]}))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]}]
(fn [_]
{:dispatch-n [[::events/yodlee-merchants-needed]]
::forward/register [{:id ::page
:events #{::form/updated}
@@ -75,7 +71,7 @@
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]}]
(fn [_]
{:dispatch [::data-page/dispose ::page]
::forward/dispose [{:id ::page}
{:id ::deleted-transaction-rule}]
@@ -85,8 +81,7 @@
(def rules-content
(with-meta
(fn []
(let [current-client @(re-frame/subscribe [::subs/client])
user @(re-frame/subscribe [::subs/user])]
(let [user @(re-frame/subscribe [::subs/user])]
[:div
[:h1.title "Transaction Rules"]
(when (= "admin" (:user/role user))

138
src/cljs/auto_ap/views/pages/admin/rules/form.cljs
View File

@@ -1,22 +1,27 @@
(ns auto-ap.views.pages.admin.rules.form
(:require [auto-ap.entities.transaction-rule :as entity]
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.subs :as subs]
[auto-ap.views.components.button-radio :refer [button-radio]]
[auto-ap.utils :refer [dollars=]]
[auto-ap.views.components.dropdown :refer [drop-down]]
[auto-ap.views.components.expense-accounts-field :as expense-accounts-field :refer [expense-accounts-field recalculate-amounts]]
[auto-ap.views.components.layouts :as layouts]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[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]
[auto-ap.status :as status]))
(:require
[auto-ap.entities.transaction-rule :as entity]
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.button-radio :refer [button-radio]]
[auto-ap.views.components.expense-accounts-field
:as expense-accounts-field
:refer [expense-accounts-field]]
[auto-ap.views.components.layouts :as layouts]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[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 [dispatch-event with-user]]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[re-frame.core :as re-frame]
[reagent.core :as r]
[vimsical.re-frame.cofx.inject :as inject]
[vimsical.re-frame.fx.track :as track]))
;; SUBS
@@ -45,7 +50,7 @@
(re-frame/reg-sub
::can-submit
:<- [::forms/form ::form]
(fn [{:keys [data status]} _]
(fn [{:keys [data]} _]
(s/valid? ::entity/transaction-rule data)))
(re-frame/reg-sub
@@ -164,47 +169,57 @@
xs)))))))))
(re-frame/reg-event-fx
::changed-vendor
[(forms/in-form ::form)]
(fn [{{{:keys [client]} :data} :db} [_ vendor]]
(when (and (:id client) (:id vendor))
{:dispatch [::events/vendor-preferences-requested {:client-id (:id client)
:vendor-id (:id vendor)
:on-success [::changed [:vendor-preferences]]}]})))
(re-frame/reg-event-fx
::changed-client
[(forms/in-form ::form)]
(fn [{{{:keys [vendor]} :data} :db} [_ client]]
(when (and (:id client) (:id vendor))
{:dispatch [::events/vendor-preferences-requested {:client-id (:id client)
:vendor-id (:id vendor)
:on-success [::changed [:vendor-preferences]]}]})))
(re-frame/reg-event-db
::changed
(forms/change-handler ::form
(fn [data field value]
(cond (and (= [:vendor] field)
(cond (and (= [:vendor-preferences] field)
value
(expense-accounts-field/can-replace-with-default? (:accounts data)))
[[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account (:id value) (:client data)])
(:default-account value)
(:total data)
[])]
(= [:client] field)
[[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account (:id (:vendor data)) value])
(:total data)
[])
[:bank-account] nil]
:else
[]))))
(re-frame/reg-event-fx
::saving
[with-user (forms/triggers-loading ::form) (forms/in-form ::form)]
(fn [{:keys [user] {:keys [data]} :db} [_ params]]
[with-user (forms/triggers-loading ::form) (forms/in-form ::form) (re-frame/inject-cofx ::inject/sub [::query])]
(fn [{:keys [user] ::keys [query]} _]
{:graphql
{:token user
:query-obj @(re-frame/subscribe [::query])
:query-obj query
:on-success (fn [result]
[::updated (:upsert-transaction-rule result)])
:on-error [::forms/save-error ::form]}}))
(re-frame/reg-event-fx
::test-clicked
[with-user (forms/triggers-loading ::form) (forms/in-form ::form)]
(fn [{:keys [user] {:keys [data]} :db} [_ params]]
[with-user (forms/triggers-loading ::form) (forms/in-form ::form) (re-frame/inject-cofx ::inject/sub [::test-query])]
(fn [{:keys [user] ::keys [test-query]} _]
{:graphql
{:token user
:owns-state {:single ::test}
:query-obj @(re-frame/subscribe [::test-query])
:query-obj test-query
:on-success [::succeeded-test]
:on-error [::forms/save-error ::form]}}))
@@ -218,7 +233,7 @@
(re-frame/reg-event-fx
::succeeded-test
[(forms/triggers-stop-loading ::form)]
(fn [{:keys [db]} [_ result]]
(fn [_ [_ result]]
{:dispatch [::results-modal/opening (:test-transaction-rule result) nil false]}))
@@ -231,15 +246,30 @@
:submit-event [::saving ]
:id ::form}))
(re-frame/reg-event-fx
::mounted
(fn [_ _]
{::track/register [{:id ::client
:subscription [::forms/field ::form [:client]]
:event-fn (fn [c]
[::changed-client c])}
{:id ::vendor-change
:subscription [::forms/field ::form [:vendor]]
:event-fn (fn [v]
[::changed-vendor v])}]}))
(re-frame/reg-event-fx
::unmounted
(fn []
{::track/dispose [{:id ::client}
{:id ::vendor-change}]}))
(defn form [{:keys [can-change-amount?] :as params}]
[layouts/side-bar {:on-close (dispatch-event [::forms/form-closing ::form ])}
(let [{:keys [data active? error id]} @(re-frame/subscribe [::forms/form ::form])
(defn form-contents [params]
[layouts/side-bar {:on-close (dispatch-event [::forms/form-closing ::form ])}
(let [{:keys [data id]} @(re-frame/subscribe [::forms/form ::form])
{:keys [form-inline field raw-field error-notification submit-button ]} rule-form
default-note @(re-frame/subscribe [::default-note])
test-state @(re-frame/subscribe [::status/single ::test])
exists? (:id data)]
default-note @(re-frame/subscribe [::default-note])
test-state @(re-frame/subscribe [::status/single ::test])]
^{:key id}
(form-inline (assoc params :title "New Transaction Rule")
[:<>
@@ -315,17 +345,15 @@
:precision 0
:step "1"}])]]]]
[:h2.title.is-4 "Outcomes"]
(field "Assign Vendor"
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
:entity-index @(re-frame/subscribe [::subs/all-vendors-index])
:entity->text :name
:type "typeahead-v3"
:field [:vendor]
:spec ::entity/vendor}])
[search-backed-typeahead {:search-query (fn [i]
[:search_vendor
{:query i}
[:name :id]])
:type "typeahead-v3"
:field [:vendor]}])
(with-meta
(field nil
@@ -336,7 +364,7 @@
:locations (into ["Shared"] @(re-frame/subscribe [::subs/locations-for-client-or-bank-account (:id (:client data)) (:id (:bank-account data))]))
:max 100
:field [:accounts]}])
{:key (some-> data :vendor :id str)})
{:key (str (some-> data :vendor :id str) "-" (some-> data :client :id str))})
(field "Approval Status"
[button-radio
@@ -363,3 +391,11 @@
"Test Rule"]]
[:div.column
(submit-button "Save")]]]))])
(defn form [_]
(r/create-class
{:display-name "rule-form"
:component-did-mount #(re-frame/dispatch [::mounted])
:component-will-unmount #(re-frame/dispatch [::unmounted])
:reagent-render (fn [p]
[form-contents p])}))

22
src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
View File

@@ -1,22 +1,22 @@
(ns auto-ap.views.pages.admin.rules.side-bar
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.pages.data-page :as data-page]))
[re-frame.core :as re-frame]))
(defn rule-side-bar [{:keys [data-page]}]
[:div
[:p.menu-label "Vendor"]
[:div
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
:entity-index @(re-frame/subscribe [::subs/searchable-vendors-index])
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))])
:entity->text :name
:type "typeahead-v3"
:value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
[search-backed-typeahead {:search-query (fn [i]
[:search_vendor
{:query i}
[:name :id]])
:type "typeahead-v3"
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %])
:value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
[:p.menu-label "Note"]
[:div

29
src/cljs/auto_ap/views/pages/admin/rules/table.cljs
View File

@@ -1,20 +1,17 @@
(ns auto-ap.views.pages.admin.rules.table
(:require [auto-ap.subs :as subs]
[auto-ap.views.utils :refer [dispatch-event ->$ with-user action-cell-width]]
[auto-ap.views.pages.admin.rules.form :as form]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.views.components.sort-by-list :refer [sort-by-list]]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]
[auto-ap.views.components.sorter :refer [sorted-column toggle-sort-by sort-icon]]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.events :as events]
[auto-ap.status :as status]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[reagent.core :as r]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.pages.data-page :as data-page]))
(:require
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.pages.admin.rules.form :as form]
[auto-ap.views.pages.admin.rules.results-modal :as results-modal]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils
:refer [->$ action-cell-width dispatch-event with-user]]
[re-frame.core :as re-frame]
[reagent.core :as r]))
(re-frame/reg-event-fx
::run-clicked

163
src/cljs/auto_ap/views/pages/admin/vendors.cljs
View File

@@ -1,93 +1,76 @@
(ns auto-ap.views.pages.admin.vendors
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[clojure.string :as str]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.pages.admin.vendors.side-bar :as side-bar]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.forms :as forms]
[auto-ap.utils :refer [by]]
[auto-ap.entities.vendors :as entity]
[auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[clojure.spec.alpha :as s]
[auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field action-cell-width]]
[auto-ap.views.pages.admin.vendors.table :as table]
[auto-ap.views.pages.admin.vendors.merge-dialog :as merge-dialog]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]
[auto-ap.status :as status]
[vimsical.re-frame.fx.track :as track]
[auto-ap.effects.forward :as forward])
(:require-macros [cljs.core.async.macros :refer [go]]
[auto-ap.entities.vendors :as vendor]))
(:require
[auto-ap.effects.forward :as forward]
[auto-ap.subs :as subs]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.pages.admin.vendors.merge-dialog :as merge-dialog]
[auto-ap.views.pages.admin.vendors.side-bar :as side-bar]
[auto-ap.views.pages.admin.vendors.table :as table]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-event with-user]]
[clojure.set :as set]
[re-frame.core :as re-frame]
[vimsical.re-frame.fx.track :as track]
[auto-ap.views.components.vendor-dialog :as vendor-dialog]))
(re-frame/reg-event-fx
::invalidated
(fn [{:keys [db]}]
{:graphql {:token (:user db)
:owns-state {:single ::vendor-page}
:query-obj {:venia/queries [[:vendor events/vendor-query]]}
:on-success [::received-vendors]}}))
(re-frame/reg-event-fx
::mounted
(fn [{:keys [db]} _]
{:dispatch [::invalidated]
::track/register {:id ::params
:subscription [::params]
:event-fn (fn [params] [::params-change params])}
::forward/register {:id ::merge-complete
:events #{::merge-dialog/complete}
:event-fn (fn [_]
[::invalidated])}}))
(re-frame/reg-event-db
::received-vendors
(fn [db [_ vendors]]
(assoc db :vendors (by :id (:vendor vendors )))))
(re-frame/reg-event-fx
::unmounted
(fn [{:keys [db]} _]
{:db (dissoc db ::table/params ::side-bar/filter-params)
::forward/dispose {:id ::merge-complete}
::track/dispose {:id ::params}}))
(re-frame/reg-sub
::params
:<- [::side-bar/filter-params]
:<- [::table/params]
(fn [[filter-params table-params]]
(cond-> {}
(seq filter-params) (merge filter-params)
(seq table-params) (merge table-params))))
(def default-read [:id :name :hidden :terms [:default-account [:name :id :location]]
[:account-overrides [[:client [:id :name]] :id [:account [:id :numeric-code :name]]]]
[:automatically-paid-when-due [:id :name]]
[:terms-overrides [[:client [:id :name]] :id :terms]]
[:schedule-payment-dom [[:client [:id :name]] :id :dom]]
[:usage [:client-id :count]]
[:primary-contact [:name :phone :email :id]]
[:secondary-contact [:id :name :phone :email]]
:print-as :invoice-reminder-schedule :code
:legal-entity-first-name :legal-entity-middle-name :legal-entity-last-name
:legal-entity-tin :legal-entity-tin-type
:legal-entity-1099-type
[:address [:street1 :street2 :city :state :zip]]])
(re-frame/reg-event-fx
::params-change
(fn [_ [_ params]]
{:set-uri-params params}))
(re-frame/reg-sub
::vendor-page
:<- [::params]
:<- [::subs/sorted-all-vendors]
(fn [[params all-vendors]]
(let [matching-vendors (cond->> all-vendors
(:name-like params) (filter #(str/includes? (str/lower-case (or (:name %) ""))
(str/lower-case (:name-like params)))))]
(assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) matching-vendors)
:data (grid/virtual-paginate (:start params) (:per-page params) matching-vendors)))))
[with-user]
(fn [{:keys [user]} [_ params]]
{:graphql {:token user
:owns-state {:single [::data-page/page ::page]}
:query-obj {:venia/queries [{:query/data [:vendor
{:sort (:sort params)
:start (:start params 0)
:per-page (:per-page params)
:name-like (:name-like params)}
[[:vendors default-read]
:total
:start
:end]]
:query/alias :result}]}
:on-success (fn [result]
[::data-page/received ::page
(set/rename-keys (:result result)
{:vendors :data})])}}))
(re-frame/reg-event-fx
::mounted
(fn [_ _]
{::forward/register [{:id ::merge-complete
:events #{::merge-dialog/complete}
:event-fn (fn [_]
[::params-change {}])}
{:id ::save-complete
:events #{::vendor-dialog/save-complete}
:event-fn (fn [_]
[::params-change {}])}]
::track/register {:id ::params
:subscription [::data-page/params ::page]
:event-fn (fn [params]
[::params-change params])}}))
(re-frame/reg-event-fx
::unmounted
(fn [_ _]
{:dispatch [::data-page/dispose ::page]
::forward/dispose [{:id ::merge-complete} {:id ::save-complete}]
::track/dispose {:id ::params}}))
(defn admin-vendors-content []
[(with-meta
@@ -95,17 +78,15 @@
[:div.inbox-messages
(when-let [banner (:banner @(re-frame/subscribe [::subs/admin]))]
[:div.notification banner])
(let [vendors (re-frame/subscribe [::subs/vendors])
editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))]
[:div
[:h1.title "Vendors"]
[:div.is-pulled-right [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::merge-dialog/show])} "Merge vendors"]]
[table/vendors-table {:page @(re-frame/subscribe [::vendor-page])
:status @(re-frame/subscribe [::status/single ::vendor-page])}]])])
[:div
[:h1.title "Vendors"]
[:div.is-pulled-right [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::merge-dialog/show])} "Merge vendors"]]
[table/vendors-table {:id :vendors
:data-page ::page}]]])
{:component-did-mount #(re-frame/dispatch [::mounted])
:component-will-unmount #(re-frame/dispatch-sync [::unmounted])})])
(defn admin-vendors-page []
[side-bar-layout {:side-bar [admin-side-bar {}
[side-bar/vendor-side-bar]]
[side-bar/vendor-side-bar {:data-page ::page}]]
:main [admin-vendors-content]}])

15
src/cljs/auto_ap/views/pages/admin/vendors/common.cljs vendored Normal file
View File

@@ -0,0 +1,15 @@
(ns auto-ap.views.pages.admin.vendors.common)
(def default-read [:id :name :hidden :terms [:default-account [:name :id :location]]
[:account-overrides [[:client [:id :name]] :id [:account [:id :numeric-code :name]]]]
[:automatically-paid-when-due [:id :name]]
[:terms-overrides [[:client [:id :name]] :id :terms]]
[:schedule-payment-dom [[:client [:id :name]] :id :dom]]
[:usage [:client-id :count]]
[:primary-contact [:name :phone :email :id]]
[:secondary-contact [:id :name :phone :email]]
:print-as :invoice-reminder-schedule :code
:legal-entity-first-name :legal-entity-middle-name :legal-entity-last-name
:legal-entity-tin :legal-entity-tin-type
:legal-entity-1099-type
[:address [:street1 :street2 :city :state :zip]]])

48
src/cljs/auto_ap/views/pages/admin/vendors/merge_dialog.cljs vendored
View File

@@ -1,11 +1,13 @@
(ns auto-ap.views.pages.admin.vendors.merge-dialog
(:require [auto-ap.forms :as forms]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.components.typeahead :refer [typeahead-v3]]
[auto-ap.views.utils :refer [dispatch-event]]
[re-frame.core :as re-frame]))
(:require
[auto-ap.forms :as forms]
[auto-ap.status :as status]
[auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal]
[auto-ap.views.components.typeahead.vendor
:refer [search-backed-typeahead]]
[auto-ap.views.utils :refer [dispatch-event]]
[re-frame.core :as re-frame]))
(re-frame/reg-sub
::can-submit
@@ -21,29 +23,29 @@
:id ::form}))
(defn form []
(let [{:keys [data active? error id]} @(re-frame/subscribe [::forms/form ::form])
{:keys [form-inline horizontal-field field raw-field error-notification submit-button]} merge-form]
(let [_ @(re-frame/subscribe [::forms/form ::form])
{:keys [form-inline field]} merge-form]
(form-inline {}
[:<>
(field "Form Vendor (will be deleted)"
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
:entity-index @(re-frame/subscribe [::subs/all-vendors-index])
:type "typeahead-v3"
:auto-focus true
:entity->text (fn [x]
(str (:name x) " (" (reduce + 0 (map :count (:usage x))) " usages)") )
:field [:from]}])
[search-backed-typeahead {:search-query (fn [i]
[:search_vendor
{:query i}
[:name :id]])
:type "typeahead-v3"
:auto-focus true
:field [:from]}])
(field "To Vendor"
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
:entity-index @(re-frame/subscribe [::subs/searchable-vendors-index])
:type "typeahead-v3"
:entity->text (fn [x]
(str (:name x) " (" (reduce + 0 (map :count (:usage x))) " usages)") )
:field [:to]}])])))
[search-backed-typeahead {:search-query (fn [i]
[:search_vendor
{:query i}
[:name :id]])
:type "typeahead-v3"
:field [:to]}])])))
(re-frame/reg-event-fx
::show
@@ -68,7 +70,7 @@
(re-frame/reg-event-fx
::save
[(forms/in-form ::form)]
(fn [{{{:keys [from to]} :data :as merge-vendors-form} :db :as g} _]
(fn [{{{:keys [from to]} :data} :db} _]
(let [user @(re-frame/subscribe [::subs/token])]
{:graphql
{:token user

68
src/cljs/auto_ap/views/pages/admin/vendors/side_bar.cljs vendored
View File

@@ -2,69 +2,17 @@
(:require
[re-frame.core :as re-frame]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [active-when dispatch-value-change]]))
(re-frame/reg-sub
::specific-filters
(fn [db ]
(::filters db nil)))
(re-frame/reg-sub
::filters
:<- [::specific-filters]
:<- [::subs/vendors-by-id]
:<- [::subs/query-params]
(fn [[specific-filters vendors-by-id query-params] ]
(let [url-filters (-> query-params
(select-keys #{:name-like})
(update :name-like #(some-> % str)))]
(merge url-filters specific-filters ))))
(re-frame/reg-sub
::filter
:<- [::filters]
(fn [filters [_ which]]
(get filters which)))
(re-frame/reg-sub
::settled-filters
(fn [db ]
(::settled-filters db)))
(re-frame/reg-sub
::filter-params
:<- [::settled-filters]
:<- [::filters]
:<- [::subs/active-page]
(fn [[settled-filters filters ap ]]
(let [filters (or settled-filters filters)]
{:name-like (:name-like filters)})))
(re-frame/reg-event-fx
::filters-settled
(fn [{:keys [db]} [_ & params]]
{:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
(re-frame/reg-event-fx
::filter-changed
(fn [{:keys [db]} [_ & params]]
(let [[a b c] params
[which val] (if (= 3 (count params))
[(into [a] b) c]
[[a] b])]
{:db (assoc-in db (into [::filters] which) val)
:dispatch-debounce {:event [::filters-settled]
:time 800
:key ::filters}})))
[auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.pages.data-page :as data-page]))
(defn vendor-side-bar []
(defn vendor-side-bar [{:keys [data-page]}]
[:div
[:p.menu-label "Name"]
[:div.field
[:div.control [:input.input {:placeholder "Harry's Food Products"
:value @(re-frame/subscribe [::filter :name-like])
:on-change (dispatch-value-change [::filter-changed :name-like])} ]]]])
[:div
[:div.field
[:div.control [:input.input {:placeholder "HOME DEPOT"
:value @(re-frame/subscribe [::data-page/filter data-page :name-like])
:on-change (dispatch-value-change [::data-page/filter-changed data-page :name-like])} ]]]]])

37
src/cljs/auto_ap/views/pages/admin/vendors/table.cljs vendored
View File

@@ -1,34 +1,21 @@
(ns auto-ap.views.pages.admin.vendors.table
(:require
[re-frame.core :as re-frame]
[reagent.core :as reagent]
(:require
[auto-ap.subs :as subs]
[auto-ap.status :as status]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog] :as vendor-dialog]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field action-cell-width]]
[auto-ap.views.components.buttons :as buttons]))
[auto-ap.views.components.vendor-dialog :as vendor-dialog]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [action-cell-width]]
[re-frame.core :as re-frame]))
(re-frame/reg-event-fx
::params-changed
(fn [{:keys [db]} [_ p]]
{:db (assoc db ::params p)}))
(re-frame/reg-sub
::params
(fn [db]
(-> db ::params)))
(defn vendors-table [{:keys [status page]}]
(let [params @(re-frame/subscribe [::params])
(defn vendors-table [{:keys [data-page]}]
(let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
accounts @(re-frame/subscribe [::subs/all-accounts-by-id])]
(println "DATA COUNT" (keys data))
[grid/grid {:status status
:on-params-change (fn [p]
(re-frame/dispatch [::params-changed p]))
:params params
[grid/grid {:data-page data-page
:column-count 4}
[grid/controls page]
[grid/controls data]
[grid/table {:fullwidth true}
[grid/header
[grid/row {}
@@ -37,7 +24,7 @@
[grid/header-cell {} "Default Account"]
[grid/header-cell {:style {:width (action-cell-width 1)}}]]]
[grid/body
(for [v (:data page)]
(for [v (:data data)]
^{:key (str (:id v))}
[grid/row {:class (:class v) :id (:id v)}
[grid/cell {} (:name v)