diff --git a/project.clj b/project.clj index 63e533f7..41e320f0 100644 --- a/project.clj +++ b/project.clj @@ -13,7 +13,7 @@ [bidi "2.1.6"] [ring/ring-defaults "0.3.2" :exclusions [ring ring/ring-core]] [mount "0.1.16"] - [metosin/malli "0.8.9"] + [metosin/malli "0.10.0"] [tolitius/yang "0.1.23"] [ring "1.9.6" :exclusions [commons-codec commons-io diff --git a/src/clj/auto_ap/ssr/users.clj b/src/clj/auto_ap/ssr/users.clj index 9e4dadb8..7c6d5b2c 100644 --- a/src/clj/auto_ap/ssr/users.clj +++ b/src/clj/auto_ap/ssr/users.clj @@ -10,7 +10,7 @@ query2]] [auto-ap.query-params :as query-params] [auto-ap.routes.auth :as auth] - [auto-ap.routes.utils :refer [wrap-admin]] + [auto-ap.routes.utils :refer [wrap-admin wrap-client-redirect-unauthenticated]] [auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr.components :as com] [auto-ap.ssr.grid-page-helper :as helper] @@ -22,7 +22,8 @@ [clojure.string :as str] [config.core :refer [env]] [datomic.api :as dc] - [malli.core :as mc])) + [malli.core :as mc] + [malli.transform :as mt2])) (defn filters [request] [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms" @@ -323,6 +324,23 @@ [:div])]])))) +(def form-schema + (mc/schema + [:map + [:id nat-int?] + [:client-ids [:vector nat-int?]] + [:role [:enum :user-role/admin :user-role/test]]])) + +#_(mc/coerce + form-schema + {"id" "1230812" + "client-ids" ["123"] + "role" "admin"} + mt2/json-transformer) + +#_(mt2/coerck) + + (def key->handler {:users (wrap-admin (helper/page-route grid-page)) :user-table (wrap-admin (helper/table-route grid-page))