sales orders and transactions better.

src/cljs/auto_ap/routes.cljs

@@ -21,6 +21,7 @@
                                "paid" :paid-invoices
                                "voided" :voided-invoices
                                "new" :new-invoice}
+                  "sales-orders/" {""  :sales-orders}
                   "transactions/" {"" :transactions
                                    "unapproved" :unapproved-transactions
                                    "approved" :approved-transactions

src/cljs/auto_ap/views/components/layouts.cljs

@@ -111,6 +111,10 @@
            [:a.navbar-item {:class [(active-when ap = :payments)]
                             :href (bidi/path-for routes/routes :payments)}
             "Payments" ]
+           (when (= "admin" (:user/role @user))
+             [:a.navbar-item {:class [(active-when ap = :sales-orders)]
+                              :href (bidi/path-for routes/routes :sales-orders)}
+              "Sales Orders" ])
            [:a.navbar-item {:class [(active-when ap = :transactions)]
                             :href (bidi/path-for routes/routes :transactions)}
             "Transactions" ]

src/cljs/auto_ap/views/main.cljs

@@ -17,6 +17,7 @@
    [auto-ap.views.pages.ledger.profit-and-loss :refer [profit-and-loss-page]]
    [auto-ap.views.pages.login :refer [login-page]]
    [auto-ap.views.pages.payments :refer [payments-page]]
+   [auto-ap.views.pages.sales-orders :refer [sales-orders-page]]
    [auto-ap.views.pages.admin :refer [admin-page]]
    [auto-ap.views.pages.home :refer [home-page]]
    [auto-ap.views.pages.admin.clients :refer [admin-clients-page]]
@@ -54,6 +55,9 @@
 (defmethod page :payments [_]
   [payments-page])
 
+(defmethod page :sales-orders [_]
+  [sales-orders-page])
+
 (defmethod page :transactions [_]
   (transactions-page {}))
 

src/cljs/auto_ap/views/pages/sales_orders.cljs

@@ -0,0 +1,74 @@
+(ns auto-ap.views.pages.sales-orders
+  (:require [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.sales-orders.form :as form]
+            [auto-ap.views.pages.sales-orders.side-bar :as side-bar]
+            [auto-ap.views.pages.sales-orders.table :as table]
+            [auto-ap.views.utils :refer [with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
+            [reagent.core :as reagent]
+            [vimsical.re-frame.fx.track :as track]))
+
+(re-frame/reg-event-fx
+ ::params-change
+ [with-user]
+ (fn [{:keys [user db ]}[_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [[:sales_order_page
+                                           {:start (:start params 0)
+                                            :sort (:sort params)
+                                            :total-gte (:amount-gte (:total-range params))
+                                            :total-lte (:amount-lte (:total-range params))
+                                            :date-range (:date-range params)
+                                            :client-id (:id @(re-frame/subscribe [::subs/client]))}
+                                           [[:sales-orders [:id :total :tax :tip :date
+                                                            [:charges [:type-name :total]]
+                                                            [:line-items [:item-name :total]]
+                                                            [:client [:name :id]]]]
+                                            :total
+                                            :start
+                                            :end]]]} 
+              :on-success (fn [result]
+                            (let [result (set/rename-keys (:sales-order-page result)
+                                                          {:sales-orders :data})]
+                              [::data-page/received ::page result]))}}))
+
+
+(re-frame/reg-event-fx
+ ::unmounted
+ (fn [{:keys [db]} _]
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}}))
+
+(re-frame/reg-event-fx
+ ::mounted
+ (fn [{:keys [db]} _]
+   {::track/register {:id ::params
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params]
+                                  [::params-change params])}}))
+
+(defn content []
+  [:div
+   [:h1.title "Sales Orders"]
+   [table/table {:id :sales-orders
+                 :data-page ::page}]])
+
+(defn sales-orders-page []
+  (reagent/create-class
+   {:display-name "sales-orders-page"
+    :component-will-unmount #(re-frame/dispatch-sync [::unmounted])
+    :component-did-mount #(re-frame/dispatch [::mounted])
+    :reagent-render
+    (fn []
+      (let [{form-active? :active?} @(re-frame/subscribe [::forms/form ::form/form])]
+        (println form-active?)
+        [side-bar-layout {:side-bar [side-bar/side-bar {:data-page ::page}]
+                          :main [content]
+                          :right-side-bar [appearing-side-bar {:visible? form-active?}
+                                           [form/form {}]]}]))}))
+

