partway through transaction rules

resources/public/css/bulma.min.css

@@ -9511,7 +9511,7 @@ tbody tr.live-added {
   animation-fill-mode: forwards;
 }
 
-.button {
+.button.is-primary, .button.is-secondary, .button.is-success, .button.is-info, .button.is-danger, .button.is-warning, .button.is-primary-two {
   font-weight: 800;
 }
 

resources/sass/bulma.scss

@@ -163,7 +163,7 @@ tbody tr.live-added {
     animation: flashPrimary 1.0s ease both;
     animation-fill-mode: forwards;
 }
-.button {
+.button.is-primary, .button.is-secondary, .button.is-success, .button.is-info, .button.is-danger, .button.is-warning,  .button.is-primary-two {
     font-weight: 800;
 }
 .button.is-outlined {

src/clj/auto_ap/datomic.clj

@@ -806,6 +806,6 @@
 
   {:ids  (->> results
               (drop (:start args 0))
-              (take (:count args default-pagination-size))
+              (take (:count args (or (:per-page args) default-pagination-size)))
               (map last))
    :count (count results)})

src/clj/auto_ap/graphql.clj

@@ -465,6 +465,7 @@
                           :amount_gte {:type :money}
                           :invoice_number_like {:type 'String}
                           :start {:type 'Int}
+                          :per_page {:type 'Int}
                           :sort {:type '(list :sort_item)}}
                    
                    :resolve :get-invoice-page}
@@ -500,6 +501,7 @@
                           :amount_gte {:type :money}
                           :description {:type 'String}
                           :start {:type 'Int}
+                          :per_page {:type 'Int}
                           :sort {:type '(list :sort_item)}
                           :approval_status {:type :transaction_approval_status}}
                    
@@ -509,6 +511,7 @@
                 :args {:client_id {:type :id}
                        :vendor_id {:type :id}
                        :start {:type 'Int}
+                       :per_page {:type 'Int}
                        :sort {:type '(list :sort_item)}
                        :asc {:type 'Boolean}}
                 :resolve :get-transaction-rule-page}
@@ -525,6 +528,7 @@
                          :from_numeric_code {:type 'Int}
                          :to_numeric_code {:type 'Int}
                          :start {:type 'Int}
+                         :per_page {:type 'Int}
                          :sort {:type '(list :sort_item)}}
                   
                   :resolve :get-ledger-page}
@@ -535,6 +539,7 @@
                               :total_lte {:type :money}
                               :total_gte {:type :money}
                               :start {:type 'Int}
+                              :per_page {:type 'Int}
                               :sort {:type '(list :sort_item)}}
                        
                        :resolve :get-sales-order-page}
@@ -548,6 +553,7 @@
                           :check_number_like {:type 'String}
                           :invoice_number {:type 'String}
                           :start {:type 'Int}
+                          :per_page {:type 'Int}
                           :sort {:type '(list :sort_item)}}
                    
                    :resolve :get-payment-page}

src/clj/user.clj

@@ -367,3 +367,19 @@
   (require '[mount.core :as mount])
   (require '[auto-ap.server])
   (mount/start-without #'auto-ap.server/jetty))
+
+(defn entity-history [i]
+  (vec (sort-by first (d/query
+                       {:query {:find ['?tx '?z '?v  ]
+                                :in ['?i '$]
+                                :where ['[?i ?a ?v ?tx ?ad]
+                                        '[?a :db/ident ?z]
+                                        '[(= ?ad true)]]}
+                        :args [i (d/history (d/db (d/connect uri)))]}))))
+
+(defn tx-detail [i]
+  (map (juxt :e #(d/ident (d/db (d/connect uri)) (:a %)) :v)
+       (:data (first
+               (d/tx-range (d/log (d/connect uri))
+                           i
+                           (inc i))))))

src/cljs/auto_ap/views/components/grid.cljs

@@ -54,8 +54,8 @@
         :else 
         y))
 
-(defn paginator [{:keys [start end count total on-change]}]
+(defn paginator [{:keys [start per-page end count total on-change] :as g}]
-  (let [per-page default-pagination-size
+  (let [per-page (or per-page default-pagination-size)
         max-buttons 5
         buttons-before (Math/floor (/ max-buttons 2))
         total-pages (Math/max 1 (Math/ceil (/ total per-page)))
@@ -66,7 +66,8 @@
                                [:li
                                 [:a.pagination-link {:class   (when (= current-page x)
                                                                 "is-current")
-                                                     :on-click (fn [e] (on-change {:start (* x per-page)}))}
+                                                     :on-click (fn [e] (on-change {:start (* x per-page)
+                                                                                   :per-page per-page}))}
                                  (inc x)]]))
 
 
@@ -88,7 +89,14 @@
       extended-first-page-button
       (apply list (subvec all-buttons first-page-button last-page-button))
       extended-last-page-button
-      "Showing " (Math/min (inc start) total) "-" end "/" total]]))
+      [:span.mx-4 (Math/min (inc start) total) "-" end "/" total]
+      [:div.select
+       [:select {:value per-page :on-change (fn [e] (on-change {:start 0
+                                                                :per-page (js/parseInt (.. e -target -value ))}))}
+        [:option {:value 20 } "20 per page" ]
+        [:option {:value 50} "50 per page" ]
+        [:option {:value 100} "100 per page" ]
+        [:option {:value 200} "200 per page" ]]]]]))
 
 (defn sort-by-list [{:keys [sort on-change]}]
   [:div.field.is-grouped.is-grouped-multiline
@@ -103,7 +111,7 @@
        [:a.tag.is-medium.is-delete {:on-click (fn []
                                                 (on-change {:sort (filter #(not= sort-key (:sort-key %)) sort)}))}]]])])
 
-(defn controls [{:keys [start end count total] :as para}]
+(defn controls [{:keys [start end count total per-page] :as para}]
   (let [children (r/children (r/current-component))]
     [:> Consumer {}
      (fn [consume]
@@ -115,6 +123,7 @@
                            [:div.level-left
                             [:div.level-item 
                              [paginator {:start start :end end :count count :total total
+                                         :per-page (:per-page params)
                                          :on-change on-params-change}]]
                             [:div.level-item
                              [sort-by-list {:sort (:sort params)  
@@ -156,16 +165,17 @@
                                                                       "checked"
                                                                       "")
                                                            :on-change (fn [x e]
-                                                                        (let [checked (or checked #{})]
+                                                                        (if id 
-                                                                          ;; TODO only map once everything is moved over to data-page
+                                                                          (let [checked (or checked #{})]
-                                                                          (if (map? checked)
+                                                                            ;; TODO only map once everything is moved over to data-page
-                                                                            (if (get checked id)
+                                                                            (if (map? checked)
-                                                                              (on-check-changed (dissoc checked id))
+                                                                              (if (get checked id)
-                                                                              (on-check-changed (assoc checked id entity)))
+                                                                                (on-check-changed (dissoc checked id))
+                                                                                (on-check-changed (assoc checked id entity)))
 
-                                                                            (if (get checked id)
+                                                                              (if (get checked id)
-                                                                              (on-check-changed (disj checked id))
+                                                                                (on-check-changed (disj checked id))
-                                                                              (on-check-changed (conj checked id))))))}
+                                                                                (on-check-changed (conj checked id)))))))}
                                                     (boolean? checkable?) (assoc :disabled (not checkable?))) ]]))
 
                 (map r/as-element children))))]))
@@ -258,10 +268,10 @@
                         [:<> ]
                         (r/children (r/current-component)))))))
 
-(defn virtual-paginate [start xs ]
+(defn virtual-paginate [start per-page xs ]
-  (take default-pagination-size (drop (or start 0) xs)))
+  (take (or per-page default-pagination-size) (drop (or start 0) xs)))
 
-(defn virtual-paginate-controls [start xs]
+(defn virtual-paginate-controls [start per-page xs ]
-  {:start (or start 0) :end (min (+ (or start 0) default-pagination-size)
+  {:start (or start 0) :end (min (+ (or start 0) (or per-page default-pagination-size))
                                  (count xs))
    :total (count xs)})

src/cljs/auto_ap/views/components/invoice_table.cljs

@@ -24,6 +24,7 @@
                     {
                      :start (:start params 0)
                      :sort (:sort params)
+                     :per-page (:per-page params)
 
                      :vendor-id (:id (:vendor params))
                      :date-range (:date-range params)

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

@@ -69,9 +69,9 @@
                                                                         (str/lower-case (:name-like params))))
                             (not-empty  (:code-like params)) (filter #(str/starts-with? (str (or (:numeric-code %) ""))
                                                                         (str/lower-case (:code-like params)))))]
-     (assoc (grid/virtual-paginate-controls (:start params ) matching-accounts)
+     (assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) matching-accounts)
             :data (grid/virtual-paginate (:start params)
-
+                                         (:per-page params)
                                          (sort-by :numeric-code matching-accounts))))))
 
 (defn accounts-table [{:keys [accounts]}]

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

@@ -66,8 +66,8 @@
                                                                                (str/lower-case (:name params))))
                             (not-empty (:code params)) (filter #(= (str/lower-case (or (:code %) ""))
                                                                    (str/lower-case (:code params)))))]
-     (assoc (grid/virtual-paginate-controls (:start params ) matching-clients)
+     (assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) matching-clients)
-            :data (grid/virtual-paginate (:start params) matching-clients)))))
+            :data (grid/virtual-paginate (:start params) (:per-page params) matching-clients)))))
 
 
 (def admin-clients-content 

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]}
+              :on-success (fn [result]
-    :set-uri-params (dissoc params
+                            [::data-page/received ::page
-                            :client-id)}))
+                             (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
+    ::forward/register [{:id ::page
-                        :events #{::table/deleted-transaction-rule}
+                         :events #{::form/updated}
-                        :event-fn (fn [[_ result]]
+                         :event-fn (fn [[_ result]]
-                                    [::deleted-transaction-rule 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]
+                      :subscription [::data-page/params ::page]
-                      :event-fn (fn [params] [::params-change params])}}))
+                      :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"]])
+            [buttons/new-button {:event [::new-rule-clicked]
-         [table/table {:id :transactions
+                                 :class "is-primary"
-                       :params (re-frame/subscribe [::params])
+                                 :name "Transaction Rule"}]])
-                       :rule-page (re-frame/subscribe [::page])
+         [table/table {:id :transaction-rules
-                       :status @(re-frame/subscribe [::status/single ::page])}]
+                       :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]}]))

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

