diff --git a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs index 4424a3b8..c3923802 100644 --- a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs +++ b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs @@ -1,14 +1,17 @@ (ns auto-ap.views.components.invoices.side-bar - (:require [auto-ap.routes :as routes] - [auto-ap.subs :as subs] - [auto-ap.views.components.date-range-filter :refer [date-range-filter]] - [auto-ap.views.components.number-filter :refer [number-filter]] - [auto-ap.views.components.switch-field :refer [switch-field]] - [auto-ap.views.components.typeahead :refer [typeahead-v3]] - [auto-ap.views.pages.data-page :as data-page] - [auto-ap.views.utils :refer [active-when dispatch-event dispatch-value-change]] - [bidi.bidi :as bidi] - [re-frame.core :as re-frame])) + (:require + [auto-ap.routes :as routes] + [auto-ap.subs :as subs] + [auto-ap.views.components.date-range-filter :refer [date-range-filter]] + [auto-ap.views.components.number-filter :refer [number-filter]] + [auto-ap.views.components.switch-field :refer [switch-field]] + [auto-ap.views.components.typeahead.vendor + :refer [search-backed-typeahead]] + [auto-ap.views.pages.data-page :as data-page] + [auto-ap.views.utils + :refer [active-when dispatch-event dispatch-value-change]] + [bidi.bidi :as bidi] + [re-frame.core :as re-frame])) (defn invoice-number-filter [{:keys [data-page]}] [:div.field @@ -59,12 +62,13 @@ [:div [:p.menu-label "Vendor"] [:div - [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) - :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) - :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))]) - :entity->text :name - :type "typeahead-v3" - :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] + [search-backed-typeahead {:search-query (fn [i] + [:search_vendor + {:query i} + [:name :id]]) + :type "typeahead-v3" + :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %]) + :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] [:p.menu-label "Date Range"] [:div [date-range-filter diff --git a/src/cljs/auto_ap/views/pages/home.cljs b/src/cljs/auto_ap/views/pages/home.cljs index 16c65d47..3daefedc 100644 --- a/src/cljs/auto_ap/views/pages/home.cljs +++ b/src/cljs/auto_ap/views/pages/home.cljs @@ -300,9 +300,6 @@ (defn home-content [] (let [client-id (-> @(re-frame/subscribe [::subs/client]) :id) - vendors-by-id @(re-frame/subscribe [::subs/vendors-by-id]) - vendors-index @(re-frame/subscribe [::subs/searchable-vendors-index]) - accounts-by-id @(re-frame/subscribe [::subs/accounts-by-id]) accounts-index @(re-frame/subscribe [::subs/accounts-index]) chart-options @(re-frame/subscribe [::chart-options])] diff --git a/src/cljs/auto_ap/views/pages/invoices/form.cljs b/src/cljs/auto_ap/views/pages/invoices/form.cljs index dc5e7441..7eff34a7 100644 --- a/src/cljs/auto_ap/views/pages/invoices/form.cljs +++ b/src/cljs/auto_ap/views/pages/invoices/form.cljs @@ -5,7 +5,7 @@ [auto-ap.status :as status] [auto-ap.subs :as subs] [auto-ap.time-utils :refer [next-dom]] - [auto-ap.utils :refer [by dollars=]] + [auto-ap.utils :refer [dollars=]] [auto-ap.views.components.dropdown :refer [drop-down]] [auto-ap.views.components.expense-accounts-field :as @@ -179,22 +179,21 @@ ::changed (forms/change-handler ::form (fn [data field value] - (let [locations @(re-frame/subscribe [::subs/locations-for-client (:id (:client data))])] - (cond (= [:total] field) - [[:expense-accounts] (recalculate-amounts (:expense-accounts data) value)] + (cond (= [:total] field) + [[:expense-accounts] (recalculate-amounts (:expense-accounts data) value)] - (and (= [:date] field) - (:schedule-payment-dom data)) - [[:scheduled-payment] (date->str (next-dom (str->date value standard) (:schedule-payment-dom data)) standard) ] + (and (= [:date] field) + (:schedule-payment-dom data)) + [[:scheduled-payment] (date->str (next-dom (str->date value standard) (:schedule-payment-dom data)) standard) ] - (and (= [:schedule-when-due] field) value) - [[:scheduled-payment] (:due data)] + (and (= [:schedule-when-due] field) value) + [[:scheduled-payment] (:due data)] - (and (= [:due] field) (:schedule-when-due data)) - [[:scheduled-payment] value] + (and (= [:due] field) (:schedule-when-due data)) + [[:scheduled-payment] value] - :else - []))))) + :else + [])))) (re-frame/reg-event-db ::maybe-change-client [ (forms/in-form ::form)] diff --git a/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs b/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs index a1d93c85..724895b7 100644 --- a/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs +++ b/src/cljs/auto_ap/views/pages/ledger/side_bar.cljs @@ -1,14 +1,18 @@ (ns auto-ap.views.pages.ledger.side-bar - (:require [auto-ap.routes :as routes] - [auto-ap.subs :as subs] - [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]] - [auto-ap.views.components.typeahead :refer [typeahead-v3]] - [auto-ap.views.pages.data-page :as data-page] - [auto-ap.views.utils :refer [active-when dispatch-value-change]] - [bidi.bidi :as bidi] - [re-frame.core :as re-frame])) + (:require + [auto-ap.routes :as routes] + [auto-ap.subs :as subs] + [auto-ap.views.components.bank-account-filter + :refer [bank-account-filter]] + [auto-ap.views.components.date-range-filter :refer [date-range-filter]] + [auto-ap.views.components.number-filter :refer [number-filter]] + [auto-ap.views.components.typeahead :refer [typeahead-v3]] + [auto-ap.views.components.typeahead.vendor + :refer [search-backed-typeahead]] + [auto-ap.views.pages.data-page :as data-page] + [auto-ap.views.utils :refer [active-when dispatch-value-change]] + [bidi.bidi :as bidi] + [re-frame.core :as re-frame])) (defn ledger-side-bar [{:keys [data-page]}] (let [ap @(re-frame/subscribe [::subs/active-page]) @@ -66,14 +70,13 @@ [:p.menu-label "Vendor"] [:div - [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) - :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) - :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))]) - :entity->text :name - :type "typeahead-v3" - :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] - - + [search-backed-typeahead {:search-query (fn [i] + [:search_vendor + {:query i} + [:name :id]]) + :type "typeahead-v3" + :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %]) + :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] [:p.menu-label "Date Range"] [:div diff --git a/src/cljs/auto_ap/views/pages/payments/side_bar.cljs b/src/cljs/auto_ap/views/pages/payments/side_bar.cljs index d40ebd4b..2133c2fe 100644 --- a/src/cljs/auto_ap/views/pages/payments/side_bar.cljs +++ b/src/cljs/auto_ap/views/pages/payments/side_bar.cljs @@ -1,11 +1,13 @@ (ns auto-ap.views.pages.payments.side-bar - (:require [auto-ap.subs :as subs] - [auto-ap.views.components.date-range-filter :refer [date-range-filter]] - [auto-ap.views.components.number-filter :refer [number-filter]] - [auto-ap.views.components.typeahead :refer [typeahead-v3]] - [auto-ap.views.pages.data-page :as data-page] - [auto-ap.views.utils :refer [dispatch-event dispatch-value-change]] - [re-frame.core :as re-frame])) + (:require + [auto-ap.subs :as subs] + [auto-ap.views.components.date-range-filter :refer [date-range-filter]] + [auto-ap.views.components.number-filter :refer [number-filter]] + [auto-ap.views.components.typeahead.vendor + :refer [search-backed-typeahead]] + [auto-ap.views.pages.data-page :as data-page] + [auto-ap.views.utils :refer [dispatch-event dispatch-value-change]] + [re-frame.core :as re-frame])) (defn side-bar [{:keys [data-page]}] (let [ap @(re-frame/subscribe [::subs/active-page]) @@ -14,13 +16,13 @@ [:div [:p.menu-label "Vendor"] [:div - [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) - :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) - :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))]) - :include-keys [:name :id] - :entity->text :name - :type "typeahead-v3" - :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] + [search-backed-typeahead {:search-query (fn [i] + [:search_vendor + {:query i} + [:name :id]]) + :type "typeahead-v3" + :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %]) + :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] [:p.menu-label "Date Range"] [:div diff --git a/src/cljs/auto_ap/views/pages/transactions/side_bar.cljs b/src/cljs/auto_ap/views/pages/transactions/side_bar.cljs index 03678058..9f0d1bd5 100644 --- a/src/cljs/auto_ap/views/pages/transactions/side_bar.cljs +++ b/src/cljs/auto_ap/views/pages/transactions/side_bar.cljs @@ -1,17 +1,20 @@ (ns auto-ap.views.pages.transactions.side-bar - (:require [auto-ap.routes :as routes] - [auto-ap.subs :as subs] - [auto-ap.views.components.bank-account-filter - :refer - [bank-account-filter]] - [auto-ap.views.components.date-range-filter :refer [date-range-filter]] - [auto-ap.views.components.number-filter :refer [number-filter]] - [auto-ap.views.components.switch-field :refer [switch-field]] - [auto-ap.views.components.typeahead :refer [typeahead-v3]] - [auto-ap.views.pages.data-page :as data-page] - [auto-ap.views.utils :refer [active-when dispatch-event dispatch-value-change ->$ account->match-text]] - [bidi.bidi :as bidi] - [re-frame.core :as re-frame])) + (:require + [auto-ap.routes :as routes] + [auto-ap.subs :as subs] + [auto-ap.views.components.bank-account-filter + :refer [bank-account-filter]] + [auto-ap.views.components.date-range-filter :refer [date-range-filter]] + [auto-ap.views.components.number-filter :refer [number-filter]] + [auto-ap.views.components.switch-field :refer [switch-field]] + [auto-ap.views.components.typeahead :refer [typeahead-v3]] + [auto-ap.views.components.typeahead.vendor + :refer [search-backed-typeahead]] + [auto-ap.views.pages.data-page :as data-page] + [auto-ap.views.utils + :refer [account->match-text active-when dispatch-event dispatch-value-change]] + [bidi.bidi :as bidi] + [re-frame.core :as re-frame])) (defn side-bar [{:keys [data-page]}] (let [ap @(re-frame/subscribe [::subs/active-page]) @@ -74,12 +77,13 @@ [:p.menu-label "Vendor"] [:div - [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) - :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) - :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))]) - :entity->text :name - :type "typeahead-v3" - :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]] + [search-backed-typeahead {:search-query (fn [i] + [:search_vendor + {:query i} + [:name :id]]) + :type "typeahead-v3" + :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %]) + :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]