Makes navigation a little bit better.

src/clj/auto_ap/routes/ezcater_xls.clj

@@ -192,10 +192,11 @@
     (upload-xls request)
     (base-page
      request
-     (com/page {:nav (com/admin-aside-nav)
+     (com/page {:nav com/admin-aside-nav
                 :client-selection (:client-selection (:session request))
                 :client (:client request)
                 :identity (:identity request)
+                :request request
                 :app-params {:hx-get     (bidi/path-for ssr-routes/only-routes
                                                         :admin-ezcater-xls)
                              :hx-trigger "clientSelected from:body"

src/clj/auto_ap/ssr/admin.clj

@@ -44,7 +44,7 @@
 (defn page [request]
   (base-page 
     request
-    (com/page {:nav              (com/admin-aside-nav)
+    (com/page {:nav              com/admin-aside-nav
                :client-selection (:client-selection (:session  request))
                :clients          (:clients request)
                :client           (:client request)

src/clj/auto_ap/ssr/admin/accounts.clj

@@ -132,7 +132,7 @@
 
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (comp

src/clj/auto_ap/ssr/admin/background_jobs.clj

@@ -89,7 +89,7 @@
 (def grid-page
   (helper/build {:id                 "job-table"
                  :id-fn :arn
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :fetch-page         fetch-page
                  :action-buttons (fn [request]
                                    [(com/button {:hx-get    (str (bidi/path-for ssr-routes/only-routes :admin-job-start-dialog))

src/clj/auto_ap/ssr/admin/clients.clj

@@ -168,7 +168,7 @@
 
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (helper/default-parse-query-params grid-page)

src/clj/auto_ap/ssr/admin/excel_invoice.clj

@@ -242,11 +242,12 @@
 (defn page [{:keys [form-params form-errors] :as request}]
   (base-page 
     request
-    (com/page {:nav              (com/admin-aside-nav)
+    (com/page {:nav              com/admin-aside-nav
                :client-selection (:client-selection (:session  request))
                :clients          (:clients request)
                :client           (:client request)
-               :identity         (:identity request)}
+               :identity         (:identity request)
+               :request request}
               (com/breadcrumbs {} [:a {:href (bidi/path-for ssr-routes/only-routes ::route/page)}
                                    "Admin"])
               [:div.flex.space-x-4 

src/clj/auto_ap/ssr/admin/history.clj

@@ -165,10 +165,11 @@
   (let [entity-id         (or (some-> query-params (get "entity-id") Long/parseLong)
                               (some-> route-params (get :entity-id) Long/parseLong))]
     (base-page request
-               (com/page {:nav (com/admin-aside-nav)
+               (com/page {:nav com/admin-aside-nav
                           :client-selection (:client-selection (:session request))
                           :client (:client request)
                           :identity (:identity request)
+                          :request request
                           :app-params {:hx-get     (bidi/path-for ssr-routes/only-routes
                                                                   :admin-history)
                                        :hx-trigger "clientSelected from:body"

src/clj/auto_ap/ssr/admin/import_batch.clj

@@ -124,7 +124,7 @@
 (def grid-page
   (helper/build {:id                 "entity-table"
                  :id-fn :db/id
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :fetch-page         fetch-page
                  :page-specific-nav  filters
                  :row-buttons (fn [_ entity]

src/clj/auto_ap/ssr/admin/transaction_rules.clj

@@ -176,7 +176,7 @@
 
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (comp

src/clj/auto_ap/ssr/admin/vendors.clj

@@ -136,7 +136,7 @@
 
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (comp

src/clj/auto_ap/ssr/company.clj

@@ -130,7 +130,7 @@
 (defn page [{:keys [identity matched-route] :as request}]
   (base-page
    request
-   (com/page {:nav           (com/company-aside-nav)
+   (com/page {:nav           com/company-aside-nav
               :client-selection (:client-selection (:session  request))
               :client (:client request)
               :identity      (:identity request)

src/clj/auto_ap/ssr/company/company_1099.clj

@@ -90,7 +90,7 @@
 (def grid-page
   (helper/build 
     {:id          "entity-table"
-     :nav         (com/company-aside-nav)
+     :nav         com/company-aside-nav
      :id-fn       (comp :db/id second)
      :fetch-page  fetch-page
      :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes

src/clj/auto_ap/ssr/company/plaid.clj

@@ -133,7 +133,7 @@
 (def grid-page 
   (helper/build 
     {:id          "plaid-table"
-     :nav         (com/company-aside-nav)
+     :nav         com/company-aside-nav
      :fetch-page  fetch-page
      :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
                                              :company)}

src/clj/auto_ap/ssr/company/reports.clj

@@ -70,7 +70,7 @@
 
 (def grid-page
   (helper/build {:id          "report-table"
-                 :nav         (com/company-aside-nav)
+                 :nav         com/company-aside-nav
                  :fetch-page  fetch-page
                  :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes
                                                          :company)}

src/clj/auto_ap/ssr/company/yodlee.clj

@@ -122,7 +122,7 @@ fastlink.open({fastLinkURL: '%s',
 (def grid-page
   (helper/build 
     {:id          "yodlee-table"
-     :nav         (com/company-aside-nav)
+     :nav         com/company-aside-nav
      :id-fn       :db/id
      :fetch-page  fetch-page
      :breadcrumbs [[:a {:href (bidi/path-for ssr-routes/only-routes

src/clj/auto_ap/ssr/components/aside.clj

@@ -1,12 +1,13 @@
 (ns auto-ap.ssr.components.aside
   (:require [auto-ap.client-routes :as client-routes]
+            [auto-ap.logging :as alog]
             [auto-ap.routes.admin.clients :as ac-routes]
             [auto-ap.routes.admin.excel-invoices :as ei-routes]
             [auto-ap.routes.admin.import-batch :as ib-routes]
             [auto-ap.routes.admin.transaction-rules :as transaction-rules]
             [auto-ap.routes.admin.vendors :as v-routes]
-            [auto-ap.routes.payments :as payment-routes]
             [auto-ap.routes.invoice :as invoice-route]
+            [auto-ap.routes.payments :as payment-routes]
             [auto-ap.ssr-routes :as ssr-routes]
             [auto-ap.ssr.hiccup-helper :as hh]
             [auto-ap.ssr.hx :as hx]
@@ -19,30 +20,36 @@
    [:a (-> params
            (dissoc :icon)
            (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")
+           (update :class (fn [c]
+                            (cond-> (or c "cursor-pointer flex items-center p-2 w-full text-sm rounded-lg transition duration-75 group hover:bg-gray-100 dark:hover:bg-gray-700 select-none")
+                              (:active? params) (hh/add-class "text-blue-600 font-extrabold dark:text-blue-100 bg-gray-100")
+                              (not (:active? params)) (hh/add-class "text-gray-600 dark:text-white"))))
            (assoc :hx-indicator "find .htmx-indicator")
            (assoc :hx-boost "true")
            (assoc :hx-select "#app")
            (assoc :hx-target "#app")
            (assoc :hx-swap "innerHTML"))
-
     (when (:icon params)
       [:span {:class "flex-shrink-0 w-6 h-6 text-gray-400 transition duration-75 group-hover:text-blue-500 dark:text-gray-400 group-hover:scale-110 dark:group-hover:text-white mr-3"}
        (:icon params)])
 
-    (into [:span {:class "flex-1 text-left whitespace-nowrap text-gray-600 dark:text-white"}] children)
+    (into [:span {:class "flex-1 text-left whitespace-nowrap"}] children)
-    (when (get params "@click")
+    (when (get params "@click.prevent")
       [:svg {:aria-hidden "true", :class "w-6 h-6", :fill "currentColor", :viewbox "0 0 20 20", :xmlns "http://www.w3.org/2000/svg"}
        [:path {:fill-rule "evenodd", :d "M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z", :clip-rule "evenodd"}]])
     [:div.htmx-indicator.flex.items-center
      (svg/spinner-primary {:class "inline w-4 h-4 text-white"})]]])
 
 (defn sub-menu- [params & children]
-  [:ul (update params
+  [:ul (cond-> (update params
-               :class (fnil hh/add-class "")"py-2 space-y-1.5")
+                       :class (fnil hh/add-class "") "space-y-1.5 max-h-0 transition transition-all overflow-hidden")
+         true (assoc ":class" (format "selected == '%s' ? 'py-0.5' : 'py-0'" (:selector params))
+                     :x-ref "submenu"
+                     ":style" (format "selected == '%s' ? 'max-height: ' + $refs.submenu.scrollHeight + 'px' : ''" (:selector params))))
    (for [c children]
      [:li
-      (update-in c [1 1 :class ] str  " flex items-center p-2 pl-11 w-full text-base font-normal text-gray-900 rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700")])])
+      (update-in c [1 1 :class ] (fn [c]
+                                   (hh/add-class (or c "") " flex items-center p-2 pl-11 w-full text-base font-normal rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700")))])])
 
 (defn left-aside- [{:keys [nav page-specific]} & children]
   [:aside {:id         "left-nav",
@@ -67,84 +74,113 @@
        page-specific]
       )]])
 
-(defn main-aside-nav- []
+(defn main-aside-nav- [request]
-  [:ul {:class "space-y-1"}
+  [:ul {:class "space-y-1"
+        :x-data (hx/json {:selected
+                          (cond
+                            (#{::invoice-route/page} (:matched-route request))
+                            "invoices"
+
+                            (#{:pos-sales :pos-expected-deposits :pos-tenders :pos-refunds :pos-cash-drawer-shifts} (:matched-route request))
+                            "sales"
+                            (#{::payment-routes/page} (:matched-route request))
+                            "payments"
+                            :else
+                            nil)})}
 
    [:li
     (menu-button- {:icon svg/pie
                    :href "/"}
                   "Dashboard")]
-   [:li {:x-data (hx/json {:open false})}
+
-    (menu-button- {"@click" "open = !open"
+   (menu-button- {"@click.prevent" "if (selected == 'invoices') {selected = null } else { selected = 'invoices'} "
                   :icon                 svg/accounting-invoice-mail}
                  "Invoices")
-    (sub-menu- (hx/alpine-appear {:x-show "open"})
+   (sub-menu-
+    {:selector "invoices"}
     (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                 ::invoice-route/page)
-                                            {:date-range "month"})}
+                                 {:date-range "month"})
+                   :active? (= ::invoice-route/page (:matched-route request))}
+
                   "All")
     (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                 ::invoice-route/page)
-                                            {:date-range "month"})}
+                                 {:date-range "month"})
+                   :active? (= ::invoice-route/page (:matched-route request))}
                   "Paid")
     (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                 ::invoice-route/unpaid-page)
-                                            {:date-range "month"})}
+                                 {:date-range "month"})
+                   :active? (= ::invoice-route/page (:matched-route request))}
                   "Unpaid")
     (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                 ::invoice-route/voided-page)
-                                            {:date-range "month"})}
+                                 {:date-range "month"})
-                             "Voided"))]
+                   :active? (= ::invoice-route/page (:matched-route request))}
-   [:li {:x-data (hx/json {:open false})}
+                  "Voided"))
+
    (menu-button- {:icon                 svg/receipt-register-1
-                   "@click" "open = !open"}
+
+                  "@click.prevent" "if (selected == 'sales') {selected = null } else { selected = 'sales'} "}
                  "Sales")
-    (sub-menu- (hx/alpine-appear {:x-show "open"})
+   (sub-menu- {:selector "sales"}
               (menu-button- {:href (str (bidi/path-for ssr-routes/only-routes
                                                        :pos-sales)
-                                         "?date-range=week")} "Sales")
+                                        "?date-range=week")
+                             :active? (= :pos-sales (:matched-route request))} "Sales")
               (menu-button- {:href (str (bidi/path-for ssr-routes/only-routes
                                                        :pos-expected-deposits)
-                                         "?date-range=week")} "Expected Deposits")
+                                        "?date-range=week")
+                             :active? (= :pos-expected-deposits (:matched-route request))}
+                            "Expected Deposits")
               (menu-button- {:href (str (bidi/path-for ssr-routes/only-routes
                                                        :pos-tenders)
-                                         "?date-range=week")} "Tenders")
+                                        "?date-range=week")
+                             :active? (= :pos-tenders (:matched-route request))} "Tenders")
 
               (menu-button- {:href (str (bidi/path-for ssr-routes/only-routes
                                                        :pos-refunds)
-                                         "?date-range=week")} "Refunds")
+                                        "?date-range=week")
+                             :active? (= :pos-refunds (:matched-route request))} "Refunds")
               (menu-button- {:href (str (bidi/path-for ssr-routes/only-routes
                                                        :pos-cash-drawer-shifts)
-                                         "?date-range=week")} "Cash drawer shifts")
+                                        "?date-range=week")
-               #_(menu-button- {:href "Sales"} "Cash Shifts")
+                             :active? (= :cash-drawer-shifts (:matched-route request))} "Cash drawer shifts"))
-               #_(menu-button- {:href "Sales"} "Tenders"))]
+   ;; TODO make specific routes for categories
-   [:li {:x-data (hx/json {:open false})}
+   ;; TODO auto-apen sub menus
-    (menu-button- {"@click" "open = !open"
+
+   (menu-button- {"@click.prevent" "if (selected == 'payments') {selected = null } else { selected = 'payments'} "
                   :icon                 svg/payments}
                  "Payments")
-    (sub-menu- (hx/alpine-appear {:x-show "open"})
+   (sub-menu- {:selector "payments"}
               (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                           ::payment-routes/page)
-                                            { :date-range "month"})} "All")
+                                           {:date-range "month"})
+                             :active? (= ::payment-routes/page (:matched-route request))} "All")
+
               (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                           ::payment-routes/page)
                                            {:status "pending"
-                                             :date-range "month"})} "Pending")
+                                            :date-range "month"})
+                             :active? (= ::payment-routes/page (:matched-route request))} "Pending")
               (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                           ::payment-routes/page)
                                            {:status "cleared"
-                                             :date-range "month"})} "Cleared")
+                                            :date-range "month"})
+                             :active? (= ::payment-routes/page (:matched-route request))} "Cleared")
               (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes
                                                           ::payment-routes/page)
                                            {:status "voided"
-                                             :date-range "month"})} "Voided"))]
+                                            :date-range "month"})
+                             :active? (= ::payment-routes/page (:matched-route request))} "Voided"))
 
    [:li {:x-data (hx/json {:open false})}
-    (menu-button- {"@click" "open = !open"
+    (menu-button- {"@click.prevent" "if (selected == 'transactions') {selected = null } else { selected = 'transactions'} "
                    :icon                 svg/bank}
                   "Transactions")
 
-    (sub-menu- (hx/alpine-appear {:x-show "open"})
+    (sub-menu- {:selector "transactions"}
                (menu-button- {:href (bidi/path-for client-routes/routes
                                                    :transactions)} "All")
                (menu-button- {:href (bidi/path-for client-routes/routes
@@ -155,11 +191,11 @@
                                                    :approved-transactions)} "Approved")
                (menu-button- {:href (bidi/path-for ssr-routes/only-routes
                                                    :transaction-insights)} "Insights"))]
-   [:li {:x-data (hx/json {:open false})}
+
-    (menu-button- {"@click" "open = !open"
+   (menu-button- {"@click.prevent" "if (selected == 'ledger') {selected = null } else { selected = 'ledger'} "
                   :icon                 svg/receipt}
                  "Ledger")
-    (sub-menu- (hx/alpine-appear {:x-show "open"})
+   (sub-menu- {:selector "ledger"}
               (menu-button- {:href (bidi/path-for client-routes/routes
                                                   :ledger)} "Register")
               (menu-button- {:href (bidi/path-for client-routes/routes
@@ -171,10 +207,10 @@
               (menu-button- {:href (bidi/path-for client-routes/routes
                                                   :balance-sheet)} "Balance Sheet")
               (menu-button- {:href (bidi/path-for client-routes/routes
-                                                   :external-import-ledger)} "External Ledger Import"))]])
+                                                  :external-import-ledger)} "External Ledger Import"))])
 
 
-(defn company-aside-nav- []
+(defn company-aside-nav- [_]
   [:ul {:class "space-y-2" :hx-boost "true"}
    [:li
     (menu-button- {:icon svg/vendors
@@ -204,40 +240,47 @@
                   "1099 Vendor Info"
                   )]])
 
-(defn admin-aside-nav- []
+(defn admin-aside-nav- [{:keys [matched-route] :as request}]
-  [:ul {:class "space-y-2"}
+  [:ul {:class "space-y-2" :x-data (hx/json {:selected "nil"})}
    [:li
     (menu-button- {:icon svg/dashboard
+                   :active? (= :auto-ap.routes.admin/page matched-route)
                    :href (bidi/path-for ssr-routes/only-routes :auto-ap.routes.admin/page)}
                   "Dashboard")]
 
    [:li
     (menu-button- {:icon svg/restaurant
+                   :active? (= ::ac-routes/page matched-route)
                    :href (bidi/path-for ssr-routes/only-routes ::ac-routes/page)}
                   "Clients")]
    [:li
     (menu-button- {:icon svg/vendors
+                   :active? (= ::v-routes/page matched-route)
                    :href (bidi/path-for ssr-routes/only-routes
                                         ::v-routes/page)}
                   "Vendors")]
    [:li
     (menu-button- {:icon svg/user
+                   :active? (= :users matched-route)
                    :href (bidi/path-for ssr-routes/only-routes
                                         :users)}
                   "Users")]
    [:li
     (menu-button- {:icon svg/accounts
+                   :active? (= :admin-accounts matched-route)
                    :href (bidi/path-for ssr-routes/only-routes
                                         :admin-accounts)}
                   "Accounts")]
 
    [:li
     (menu-button- {:icon svg/cog
+                   :active? (= ::transaction-rules/page matched-route)
                    :href (bidi/path-for ssr-routes/only-routes ::transaction-rules/page)}
                   "Rules")]
 
    [:li
     (menu-button- {:icon svg/question
+                   :active? (= :admin-rules matched-route)
                    :href (bidi/path-for ssr-routes/only-routes
                                         :admin-history)
                    :hx-boost "true"}
@@ -245,20 +288,24 @@
 
    [:li
     (menu-button- {:icon svg/rabbit
+                   :active? (= :admin-jobs matched-route)
                    :href (bidi/path-for ssr-routes/only-routes
                                         :admin-jobs)}
                   "Background Jobs")]
-   [:li {:x-data (hx/json {:open false})}
+
+
    (menu-button- {:icon                 svg/arrow-in
-                   "@click" "open = !open"}
+                  "@click.prevent" "if (selected == 'import') {selected = null } else { selected = 'import'} "}
                  "Import")
 
-    (sub-menu- (hx/alpine-appear
+   (sub-menu- {:selector "import"}
-                 {:x-show "open"})
               (menu-button- {:href (bidi/path-for ssr-routes/only-routes
-                                                   ::ei-routes/page)} "Excel Invoices")
+                                                  ::ei-routes/page)
+                             :active? (= ::ei-routes/page matched-route)} "Excel Invoices")
               (menu-button- {:href (bidi/path-for ssr-routes/only-routes
-                                                   ::ib-routes/page)} "Import Batches")
+                                                  ::ib-routes/page)
+                             :active? (= ::ib-routes/page matched-route)} "Import Batches")
               (menu-button- {:href (bidi/path-for ssr-routes/only-routes
                                                   :admin-ezcater-xls)
-                              :hx-boost "true"} "EZCater XLS Import"))]])
+                             :active? (= :admin-ezcater-xls matched-route)
+                             :hx-boost "true"} "EZCater XLS Import"))])

