added support for merging vendors.

2020-01-05 10:28:10 -08:00
parent 2913f05479
commit 2a708f1990
7 changed files with 144 additions and 38 deletions
--- a/src/cljs/auto_ap/subs.cljs
+++ b/src/cljs/auto_ap/subs.cljs
@@ -53,8 +53,12 @@

 (re-frame/reg-sub
 ::modal-state
- (fn [db [_ id]]
-   (get (:modal-state db) id)))
+ (fn [db [_ id status-from]]
+   (if status-from
+     (assoc (get (:modal-state db) id)
+            :error-message (get-in db [:auto-ap.forms/forms status-from :error])
+            :saving? (= (get-in db [:auto-ap.forms/forms status-from :status]) :loading))
+     (get (:modal-state db) id))))

 (re-frame/reg-sub
 ::token