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

a bunch of cleanup to remove stuff

Browse Source
This commit is contained in:
Bryce
2023-10-14 23:37:04 -07:00
parent f997c41abd
commit 3d9d02f76a
15 changed files with 33 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/clj/auto_ap/ssr/admin/accounts.clj
View File

@@ -4,6 +4,7 @@
:refer [add-sorter-fields
apply-pagination
apply-sort-3
audit-transact
conn
merge-query
pull-many
@@ -11,6 +12,7 @@
[auto-ap.query-params :as query-params]
[auto-ap.routes.utils
:refer [wrap-admin wrap-client-redirect-unauthenticated]]
[auto-ap.solr :as solr]
[auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components :as com]
[auto-ap.ssr.grid-page-helper :as helper]
@@ -31,6 +33,7 @@
[malli.core :as mc]
[ring.middleware.nested-params :refer [wrap-nested-params]]))
;; TODO support for new account
(defn filters [request]
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
"hx-get" (bidi/path-for ssr-routes/only-routes
@@ -168,13 +171,33 @@
(def table* (partial helper/table* grid-page))
(defn account-edit-save [{:keys [params route-params] :as request}]
(let [_ @(dc/transact conn [[:upsert-entity (-> params (assoc :db/id (:db/id route-params)) (dissoc :id))]])
new-account (some-> route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
(let [_ (audit-transact [[:upsert-entity (-> params (assoc :db/id (:db/id route-params)) (dissoc :id))]]
(:identity request))
updated-account (some-> route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
(solr/index-documents-raw solr/impl
"accounts"
(into [{"id" (:db/id updated-account)
"account_id" (:db/id updated-account)
"name" (:account/name updated-account)
"numeric_code" (:account/numeric-code updated-account)
"location" (:account/location updated-account)
"applicability" (clojure.core/name (:account/applicability updated-account))}]
(for [o (:account/client-overrides updated-account)]
{"id" (:db/id o)
"account_id" (:db/id updated-account)
"name" (:account-client-override/name o)
"numeric_code" (:account/numeric-code updated-account)
"location" (:account/location updated-account)
"applicability" (clojure.core/name (:account/applicability updated-account))
"client_id" (:db/id (:account-client-override/client o))
"account_client_override_id" (:db/id o)}))
)
(html-response
(row* identity new-account {:flash? true})
(row* identity updated-account {:flash? true})
:headers {"hx-trigger" "closeModal"
"hx-retarget" (format "#account-table tr[data-id=\"%d\"]" (:db/id new-account))})))
"hx-retarget" (format "#account-table tr[data-id=\"%d\"]" (:db/id updated-account))})))
(defn client-override* [override]
[:div.flex.gap-2.mb-2.client-override
@@ -194,10 +217,7 @@
(defn account-edit-dialog [request]
(prn (:route-params request))
(let [account (some-> request
:route-params
:db/id
(#(dc/pull (dc/db conn) default-read %)))]
(let [account (some-> request :route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
(html-response
(com/modal
{:modal-class "max-w-4xl"}