src/cljs/auto_ap/views/pages/sales_orders/form.cljs

@@ -0,0 +1,81 @@
+(ns auto-ap.views.pages.sales-orders.form
+  (:require 
+            [auto-ap.events :as events]
+            [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.utils :refer [dollars=]]
+            [auto-ap.views.components.dropdown :refer [drop-down]]
+            [auto-ap.views.components.expense-accounts-field :as expense-accounts-field :refer [expense-accounts-field recalculate-amounts]]
+            [auto-ap.views.components.layouts :as layouts]
+            [auto-ap.views.components.money-field :refer [money-field]]
+            [auto-ap.views.components.typeahead :refer [typeahead-entity]]
+            [auto-ap.status :as status]
+            [auto-ap.views.utils :refer [date->str date-picker dispatch-event standard with-user]]
+            [cljs-time.core :as c]
+            [clojure.spec.alpha :as s]
+            [clojure.string :as str]
+            [re-frame.core :as re-frame]))
+(re-frame/reg-sub
+ ::can-submit
+ :<- [::forms/form ::form]
+ (fn [{:keys [data status]} _]
+   false))
+
+(re-frame/reg-event-db
+ ::editing
+ (fn [db [_ which]]
+   (let [which (update which :date #(date->str % standard))]
+     (forms/start-form db ::form which))))
+
+(def sales-order-form (forms/vertical-form {:can-submit [::can-submit]
+                                        :change-event [::forms/changed]
+                                        :submit-event [::saving ]
+                                        :id ::form}))
+
+(defn form [{:keys [can-change-amount?] :as params}]
+  [layouts/side-bar {:on-close   (dispatch-event [::forms/form-closing ::form ])}
+   (let [{:keys [data active? error id]} @(re-frame/subscribe [::forms/form ::form])
+         {:keys [form-inline field raw-field error-notification submit-button ]} sales-order-form]
+     (with-meta 
+       (form-inline (assoc params :title "Sales order") 
+                    [:<>
+                     (when-not @(re-frame/subscribe [::subs/client])
+                       (field [:span "Client"
+                               [:span.has-text-danger " *"]]
+                              [typeahead-entity {:matches @(re-frame/subscribe [::subs/clients])
+                                                 :match->text :name
+                                                 :type "typeahead"
+                                                 :field [:client]
+                                                 :disabled true}]))
+
+
+                     (field "Date"
+                            [date-picker {:class-name "input"
+                                          :class "input"
+                                          :type "date"
+                                          :disabled true
+                                          :field [:date]}])
+                     (field "Total"
+                            [money-field {:type "money"
+                                          :field [:total]
+                                          :disabled true}])
+                     (field "Tax"
+                            [money-field {:type "money"
+                                          :field [:tax]
+                                          :disabled true}])
+                     (field "Tip"
+                            [money-field {:type "money"
+                                          :field [:tip]
+                                          :disabled true}])
+
+                     [:h1.subtitle.is-4 "Charges"]
+                     [:ul 
+                      (for [charge (:charges data)]
+                        [:li (:type-name charge) ": " (:total charge)])]
+
+                     [:h1.subtitle.is-4 "Line Items"]
+                     [:ul 
+                      (for [line-item (:line-items data)]
+                        [:li (:item-name line-item) ": " (:total line-item)])]])
+       {:key (:id data)}))])
+

src/cljs/auto_ap/views/pages/sales_orders/side_bar.cljs

@@ -0,0 +1,31 @@
+(ns auto-ap.views.pages.sales-orders.side-bar
+  (:require [auto-ap.routes :as routes]
+            [auto-ap.subs :as subs]
+            [auto-ap.views.utils :refer [active-when dispatch-value-change]]
+            [auto-ap.views.components.vendor-filter :refer [vendor-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.bank-account-filter :refer [bank-account-filter]]
+            [auto-ap.views.components.typeahead :refer [typeahead-entity]]
+            [bidi.bidi :as bidi]
+            [re-frame.core :as re-frame]
+            [auto-ap.views.pages.data-page :as data-page]))
+
+(defn side-bar [{:keys [data-page]}]
+  (let [ap @(re-frame/subscribe [::subs/active-page])
+        user @(re-frame/subscribe [::subs/user])]
+    [:div
+     [:div 
+      
+
+      [:p.menu-label "Date Range"]
+      [:div
+       [date-range-filter
+        {:on-change-event [::data-page/filter-changed data-page :date-range]
+         :value @(re-frame/subscribe [::data-page/filter data-page :date-range])}]]
+
+      [:p.menu-label "Total"]
+      [:div
+       [number-filter
+        {:on-change-event [::data-page/filter-changed data-page :total-range]
+         :value @(re-frame/subscribe [::data-page/filter data-page :total-range])}]]]]))

src/cljs/auto_ap/views/pages/sales_orders/table.cljs

@@ -0,0 +1,49 @@
+(ns auto-ap.views.pages.sales-orders.table
+  (:require [auto-ap.subs :as subs]
+            [auto-ap.views.components.buttons :as buttons]
+            [auto-ap.views.components.grid :as grid]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.sales-orders.form :as form]
+            [auto-ap.views.utils :refer [date->str nf]]
+            [clojure.string :as str]
+            [re-frame.core :as re-frame]))
+
+(defn row [{sales-order :sales-order
+            selected-client :selected-client}]
+  (let [{:keys [client date total tax tip charges line-items]} sales-order]
+    [grid/row {:class (:class sales-order)}
+     (when-not selected-client
+       [grid/cell {} (:name client)])
+     [grid/cell {} (date->str date) ]
+     [grid/cell {:class "has-text-right"} (nf total )]
+     [grid/cell {:class "has-text-right"} (nf tax )]
+     [grid/cell {:class "has-text-right"} (nf tip )]
+     [grid/cell {} (str/join ", " (map :type-name charges))]
+     [grid/cell {} (str/join ", " (map :item-name line-items))]
+[grid/button-cell {}
+      [:div.buttons 
+       [buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
+
+(defn table [{:keys [data-page]}]
+  (let [selected-client @(re-frame/subscribe [::subs/client])
+        {:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])]
+    [grid/grid {:data-page data-page
+                :column-count (if selected-client 7 8)}
+     [grid/controls data]
+     [grid/table {:fullwidth true}
+      [grid/header {}
+       [grid/row {}
+        (when-not selected-client
+          [grid/sortable-header-cell {:sort-key "client" :sort-name "Client"} "Client"])
+        [grid/sortable-header-cell {:sort-key "date" :sort-name "Date" :style {:width "8em"}} "Date"]
+        [grid/sortable-header-cell {:sort-key "total" :sort-name "Total" :class "has-text-right" :style {:width "8em"}} "Total"]
+        [grid/sortable-header-cell {:sort-key "tax" :sort-name "Tax" :class "has-text-right" :style {:width "7em"}} "Tax"]
+        [grid/sortable-header-cell {:sort-key "tip" :sort-name "Tip" :class "has-text-right" :style {:width "7em"}} "Tip"]
+        [grid/header-cell  {} "Payment Methods"]
+        [grid/header-cell  {} "Line Items"]
+        [grid/header-cell {:style {:width "4em"}}]]]
+      [grid/body
+       (for [sales-order (:data data)]
+         ^{:key (:id sales-order)}
+         [row {:sales-order sales-order
+               :selected-client selected-client}])]]]))

src/cljs/auto_ap/views/pages/transactions.cljs

@@ -1,81 +1,66 @@
 (ns auto-ap.views.pages.transactions
-  (:require [auto-ap.events :as events]
+  (:require [auto-ap.effects.forward :as forward]
             [auto-ap.forms :as forms]
             [auto-ap.subs :as subs]
-            [bidi.bidi :as bidi]
-            [auto-ap.routes :as routes]
-            [vimsical.re-frame.cofx.inject :as inject]
-            [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.vendor-filter :refer [vendor-filter]]
-            [auto-ap.views.components.typeahead :refer [typeahead-entity]]
-            [auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
-            [auto-ap.views.components.modal :refer [action-modal]]
-            [auto-ap.views.components.paginator :refer [paginator]]
-            [auto-ap.views.components.sort-by-list :refer [sort-by-list]]
-            [auto-ap.views.components.sorter :refer [sorted-column]]
-            [auto-ap.views.pages.transactions.form :as edit]
-            [auto-ap.views.pages.transactions.table :as table]
-            [auto-ap.views.pages.transactions.common :refer [transaction-read]]
             [auto-ap.utils :refer [replace-by]]
+            [auto-ap.views.components.layouts
+             :refer
+             [appearing-side-bar side-bar-layout]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.transactions.common :refer [transaction-read]]
+            [auto-ap.views.pages.transactions.form :as edit]
             [auto-ap.views.pages.transactions.manual :as manual]
-            [auto-ap.views.utils :refer [bind-field date->str dispatch-event nf date-picker active-when with-user]]
-            [goog.string :as gstring]
-            [re-frame.core :as re-frame]
             [auto-ap.views.pages.transactions.side-bar :as side-bar]
+            [auto-ap.views.pages.transactions.table :as table]
+            [auto-ap.views.utils :refer [dispatch-event with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
             [reagent.core :as reagent]
-            [auto-ap.status :as status]
-            [vimsical.re-frame.fx.track :as track]))
+            [vimsical.re-frame.fx.track :as track]
+            [auto-ap.status :as status]))
 
 
-
-(re-frame/reg-event-db
- ::edit-completed
- (fn [db [_ edit-transaction]]
-   (-> db
-       (update-in [::transaction-page :transactions]
-                  replace-by :id  (assoc edit-transaction :class "live-added")))))
-
 (re-frame/reg-event-fx
  ::manual-import-completed
  (fn [{:keys [db]} [_ {:keys [imported errors]}]]
-   {:dispatch [::params-change (::params db)]
+   {:dispatch [::params-change @(re-frame/subscribe [::data-page/params ::page])]
     :db (-> db
             (assoc-in [::notification :message] (str "Successfully imported " imported " transactions"))
             (assoc-in [::notification :errors] errors))}))
 
-(re-frame/reg-sub
- ::transaction-page
- (fn [db]
-   (-> db ::transaction-page)))
 
-
-(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))))
+(defn data-params->query-params [params]
+  {:start (:start params 0)
+   :sort (:sort params)
+   :client-id (:id @(re-frame/subscribe [::subs/client]))
+   :vendor-id (:id (:vendor params))
+   :date-range (:date-range params)
+   :bank-account-id (:id (:bank-account params))
+   :amount-gte (:amount-gte (:amount-range params))
+   :amount-lte (:amount-lte (:amount-range params))
+   :description (:description params)
+   :approval-status (condp = @(re-frame/subscribe [::subs/active-page])
+                      :transactions nil
+                      :unapproved-transactions :unapproved
+                      :requires-feedback-transactions :requires-feedback
+                      :excluded-transactions :excluded
+                      :approved-transactions :approved)})
 
 (re-frame/reg-event-fx
  ::params-change
  [with-user]
  (fn [{:keys [user db ]} [_ params]]
    {:graphql {:token user
-              :owns-state {:single ::page}
+              :owns-state {:single [::data-page/page ::page]}
               :query-obj {:venia/queries [[:transaction_page
-                                           params 
+                                           (data-params->query-params params)
                                            [[:transactions transaction-read]
                                             :total
                                             :start
                                             :end]]]} 
-              :on-success [::received]}
-    :set-uri-params (dissoc params :status :client-id)}))
+              :on-success (fn [result]
+                            [::data-page/received ::page (set/rename-keys (first (:transaction-page result))
+                                                                          {:transactions :data})])}}))
 
 (re-frame/reg-event-fx
  ::unapprove-all
@@ -84,38 +69,41 @@
    {:db (-> (:db cofx)
             (assoc-in [:status :loading] true))
     :graphql {:token (-> cofx :db :user)
+              :owns-state {:single ::unapprove-all}
               :query-obj
               {:venia/operation {:operation/type :mutation
                                  :operation/name "UnapproveTransactions"}
                :venia/queries [{:query/data
                                 [:unapprove-transactions
-                                 @(re-frame/subscribe [::params])
+                                 (data-params->query-params params)
                                  [[:transactions transaction-read]
                                   :total
                                   :start
                                   :end]]}]}
-              :on-success [::received]}}))
+              :on-success (fn [result]
+                            [::data-page/received ::page (set/rename-keys (first (:unapprove-transactions result))
+                                                                          {:transactions :data})])}}))
 
 (re-frame/reg-event-fx
  ::unmounted
  (fn [{:keys [db]} _]
-   {:db (dissoc db ::table/table-params ::side-bar/filters ::side-bar/settled-filters ::transaction-page)
-    ::track/dispose {:id ::params}}))
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}
+    ::forward/dispose {:id ::updated}}))
 
 (re-frame/reg-event-fx
  ::mounted
  (fn [{:keys [db]} _]
    {::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])}
