progress on ssr sales.
This commit is contained in:
@@ -64,10 +64,7 @@
|
||||
per-page (or per-page 30)
|
||||
[entities total] ((:fetch-page grid-spec)
|
||||
user
|
||||
{:start start
|
||||
:per-page per-page
|
||||
:clients clients
|
||||
:sort sort})]
|
||||
params)]
|
||||
(com/data-grid-card {:id (:id grid-spec)
|
||||
:title (:title grid-spec)
|
||||
:route (:route grid-spec)
|
||||
@@ -162,7 +159,7 @@
|
||||
|
||||
(defn params->query-string [q]
|
||||
(-> q
|
||||
(dissoc :client :session :client-selection :clients)
|
||||
(dissoc :client :session :client-selection :clients :query-params)
|
||||
(update :sort sort->query)
|
||||
(url/map->query)))
|
||||
|
||||
@@ -177,6 +174,7 @@
|
||||
hx-sort (assoc :sort (parse-sort grid-spec hx-sort))
|
||||
q-sort (assoc :sort (parse-sort grid-spec q-sort))
|
||||
(not-empty q-toggle-sort) (update :sort #(toggle-sort grid-spec % q-toggle-sort) )
|
||||
(seq query-params) (assoc :query-params query-params)
|
||||
(:session request) (assoc :session (:session request))
|
||||
(:client-selection (:session request)) (assoc :client-selection (:client-selection (:session request)))
|
||||
(:clients request) (assoc :clients (:clients request))
|
||||
@@ -193,15 +191,19 @@
|
||||
:headers {"hx-push-url" (str "?" query-string)})))
|
||||
|
||||
(defn page [grid-spec {:keys [identity] :as request}]
|
||||
(base-page
|
||||
request
|
||||
(com/page {:nav (:nav grid-spec)
|
||||
:client-selection (:client-selection (:session request))
|
||||
:clients (:clients request)
|
||||
:client (:client request)
|
||||
:identity (:identity request)}
|
||||
(apply com/breadcrumbs {} (:breadcrumbs grid-spec))
|
||||
(table* grid-spec
|
||||
identity
|
||||
(extract-params grid-spec request)))
|
||||
(:title grid-spec)))
|
||||
(let [params (extract-params grid-spec request)]
|
||||
(base-page
|
||||
request
|
||||
(com/page {:nav (:nav grid-spec)
|
||||
:page-specific (when-let [page-specific-nav (:page-specific-nav grid-spec)]
|
||||
(page-specific-nav params))
|
||||
:client-selection (:client-selection (:session request))
|
||||
:clients (:clients request)
|
||||
:client (:client request)
|
||||
:identity (:identity request)}
|
||||
(apply com/breadcrumbs {} (:breadcrumbs grid-spec))
|
||||
(table* grid-spec
|
||||
identity
|
||||
params
|
||||
))
|
||||
(:title grid-spec))))
|
||||
|
||||
Reference in New Issue
Block a user