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

progress on migrating all grids.

Browse Source
This commit is contained in:
Bryce
2023-09-28 22:22:25 -07:00
parent d1798f6b5c
commit 99accc067c
15 changed files with 743 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scratch-sessions/fix-page-performance.repl
View File

@@ -213,4 +213,15 @@
{:user/name "hydrate-tuples"})
(auto-ap.datomic/audit-transact-batch (->> (dc/q '[:find ?e ?c
:in $
:where [?e :expected-deposit/client ?c]]
(dc/db conn)
)
(map (fn [[i c]]
{:db/id i
:expected-deposit/client c})))
{:user/name "hydrate-tuples"})
)

2
src/clj/auto_ap/datomic/yodlee2.clj
View File

@@ -12,7 +12,7 @@
[clj-time.coerce :as c]
[datomic.api :as dc]))
(def default-read '[*])
(def default-read '[* {:yodlee-provider-account/client [:client/code]}])
(defn <-datomic [x]
(-> x (update :yodlee-provider-account/last-updated c/from-date)))

10
src/clj/auto_ap/ssr/company/company_1099.clj
View File

@@ -115,7 +115,9 @@
:per-page (:per-page (:parsed-query-params args))} all)]
[(:entries paginated) (:count paginated)]))
(def grid-page {:id "vendor-table"
(def grid-page
(helper/build
{:id "vendor-table"
:nav (com/company-aside-nav)
:id-fn (comp :db/id second)
:fetch-page (fn [user args]
@@ -199,7 +201,7 @@
:render (fn [[_ _ paid]]
(com/pill {:class "text-xs font-medium"
:color :primary}
"Paid $" (Math/round paid)))}]})
"Paid $" (Math/round paid)))}]}))
@@ -318,5 +320,5 @@
"Save")]]]
[:div])]]))))
(def vendor-table (partial helper/table grid-page))
(def page (partial helper/page grid-page))
(def vendor-table (helper/table-route grid-page))
(def page (helper/page-route grid-page))

62
src/clj/auto_ap/ssr/company/plaid.clj
View File