+    ::forward/register {:id ::updated
+                        :events #{::edit/edited}
+                        :event-fn (fn [[_ edited-transaction]]
+                                    [::data-page/updated-entity ::page edited-transaction])}}))
+
 
-(re-frame/reg-event-db
- ::received
- (fn [db [_ data]]
-   (-> db
-       (update ::transaction-page merge (or (first (:transaction-page data))
-                                            (first (:unapprove-transactions data))))
-       (assoc-in [:status :loading] false))))
 
 
 (re-frame/reg-sub
@@ -125,10 +113,11 @@
 
 (defn content []
   (let [notification (re-frame/subscribe [::notification])
-        current-client @(re-frame/subscribe [::subs/client])
-        user @(re-frame/subscribe [::subs/user])]
+        user @(re-frame/subscribe [::subs/user])
+        params @(re-frame/subscribe [::data-page/params ::page])]
     [:div 
      [:h1.title "Transactions"]
+     [status/status-notification {:statuses [[::status/single ::unapprove-all]]}]
      (when (= "admin" (:user/role user))
        [:div 
         (when (:message @notification)
@@ -146,11 +135,12 @@
          [:div.buttons 
           [:button.button.is-outlined.is-primary {:on-click (dispatch-event [::manual/opening])}
            "Manual Yodlee Import"]
-          [:button.button.is-outlined.is-danger {:on-click (dispatch-event [::unapprove-all])}
+          [:button.button.is-outlined.is-danger {:on-click (dispatch-event [::unapprove-all params])
+                                                 :class (status/class-for @(re-frame/subscribe [::status/single ::unapprove-all]))
+                                                 :disabled (status/disabled-for @(re-frame/subscribe [::status/single ::unapprove-all]))}
            "Unapprove all"]]]])
      [table/table {:id :transactions
-                   :transaction-page @(re-frame/subscribe [::transaction-page])
-                   :status @(re-frame/subscribe [::status/single ::page])}]]))
+                   :data-page ::page}]]))
 
 
 (defn transactions-page [{:keys [approval-status]}]
@@ -160,17 +150,14 @@
     :component-did-mount #(re-frame/dispatch [::mounted])
     :reagent-render
     (fn []
-      (let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])
-            params @(re-frame/subscribe [::params]) ;; Keep to make sure it doens'nt get disposed
-            ap @(re-frame/subscribe [::subs/active-page])
-            user (re-frame/subscribe [::subs/user])]
+      (let [{transaction-bar-active? :active?} @(re-frame/subscribe [::forms/form ::edit/form])]
         [side-bar-layout
-         {:side-bar [side-bar/side-bar]
+         {:side-bar [side-bar/side-bar {:data-page ::page}]
           :main [:div ^{:key approval-status}
                  [content]]
           :bottom [:div
                    [manual/modal {:import-completed [::manual-import-completed ]}]]
           :right-side-bar [appearing-side-bar
                            {:visible? transaction-bar-active?}
-                           [edit/form {:edit-completed [::edit-completed]}]]}]))}))
+                           [edit/form]]}]))}))
 

