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

Date default

Browse Source
This commit is contained in:
Bryce
2024-04-10 09:58:05 -07:00
parent 8da7eaaf46
commit 894f7af16e
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,7 @@
(defn table-route [grid-spec] (defn table-route [grid-spec]
(-> (fn table [{:keys [identity] :as request}] (-> (fn table [{:keys [identity] :as request}]
(alog/peek ::TABLE-QP (:parsed-query-params request))
(let [unparse-query-params (or (:unparse-query grid-spec) (let [unparse-query-params (or (:unparse-query grid-spec)
default-unparse-query-params)] default-unparse-query-params)]
(html-response (table* (html-response (table*
@@ -224,10 +225,10 @@
main-transformer)) main-transformer))
"sort" sort->query))) "sort" sort->query)))
(update (filter-vals #(not (nil? %)) (update (filter-vals #(not (nil? %))
(m/encode (:query-schema grid-spec) (m/encode (:query-schema grid-spec)
(:query-params request) (:query-params request)
main-transformer)) main-transformer))
"sort" sort->query)) "sort" sort->query))
(unparse-query-params (:parsed-query-params request))) (unparse-query-params (:parsed-query-params request)))
"selected" "all-selected")))} ;; TODO seems hacky to special case selected and all-selected here "selected" "all-selected")))} ;; TODO seems hacky to special case selected and all-selected here
:oob (when-let [oob-render (:oob-render grid-spec)] :oob (when-let [oob-render (:oob-render grid-spec)]

6
src/clj/auto_ap/ssr/invoices.clj
View File

@@ -390,7 +390,8 @@
(assoc-in (exact-match-id* request) [1 :hx-swap-oob] true)]) (assoc-in (exact-match-id* request) [1 :hx-swap-oob] true)])
:query-schema query-schema :query-schema query-schema
:parse-query-params (fn [p] :parse-query-params (fn [p]
(mc/decode query-schema p main-transformer)) (alog/peek ::PARSE
(mc/decode query-schema p main-transformer)))
:action-buttons (fn [request] :action-buttons (fn [request]
[(when (can? (:identity request) {:subject :invoice :activity :bulk-delete}) [(when (can? (:identity request) {:subject :invoice :activity :bulk-delete})
(com/button {:hx-get (str (bidi/path-for ssr-routes/only-routes ::route/bulk-delete)) (com/button {:hx-get (str (bidi/path-for ssr-routes/only-routes ::route/bulk-delete))
@@ -1216,6 +1217,7 @@
(-> h (-> h
(wrap-status-from-source) (wrap-status-from-source)
(wrap-apply-sort grid-page) (wrap-apply-sort grid-page)
(wrap-schema-enforce :query-schema query-schema)
(wrap-merge-prior-hx) (wrap-merge-prior-hx)
(wrap-schema-enforce :query-schema query-schema)
(wrap-schema-enforce :hx-schema query-schema)
(wrap-client-redirect-unauthenticated))))) (wrap-client-redirect-unauthenticated)))))