fix(ssr): require Apply for all date-range filters

Most grid pages auto-submitted their date-range filter on every change
event, which fired mid-typing and re-rendered the date inputs, breaking
manual date entry. Invoices and ledgers already gated date submission
behind an explicit Apply button; this brings the other ten pages in line.

- date-range component: stop `change` from the date inputs bubbling to
  the form (@change.stop) and always render the Apply button, so typed or
  picked dates submit only via the Apply button's `datesApplied` event.
  The All/Week/Month/Year presets and all other filters are unaffected.
- payments, invoice import, transactions, import batches, sales
  summaries, expected deposits, cash drawer shifts, refunds, tenders,
  sales orders: add `datesApplied` to the form hx-trigger.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.gitignore

@@ -51,3 +51,6 @@ sysco-poller/**/*.csv
 .tmp/**
 playwright-report/**
 test-results/**
+# Scratch dir for temp files (screenshots, logs, etc.); keep the dir, ignore contents
+/tmp/*
+!/tmp/.gitkeep

AGENTS.md

@@ -1,5 +1,9 @@
 # Integreat Development Guide
 
+## Temporary Files
+
+Write any temporary files (screenshots, scratch logs, generated artifacts, etc.) to the `./tmp/` directory at the repo root. Its contents are gitignored (only `.gitkeep` is tracked), so nothing there will be accidentally committed. Do not scatter temp files elsewhere in the repo or in the system `/tmp`.
+
 ## Build & Run Commands
 
 ### Build

src/clj/auto_ap/jobs/sales_summaries.clj

@@ -333,7 +333,8 @@
 
   (iol-ion.tx.upsert-sales-summary-ledger/upsert-sales-summary (dc/db conn) {:db/id 17592314241429})
 
-  (mark-all-dirty 5)
+  (mark-all-dirty 14)
+  
   (delete-all)
 
   (sales-summaries-v2)

src/clj/auto_ap/ssr/admin.clj

@@ -10,8 +10,7 @@
    [bidi.bidi :as bidi]
    [clj-time.coerce :as coerce]
    [clj-time.core :as time]
-   [datomic.api :as dc]
+   [datomic.api :as dc]))
-   [hiccup2.core :as hiccup]))
 
 (defn hourly-changes []
   (let [tx-instant-attr (:db/id (dc/pull (dc/db conn) '[:db/id] :db/txInstant))
@@ -56,34 +55,68 @@
                                  [:div
                                   [:h1.text-2xl.mb-3.font-bold "Growth in clients"]
                                   [:div
-                                   [:div {:class      "w-full h-64"
+                                   [:div.w-full.h-64
-                                          :id         "client-chart"
+                                    [:canvas.w-full.h-full {:x-data (hx/json {:chart  nil
-                                          :data-chart (hx/json {:labels ["2 years ago" "1 year ago" "today"],
+                                                                              :labels ["2 years ago" "1 year ago" "today"]
-                                                                :series [(for [n    [2 1 0]
+                                                                              :data   (for [n    [2 1 0]
                                                                                             :let [start (time/plus (time/now) (time/years (- n)))]]
                                                                                         (->> (dc/q '[:find (count ?c)
                                                                                                      :in $
                                                                                                      :where [?c :client/code]]
                                                                                                    (dc/as-of (dc/db conn) (coerce/to-date start)))
                                                                                              first
-                                                                                first))]})}]
+                                                                                             first))})
-                                   [:script {:lang "javascript"}
+                                                            :x-init "new Chart($el, {
-                                    (hiccup/raw
+                        type: 'bar',
-                                     "new Chartist.Bar('#client-chart', JSON.parse(document.getElementById('client-chart').getAttribute('data-chart')))")]]]])
+                        data: {
+                          labels: labels,
+                          datasets: [{
+                            label: 'Clients',
+                            data: data,
+                            borderWidth: 1
+                          }]
+                        },
+                        options: {
+                          responsive: true,
+                          maintainAspectRatio: false,
+                          scales: {
+                            y: {
+                              beginAtZero: true
+                            }
+                          }
+                        }
+                      });"}]]]]])
 
               (com/content-card {:class "w-1/2"}
                                 [:div {:class "flex flex-col px-4 py-3 space-y-3"}
                                  [:div
                                   [:h1.text-2xl.mb-3.font-bold "Changes by hour"]
                                   [:div
-                                   [:div {:class      "w-full h-64"
+                                   [:div.w-full.h-64
-                                          :id         "changes"
+                                    [:canvas.w-full.h-full {:x-data (hx/json {:chart  nil
-                                          :data-chart (hx/json {:labels (for [n (range -24 0)]
+                                                                              :labels (for [n (range -24 0)]
-                                                                          (format "%d" n)),
+                                                                                        (format "%d" n))
-                                                                :series [(hourly-changes)]})}]
+                                                                              :data   (hourly-changes)})
-                                   [:script {:lang "javascript"}
+                                                            :x-init "new Chart($el, {
-                                    (hiccup/raw
+                        type: 'line',
-                                     "new Chartist.Line('#changes', JSON.parse(document.getElementById('changes').getAttribute('data-chart')))")]]]])])
+                        data: {
+                          labels: labels,
+                          datasets: [{
+                            label: 'Changes',
+                            data: data,
+                            borderWidth: 1
+                          }]
+                        },
+                        options: {
+                          responsive: true,
+                          maintainAspectRatio: false,
+                          scales: {
+                            y: {
+                              beginAtZero: true
+                            }
+                          }
+                        }
+                      });"}]]]]])])
    "Admin"))
 
 (def key->handler

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

@@ -35,7 +35,7 @@
                           default-grid-fields-schema)]))
 
 (defn filters [request]
-  [:form {"hx-trigger"         "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger"         "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get"             (bidi/path-for ssr-routes/only-routes
                                               ::route/table)
           "hx-target"          "#entity-table"

src/clj/auto_ap/ssr/components/card.clj

@@ -14,5 +14,5 @@
   [:section (merge params {:class (hh/add-class " py-3 sm:py-5" (:class params))})
    [:div {:class (:max-w params "max-w-screen-2xl")}
     (into
-     [:div {:class "relative overflow-scroll shadow-md dark:bg-gray-800 sm:rounded-lg border-2 border-gray-200 dark:border-gray-900 bg-white"}]
+     [:div {:class "relative overflow-auto shadow-md dark:bg-gray-800 sm:rounded-lg border-2 border-gray-200 dark:border-gray-900 bg-white"}]
      children)]])

src/clj/auto_ap/ssr/components/date_range.clj

@@ -7,7 +7,7 @@
             [clj-time.core :as t]
             [clj-time.periodic :as per]))
 
-(defn date-range-field [{:keys [value id apply-button?]}]
+(defn date-range-field [{:keys [value id]}]
   [:div {:id id}
    (com/field {:label "Date Range"}
               [:div.space-y-4
@@ -17,7 +17,7 @@
                                   (com/button-group-button {:size :small :value "week" :hx-trigger "click"} "Week")
                                   (com/button-group-button {:size :small :value "month" :hx-trigger "click"} "Month")
                                   (com/button-group-button {:size :small :value "year" :hx-trigger "click"} "Year"))]
-               [:div.flex.space-x-1.items-baseline.w-full.justify-start
+               [:div.flex.space-x-1.items-baseline.w-full.justify-start {"@change.stop" ""}
                 (com/date-input {:name        "start-date"
                                  :value       (some-> (:start value)
                                                       (atime/unparse-local atime/normal-date))
@@ -31,9 +31,8 @@
                                  :placeholder "Date"
                                  :size        :small
                                  :class "shrink date-filter-input"})
-                (when apply-button?
                 (but/button- {:color :secondary
                               :size :small
                               :type "button"
                               "x-on:click" "$dispatch('datesApplied')"}
-                               "Apply"))]])])
+                             "Apply")]])])

src/clj/auto_ap/ssr/invoice/import.clj

@@ -56,7 +56,7 @@
     [:div {:id "exact-match-id-tag"}]))
 
 (defn filters [request]
-  [:form#invoice-filters {"hx-trigger"   "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form#invoice-filters {"hx-trigger"   "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
                           "hx-get"       (bidi/path-for ssr-routes/only-routes
                                                         ::route/import-table)
                           "hx-target"    "#entity-table"

src/clj/auto_ap/ssr/ledger/common.clj

@@ -11,10 +11,10 @@
    [auto-ap.routes.transactions :as transaction-routes]
    [auto-ap.ssr-routes :as ssr-routes]
    [auto-ap.ssr.components :as com]
+   [auto-ap.ssr.components.date-range :as dr]
    [auto-ap.ssr.components.link-dropdown :refer [link-dropdown]]
    [auto-ap.ssr.grid-page-helper :as helper]
    [auto-ap.ssr.hx :as hx]
-   [auto-ap.ssr.pos.common :refer [date-range-field*]]
    [auto-ap.ssr.svg :as svg]
    [auto-ap.ssr.utils
     :refer [clj-date-schema entity-id html-response ref->enum-schema
@@ -31,7 +31,7 @@
 
 (defn exact-match-id* [request]
   (if (nat-int? (:exact-match-id (:query-params request)))
-    [:div {:x-data (hx/json {:exact_match (:exact-match-id (:query-params request))}) :id "exact-match-id-tag"}
+    [:div {:x-data (hx/json {:exact_match (:exact-match-id (:query-params request))}) :id "exact-match-id-tag" :class "filter-trigger"}
      (com/hidden {:name "exact-match-id"
                   "x-model" "exact_match"})
      (com/pill {:color :primary}
@@ -46,7 +46,8 @@
   [:div {:hx-trigger "clientSelected from:body"
          :hx-get (bidi.bidi/path-for ssr-routes/only-routes ::route/bank-account-filter)
          :hx-target "this"
-         :hx-swap "outerHTML"}
+         :hx-swap "outerHTML"
+         :class "filter-trigger"}
    (when (:client request)
      (let [bank-account-belongs-to-client? (get (set (map :db/id (:client/bank-accounts (:client request))))
                                                 (:db/id (:bank-account (:query-params request))))]
@@ -67,7 +68,7 @@
   (html-response (bank-account-filter* request)))
 
 (defn filters [request]
-  [:form#ledger-filters {"hx-trigger"   "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form#ledger-filters {"hx-trigger" "datesApplied, change delay:500ms from:.filter-trigger, keyup changed from:.hot-filter delay:1000ms"
                          "hx-get" (bidi/path-for ssr-routes/only-routes
                                                  ::route/table)
                          "hx-target" "#entity-table"
@@ -82,7 +83,8 @@
                                :url (bidi/path-for ssr-routes/only-routes :vendor-search)
                                :value (:vendor (:query-params request))
                                :value-fn :db/id
-                               :content-fn :vendor/name}))
+                               :content-fn :vendor/name
+                               :class "filter-trigger"}))
     (com/field {:label "Account"}
                (com/typeahead {:name "account"
                                :id "account"
@@ -90,11 +92,15 @@
                                :value (:account (:query-params request))
                                :value-fn :db/id
                                :content-fn #(:account/name (d-accounts/clientize (dc/pull (dc/db conn) d-accounts/default-read (:db/id %))
-                                                                                 (:db/id (:client request))))}))
+                                                                                 (:db/id (:client request))))
+                               :class "filter-trigger"}))
 
     (bank-account-filter* request)
 
-    (date-range-field* request)
+    (dr/date-range-field {:value {:start (:start-date (:query-params request))
+                                  :end (:end-date (:query-params request))}
+                          :id "date-range"
+                          :apply-button? true})
     (com/field {:label "Invoice #"}
                (com/text-input {:name "invoice-number"
                                 :id "invoice-number"
@@ -144,6 +150,7 @@
      (com/hidden {:name "only-unbalanced"
                   ":value" "onlyUnbalanced ? 'on' : ''"})
      (com/checkbox {:value (:only-unbalanced (:query-params request))
+                    :class "filter-trigger"
                     :x-model "onlyUnbalanced"}
                    "Show unbalanced")]
     (exact-match-id* request)]])
@@ -468,7 +475,10 @@
                  :fetch-page fetch-page
                  :oob-render
                  (fn [request]
-                   [(assoc-in (date-range-field* request) [1 :hx-swap-oob] true)
+                   [(assoc-in (dr/date-range-field {:value {:start (:start-date (:query-params request))
+                                                            :end (:end-date (:query-params request))}
+                                                    :id "date-range"
+                                                    :apply-button? true}) [1 :hx-swap-oob] true)
                     (assoc-in (exact-match-id* request) [1 :hx-swap-oob] true)])
                  :query-schema query-schema
                  :action-buttons (fn [request]

src/clj/auto_ap/ssr/payments.clj

@@ -53,7 +53,7 @@
     [:div {:id "exact-match-id-tag"}]))
 
 (defn filters [request]
-  [:form#payment-filters {"hx-trigger"   "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form#payment-filters {"hx-trigger"   "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
                           "hx-get"       (bidi/path-for ssr-routes/only-routes
                                                         ::route/table)
                           "hx-target"    "#entity-table"

src/clj/auto_ap/ssr/pos/cash_drawer_shifts.clj

@@ -29,7 +29,7 @@
                           default-grid-fields-schema)]))
 
 (defn filters [params]
-  [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger" "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get" (bidi/path-for ssr-routes/only-routes
                                   :pos-cash-drawer-shift-table)
           "hx-target" "#cash-drawer-shift-table"

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

@@ -34,7 +34,7 @@
                           default-grid-fields-schema)]))
 
 (defn filters [request]
-  [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger" "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get" (bidi/path-for ssr-routes/only-routes
                                   :pos-expected-deposit-table)
           "hx-target" "#expected-deposit-table"

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

@@ -29,7 +29,7 @@
                            [:client {:optional true :default nil} [:maybe  [:entity-map {:pull [:db/id :client/name]}]]]]
                           default-grid-fields-schema)]))
 (defn filters [request]
-  [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger" "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get" (bidi/path-for ssr-routes/only-routes
                                   :pos-refund-table)
           "hx-target" "#refund-table"

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

@@ -34,7 +34,7 @@
                           default-grid-fields-schema)]))
 
 (defn filters [request]
-  [:form {"hx-trigger"         "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger"         "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get"             (bidi/path-for ssr-routes/only-routes
                                               :pos-sales-table)
           "hx-target"          "#sales-table"

src/clj/auto_ap/ssr/pos/sales_summaries.clj

@@ -44,7 +44,7 @@
                           default-grid-fields-schema)]))
 
 (defn filters [request]
-  [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger" "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get" (bidi/path-for ssr-routes/only-routes
                                   ::route/table)
           "hx-target" "#entity-table"

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

@@ -22,7 +22,7 @@
 ;; always should be fast
 
 (defn filters [request]
-  [:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form {"hx-trigger" "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get" (bidi/path-for ssr-routes/only-routes
                                   :pos-tender-table)
           "hx-target" "#tender-table"

src/clj/auto_ap/ssr/transaction/common.clj

@@ -316,7 +316,7 @@
                                             :content (:bank-account/name ba)}))}))))])
 
 (defn filters [request]
-  [:form#transaction-filters {"hx-trigger"   "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
+  [:form#transaction-filters {"hx-trigger"   "datesApplied, change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
                               "hx-get"       (bidi/path-for ssr-routes/only-routes
                                                             ::route/table)
                               "hx-target"    "#entity-table"

src/clj/auto_ap/ssr/ui.clj

@@ -23,8 +23,6 @@
      [:title (str "Integreat | " page-name)]
      [:link {:href "/css/font.min.css", :rel "stylesheet"}]
      [:link {:rel "icon" :type "image/png" :href "/favicon.png"}]
-     [:link {:rel "stylesheet" :href "//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css"}]
-     [:script {:src "//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"}]
      [:link {:rel "stylesheet", :href "/output.css"}]
      [:script {:src "https://cdn.plaid.com/link/v2/stable/link-initialize.js"}]
      [:script {:src "https://cdn.jsdelivr.net/npm/@ryangjchandler/alpine-tooltip@1.x.x/dist/cdn.min.js" :defer true}]