src/cljs/auto_ap/views/pages/transactions/form.cljs

@@ -81,18 +81,19 @@
 (re-frame/reg-event-fx
  ::saving
  [with-user (forms/triggers-loading ::form) (forms/in-form ::form)]
- (fn [{:keys [user]} [_ params]]
+ (fn [{:keys [user]} [_]]
    {:graphql
     {:token user
      :query-obj  @(re-frame/subscribe [::submit-query])
-     :on-success [::edited params]
+     :on-success (fn [result]
+                   [::edited (:edit-transaction result)])
      :on-error [::forms/save-error ::form]}}))
 
 
 (re-frame/reg-event-fx
  ::matching
  [with-user (forms/triggers-loading ::form) (forms/in-form ::form)]
- (fn [{{{:keys [id]} :data} :db user :user} [_ params payment-id]]
+ (fn [{{{:keys [id]} :data} :db user :user} [_ payment-id]]
    {:graphql
     {:token user
      :query-obj {:venia/operation {:operation/type :mutation
@@ -101,13 +102,14 @@
                                                {:transaction_id id
                                                 :payment-id payment-id}
                                                transaction-read]}]}  
-     :on-success [::edited params]
+     :on-success (fn [result]
+                   [::edited (:match-transaction result)])
      :on-error [::forms/save-error ::form]}}))
 
 (re-frame/reg-event-fx
  ::matching-rule
  [with-user (forms/triggers-loading ::form) (forms/in-form ::form)]
- (fn [{{{:keys [id]} :data} :db user :user} [_ params transaction-rule-id]]
+ (fn [{{{:keys [id]} :data} :db user :user} [_ transaction-rule-id]]
    {:graphql
     {:token user
      :query-obj {:venia/operation {:operation/type :mutation
@@ -116,14 +118,16 @@
                                                {:transaction-ids [id]
                                                 :transaction-rule-id transaction-rule-id}
                                                transaction-read]}]}  
-     :on-success [::edited params]
+     :on-success (fn [result]
+                   [::edited (first (:match-transaction-rules result))])
      :on-error [::forms/save-error ::form]}}))
 
 (re-frame/reg-event-fx
  ::edited
  [(forms/triggers-stop ::form)]
- (fn [{:keys [db]} [_ {:keys [edit-completed]} {:keys [edit-transaction match-transaction match-transaction-rules]}]]
-   {:dispatch (conj edit-completed (or edit-transaction match-transaction (first match-transaction-rules)))}))
+ (fn [{:keys [db]} [_ transaction]]
+   {}))
+
 
 (re-frame/reg-event-db
  ::manual-match
@@ -158,7 +162,7 @@
       [:tr 
        [:td.no-border note]
        [:td.no-border
-        [:a.button.is-primary.is-small {:on-click (dispatch-event [::matching-rule params id])}
+        [:a.button.is-primary.is-small {:on-click (dispatch-event [::matching-rule id])}
          "Use this rule"]]])]])
 
 