@@ -85,6 +85,11 @@
                                                           (assoc :bank-account-id (:id (:bank-account data))))}
                                   default-read]}]}))
 
+(defn ungraphql-transaction-rule [x]
+  (-> x
+      (update :amount-lte #(some-> % js/parseFloat))
+      (update :amount-gte #(some-> % js/parseFloat))))
+
 (re-frame/reg-sub
  ::test-query
  :<- [::forms/form ::form]
@@ -182,7 +187,8 @@
    {:graphql
     {:token user
      :query-obj @(re-frame/subscribe [::query])
-     :on-success [::succeeded params]
+     :on-success (fn [result]
+                   [::updated (:upsert-transaction-rule result)])
      :on-error [::forms/save-error ::form]}}))
 
 (re-frame/reg-event-fx
@@ -196,7 +202,7 @@
      :on-error [::forms/save-error ::form]}}))
 
 (re-frame/reg-event-fx
- ::succeeded
+ ::updated
  [(forms/triggers-stop ::form)]
  (fn [{:keys [db]} [_ {:keys [rule-saved]} result]]
    {:db (forms/start-form db ::form {:client @(re-frame/subscribe [::subs/client])})

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

@@ -14,7 +14,8 @@
             [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [reagent.core :as r]
-            [auto-ap.views.components.modal :as modal]))
+            [auto-ap.views.components.modal :as modal]
+            [auto-ap.views.pages.data-page :as data-page]))
 
 (re-frame/reg-event-fx
  ::run-clicked
@@ -100,17 +101,13 @@
 
 
 
-(defn table* [{:keys [id rule-page params status]}]
+(defn table* [{:keys [id data-page]}]
-  (let [{:keys [transaction-rules start end count total]} @rule-page
+  (let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
         selected-client @(re-frame/subscribe [::subs/client])
-        opc (fn [p]
-              (re-frame/dispatch [::params-changed p]))
         states @(re-frame/subscribe [::status/multi ::run])]
-    [grid/grid {:on-params-change opc
+    [grid/grid {:data-page data-page
-                :params @(re-frame/subscribe [::table-params])
-                :status status
                 :column-count 6}
-     [grid/controls {:start start :end end :count count :total total}]
+     [grid/controls data]
      [grid/table {:fullwidth true }
       [grid/header
        [grid/row {}
@@ -134,7 +131,7 @@
 
         [grid/header-cell {:style {:width (action-cell-width 3)}}]]]
       [grid/body
-       (for [{:keys [client bank-account description amount-lte amount-gte note id] :as r} transaction-rules]
+       (for [{:keys [client bank-account description amount-lte amount-gte note id] :as r} (:data data)]
          ^{:key id}
          [grid/row {:class (:class r)}
           [grid/cell {} (:name client)]

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

@@ -42,8 +42,8 @@
  :<- [::params]
  :<- [::users]
  (fn [[params all-users]]
-   (assoc (grid/virtual-paginate-controls (:start params ) all-users)
+   (assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) all-users )
-          :data (grid/virtual-paginate (:start params) all-users))))
+          :data (grid/virtual-paginate (:start params) (:per-page params) all-users))))
 
 (re-frame/reg-event-fx
  ::mounted

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

@@ -84,8 +84,8 @@
    (let [matching-vendors (cond->> all-vendors
                             (:name-like params) (filter #(str/includes? (str/lower-case (or (:name %) ""))
                                                                         (str/lower-case (:name-like params)))))]
-     (assoc (grid/virtual-paginate-controls (:start params ) matching-vendors)
+     (assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) matching-vendors)
-            :data (grid/virtual-paginate (:start params) matching-vendors)))))
+            :data (grid/virtual-paginate (:start params) (:per-page params) matching-vendors)))))
 
 
 

src/cljs/auto_ap/views/pages/data_page.cljs

@@ -120,7 +120,9 @@
 (re-frame/reg-event-fx
  ::additional-params-changed
  (fn [{:keys [db]} [_ which params :as z]]
-   {:db (update-in db [::additional-params which] merge params)}))
+   {:db (-> db
+            (update-in [::additional-params which] merge params)
+            (assoc-in [::table-params which :start] 0))}))
 
 (re-frame/reg-sub
  ::specific-filters

src/cljs/auto_ap/views/pages/home.cljs

@@ -230,8 +230,9 @@
                               :name (str (:name (get vendors-by-id (:id (:vendor c)))) " (" (:invoice-number c) ")")
                               :type "Invoice"})
                            invoices-due-soon))]
