really improved vendor dialog code.
This commit is contained in:
Bryce Covert
@@ -1,15 +1,17 @@
|
||||
(ns auto-ap.views.pages.admin.vendors
|
||||
(:require-macros [cljs.core.async.macros :refer [go]])
|
||||
(:require-macros [cljs.core.async.macros :refer [go]]
|
||||
[auto-ap.entities.vendors :as vendor])
|
||||
(:require [re-frame.core :as re-frame]
|
||||
[reagent.core :as reagent]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.subs :as subs]
|
||||
[auto-ap.events :as main-events]
|
||||
[auto-ap.events :as events]
|
||||
[auto-ap.forms :as forms]
|
||||
[auto-ap.events.admin.vendors :as events]
|
||||
[auto-ap.utils :refer [by]]
|
||||
[auto-ap.entities.vendors :as entity]
|
||||
[auto-ap.views.components.address :refer [address-field]]
|
||||
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
|
||||
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog] :as vendor-dialog]
|
||||
|
||||
[auto-ap.views.components.modal :refer [modal action-modal]]
|
||||
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
|
||||
[auto-ap.views.components.layouts :refer [side-bar-layout]]
|
||||
@@ -21,13 +23,98 @@
|
||||
[auto-ap.routes :as routes]
|
||||
[bidi.bidi :as bidi]))
|
||||
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::new
|
||||
(fn [{:keys [db]} _]
|
||||
{:db (assoc-in db [:admin :vendor]
|
||||
{})
|
||||
:dispatch [::events/modal-status ::admin-vendor {:visible? true}]}))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::remind
|
||||
(fn [{:keys [db] :as fx} [_ id]]
|
||||
{ :http {:method :post
|
||||
:token (:user db)
|
||||
:headers {"Content-Type" "application/edn"}
|
||||
:uri (str "/api/vendors/" id "/remind")
|
||||
:on-success [::reminder-sent]
|
||||
:on-error [::failed "Failed to send reminder"]}
|
||||
:db (assoc-in db [:admin :banner] nil)}))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::reminder-sent
|
||||
(fn [db [_ error]]
|
||||
(-> db
|
||||
(assoc-in [:admin :banner] "Reminder sent!"))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::failed
|
||||
(fn [db [_ error]]
|
||||
(-> db
|
||||
(assoc-in [:admin :banner] error))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::save-complete
|
||||
(fn [{:keys [db]} [_ {vendor :upsert-vendor} ]]
|
||||
{:dispatch [::events/modal-completed ::admin-vendor ]
|
||||
:db (-> db
|
||||
|
||||
(assoc-in [:admin :vendor] nil)
|
||||
(assoc-in [:vendors (:id vendor)] vendor))}))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::save-error
|
||||
(fn [db [_ vendor]]
|
||||
(println "ERROR?")
|
||||
(-> db
|
||||
(assoc-in [:admin :vendor :error] true)
|
||||
(assoc-in [:admin :vendor :saving?] false))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::change
|
||||
(fn [db [_ path value]]
|
||||
(println path value)
|
||||
(assoc-in db (concat [:admin :vendor] path)
|
||||
value)))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::add-relationship
|
||||
(fn [db [_ ]]
|
||||
(-> db
|
||||
(update-in [:admin :vendor :relationships] #(conj (or % [])
|
||||
{:account-number (get-in db [:admin :vendor :new-relationship-account-number])
|
||||
:client-id (get-in db [:admin :vendor :new-relationship-client])}))
|
||||
(update-in [:admin :vendor] dissoc :new-relationship-account-number :new-relationship-client))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::remove-relationship
|
||||
(fn [db [_ i]]
|
||||
(-> db
|
||||
(update-in [:admin :vendor :relationships] #(vec (concat (subvec % 0 i) (subvec % (min (count %) (inc i)))))))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::mounted
|
||||
(fn [{:keys [db]} _]
|
||||
{:graphql {:token (:user db)
|
||||
:query-obj {:venia/queries [[:vendor events/vendor-query]]}
|
||||
:on-success [::received-vendors]}}))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::received-vendors
|
||||
(fn [db [_ vendors]]
|
||||
(assoc db :vendors (by :id (:vendor vendors )))))
|
||||
|
||||
|
||||
(defn invalid-fields [spec v]
|
||||
(set (mapcat :in (::s/problems (s/explain-data spec v)))))
|
||||
|
||||
(defn vendors-table []
|
||||
(let [vendors (re-frame/subscribe [::subs/sorted-all-vendors])
|
||||
editing-vendor (:editing @(re-frame/subscribe [::subs/admin]))]
|
||||
|
||||
(let [vendors (re-frame/subscribe [::subs/sorted-all-vendors])]
|
||||
[:table {:class "table", :style {:width "100%"}}
|
||||
[:thead
|
||||
[:tr
|
||||
@@ -37,7 +124,7 @@
|
||||
[:th]]]
|
||||
[:tbody (for [v @vendors]
|
||||
^{:key (str (:id v))}
|
||||
[:tr {:on-click (dispatch-event [::events/edit (:id v)])
|
||||
[:tr {:on-click (dispatch-event [::vendor-dialog/started v])
|
||||
:style {"cursor" "pointer"}}
|
||||
[:td (:name v)]
|
||||
[:td (:primary-email v)]
|
||||
@@ -61,14 +148,14 @@
|
||||
::merge-clicked
|
||||
(fn [{:keys [db]} _]
|
||||
{:db (forms/start-form db ::merge-vendors {})
|
||||
:dispatch [::main-events/modal-status ::merge-vendors {:visible? true :saving? false}]}))
|
||||
:dispatch [::events/modal-status ::merge-vendors {:visible? true :saving? false}]}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::merge-vendors-complete
|
||||
(fn [{:keys [db]} _]
|
||||
{:db (forms/stop-form db ::merge-vendors)
|
||||
:dispatch-n (list [::main-events/modal-status ::merge-vendors {:visible? false}]
|
||||
[::events/mounted])}))
|
||||
:dispatch-n (list [::events/modal-status ::merge-vendors {:visible? false}]
|
||||
[::mounted])}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::merge-submit-clicked
|
||||
@@ -138,14 +225,15 @@
|
||||
[vendors-table]
|
||||
|
||||
[:div.is-pulled-right
|
||||
[:a.button.is-primary.is-large {:on-click (dispatch-event [::main-events/modal-status :auto-ap.views.main/user-editing-vendor {:visible? true}])} "New vendor"]]
|
||||
[:a.button.is-primary.is-large {:on-click (dispatch-event [::vendor-dialog/started {}])} "New vendor"]]
|
||||
[merge-vendors-dialog]
|
||||
[vendor-dialog {:vendor editing-vendor
|
||||
#_[vendor-dialog {:vendor editing-vendor
|
||||
:save-event [::events/save]
|
||||
:change-event ::events/change
|
||||
:form ::admin-vendor
|
||||
:id ::admin-vendor}]])])
|
||||
{:component-did-mount (fn []
|
||||
(re-frame/dispatch [::events/mounted]))})])
|
||||
(re-frame/dispatch [::mounted]))})])
|
||||
|
||||
(defn admin-vendors-page []
|
||||
[side-bar-layout {:side-bar [admin-side-bar {}]
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
(ns auto-ap.views.pages.paid-invoices
|
||||
(:require [re-frame.core :as re-frame]
|
||||
[auto-ap.entities.clients :as client]
|
||||
[auto-ap.entities.vendors :as vendor]
|
||||
[auto-ap.events :as events]
|
||||
[auto-ap.views.utils :refer [dispatch-event]]
|
||||
[auto-ap.utils :refer [by replace-if]]
|
||||
[auto-ap.views.components.layouts :refer [side-bar-layout]]
|
||||
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
|
||||
[auto-ap.views.pages.check :as check]
|
||||
[auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table]
|
||||
[auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog]
|
||||
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
|
||||
[auto-ap.subs :as subs]))
|
||||
|
||||
|
||||
(re-frame/reg-sub
|
||||
::invoice-page
|
||||
(fn [db]
|
||||
(-> db ::invoice-page)))
|
||||
|
||||
(re-frame/reg-sub
|
||||
::params
|
||||
(fn [db]
|
||||
(-> db (::params {}))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
(fn [cofx [_ params]]
|
||||
{:db (-> (:db cofx)
|
||||
(assoc-in [:status :loading] true)
|
||||
(assoc-in [::params] params))
|
||||
:graphql {:token (-> cofx :db :user)
|
||||
:query-obj (invoice-table/query (assoc params :imported true :status "paid"))
|
||||
:on-success [::received]}}))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::received
|
||||
(fn [db [_ data]]
|
||||
(-> db
|
||||
(assoc ::invoice-page (first (:invoice-page data)))
|
||||
(assoc-in [:status :loading] false))))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::invalidated
|
||||
(fn [cofx [_ params]]
|
||||
{:dispatch [::params-change @(re-frame/subscribe [::params])]}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::expense-accounts-updated
|
||||
(fn [{:keys [db]} [_ data]]
|
||||
(let [updated (:edit-expense-accounts data)]
|
||||
{:dispatch [::events/modal-completed ::expense-accounts-dialog/change-expense-accounts]
|
||||
:db (-> db
|
||||
(update-in [::invoice-page :invoices]
|
||||
|
||||
(fn [is]
|
||||
|
||||
(replace-if #(= (:id %1) (:id %2)) updated is)))
|
||||
(dissoc ::change-expense-accounts))})))
|
||||
|
||||
(def paid-invoices-content
|
||||
(with-meta
|
||||
(fn []
|
||||
(let [current-client @(re-frame/subscribe [::subs/client])]
|
||||
[:div
|
||||
[:h1.title "Paid invoices"]
|
||||
[invoice-table {:id :paid
|
||||
:params (re-frame/subscribe [::params])
|
||||
:invoice-page (re-frame/subscribe [::invoice-page])
|
||||
:status (re-frame/subscribe [::subs/status])
|
||||
:expense-event [::expense-accounts-dialog/change-expense-accounts]
|
||||
:on-params-change (fn [params]
|
||||
(re-frame/dispatch [::params-change params]))
|
||||
:check-boxes false}]
|
||||
[expense-accounts-dialog/change-expense-accounts-modal
|
||||
{:updated-event [::expense-accounts-updated]}]]))
|
||||
{:component-will-mount #(do (println "HERE2") (re-frame/dispatch-sync [::params-change {}])) }))
|
||||
|
||||
(defn paid-invoices-page []
|
||||
[side-bar-layout {:side-bar [invoices-side-bar]
|
||||
:main [paid-invoices-content]
|
||||
:bottom [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor])
|
||||
:save-event [::events/save-vendor]
|
||||
:change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]}])
|
||||
Reference in New Issue
Block a user