@@ -9,8 +9,7 @@
pull-attr
pull-many-by-id
query2]]
[auto-ap.graphql.utils
:refer [assert-can-see-client extract-client-ids]]
[auto-ap.graphql.utils :refer [assert-can-see-client]]
[auto-ap.logging :as alog]
[auto-ap.plaid.core :as p]
[auto-ap.ssr-routes :as ssr-routes]
@@ -36,43 +35,36 @@
:plaid-account/balance
:plaid-account/name]}])
(defn raw-graphql-ids [db args]
(let [valid-clients (extract-client-ids (:clients args)
(:client-id args)
(when (:client-code args)
[:client/code (:client-code args)]))
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
query (cond-> {:query {:find []
:in ['$ '[?xx ...]]
:where ['[?e :plaid-item/client ?xx]]}
:args [db valid-clients]}
:args [db (:trimmed-clients request)]}
(:sort args) (add-sorter-fields {"external-id" ['[?e :plaid-item/external-id ?sort-external-id]]
(:sort query-params) (add-sorter-fields {"external-id" ['[?e :plaid-item/external-id ?sort-external-id]]
"status" ['[?e :plaid-item/status ?sort-status]]}
args)
(:client-id args)
(merge-query {:query {:in '[?client-id]
:where ['[?e :plaid-item/client ?client-id]]}
:args [(:client-id args)]})
query-params)
true
(merge-query {:query {:find ['?e]
:where ['[?e :plaid-item/external-id]]}}))]
(clojure.pprint/pprint query-params)
(cond->> (query2 query)
true (apply-sort-3 args)
true (apply-pagination args))))
true (apply-sort-3 query-params)
true (apply-pagination query-params))))
(defn graphql-results [ids db _]
(defn hydrate-results [ids db _]
(let [results (pull-many-by-id db default-read ids)]
(->> ids
(map results))))
(defn get-page [args]
(defn fetch-page [request]
(let [db (dc/db conn)
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]
[(graphql-results ids-to-retrieve db args)
{ids-to-retrieve :ids matching-count :count} (fetch-ids db request)]
[(hydrate-results ids-to-retrieve db request)
matching-count]))
@@ -138,16 +130,11 @@
"Start relink")])))
(def grid-page {:id "plaid-table"
(def grid-page
(helper/build
{:id "plaid-table"
:nav (com/company-aside-nav)
:id-fn :db/id
:fetch-page (fn [user args]
(get-page {:client (:client args)
:clients (:clients args)
:start (:start (:parsed-query-params args))
:sort (:sort (:parsed-query-params args))
:per-page (:per-page (:parsed-query-params args))
}))
:fetch-page fetch-page
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"My Company"]
@@ -158,8 +145,8 @@
:title "Plaid Accounts"
:entity-name "Plaid accounts"
:route :company-plaid-table
:action-buttons (fn [user params]
(when-let [client-code (:client/code (:client params))]
:action-buttons (fn [request]
(when-let [client-code (:client/code (:client request))]
[[:div {:hx-post (str (bidi/path-for ssr-routes/only-routes
:company-plaid-link
:request-method :post))
@@ -170,8 +157,8 @@
:id "link-account"
:onClick "window.plaid.open()"}
(com/button-icon {} svg/refresh)
"Link new account")]]))
:row-buttons (fn [user e]
(format "Link %s account" client-code))]]))
:row-buttons (fn [request e]
[[:div (com/button {:hx-put (str (bidi/path-for ssr-routes/only-routes
:company-plaid-relink)
"?plaid-item-id=" (:db/id e))
@@ -196,7 +183,8 @@
:render (fn [e]
[:ul
(for [a (:plaid-item/accounts e)]
[:li (:plaid-account/name a) " - " (:plaid-account/number a)])])}]})
[:li (:plaid-account/name a) " - " (:plaid-account/number a)])])}]}))
(def page (partial helper/page grid-page))
(def table (partial helper/table grid-page))
(def page (helper/page-route grid-page))
(def table (helper/table-route grid-page))

9
src/clj/auto_ap/ssr/company/reports.clj
View File

@@ -15,7 +15,8 @@
[datomic.api :as dc]
[com.brunobonacci.mulog :as mu]))
(def grid-page {:id "report-table"
(def grid-page
(helper/build {:id "report-table"
:nav (com/company-aside-nav)
:id-fn :db/id
:fetch-page (fn [user args]
@@ -62,12 +63,12 @@
:name "Created"
:sort-key "created"
:render #(atime/unparse-local (:report/created %)
atime/normal-date)}]})
atime/normal-date)}]}))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (partial helper/table grid-page))
(def page (partial helper/page grid-page))
(def table (helper/table-route grid-page))
(def page (helper/page-route grid-page))
(defn delete-report [{:keys [form-params identity]}]

45
src/clj/auto_ap/ssr/company/yodlee.clj
View File

@@ -1,21 +1,19 @@
(ns auto-ap.ssr.company.yodlee
(:require
[auto-ap.datomic :refer [conn]]
[auto-ap.datomic :refer [conn pull-attr]]
[auto-ap.datomic.yodlee2 :as yodlee2]
[auto-ap.graphql.utils :refer [is-admin?]]
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.svg :as svg]
[auto-ap.ssr.ui :refer [base-page]]
[auto-ap.ssr.grid-page-helper :as helper]
[auto-ap.ssr.svg :as svg]
[auto-ap.ssr.utils :refer [html-response]]
[auto-ap.time :as atime]
[auto-ap.yodlee.core2 :as yodlee]
[bidi.bidi :as bidi]
[config.core :refer [env]]
[datomic.api :as dc]
[hiccup2.core :as hiccup]
[auto-ap.datomic :refer [pull-attr]]))
[hiccup2.core :as hiccup]))
(def default-read '[:db/id
:yodlee-provider-account/last-updated
@@ -77,16 +75,19 @@ fastlink.open({fastLinkURL: '%s',
(pull-attr (dc/db conn) :yodlee-provider-account/id (Long/parseLong (get form-params "id")))))]]
[:div]))))
(def grid-page {:id "yodlee-table"
(def grid-page
(helper/build
{:id "yodlee-table"
:nav (com/company-aside-nav)
:id-fn :db/id
:fetch-page (fn [user args]
:fetch-page (fn [request]
(println (count (:clients request)))
(yodlee2/get-graphql
{:client (:client args)
:clients (:clients args)
:sort (:sort (:parsed-query-params args))
:start (:start (:parsed-query-params args))
:per-page (:per-page (:parsed-query-params args))}))
{:client (:client request)
:clients (:clients request)
:sort (:sort (:parsed-query-params request))
:start (:start (:parsed-query-params request))
:per-page (:per-page (:parsed-query-params request))}))
:breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
:company)}
"My Company"]
@@ -97,7 +98,7 @@ fastlink.open({fastLinkURL: '%s',
:title "Yodlee Accounts"
:entity-name "Yodlee accounts"
:route :company-yodlee-table
:action-buttons (fn [user _]
:action-buttons (fn [request]
[(com/button {:color :primary
:on-click "openFastlink()"
:hx-get (bidi/path-for ssr-routes/only-routes
@@ -105,19 +106,25 @@ fastlink.open({fastLinkURL: '%s',
:hx-target "#modal-holder"}
(com/button-icon {} svg/refresh)
"Link new account")])
:row-buttons (fn [user e]
:row-buttons (fn [request _]
[
(com/button {:hx-put (bidi/path-for ssr-routes/only-routes
:company-yodlee-provider-account-reauthenticate)
:color :primary
:hx-target "#modal-holder"}
"Reauthenticate")
(when (is-admin? user)
(when (is-admin? (:identity request))
(com/icon-button {:hx-put (bidi/path-for ssr-routes/only-routes
:company-yodlee-provider-account-refresh)
:hx-target "closest tr"}
svg/refresh))])
:headers [{:key "provider-account"
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
(= (count (:clients args)) 1))
:render #(-> % :yodlee-provider-account/client :client/code)}
{:key "provider-account"
:name "Provider Account"
:sort-key "provider-account"
:render :yodlee-provider-account/id}
@@ -146,10 +153,10 @@ fastlink.open({fastLinkURL: '%s',
:render (fn [e]
[:ul
(for [a (:yodlee-provider-account/accounts e)]
[:li (:yodlee-account/name a) " - " (:yodlee-account/number a)])])}]})
[:li (:yodlee-account/name a) " - " (:yodlee-account/number a)])])}]}))
(def page (partial helper/page grid-page))
(def table (partial helper/table grid-page))
(def page (helper/page-route grid-page))
(def table (helper/table-route grid-page))
;; TODO delete-after-settle
(defn refresh-provider-account [{:keys [form-params identity]}]

1
src/clj/auto_ap/ssr/components/aside.clj
View File

@@ -12,6 +12,7 @@
(assoc :type "button")
(update :class str " cursor-pointer flex items-center p-2 w-full text-xs text-gray-600 rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700")
(assoc :hx-indicator "find .htmx-indicator")
(assoc :hx-boost "true")
(assoc :hx-select "#app-contents")
(assoc :hx-target "#app-contents")
(assoc :hx-swap "outerHTML"))

