From d9bd09a9cc5c224110d78b145d5b36ac1e6c2c44 Mon Sep 17 00:00:00 2001 From: Bryce Date: Thu, 22 Aug 2024 21:14:43 -0700 Subject: [PATCH] Resets selected on page change, adds account number to drop downs and makes missing emails less noisy --- src/clj/auto_ap/jobs/import_uploaded_invoices.clj | 2 +- src/clj/auto_ap/ssr/admin/accounts.clj | 3 +-- src/clj/auto_ap/ssr/admin/transaction_rules.clj | 10 +++++++--- src/clj/auto_ap/ssr/grid_page_helper.clj | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/clj/auto_ap/jobs/import_uploaded_invoices.clj b/src/clj/auto_ap/jobs/import_uploaded_invoices.clj index 44d4d828..6fbb8f8d 100644 --- a/src/clj/auto_ap/jobs/import_uploaded_invoices.clj +++ b/src/clj/auto_ap/jobs/import_uploaded_invoices.clj @@ -50,7 +50,7 @@ :bucket-name (-> r :s3 :bucket :name)}} (doseq [pdf-stream (->> (-> mail :body) (filter :content-type) - #_(filter #(re-find #"application/pdf" (:content-type %)))) + (filter (complement #(re-find #"html" (:content-type % ""))))) :let [filename (str "/tmp/" (UUID/randomUUID) ".pdf")]] (try (let [_ (io/copy (:body pdf-stream) (io/file filename)) diff --git a/src/clj/auto_ap/ssr/admin/accounts.clj b/src/clj/auto_ap/ssr/admin/accounts.clj index 4bf448f5..93283b4b 100644 --- a/src/clj/auto_ap/ssr/admin/accounts.clj +++ b/src/clj/auto_ap/ssr/admin/accounts.clj @@ -261,8 +261,7 @@ (defn client-override* [override] (com/data-grid-row (-> {:x-ref "p" :data-key "show" - :x-data (hx/json {:show (boolean (doto (not (fc/field-value (:new? override))) - println))})} + :x-data (hx/json {:show (boolean (not (fc/field-value (:new? override))))})} hx/alpine-mount-then-appear) (fc/with-field :db/id (com/hidden {:name (fc/field-name) diff --git a/src/clj/auto_ap/ssr/admin/transaction_rules.clj b/src/clj/auto_ap/ssr/admin/transaction_rules.clj index 84555e37..a408130d 100644 --- a/src/clj/auto_ap/ssr/admin/transaction_rules.clj +++ b/src/clj/auto_ap/ssr/admin/transaction_rules.clj @@ -369,7 +369,6 @@ true (merge-query {:query {:where ['[?e :transaction/id]]}})) - _ (alog/peek query) results (->> (query2 query) (map first))] @@ -431,8 +430,13 @@ :x-model x-model :value value :content-fn (fn [value] - (:account/name (d-accounts/clientize (dc/pull (dc/db conn) d-accounts/default-read value) - client-id)))})]) + (let [a (dc/pull (dc/db conn) d-accounts/default-read value)] + (when value + (str + (:account/numeric-code a) + " - " + (:account/name (d-accounts/clientize a + client-id))))))})]) (defn- transaction-rule-account-row* [account client-id client-locations] diff --git a/src/clj/auto_ap/ssr/grid_page_helper.clj b/src/clj/auto_ap/ssr/grid_page_helper.clj index 7118f73e..ba77ab4d 100644 --- a/src/clj/auto_ap/ssr/grid_page_helper.clj +++ b/src/clj/auto_ap/ssr/grid_page_helper.clj @@ -294,6 +294,7 @@ (when (:above-grid grid-spec) ( (:above-grid grid-spec) request)) [:div {:x-data (hx/json {:selected [] :all_selected false}) + "x-on:client-selected.document" "selected=[]; all_selected=false" "x-bind:hx-vals" "JSON.stringify({selected: $data.selected, 'all-selected': $data.all_selected})" :x-init "$watch('selected', s=> $dispatch('selectedChanged', {selected: s, all_selected: all_selected}) ); $watch('all_selected', a=>$dispatch('selectedChanged', {selected: selected, all_selected: a}))"}