@@ -177,11 +181,11 @@
         [:td.no-border (:name vendor)]
         [:td.no-border (when check-number (str "Check " check-number " ")) memo]
         [:td.no-border
-         [:a.button.is-primary.is-small {:on-click (dispatch-event [::matching params id])}
+         [:a.button.is-primary.is-small {:on-click (dispatch-event [::matching id])}
           "Match"]]]))]])
 
 
-(defn form [{:keys [edit-completed]}]
+(defn form [_]
   [layouts/side-bar {:on-close (dispatch-event [::forms/form-closing ::form])}
    (let [change-event [::forms/change ::form]
          {:keys [data] } @(re-frame/subscribe [::forms/form ::form])
@@ -190,7 +194,7 @@
          is-admin? @(re-frame/subscribe [::subs/is-admin?])
          should-disable-for-client? (and (not is-admin?)
                                          (not= :requires-feedback (:original-status data)))]
-     [form {:title "Transaction" :edit-completed edit-completed}
+     [form {:title "Transaction"}
 
       (when (and @(re-frame/subscribe [::subs/is-admin?])
                  (get-in data [:yodlee-merchant]))
@@ -221,15 +225,13 @@
              (not (:matched-rule data))
              (not (:payment data))
              is-admin?)
-        [potential-transaction-rule-matches-box {:potential-transaction-rule-matches (:potential-transaction-rule-matches data)
-                                                 :edit-completed edit-completed}]
+        [potential-transaction-rule-matches-box {:potential-transaction-rule-matches (:potential-transaction-rule-matches data)}]
 
 
         (and (seq (:potential-payment-matches data))
              (not (:payment data))
              is-admin?)
-        [potential-payment-matches-box {:potential-payment-matches (:potential-payment-matches data)
-                                        :edit-completed edit-completed}]
+        [potential-payment-matches-box {:potential-payment-matches (:potential-payment-matches data)}]
 
         (and (not (seq (:potential-payment-matches data)))
              (not (seq (:potential-transaction-rule-matches data))))

src/cljs/auto_ap/views/pages/transactions/side_bar.cljs

@@ -7,90 +7,12 @@
             [auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
             [auto-ap.views.components.typeahead :refer [typeahead-entity]]
             [bidi.bidi :as bidi]
-            [re-frame.core :as re-frame]))
-(re-frame/reg-sub
- ::specific-filters
- (fn [db ]
-   (::filters db {})))
-
-(re-frame/reg-sub
- ::filters
- :<- [::specific-filters]
- :<- [::subs/vendors-by-id]
- :<- [::subs/bank-accounts-by-id]
- :<- [::subs/query-params]
- (fn [[specific-filters vendors-by-id bank-accounts-by-id query-params] ]
-
-   
-   (let [url-filters (-> query-params
-                         (select-keys #{:vendor-id
-                                        :bank-account-id
-                                        :date-range
-                                        :description
-                                        :amount-gte
-                                        :amount-lte}))
-         url-filters {:vendor (when-let [vendor-id (:vendor-id url-filters)]
-                                {:id (str vendor-id)
-                                 :name (get-in vendors-by-id [(str vendor-id) :name] "Loading...")})
-                      :bank-account (when-let [bank-account-id (:bank-account-id url-filters)]
-                                      {:id (str bank-account-id)
-                                       :name (get-in bank-accounts-by-id [(str bank-account-id) :name] "Loading...")})
-                      :amount-range {:amount-gte (:amount-gte url-filters)
-                                     :amount-lte (:amount-lte url-filters)} 
-                      :description (:description url-filters)
-                      :date-range (:date-range url-filters)}]
-     (merge url-filters specific-filters ))))
-
-(re-frame/reg-sub
- ::filter
- :<- [::filters]
- (fn [filters [_ which]]
-   (filters which)))
-
-(re-frame/reg-sub
- ::settled-filters
- (fn [db ]
-   (::settled-filters db)))
-
-(re-frame/reg-sub
- ::filter-params
- :<- [::settled-filters]
- :<- [::filters]
- :<- [::subs/active-page]
- (fn [[settled-filters filters ap]]
-   (let [filters (or settled-filters filters)]
-     {:vendor-id (:id (:vendor filters))
-      :date-range (:date-range filters)
-      :bank-account-id (:id (:bank-account filters))
-      :amount-gte (:amount-gte (:amount-range filters))
-      :amount-lte (:amount-lte (:amount-range filters))
-      :description (:description filters)
-      :approval-status (condp = ap
-                         :transactions nil
-                         :unapproved-transactions :unapproved
-                         :requires-feedback-transactions :requires-feedback
-                         :excluded-transactions :excluded
-                         :approved-transactions :approved)})))
-(re-frame/reg-event-fx
- ::filters-settled
- (fn [{:keys [db]} [_ & params]]
-   {:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
+            [re-frame.core :as re-frame]
+            [auto-ap.views.pages.data-page :as data-page]))
 
 
-(re-frame/reg-event-fx
- ::filter-changed
- (fn [{:keys [db]} [_ & params]]
-   (let [[a b c] params
-         [which val] (if (= 3 (count params))
-                       [(into [a] b) c]
-                       [[a] b])]
-     {:db (assoc-in db (into [::filters] which) val)
-      :dispatch-debounce
-      {:event [::filters-settled]
-       :time 800
-       :key ::filters}})))
 
-(defn side-bar []
+(defn side-bar [{:keys [data-page]}]
   (let [ap @(re-frame/subscribe [::subs/active-page])
         user @(re-frame/subscribe [::subs/user])]
     [:div
@@ -131,34 +53,35 @@
        [:p.menu-label "Bank Account"]
        [:div 
         [bank-account-filter
-         {:on-change-event [::filter-changed :bank-account]
-          :value @(re-frame/subscribe [::filter :bank-account])
+         {:on-change-event [::data-page/filter-changed data-page :bank-account]
+          :value @(re-frame/subscribe [::data-page/filter data-page :bank-account])
           :bank-accounts @(re-frame/subscribe [::subs/bank-accounts])}]]
 
        [:p.menu-label "Date Range"]
        [:div
         [date-range-filter
-         {:on-change-event [::filter-changed :date-range]
-          :value @(re-frame/subscribe [::filter :date-range])}]]
+         {:on-change-event [::data-page/filter-changed data-page :date-range]
+          :value @(re-frame/subscribe [::data-page/filter data-page :date-range])}]]
 
-       [:p.menu-label "Amount"]
+     [:p.menu-label "Amount"]
        [:div
         [number-filter
-         {:on-change-event [::filter-changed :amount-range]
-          :value @(re-frame/subscribe [::filter :amount-range])}]]
+         {:on-change-event [::data-page/filter-changed data-page :amount-range]
+          :value @(re-frame/subscribe [::data-page/filter data-page :amount-range])}]]
 
        [:p.menu-label "Vendor"]
        [:div
         [typeahead-entity {:matches @(re-frame/subscribe [::subs/vendors])
-                           :on-change #(re-frame/dispatch [::filter-changed :vendor %])
+                           :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %])
+                           :include-keys [:name :id]
                            :match->text :name
                            :type "typeahead-entity"
-                           :value @(re-frame/subscribe [::filter :vendor])}]]
+                           :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
 
        [:p.menu-label "Description"]
        [:div
         [:div.field
          [:div.control [:input.input {:placeholder "CHECK 123 ABC"
-                                      :value @(re-frame/subscribe [::filter :description])
-                                      :on-change (dispatch-value-change [::filter-changed :description])} ]]]]]))
+                                      :value @(re-frame/subscribe [::data-page/filter data-page :description])
+                                      :on-change (dispatch-value-change [::data-page/filter-changed data-page :description])} ]]]]]))
 