-     (assoc (grid/virtual-paginate-controls (:start params ) rows)
+     (assoc (grid/virtual-paginate-controls (:start params ) (:per-page params) rows)
             :data (grid/virtual-paginate (:start params)
+                                         (:per-page params)
                                          (sort-by (comp  coerce/to-date :date) rows))))))
 
 (re-frame/reg-event-fx

src/cljs/auto_ap/views/pages/ledger.cljs

@@ -25,6 +25,7 @@
 (defn data-params->query-params [params]
   {:start (:start params 0)
    :sort (:sort params)
+   :per-page (:per-page params)
    :client-id (:id @(re-frame/subscribe [::subs/client]))
    :vendor-id (:id (:vendor params))
    :date-range (:date-range params)

src/cljs/auto_ap/views/pages/ledger/profit_and_loss.cljs

@@ -165,6 +165,7 @@
   (when params 
     {:start (:start params 0)
      :sort (:sort params)
+     :per-page (:per-page params)
      :vendor-id (:id (:vendor params))
      :client-id (:client-id params )
      :from-numeric-code (:from-numeric-code params)

src/cljs/auto_ap/views/pages/payments.cljs

@@ -34,6 +34,7 @@
               :owns-state {:single [::data-page/page ::page]}
               :query-obj {:venia/queries [[:payment_page
                                            {:start (:start params 0)
+                                            :per-page (:per-page params)
                                             :sort (:sort params)
                                             :client-id (:id @(re-frame/subscribe [::subs/client]))
                                             :vendor-id (:id (:vendor params))

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

@@ -21,6 +21,7 @@
               :query-obj {:venia/queries [[:sales_order_page
                                            {:start (:start params 0)
                                             :sort (:sort params)
+                                            :per-page (:per-page params)
                                             :total-gte (:amount-gte (:total-range params))
                                             :total-lte (:amount-lte (:total-range params))
                                             :date-range (:date-range params)

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

@@ -23,6 +23,7 @@
 
 (defn data-params->query-params [params]
   {:start (:start params 0)
+   :per-page (:per-page params)
    :sort (:sort params)
    :client-id (:id @(re-frame/subscribe [::subs/client]))
    :vendor-id (:id (:vendor params))