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

Makes accounts not loaded.

Browse Source
This commit is contained in:
Bryce Covert
2022-04-19 15:05:05 -07:00
parent f51f3450d6
commit cae28589d2
7 changed files with 169 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/clj/auto_ap/datomic/accounts.clj
View File

@@ -1,7 +1,11 @@
(ns auto-ap.datomic.accounts
(:require [datomic.api :as d]
[auto-ap.graphql.utils :refer [->graphql]]
[auto-ap.datomic :refer [uri merge-query conn]]))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query uri]]
[clojure.string :as str]
[datomic.api :as d]
[clojure.tools.logging :as log]))
(defn <-datomic [a]
(update a :account/applicability :db/ident))
@@ -86,4 +90,50 @@
(map <-datomic)
(first))))
#_(get-account-by-numeric-code-and-sets 5110 nil)
(defn raw-graphql-ids [db args]
(println args)
(let [query (cond-> {:query {:find []
:in ['$]
:where []}
:args [db]}
(:sort args) (add-sorter-fields {"name" ['[?e :account/name ?sort-name]]}
args)
(:numeric-code args)
(merge-query {:query {:in ['?numeric-code]
:where ['[?e :account/numeric-code ?numeric-code]]}
:args [(:numeric-code args)]})
(not (str/blank? (:name-like args)))
(merge-query {:query {:in ['?name-like]
:where ['[?e :account/name ?n]
'[(re-find ?name-like ?n)]]}
:args [(re-pattern (str "(?i)" (:name-like args)))]})
true
(merge-query {:query {:find ['?sort-default '?e ]
:where ['[?e :account/name]
'[?e :account/numeric-code ?sort-default]]}}))]
(cond->> query
true (d/query)
true (apply-sort-3 args)
true (apply-pagination args))))
(defn graphql-results [ids db args]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))
accounts (->> ids
(map results)
(map first)
(map <-datomic))]
accounts))
(defn get-graphql [args]
(log/info "ARGS" args)
(let [db (d/db conn)
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]
[(->> (graphql-results ids-to-retrieve db args))
matching-count]))

22
src/clj/auto_ap/graphql.clj
View File

@@ -305,6 +305,12 @@
:start {:type 'Int}
:end {:type 'Int}}}
:account_page {:fields {:accounts {:type '(list :account)}
:count {:type 'Int}
:total {:type 'Int}
:start {:type 'Int}
:end {:type 'Int}}}
:reminder_page {:fields {:reminders {:type '(list :reminder)}
:count {:type 'Int}
:total {:type 'Int}
@@ -358,9 +364,13 @@
:args {:client_id {:type :id}}
:resolve :get-yodlee-provider-account-page}
:accounts {:type '(list :account)
:args {:account_set {:type 'String}}
:resolve :get-accounts}
:account_page {:type :account_page
:args {:name_like {:type 'String}
:numeric_code {:type 'Int}
:start {:type 'Int}
:per_page {:type 'Int}
:sort {:type '(list :sort_item)}}
:resolve :get-accounts}
:search_vendor {:type '(list :search_result)
:args {:query {:type 'String}}
@@ -409,10 +419,6 @@
:per_page {:type 'Int}
:sort {:type '(list :sort_item)}}
:resolve :get-sales-order-page}
:vendor {:type :vendor_page
:args {:name_like {:type 'String}
:start {:type 'Int}
@@ -803,7 +809,7 @@
(attach-resolvers {
:get-yodlee-provider-account-page gq-yodlee2/get-yodlee-provider-account-page
:get-all-sales-orders get-all-sales-orders
:get-accounts gq-accounts/get-accounts
:get-accounts gq-accounts/get-graphql
:get-sales-order-page gq-sales-orders/get-sales-orders-page
:get-transaction-rule-page gq-transaction-rules/get-transaction-rule-page
:get-transaction-rule-matches gq-transaction-rules/get-transaction-rule-matches

21
src/clj/auto_ap/graphql/accounts.clj
View File

@@ -1,16 +1,21 @@
(ns auto-ap.graphql.accounts
(:require
[auto-ap.datomic :refer [audit-transact remove-nils conn]]
[auto-ap.datomic :refer [audit-transact conn remove-nils]]
[auto-ap.datomic.accounts :as d-accounts]
[auto-ap.graphql.utils
:refer [->graphql <-graphql assert-can-see-client enum->keyword]]
[datomic.api :as d]
[clojure.tools.logging :as log]))
(defn get-accounts [_ args _]
(->graphql (d-accounts/get-accounts (<-graphql args))))
:refer [->graphql
<-graphql
assert-admin
assert-can-see-client
enum->keyword
result->page]]
[datomic.api :as d]))
(defn get-graphql [context args _]
(assert-admin (:id context))
(let [args (assoc args :id (:id context))
[accounts accounts-count ] (d-accounts/get-graphql (<-graphql args))]
(result->page accounts accounts-count :accounts args)))
(defn default-for-vendor [context args _]
(assert-can-see-client (:id context) (:client_id args))

14
src/cljs/auto_ap/events.cljs
View File

@@ -62,11 +62,7 @@
:query-params (auto-ap.views.utils/query-params)
:user token)
:graphql {:token token
:query-obj {:venia/queries [[:client
(client-query token)]
[:accounts [:numeric-code :location :name :type :account_set :applicability :id [:client-overrides [:name :id [:client [:name :id]]]]]]]}
:query-obj {:venia/queries [[:client (client-query token)]]}
:on-success [::received-initial]
:on-error [::failed-initial]}}))))
@@ -80,10 +76,7 @@
::logged-in
(fn [{:keys [db]} [_ token user]]
{:graphql {:token token
:query-obj {:venia/queries [[:client
(client-query token)]
[:accounts [:numeric-code :name :location :type :account_set :applicability :id [:client-overrides [:name [:client [:name :id]]]]]]]}
:query-obj {:venia/queries [[:client (client-query token)]]}
:on-success [::received-initial]
:on-error [::failed-initial]}
@@ -93,12 +86,11 @@
(re-frame/reg-event-fx
::received-initial
(fn [{:keys [db]} [_ {accounts :accounts clients :client}]]
(fn [{:keys [db]} [_ {clients :client}]]
{:db (-> db
(assoc :clients (by :id clients) )
(assoc :is-initial-loading? false)
(assoc :accounts accounts )
(assoc :client (or (when (= 1 (count clients)) (->> clients first :id ))
(->> clients
(map :id)

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 ]]}]))}))

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

@@ -2,78 +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/query-params]
(fn [[specific-filters 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"}]]])]]]]))