src/clj/auto_ap/ssr/components/page.clj

@@ -6,7 +6,7 @@
    [auto-ap.ssr.svg :as svg]
    [auto-ap.ssr.hx :as hx]))
 
-(defn page- [{:keys [nav page-specific client clients client-selection identity app-params] :or {app-params {}}} & children]
+(defn page- [{:keys [nav page-specific client clients client-selection identity app-params request] :or {app-params {}} } & children]
   [:div#app {"_" (hiccup/raw "
                           on notification from body 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"
@@ -19,7 +19,8 @@
    [:div#app-contents.flex.pt-16.overflow-hidden (assoc app-params
                                                         :hx-disinherit "*"
                                                         :x-init "leftNavShow = true")
-    (left-aside- {:nav           nav
+    (left-aside- {:nav           (when nav
+                                   (nav request))
                   :page-specific page-specific})
     [:div#main-content {:class "relative w-full h-full overflow-y-auto px-4 bg-gray-100 dark:bg-gray-900 min-h-content  lg:pl-64"
                         ":class" "leftNavShow ? 'lg:pl-64' : ''"

src/clj/auto_ap/ssr/grid_page_helper.clj

@@ -208,7 +208,6 @@
 
 (defn table-route [grid-spec]
   (-> (fn table [{:keys [identity] :as request}]
-        (alog/peek ::qp (pr-str (:query-params request)))
         (let [unparse-query-params (or (:unparse-query grid-spec)
                                        default-unparse-query-params)]
           (html-response (table*
@@ -249,7 +248,8 @@
                     :client-selection (:client-selection (:session  request))
                     :clients          (:clients request)
                     :client           (:client request)
-                    :identity         (:identity request)}
+                    :identity         (:identity request)
+                    :request request}
                    (apply com/breadcrumbs {} (:breadcrumbs grid-spec))
                    [:div {:x-data (hx/json {:selected [] :all_selected false})
                           "x-bind:hx-vals" "JSON.stringify({selected: $data.selected, 'all-selected': $data.all_selected})"
@@ -277,7 +277,9 @@
                             [:hide? {:optional true} [:=> [:cat entity-spec] :boolean]]]))
 (def grid-spec (m/schema [:map
                           [:id :string]
-                          [:nav vector?]
+                          [:nav [:=>
+                                    [:cat request-spec]
+                                    vector?]]
                           [:page-specific-nav
                            {:optional true
                             :default (fn [request])}

src/clj/auto_ap/ssr/invoice/glimpse.clj

@@ -420,7 +420,7 @@ invoice_dropzone = new Dropzone(\"#invoice\", {
           :method request-method)
   (base-page
     request
-    (com/page {:nav           (com/admin-aside-nav)
+    (com/page {:nav           com/admin-aside-nav
                :client-selection (:client-selection (:session request))
                :client (:client request)
                :identity      (:identity request)

src/clj/auto_ap/ssr/invoices.clj

@@ -375,7 +375,7 @@
 ;; TODO fix parsing of query params
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/main-aside-nav)
+                 :nav                com/main-aside-nav
                  :check-boxes? true
                  :page-specific-nav  filters
                  :fetch-page         fetch-page

src/clj/auto_ap/ssr/payments.clj

@@ -278,7 +278,7 @@
 ;; TODO fix parsing of query params
 (def grid-page
   (helper/build {:id                 "entity-table"
-                 :nav                (com/main-aside-nav)
+                 :nav                com/main-aside-nav
                  :check-boxes? true
                  :page-specific-nav  filters
                  :fetch-page         fetch-page

src/clj/auto_ap/ssr/pos/expected_deposits.clj

@@ -136,7 +136,7 @@
 (def grid-page
   (helper/build 
     {:id                 "expected-deposit-table"
-     :nav                (com/main-aside-nav)
+     :nav                com/main-aside-nav
      :page-specific-nav  filters
      :fetch-page         fetch-page
      :parse-query-params (comp

src/clj/auto_ap/ssr/pos/refunds.clj

@@ -95,7 +95,7 @@
 
 (def grid-page
   (helper/build {:id                 "refund-table"
-                 :nav                (com/main-aside-nav)
+                 :nav                com/main-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (comp

src/clj/auto_ap/ssr/pos/sales_orders.clj

@@ -169,7 +169,7 @@
 (def grid-page
   (helper/build 
     {:id                 "sales-table"
-     :nav                (com/main-aside-nav)
+     :nav                com/main-aside-nav
      :page-specific-nav  filters
      :fetch-page         fetch-page
      :parse-query-params (comp

src/clj/auto_ap/ssr/pos/tenders.clj

@@ -112,7 +112,7 @@
 (def grid-page
   (helper/build
     {:id                 "tender-table"
-     :nav                (com/main-aside-nav)
+     :nav                com/main-aside-nav
      :page-specific-nav  filters
      :fetch-page         fetch-page
      :parse-query-params (comp

src/clj/auto_ap/ssr/transaction/insights.clj

@@ -317,7 +317,7 @@
 (defn page [{:keys [identity matched-route session clients] :as request}]
   (base-page
    request
-   (com/page {:nav (com/main-aside-nav)
+   (com/page {:nav com/main-aside-nav
               :client-selection (:client-selection (:session request))
               :client (:client request)
               :identity (:identity request)
@@ -325,7 +325,8 @@
                                                       :transaction-insights)
                            :hx-trigger "clientSelected from:body"
                            :hx-select "#app-contents"
-                           :hx-swap    "outerHTML swap:300ms"}}
+                           :hx-swap    "outerHTML swap:300ms"}
+              :request request}
              (com/breadcrumbs {}
                               [:a {:href (bidi/path-for client-routes/routes
                                                         :transactions)}

src/clj/auto_ap/ssr/ui.clj

@@ -45,7 +45,6 @@
      [:script {:src "/js/htmx-disable.js"}]
      [:script {:type "text/javascript", :src "https://cdn.yodlee.com/fastlink/v4/initialize.js", :async "async"}]]
     [:link {:rel "stylesheet" :href "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.4/dist/css/datepicker.min.css"}]
-
     [:script {:type "text/javascript" :src "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.4/dist/js/datepicker-full.min.js"}]
 
     [:link {:rel "stylesheet" :href "https://cdn.jsdelivr.net/npm/choices.js@9.0.1/public/assets/styles/choices.min.css"}]

src/clj/auto_ap/ssr/users.clj

@@ -205,7 +205,7 @@
 
 (def grid-page
   (helper/build {:id                 "user-table"
-                 :nav                (com/admin-aside-nav)
+                 :nav                com/admin-aside-nav
                  :page-specific-nav  filters
                  :fetch-page         fetch-page
                  :parse-query-params (comp