more standardization

src/cljs/auto_ap/views/pages/admin/rules.cljs

@@ -11,11 +11,11 @@
             [auto-ap.views.utils :refer [dispatch-event with-user]]
             [vimsical.re-frame.cofx.inject :as inject]
             [vimsical.re-frame.fx.track :as track]
-            [day8.re-frame.forward-events-fx]
             [auto-ap.events :as events]
             [auto-ap.utils :refer [replace-by merge-by]]
             [re-frame.core :as re-frame]
-            [auto-ap.status :as status]))
+            [auto-ap.status :as status]
+            [auto-ap.effects.forward :as forward]))
 
 ;; SUBS
 
@@ -91,16 +91,17 @@
 (re-frame/reg-event-db
  ::deleted-transaction-rule
  [(re-frame/path [::page :transaction-rules])]
- (fn [transaction-rules [_ [_ {id :delete-transaction-rule}]]]
+ (fn [transaction-rules [_ {id :delete-transaction-rule}]]
    (merge-by transaction-rules :id {:id id :class "live-removed"})))
 
 (re-frame/reg-event-fx
  ::mounted
  (fn [{:keys [db]}]
    {:dispatch-n [[::events/yodlee-merchants-needed]]
-    :forward-events {:register ::page
-                     :events #{::table/deleted-transaction-rule}
-                     :dispatch-to [::deleted-transaction-rule]}
+    ::forward/register {:id ::page
+                        :events #{::table/deleted-transaction-rule}
+                        :event-fn (fn [[_ result]]
+                                    [::deleted-transaction-rule result])}
     ::track/register {:id ::params
                       :subscription [::params]
                       :event-fn (fn [params] [::params-change params])}}))
@@ -108,7 +109,7 @@
 (re-frame/reg-event-fx
  ::unmounted
  (fn [{:keys [db]}]
-   {:forward-events {:unregister ::page}
+   {::forward/dispose {:id ::page}
     ::track/dispose {:id ::params}}))
 
 ;; VIEWS

src/cljs/auto_ap/views/pages/admin/users.cljs

@@ -17,7 +17,8 @@
             [auto-ap.routes :as routes]
             [bidi.bidi :as bidi]
             [auto-ap.status :as status]
-            [auto-ap.views.pages.admin.users.form :as form]))
+            [auto-ap.views.pages.admin.users.form :as form]
+            [auto-ap.effects.forward :as forward]))
 
 
 
@@ -56,19 +57,20 @@
                                             :role
                                             [:clients [:id :name]]]]]} 
               :on-success [::received]}
-    :forward-events {:register ::edited-user
-                     :events #{::form/saved}
-                     :dispatch-to [::saved]}}))
+    ::forward/register {:id ::edited-user
+                        :events #{::form/saved}
+                        :event-fn (fn [[_ query-result]]
+                                    [::saved query-result])}}))
 
 (re-frame/reg-event-fx
  ::unmounted
  (fn [{:keys [db]} _]
-   {:forward-events {:unregister ::edited-user}}))
+   {::forward/dispose {:id ::edited-user}}))
 
 
 (re-frame/reg-event-db
  ::saved
- (fn [db [_ [_ query-result]]]
+ (fn [db [_ query-result]]
    (-> db
        (update ::users
                replace-by