lots of QOL improvements.

src/cljs/auto_ap/views/pages/transactions/side_bar.cljs

@@ -1,7 +1,7 @@
 (ns auto-ap.views.pages.transactions.side-bar
   (:require [auto-ap.routes :as routes]
             [auto-ap.subs :as subs]
-            [auto-ap.views.utils :refer [active-when]]
+            [auto-ap.views.utils :refer [active-when dispatch-value-change]]
             [auto-ap.views.components.date-range-filter :refer [date-range-filter]]
             [auto-ap.views.components.number-filter :refer [number-filter]]
             [auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
@@ -9,33 +9,72 @@
             [bidi.bidi :as bidi]
             [re-frame.core :as re-frame]))
 (re-frame/reg-sub
- ::filters
+ ::specific-filters
  (fn [db ]
    (::filters db {})))
 
+(re-frame/reg-sub
+ ::filters
+ :<- [::specific-filters]
+ :<- [::subs/vendors-by-id]
+ :<- [::subs/bank-accounts-by-id]
+ :<- [::subs/query-params]
+ (fn [[specific-filters vendors-by-id bank-accounts-by-id query-params] ]
+
+   
+   (let [url-filters (-> query-params
+                         (select-keys #{:vendor-id
+                                        :bank-account-id
+                                        :date-range
+                                        :description
+                                        :amount-gte
+                                        :amount-lte}))
+         url-filters {:vendor (when-let [vendor-id (:vendor-id url-filters)]
+                                {:id (str vendor-id)
+                                 :name (get-in vendors-by-id [(str vendor-id) :name] "Loading...")})
+                      :bank-account (when-let [bank-account-id (:bank-account-id url-filters)]
+                                      {:id (str bank-account-id)
+                                       :name (get-in bank-accounts-by-id [(str bank-account-id) :name] "Loading...")})
+                      :amount-range {:amount-gte (:amount-gte url-filters)
+                                     :amount-lte (:amount-lte url-filters)} 
+                      :description (:description url-filters)
+                      :date-range (:date-range url-filters)}]
+     (merge url-filters specific-filters ))))
+
 (re-frame/reg-sub
  ::filter
  :<- [::filters]
  (fn [filters [_ which]]
    (filters which)))
 
+(re-frame/reg-sub
+ ::settled-filters
+ (fn [db ]
+   (::settled-filters db)))
+
 (re-frame/reg-sub
  ::filter-params
+ :<- [::settled-filters]
  :<- [::filters]
  :<- [::subs/active-page]
- (fn [[filters ap]]
-   {:vendor-id (:id (:vendor filters))
-    :date-range (:date-range filters)
-    :bank-account-id (:id (:bank-account filters))
-    :amount-gte (:amount-gte (:settled (:amount-range filters)))
-    :amount-lte (:amount-lte (:settled (:amount-range filters)))
-    :description (:settled (:description filters))
-    :approval-status (condp = ap
-                       :transactions nil
-                       :unapproved-transactions :unapproved
-                       :requires-feedback-transactions :requires-feedback
-                       :excluded-transactions :excluded
-                       :approved-transactions :approved)}))
+ (fn [[settled-filters filters ap]]
+   (let [filters (or settled-filters filters)]
+     {:vendor-id (:id (:vendor filters))
+      :date-range (:date-range filters)
+      :bank-account-id (:id (:bank-account filters))
+      :amount-gte (:amount-gte (:amount-range filters))
+      :amount-lte (:amount-lte (:amount-range filters))
+      :description (:description filters)
+      :approval-status (condp = ap
+                         :transactions nil
+                         :unapproved-transactions :unapproved
+                         :requires-feedback-transactions :requires-feedback
+                         :excluded-transactions :excluded
+                         :approved-transactions :approved)})))
+(re-frame/reg-event-fx
+ ::filters-settled
+ (fn [{:keys [db]} [_ & params]]
+   {:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
 
 
 (re-frame/reg-event-fx
@@ -45,42 +84,11 @@
          [which val] (if (= 3 (count params))
                        [(into [a] b) c]
                        [[a] b])]
-     {:db (assoc-in db (into [::filters] which) val)})))
-
-(re-frame/reg-event-fx
- ::description-settled
- [(re-frame/path [::filters :description])]
- (fn [{:keys [db]} [_ description]]
-   {:db (assoc db :settled description)
-    :dispatch [::filter-changed :description [:settled] description]}))
-
-
-(re-frame/reg-event-fx
- ::description-changed
- [(re-frame/path [::filters :description])]
- (fn [{:keys [db]} [_ description]]
-   {:dispatch-debounce 
-    {:event [::description-settled description]
-     :time 500
-     :key ::description}
-    :db (assoc db :raw description)}))
-
-(re-frame/reg-event-fx
- ::amount-range-settled
- [(re-frame/path [::filters :amount-range])]
- (fn [{:keys [db]} [_ which value]]
-   {:db (assoc-in db [:settled which] value)
-    :dispatch [::filter-changed :amount-range [:settled] (assoc (:settled db) which value)]}))
-
-(re-frame/reg-event-fx
- ::amount-range-changed
- [(re-frame/path [::filters :amount-range])]
- (fn [{:keys [db]} [_ [which] value]]
-   {:dispatch-debounce 
-    {:event [::amount-range-settled which value]
-     :time 500
-     :key ::amount-range}
-    :db (assoc-in db [:raw which] value)}))
+     {:db (assoc-in db (into [::filters] which) val)
+      :dispatch-debounce
+      {:event [::filters-settled]
+       :time 800
+       :key ::filters}})))
 
 (defn side-bar []
   (let [ap @(re-frame/subscribe [::subs/active-page])
@@ -136,8 +144,8 @@
        [:p.menu-label "Amount"]
        [:div
         [number-filter
-         {:on-change-event [::amount-range-changed]
-          :value (:raw @(re-frame/subscribe [::filter :amount-range]))}]]
+         {:on-change-event [::filter-changed :amount-range]
+          :value @(re-frame/subscribe [::filter :amount-range])}]]
 
        [:p.menu-label "Vendor"]
        [:div
@@ -151,7 +159,6 @@
        [:div
         [:div.field
          [:div.control [:input.input {:placeholder "CHECK 123 ABC"
-                                      :value (:raw @(re-frame/subscribe [::filter :description]))
-                                      :on-change (fn [e]
-                                                   (re-frame/dispatch [::description-changed (.. e -target -value) ]))} ]]]]]))
+                                      :value @(re-frame/subscribe [::filter :description])
+                                      :on-change (dispatch-value-change [::filter-changed :description])} ]]]]]))