src/cljs/auto_ap/views/pages/transactions/table.cljs

@@ -12,7 +12,8 @@
             [goog.string :as gstring]
             [re-frame.core :as re-frame]
             [auto-ap.views.components.buttons :as buttons]
-            [auto-ap.status :as status]))
+            [auto-ap.status :as status]
+            [auto-ap.views.pages.data-page :as data-page]))
 
 (re-frame/reg-event-fx
  ::editing-matches-found
@@ -54,15 +55,13 @@
  (fn [{table-params :db} [_ params :as z]]
    {:db (merge table-params params)}))
 
-(defn table [{:keys [id transaction-page status]}]
+(defn table [{:keys [id data-page ]}]
   (let [selected-client @(re-frame/subscribe [::subs/client])
+        {:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])
         states @(re-frame/subscribe [::status/multi ::edits])]
-    [grid/grid {:on-params-change (fn [e]
-                                    (re-frame/dispatch [::params-changed e]))
-                :params @(re-frame/subscribe [::table-params])
-                :status status
+    [grid/grid {:data-page data-page
                 :column-count (if selected-client 6 7)}
-     [grid/controls transaction-page]
+     [grid/controls data]
      [grid/table {:fullwidth true}
       [grid/header {}
        [grid/row {}
@@ -75,7 +74,7 @@
         [grid/sortable-header-cell {:sort-key "status" :sort-name "Status" :style {:width "7em"}} "Status"]
         [grid/header-cell {:style {:width (action-cell-width 3)}}]]]
       [grid/body
-       (for [{:keys [client account vendor approval-status payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:transactions transaction-page)]
+       (for [{:keys [client account vendor approval-status payment status bank-account description-original date amount id yodlee-merchant ] :as i} (:data data)]
             ^{:key id}
          [grid/row {:class (:class i)}
           (when-not selected-client