Made exact match id work better and override everything else

src/cljs/auto_ap/views/components/invoice_table.cljs

@@ -20,28 +20,31 @@
             [auto-ap.views.pages.data-page :as data-page]))
 
 (defn data-params->query-params [params]
-  {:exact-match-id (some-> params :exact-match-id str)
-   :start          (:start params 0)
-   :sort           (:sort params)
-   :per-page       (:per-page params)
+  (if (:exact-match-id params)
+    {:exact-match-id (some-> params :exact-match-id str)
+     :client-id           (:id @(re-frame/subscribe [::subs/client]))}
+    {:exact-match-id (some-> params :exact-match-id str)
+     :start          (:start params 0)
+     :sort           (:sort params)
+     :per-page       (:per-page params)
 
-   :vendor-id           (:id (:vendor params))
-   :date-range          (:date-range params)
-   :due-range           (:due-range params)
-   :amount-gte          (:amount-gte (:amount-range params))
-   :amount-lte          (:amount-lte (:amount-range params))
-   :location            (:location params)
-   :unresolved          (:unresolved params)
-   :scheduled-payments  (:scheduled-payments params)
-   :invoice-number-like (:invoice-number-like params)
-   :client-id           (:id @(re-frame/subscribe [::subs/client]))
-   :import-status       (:import-status params)
-   :status              (condp = @(re-frame/subscribe [::subs/active-page])
-                          :invoices        nil
-                          :import-invoices nil
-                          :unpaid-invoices :unpaid
-                          :paid-invoices   :paid
-                          :voided-invoices :voided)})
+     :vendor-id           (:id (:vendor params))
+     :date-range          (:date-range params)
+     :due-range           (:due-range params)
+     :amount-gte          (:amount-gte (:amount-range params))
+     :amount-lte          (:amount-lte (:amount-range params))
+     :location            (:location params)
+     :unresolved          (:unresolved params)
+     :scheduled-payments  (:scheduled-payments params)
+     :invoice-number-like (:invoice-number-like params)
+     :client-id           (:id @(re-frame/subscribe [::subs/client]))
+     :import-status       (:import-status params)
+     :status              (condp = @(re-frame/subscribe [::subs/active-page])
+                            :invoices        nil
+                            :import-invoices nil
+                            :unpaid-invoices :unpaid
+                            :paid-invoices   :paid
+                            :voided-invoices :voided)}))
 
 (defn query [params]
   {:venia/queries [[:invoice_page

src/cljs/auto_ap/views/pages/payments.cljs

@@ -17,19 +17,22 @@
    [vimsical.re-frame.fx.track :as track]))
 
 (defn data-params->query-params [params]
-  {:start             (:start params 0)
-   :per-page          (:per-page params)
-   :sort              (:sort params)
-   :client-id         (:id @(re-frame/subscribe [::subs/client]))
-   :vendor-id         (:id (:vendor params))
-   :payment-type      (:payment-type params)
-   :status            (:status params)
-   :exact-match-id    (some-> (:exact-match-id params) str)
-   :date-range        (:date-range params)
-   :amount-gte        (:amount-gte (:amount-range params))
-   :amount-lte        (:amount-lte (:amount-range params))
-   :check-number-like (str (:check-number-like params))
-   :invoice-number    (:invoice-number params)})
+  (if (:exact-match-id params) 
+    {:client-id         (:id @(re-frame/subscribe [::subs/client]))
+     :exact-match-id    (some-> (:exact-match-id params) str)}
+    {:start             (:start params 0)
+     :per-page          (:per-page params)
+     :sort              (:sort params)
+     :client-id         (:id @(re-frame/subscribe [::subs/client]))
+     :vendor-id         (:id (:vendor params))
+     :payment-type      (:payment-type params)
+     :status            (:status params)
+     
+     :date-range        (:date-range params)
+     :amount-gte        (:amount-gte (:amount-range params))
+     :amount-lte        (:amount-lte (:amount-range params))
+     :check-number-like (str (:check-number-like params))
+     :invoice-number    (:invoice-number params)}))
 
 (re-frame/reg-event-fx
  ::params-change

src/cljs/auto_ap/views/pages/pos/expected_deposits.cljs

@@ -15,18 +15,21 @@
 (re-frame/reg-event-fx
  ::params-change
  [with-user]
- (fn [{:keys [user db ]}[_ params]]
+ (fn [{:keys [user]}[_ params]]
    {:graphql {:token user
               :owns-state {:single [::data-page/page ::page]}
               :query-obj {:venia/queries [[:expected_deposit_page
-                                           {:start (:start params 0)
-                                            :sort (:sort params)
-                                            :per-page (:per-page params)
-                                            :exact-match-id (some-> (:exact-match-id params) str)
-                                            :total-gte (:amount-gte (:total-range params))
-                                            :total-lte (:amount-lte (:total-range params))
-                                            :date-range (:date-range params)
-                                            :client-id (:id @(re-frame/subscribe [::subs/client]))}
+                                           (if (:exact-match-id params)
+                                             {:exact-match-id (some-> (:exact-match-id params) str)
+                                              :client-id      (:id @(re-frame/subscribe [::subs/client]))}
+                                             {:start          (:start params 0)
+                                              :sort           (:sort params)
+                                              :per-page       (:per-page params)
+                                              :exact-match-id (some-> (:exact-match-id params) str)
+                                              :total-gte      (:amount-gte (:total-range params))
+                                              :total-lte      (:amount-lte (:total-range params))
+                                              :date-range     (:date-range params)
+                                              :client-id      (:id @(re-frame/subscribe [::subs/client]))})
                                            [[:expected-deposits [:id :total :fee :location :date :status
                                                                  [:totals [:date :count :amount]]
                                                                  [:transaction [:id :date]]
@@ -42,13 +45,13 @@
 
 (re-frame/reg-event-fx
  ::unmounted
- (fn [{:keys [db]} _]
+ (fn [_ _]
    {:dispatch [::data-page/dispose ::page]
     ::track/dispose {:id ::params}}))
 
 (re-frame/reg-event-fx
  ::mounted
- (fn [{:keys [db]} _]
+ (fn [_ _]
    {::track/register {:id ::params
                       :subscription [::data-page/params ::page]
                       :event-fn (fn [params]

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

@@ -23,25 +23,28 @@
    [:bank-account [:name :yodlee-account-id :current-balance]]])
 
 (defn data-params->query-params [params]
-  {:start (:start params 0)
-   :per-page (:per-page params)
-   :sort (:sort params)
-   :client-id (:id @(re-frame/subscribe [::subs/client]))
-   :vendor-id (:id (:vendor params))
-   :date-range (:date-range params)
-   :account-id (:id (:account params))
-   :bank-account-id (:id (:bank-account params))
-   :amount-gte (:amount-gte (:amount-range params))
-   :exact-match-id (some-> (:exact-match-id params) str)
-   :unresolved (:unresolved params)
-   :potential-duplicates (:potential-duplicates params)
-   :location (:location params)
-   :import-batch-id (some-> (:import-batch-id params) str)
-   :amount-lte (:amount-lte (:amount-range params))
-   :description (:description params)
-   :approval-status (condp = @(re-frame/subscribe [::subs/active-page])
-                      :transactions nil
-                      :unapproved-transactions :unapproved
-                      :requires-feedback-transactions :requires-feedback
-                      :excluded-transactions :excluded
-                      :approved-transactions :approved)})
+  (if (:exact-match-id params)
+    {:client-id            (:id @(re-frame/subscribe [::subs/client]))
+     :exact-match-id       (some-> (:exact-match-id params) str)}
+    {:start                (:start params 0)
+     :per-page             (:per-page params)
+     :sort                 (:sort params)
+     :client-id            (:id @(re-frame/subscribe [::subs/client]))
+     :vendor-id            (:id (:vendor params))
+     :date-range           (:date-range params)
+     :account-id           (:id (:account params))
+     :bank-account-id      (:id (:bank-account params))
+     :amount-gte           (:amount-gte (:amount-range params))
+     :exact-match-id       (some-> (:exact-match-id params) str)
+     :unresolved           (:unresolved params)
+     :potential-duplicates (:potential-duplicates params)
+     :location             (:location params)
+     :import-batch-id      (some-> (:import-batch-id params) str)
+     :amount-lte           (:amount-lte (:amount-range params))
+     :description          (:description params)
+     :approval-status      (condp = @(re-frame/subscribe [::subs/active-page])
+                             :transactions                   nil
+                             :unapproved-transactions        :unapproved
+                             :requires-feedback-transactions :requires-feedback
+                             :excluded-transactions          :excluded
+                             :approved-transactions          :approved)}))