partway through transaction rules

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

@@ -15,7 +15,10 @@
             [auto-ap.utils :refer [replace-by merge-by]]
             [re-frame.core :as re-frame]
             [auto-ap.status :as status]
-            [auto-ap.effects.forward :as forward]))
+            [auto-ap.effects.forward :as forward]
+            [auto-ap.views.pages.data-page :as data-page]
+            [clojure.set :as set]
+            [auto-ap.views.components.buttons :as buttons]))
 
 ;; SUBS
 
@@ -28,88 +31,55 @@
 
 ;; EVENTS
 
-(defn ungraphql-transaction-rule [x]
-  (-> x
-      (update :amount-lte #(some-> % js/parseFloat))
-      (update :amount-gte #(some-> % js/parseFloat))))
 
-(re-frame/reg-event-db
- ::edit-completed
- (fn [db [_ edit-transaction-rule]]
-   (-> db
-       (update-in [::page :transaction-rules]
-                  replace-by :id
-                  (-> edit-transaction-rule
-                      ungraphql-transaction-rule
-                      (assoc :class "live-added"))))))
-
-
-(re-frame/reg-event-db
- ::received
- (fn [db [_ data]]
-   (-> db
-
-       (update ::page merge
-               (-> data
-                   :transaction-rule-page
-                   (update :transaction-rules (fn [rules]
-                                                (mapv ungraphql-transaction-rule rules))))))))
-
-(re-frame/reg-sub
- ::params
- :<- [::subs/client]
- :<- [::side-bar/filter-params]
- :<- [::table/table-params]
- (fn [[client filter-params table-params]]
-   (cond-> {}
-     client (assoc :client-id (:id client))
-     (seq filter-params) (merge filter-params)
-     (seq table-params) (merge table-params))))
 
 (re-frame/reg-event-fx
  ::params-change
  [with-user ]
  (fn [{:keys [db user] :as cofx} [_ params]]
    {:graphql {:token user
-              :owns-state {:single ::page}
+              :owns-state {:single [::data-page/page ::page]}
               :query-obj {:venia/queries [[:transaction_rule_page
-                                           (or params {}) 
+                                           {:vendor-id (:id (:vendor params))
+                                            :client-id (:id @(re-frame/subscribe [::subs/client]))} 
                                            [[:transaction-rules default-read]
                                             :total
                                             :start
                                             :end]]]} 
-              :on-success [::received]}
-    :set-uri-params (dissoc params
-                            :client-id)}))
-
+              :on-success (fn [result]
+                            [::data-page/received ::page
+                             (set/rename-keys (:transaction-rule-page result)
+                                              {:transaction-rules :data})])}}))
 
 (re-frame/reg-event-fx
  ::new-rule-clicked
  (fn [{:keys [db]} _]
    {:dispatch [::form/adding {:client @(re-frame/subscribe [::subs/client])}]}))
 
-(re-frame/reg-event-db
- ::deleted-transaction-rule
- [(re-frame/path [::page :transaction-rules])]
- (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/register {:id ::page
-                        :events #{::table/deleted-transaction-rule}
-                        :event-fn (fn [[_ result]]
-                                    [::deleted-transaction-rule result])}
+    ::forward/register [{:id ::page
+                         :events #{::form/updated}
+                         :event-fn (fn [[_ result]]
+                                     [::data-page/updated-entity ::page result])}
+                        {:id ::deleted-transaction-rule
+                         :events #{::table/deleted-transaction-rule }
+                         :event-fn (fn [[_ result]]
+                                     [::data-page/deleted-entity ::page result])}]
     ::track/register {:id ::params
-                      :subscription [::params]
-                      :event-fn (fn [params] [::params-change params])}}))
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params]
+                                  [::params-change params])}}))
 
 (re-frame/reg-event-fx
  ::unmounted
  (fn [{:keys [db]}]
-   {::forward/dispose {:id ::page}
+   {:dispatch [::data-page/dispose ::page]
+    ::forward/dispose [{:id ::page}
+                       {:id ::deleted-transaction-rule}]
     ::track/dispose {:id ::params}}))
 
 ;; VIEWS
@@ -122,12 +92,11 @@
          [:h1.title "Transaction Rules"]
          (when (= "admin" (:user/role user))
            [:div.is-pulled-right
-            [:button.button.is-outlined.is-primary {:on-click (dispatch-event [::new-rule-clicked])} "New Rule"]])
-         [table/table {:id :transactions
-                       :params (re-frame/subscribe [::params])
-                       :rule-page (re-frame/subscribe [::page])
-                       :status @(re-frame/subscribe [::status/single ::page])}]
-         ]))
+            [buttons/new-button {:event [::new-rule-clicked]
+                                 :class "is-primary"
+                                 :name "Transaction Rule"}]])
+         [table/table {:id :transaction-rules
+                       :data-page ::page}]]))
     {:component-did-mount (dispatch-event [::mounted ])
      :component-will-unmount #(re-frame/dispatch-sync [::unmounted])}))
 
@@ -137,5 +106,5 @@
                                  [side-bar/rule-side-bar]]
                       :main [rules-content]
                       :right-side-bar [appearing-side-bar {:visible? active?}
-                                       [form/form {:rule-saved [::edit-completed]}]]
+                                       [form/form {:data-page ::page}]]
                       :bottom [results-modal/test-results-modal]}]))