10
src/clj/auto_ap/ssr/components/page.clj
View File

@@ -6,7 +6,10 @@
[auto-ap.ssr.svg :as svg]))
(defn page- [{:keys [nav page-specific client client-selection identity app-params] :or {app-params {}}} & children]
[:div#app
[:div#app {"_" (hiccup/raw "
on notification put event.detail.value into #notification-details then add .htmx-added to #notification-holder then remove .hidden from #notification-holder then wait 30ms then remove .htmx-added from #notification-holder
on htmx:responseError put event.detail.xhr.response into #error-details then add .htmx-added to #error-holder then remove .hidden from #error-holder then wait 30ms then remove .htmx-added from #error-holder"
)}
(navbar- {:client-selection client-selection
:client client
:identity identity})
@@ -14,10 +17,7 @@
(left-aside- {:nav nav
:page-specific page-specific})
[:div#main-content {:class "relative w-full h-full lg:pl-64 overflow-y-auto px-4 bg-gray-100 dark:bg-gray-900 min-h-content "
"_" (hiccup/raw "
on notification put event.detail.value into #notification-details then add .htmx-added to #notification-holder then remove .hidden from #notification-holder then wait 30ms then remove .htmx-added from #notification-holder
on htmx:responseError put event.detail.xhr.response into #error-details then add .htmx-added to #error-holder then remove .hidden from #error-holder then wait 30ms then remove .htmx-added from #error-holder"
)}
}
[:div#notification-holder.hidden
[:div.fixed.top-0.right-0.left-0.z-30.mx-auto.max-w-screen-lg.w-screen-lg.my-0.pt-8.rounded-lg
[:div.relative

133
src/clj/auto_ap/ssr/grid_page_helper.clj
View File

@@ -1,17 +1,21 @@
(ns auto-ap.ssr.grid-page-helper
(:require
[auto-ap.graphql.utils :refer [extract-client-ids]]
[auto-ap.query-params :as query-params]
[auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.svg :as svg]
[auto-ap.ssr.ui :refer [base-page]]
[auto-ap.ssr.utils :refer [html-response]]
[auto-ap.time :as atime]
[malli.core :as m]
[bidi.bidi :as bidi]
[cemerick.url :as url]
[clojure.string :as str]
[hiccup2.core :as hiccup]
[clj-time.core :as time]
[auto-ap.time :as atime]
[auto-ap.query-params :as query-params]))
[malli.transform :as mt2]))
(defn row* [gridspec user entity {:keys [flash? delete-after-settle? request] :as options}]
(let [cells (->> gridspec
@@ -125,23 +129,12 @@
(com/data-grid-header {}))})))
(defn sort->query [s]
(str/join "," (map (fn [k] (format "%s:%s" (:sort-key k) (if (= true (:asc k))
"asc"
"desc")))
s)))
(defn params->query-string [q]
(-> q
:parsed-query-params
(update :sort sort->query)
(url/map->query)))
(defn default-unparse-query-params [query-params]
(reduce
(fn [query-params [k value]]
@@ -169,10 +162,32 @@
query-params
query-params))
(defn default-parse-query-params [grid-spec]
(comp
(query-params/apply-remove-sort)
(query-params/apply-toggle-sort grid-spec)
(query-params/apply-date-range :date-range :start-date :end-date)
(query-params/parse-key :exact-match-id query-params/parse-long)
(query-params/parse-key :sort #(query-params/parse-sort grid-spec %))
(query-params/parse-key :per-page query-params/parse-long)
(query-params/parse-key :start query-params/parse-long)
(query-params/parse-key :start-date query-params/parse-date)
(query-params/parse-key :end-date query-params/parse-date)))
(defn wrap-trim-client-ids [handler]
(fn trim-client-ids [request]
(let [valid-clients (extract-client-ids (:clients request)
(:client request)
(:client-id (:parsed-query-params request))
(when (:client-code (:parsed-query-params request))
[:client/code (:client-code (:parsed-query-params request))]))
valid-clients (->> valid-clients
(take 20)
set)]
(handler (assoc request :trimmed-clients valid-clients)))))
(defn table [grid-spec {:keys [identity] :as request}]
(defn table-route [grid-spec]
(-> (fn table [{:keys [identity] :as request}]
(let [unparse-query-params (or (:unparse-query grid-spec)
default-unparse-query-params)]
(html-response (table*
@@ -182,9 +197,14 @@
:headers {"hx-push-url" (str "?" (url/map->query (unparse-query-params (:parsed-query-params request))))}
:oob (when-let [oob-render (:oob-render grid-spec)]
(oob-render request)))))
(wrap-trim-client-ids)
(query-params/wrap-parse-query-params (or (:parse-query-params grid-spec)
(default-parse-query-params grid-spec)))
(wrap-secure)
(wrap-client-redirect-unauthenticated)))
(defn page [grid-spec {:keys [identity] :as request}]
(defn page-route [grid-spec ]
(-> (fn page [{:keys [identity] :as request}]
(base-page
request
(com/page {:nav (:nav grid-spec)
@@ -199,15 +219,70 @@
identity
request))
(:title grid-spec)))
(wrap-trim-client-ids)
(query-params/wrap-parse-query-params (or (:parse-query-params grid-spec)
(default-parse-query-params grid-spec)))
(wrap-secure)
(wrap-client-redirect-unauthenticated)))
(def request-spec (m/schema [:map]))
(def entity-spec (m/schema [:map]))
(def header-spec (m/schema [:map
[:key :string]
[:name :string]
[:sort-key {:optional true} :string]
[:render [:=> [:cat entity-spec] :any]]
[:hide? {:optional true} [:=> [:cat entity-spec] :boolean]]]))
(def grid-spec (m/schema [:map
[:id :string]
[:nav vector?]
[:page-specific-nav
{:optional true
:default (fn [request])}
[:maybe [:=>
[:cat request-spec]
vector?]]]
[:id-fn {:default :db/id
:optional true}
[:=>
[:cat map?]
nat-int?]]
[:fetch-page [:=>
[:cat request-spec]
[:cat [:vector entity-spec] :int]]]
[:parse-query-params
{:optional true}
[:=>
[:cat [:map-of :keyword :any]]
[:map-of :keyword :any]]]
[:oob-render
{:optional true
:default (fn [request])}
[:=>
[:cat request-spec]
vector?]]
[:breadcrumbs [:vector vector?]]
[:title :string]
[:entity-name :string]
[:route :keyword]
[:action-buttons
{:default (fn [request])
:optional true}
[:=>
[:cat request-spec]
[:maybe [:vector vector?]]]]
[:row-buttons
{:default (fn [request entity])
:optional true}
[:=>
[:cat request-spec entity-spec]
[:maybe [:vector vector?]]]]
[:headers [:vector header-spec]]]))
(defn build [grid-page]
(when-not (m/validate grid-spec grid-page)
(throw (ex-info "Could not validate grid"
(m/explain grid-spec grid-page))))
(m/decode grid-spec grid-page (mt2/default-value-transformer {::mt2/add-optional-keys true})))
(defn default-parse-query-params [grid-spec]
(comp
(query-params/apply-remove-sort)
(query-params/apply-toggle-sort grid-spec)
(query-params/apply-date-range :date-range :start-date :end-date)
(query-params/parse-key :exact-match-id query-params/parse-long)
(query-params/parse-key :sort #(query-params/parse-sort grid-spec %))
(query-params/parse-key :per-page query-params/parse-long)
(query-params/parse-key :start query-params/parse-long)
(query-params/parse-key :start-date query-params/parse-date)
(query-params/parse-key :end-date query-params/parse-date)))

37
src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj
View File

@@ -8,10 +8,6 @@
merge-query
pull-many
query2]]
[auto-ap.graphql.utils :refer [extract-client-ids]]
[auto-ap.query-params :as query-params]
[auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.grid-page-helper :as helper]
@@ -19,7 +15,8 @@
[auto-ap.time :as atime]
[bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]))
[datomic.api :as dc]
[malli.core :as m]))
;; always should be fast
@@ -42,17 +39,10 @@
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-cash-drawer-shifts $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
:args [db [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date)
(some-> (:end-date query-params) c/to-date )]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :cash-drawer-shift/client ?c]
@@ -93,10 +83,11 @@
[(->> (hydrate-results ids-to-retrieve db request))
matching-count]))
(def grid-page {:id "cash-drawer-shift-table"
(def grid-page
(helper/build
{:id "cash-drawer-shift-table"
:nav (com/main-aside-nav)
:page-specific-nav filters
:id-fn :db/id
:fetch-page fetch-page
:oob-render
(fn [request]
@@ -111,8 +102,6 @@
:title "Cash drawer shifts"
:entity-name "Cash drawer shift"
:route :pos-cash-drawer-shift-table
:action-buttons (fn [request])
:row-buttons (fn [_ e])
:headers [{:key "client"
:name "Client"
:sort-key "client"
@@ -139,18 +128,12 @@
:name "Opened cash"
:sort-key "opened-cash"
:render #(some->> % :cash-drawer-shift/opened-cash (format "$%.2f"))}
]})
]}))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table
(query-params/wrap-parse-query-params (partial helper/table grid-page)
(helper/default-parse-query-params grid-page))
)
(def page (query-params/wrap-parse-query-params (partial helper/page grid-page)
(helper/default-parse-query-params grid-page)))
(def key->handler
{:pos-cash-drawer-shifts (wrap-client-redirect-unauthenticated (wrap-secure page))
:pos-cash-drawer-shift-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
{:pos-cash-drawer-shifts (helper/page-route grid-page)
:pos-cash-drawer-shift-table (helper/table-route grid-page)})

3
src/clj/auto_ap/ssr/pos/common.clj
View File

@@ -7,9 +7,6 @@
;; TODO make total fields take decimals
(defn date-range-field* [request]
(println "DR" (some-> request
:parsed-query-params
))
[:div#date-range {}
(com/field {:label "Date Range"}
[:div.space-y-4

33
src/clj/auto_ap/ssr/pos/expected_deposits.clj
View File

@@ -21,7 +21,8 @@
[bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]
[auto-ap.client-routes :as client-routes]))
[auto-ap.client-routes :as client-routes]
[malli.core :as m]))
;; make params parsing composable
@@ -132,11 +133,16 @@
[(->> (hydrate-results ids-to-retrieve db args))
matching-count]))
(def grid-page {:id "expected-deposit-table"
(def grid-page
(helper/build
{:id "expected-deposit-table"
:nav (com/main-aside-nav)
:page-specific-nav filters
:id-fn :db/id
:fetch-page fetch-page
:parse-query-params (comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
@@ -150,8 +156,6 @@
:title "Expected deposits"
:entity-name "Expected deposit"
:route :pos-expected-deposit-table
:action-buttons (fn [request]
)
:row-buttons (fn [_ e]
[
(when (:expected-deposit/reference-link e)
@@ -183,24 +187,11 @@
{:key "fee"
:name "Fee"
:sort-key "fee"
:render #(some->> % :expected-deposit/fee (format "$%.2f"))}]})
:render #(some->> % :expected-deposit/fee (format "$%.2f"))}]}))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (-> (partial helper/table grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def page (-> (partial helper/page grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def key->handler
{:pos-expected-deposits (wrap-client-redirect-unauthenticated (wrap-secure page))
:pos-expected-deposit-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
{:pos-expected-deposits (helper/page-route grid-page)
:pos-expected-deposit-table (helper/table-route grid-page)})

40
src/clj/auto_ap/ssr/pos/refunds.clj
View File

@@ -21,7 +21,8 @@
[clj-time.coerce :as c]
[datomic.api :as dc]
[clojure.set :as set]
[auto-ap.query-params :as query-params]))
[auto-ap.query-params :as query-params]
[malli.core :as m]))
;; TODO refunds
;; always should be fast
@@ -48,17 +49,10 @@
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
:args [db [(:trimmed-clients request)
(some-> query-params :start-date c/to-date)
(some-> query-params :end-date c/to-date )]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :sales-refund/client ?c]
@@ -109,11 +103,15 @@
[(->> (hydrate-results ids-to-retrieve db request))
matching-count]))
(def grid-page {:id "refund-table"
(def grid-page
(helper/build {:id "refund-table"
:nav (com/main-aside-nav)
:page-specific-nav filters
:id-fn :db/id
:fetch-page fetch-page
:parse-query-params (comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
@@ -127,8 +125,6 @@
:title "Refunds"
:entity-name "Refund"
:route :pos-refund-table
:action-buttons (fn [request])
:row-buttons (fn [request _])
:headers [{:key "client"
:name "Client"
:sort-key "client"
@@ -150,23 +146,11 @@
{:key "fee"
:name "Fee"
:sort-key "fee"
:render #(some->> % :sales-refund/fee (format "$%.2f"))}]})
:render #(some->> % :sales-refund/fee (format "$%.2f"))}]}))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (-> (partial helper/table grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def page (-> (partial helper/page grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def key->handler
{:pos-refunds (wrap-client-redirect-unauthenticated (wrap-secure page))
:pos-refund-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
{:pos-refunds (helper/page-route grid-page)
:pos-refund-table (helper/table-route grid-page)})

56
src/clj/auto_ap/ssr/pos/sales_orders.clj
View File

@@ -22,12 +22,8 @@
[auto-ap.time :as atime]
[bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]))
;; TODO incorporate parsing into spec
;; TODO incorporate permissions into spec
;; TODO incorporate limiting clients into spec
[datomic.api :as dc]
[malli.core :as m]))
(defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
@@ -98,18 +94,10 @@
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
:args [db [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date)
(some-> (:end-date query-params) c/to-date)]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :sales-order/client ?c]
@@ -182,11 +170,17 @@
matching-count]))
(def grid-page {:id "sales-table"
(def grid-page
(helper/build
{:id "sales-table"
:nav (com/main-aside-nav)
:page-specific-nav filters
:id-fn :db/id
:fetch-page fetch-page
:parse-query-params (comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
@@ -214,8 +208,7 @@
(when (:sales-order/reference-link e)
[(com/a-icon-button {:href (:sales-order/reference-link e)}
svg/external-link)]))
:headers [
{:key "client"
:headers [{:key "client"
:name "Client"
:sort-key "client"
:hide? (fn [args]
@@ -257,28 +250,13 @@
"CARD" "card"
"SQUARE_GIFT_CARD" "gift card"
"OTHER" "other"
nil)))])}]})
nil)))])}]}
))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (-> (partial helper/table grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def page (-> (partial helper/page grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def key->handler
{:pos-sales (wrap-client-redirect-unauthenticated (wrap-secure page))
:pos-sales-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
{:pos-sales (helper/page-route grid-page)
:pos-sales-table (helper/table-route grid-page)})

57
src/clj/auto_ap/ssr/pos/tenders.clj
View File

@@ -8,19 +8,19 @@
merge-query
pull-many
query2]]
[auto-ap.graphql.utils :refer [extract-client-ids]]
[auto-ap.routes.utils
:refer [wrap-client-redirect-unauthenticated wrap-secure]]
[auto-ap.ssr.pos.common :refer [date-range-field* processor-field* total-field*]]
[auto-ap.query-params :as query-params]
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.grid-page-helper :as helper]
[auto-ap.ssr.pos.common
:refer [date-range-field* processor-field* total-field*]]
[auto-ap.ssr.svg :as svg]
[auto-ap.time :as atime]
[bidi.bidi :as bidi]
[clj-time.coerce :as c]
[datomic.api :as dc]
[auto-ap.query-params :as query-params]))
[malli.core :as m]
[malli.transform :as mt2]))
;; always should be fast
@@ -48,19 +48,10 @@
(defn fetch-ids [db request]
(let [query-params (:parsed-query-params request)
valid-clients (extract-client-ids (:clients request)
(:client request)
(:client-id query-params)
(when (:client-code query-params)
[:client/code (:client-code query-params)]))
valid-clients (->> valid-clients
(take 10)
set)
processor (some-> query-params :processor (#(keyword "ccp-processor" (name %)))) ; TODO parse
query (cond-> {:query {:find []
:in ['$ '[?clients ?start-date ?end-date]]
:where '[[(iol-ion.query/scan-charges $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]]}
:args [db [valid-clients
:args [db [(:trimmed-clients request)
(some-> (:start-date query-params) c/to-date)
(some-> (:end-date query-params) c/to-date)]]}
(:sort query-params) (add-sorter-fields {"client" ['[?e :charge/client ?c]
@@ -90,10 +81,10 @@
'[(<= ?a ?total-lte)]]}
:args [(:total-lte query-params)]})
processor
(:processor query-params)
(merge-query {:query {:in '[?processor]
:where ['[?e :charge/processor ?processor]]}
:args [processor]})
:args [(:processor query-params)]})
true
@@ -118,11 +109,17 @@
[(->> (hydrate-results ids-to-retrieve db request))
matching-count]))
(def grid-page {:id "tender-table"
(def grid-page
(helper/build
{:id "tender-table"
:nav (com/main-aside-nav)
:page-specific-nav filters
:id-fn :db/id
:fetch-page fetch-page
:parse-query-params (comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page))
:oob-render
(fn [request]
[(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)])
@@ -136,7 +133,6 @@
:title "Tenders"
:entity-name "Tender"
:route :pos-tender-table
:action-buttons (fn [request])
:row-buttons (fn [request e]
(when (:charge/reference-link e)
[(com/a-icon-button {:href (:charge/reference-link e)}
@@ -174,25 +170,12 @@
:pos-expected-deposits)
"?exact-match-id=" expected-deposit-id)
:hx-boost "true"}
(com/pill {:color :secondary} "expected deposit")]))}]})
(com/pill {:color :secondary} "expected deposit")]))}]}))
(def row* (partial helper/row* grid-page))
(def table* (partial helper/table* grid-page))
(def table (-> (partial helper/table grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def page (-> (partial helper/page grid-page)
(query-params/wrap-parse-query-params
(comp
(query-params/parse-key :processor #(query-params/parse-keyword "ccp-processor" %))
(query-params/parse-key :total-gte query-params/parse-double)
(query-params/parse-key :total-lte query-params/parse-double)
(helper/default-parse-query-params grid-page)))))
(def key->handler
{:pos-tenders (wrap-client-redirect-unauthenticated (wrap-secure page))
:pos-tender-table (wrap-client-redirect-unauthenticated (wrap-secure table))})
{:pos-tenders (helper/page-route grid-page)
:pos-tender-table (helper/table-route grid-page)})