Supports vendors not loading

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

@@ -13,9 +13,8 @@
 (re-frame/reg-sub
  ::filters
  :<- [::specific-filters]
- :<- [::subs/vendors-by-id]
  :<- [::subs/query-params]
- (fn [[specific-filters vendors-by-id query-params] ]
+ (fn [[specific-filters query-params] ]
    (let [url-filters (-> query-params
                          (select-keys #{:name-like :code-like})
                          (update :name-like #(some-> % str))

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

@@ -1,26 +1,22 @@
 (ns auto-ap.views.pages.admin.rules
-  (:require [auto-ap.forms :as forms]
-            [auto-ap.subs :as subs]
-            [auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
-            [auto-ap.views.pages.admin.rules.side-bar :as side-bar]
-            [auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
-            [auto-ap.views.pages.admin.rules.table :as table]
-            [auto-ap.views.pages.admin.rules.results-modal :as results-modal]
-            [auto-ap.views.pages.admin.rules.form :as form]
-            [auto-ap.views.pages.admin.rules.common :refer [default-read]]
-            [auto-ap.views.utils :refer [dispatch-event with-user]]
-            [vimsical.re-frame.cofx.inject :as inject]
-            [vimsical.re-frame.fx.track :as track]
-            [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.effects.forward :as forward]
-            [auto-ap.views.pages.data-page :as data-page]
-            [clojure.set :as set]
-            [auto-ap.views.components.buttons :as buttons]))
-
-
+  (:require
+   [auto-ap.effects.forward :as forward]
+   [auto-ap.events :as events]
+   [auto-ap.forms :as forms]
+   [auto-ap.subs :as subs]
+   [auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
+   [auto-ap.views.components.buttons :as buttons]
+   [auto-ap.views.components.layouts
+    :refer [appearing-side-bar side-bar-layout]]
+   [auto-ap.views.pages.admin.rules.common :refer [default-read]]
+   [auto-ap.views.pages.admin.rules.form :as form]
+   [auto-ap.views.pages.admin.rules.side-bar :as side-bar]
+   [auto-ap.views.pages.admin.rules.table :as table]
+   [auto-ap.views.pages.data-page :as data-page]
+   [auto-ap.views.utils :refer [dispatch-event with-user]]
+   [clojure.set :as set]
+   [re-frame.core :as re-frame]
+   [vimsical.re-frame.fx.track :as track]))
 
 ;; EVENTS
 
@@ -29,7 +25,7 @@
 (re-frame/reg-event-fx
  ::params-change
  [with-user ]
- (fn [{:keys [db user] :as cofx} [_ params]]
+ (fn [{:keys [user]} [_ params]]
    {:graphql {:token user
               :owns-state {:single [::data-page/page ::page]}
               :query-obj {:venia/queries [{:query/data [:transaction_rule_page
@@ -52,13 +48,13 @@
 
 (re-frame/reg-event-fx
  ::new-rule-clicked
- (fn [{:keys [db]} _]
+ (fn [_ _]
    {:dispatch [::form/adding {:client @(re-frame/subscribe [::subs/client])}]}))
 
 
 (re-frame/reg-event-fx
  ::mounted
- (fn [{:keys [db]}]
+ (fn [_]
    {:dispatch-n [[::events/yodlee-merchants-needed]]
     ::forward/register [{:id ::page
                          :events #{::form/updated}
@@ -75,7 +71,7 @@
 
 (re-frame/reg-event-fx
  ::unmounted
- (fn [{:keys [db]}]
+ (fn [_]
    {:dispatch [::data-page/dispose ::page]
     ::forward/dispose [{:id ::page}
                        {:id ::deleted-transaction-rule}]
@@ -85,8 +81,7 @@
 (def rules-content
   (with-meta
     (fn []
-      (let [current-client @(re-frame/subscribe [::subs/client])
-            user @(re-frame/subscribe [::subs/user])]
+      (let [user @(re-frame/subscribe [::subs/user])]
         [:div 
          [:h1.title "Transaction Rules"]
          (when (= "admin" (:user/role user))

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

@@ -1,20 +1,17 @@
 (ns auto-ap.views.pages.admin.rules.table
-  (:require [auto-ap.subs :as subs]
-            [auto-ap.views.utils :refer [dispatch-event ->$ with-user action-cell-width]]
-            [auto-ap.views.pages.admin.rules.form :as form]
-            [auto-ap.views.components.paginator :refer [paginator]]
-            [auto-ap.views.components.sort-by-list :refer [sort-by-list]]
-            [auto-ap.views.pages.admin.rules.results-modal :as results-modal]
-            [auto-ap.views.components.sorter :refer [sorted-column toggle-sort-by sort-icon]]
-            [auto-ap.views.components.buttons :as buttons]
-            [auto-ap.views.components.grid :as grid]
-            [auto-ap.events :as events]
-            [auto-ap.status :as status]
-            [re-frame.core :as re-frame]
-            [reagent.core :as reagent]
-            [reagent.core :as r]
-            [auto-ap.views.components.modal :as modal]
-            [auto-ap.views.pages.data-page :as data-page]))
+  (:require
+   [auto-ap.status :as status]
+   [auto-ap.subs :as subs]
+   [auto-ap.views.components.buttons :as buttons]
+   [auto-ap.views.components.grid :as grid]
+   [auto-ap.views.components.modal :as modal]
+   [auto-ap.views.pages.admin.rules.form :as form]
+   [auto-ap.views.pages.admin.rules.results-modal :as results-modal]
+   [auto-ap.views.pages.data-page :as data-page]
+   [auto-ap.views.utils
+    :refer [->$ action-cell-width dispatch-event with-user]]
+   [re-frame.core :as re-frame]
+   [reagent.core :as r]))
 
 (re-frame/reg-event-fx
  ::run-clicked

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

@@ -1,93 +1,76 @@
 (ns auto-ap.views.pages.admin.vendors
-  (:require [re-frame.core :as re-frame]
-            [reagent.core :as reagent]
-            [clojure.string :as str]
-            [auto-ap.views.components.buttons :as buttons]
-            [auto-ap.views.pages.admin.vendors.side-bar :as side-bar]
-            [auto-ap.subs :as subs]
-            [auto-ap.events :as events]
-            [auto-ap.forms :as forms]
-            [auto-ap.utils :refer [by]]
-            [auto-ap.entities.vendors :as entity]
-            [auto-ap.views.components.address :refer [address-field]]
-            [auto-ap.views.components.grid :as grid]             
-            [auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
-            [auto-ap.views.components.layouts :refer [side-bar-layout]]
-            [clojure.spec.alpha :as s]
-            [auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field action-cell-width]]
-            [auto-ap.views.pages.admin.vendors.table :as table]
-            [auto-ap.views.pages.admin.vendors.merge-dialog :as merge-dialog]
-            [cljs.reader :as edn]
-            [auto-ap.routes :as routes]
-            [bidi.bidi :as bidi]
-            [auto-ap.status :as status]
-            [vimsical.re-frame.fx.track :as track]
-            [auto-ap.effects.forward :as forward])
-  (:require-macros [cljs.core.async.macros :refer [go]]
-                   [auto-ap.entities.vendors :as vendor]))
+  (:require
+   [auto-ap.effects.forward :as forward]
+   [auto-ap.subs :as subs]
+   [auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
+   [auto-ap.views.components.layouts :refer [side-bar-layout]]
+   [auto-ap.views.pages.admin.vendors.merge-dialog :as merge-dialog]
+   [auto-ap.views.pages.admin.vendors.side-bar :as side-bar]
+   [auto-ap.views.pages.admin.vendors.table :as table]
+   [auto-ap.views.pages.data-page :as data-page]
+   [auto-ap.views.utils :refer [dispatch-event with-user]]
+   [clojure.set :as set]
+   [re-frame.core :as re-frame]
+   [vimsical.re-frame.fx.track :as track]
+   [auto-ap.views.components.vendor-dialog :as vendor-dialog]))
 
-
-(re-frame/reg-event-fx
- ::invalidated
- (fn [{:keys [db]}]
-   {:graphql {:token (:user db)
-              :owns-state {:single ::vendor-page}
-              :query-obj {:venia/queries [[:vendor events/vendor-query]]} 
-              :on-success [::received-vendors]}}))
-
-(re-frame/reg-event-fx
- ::mounted
- (fn  [{:keys [db]} _]
-   {:dispatch [::invalidated]
-    ::track/register {:id ::params
-                      :subscription [::params]
-                      :event-fn (fn [params] [::params-change params])}
-    ::forward/register {:id ::merge-complete
-                        :events #{::merge-dialog/complete}
-                        :event-fn (fn [_]
-                                    [::invalidated])}}))
-
-(re-frame/reg-event-db
- ::received-vendors
- (fn  [db [_ vendors]]
-   (assoc db :vendors (by :id (:vendor vendors )))))
-
-
-(re-frame/reg-event-fx
- ::unmounted
- (fn [{:keys [db]} _]
-   {:db (dissoc db ::table/params ::side-bar/filter-params)
-    ::forward/dispose {:id ::merge-complete}
-    ::track/dispose {:id ::params}}))
-
-(re-frame/reg-sub
- ::params
- :<- [::side-bar/filter-params]
- :<- [::table/params]
- (fn [[filter-params table-params]]
-   (cond-> {}
-     (seq filter-params) (merge filter-params)
-     (seq table-params) (merge table-params))))
+(def default-read [:id :name :hidden :terms [:default-account [:name :id :location]]
+                   [:account-overrides [[:client [:id :name]] :id [:account [:id :numeric-code :name]]]]
+                   [:automatically-paid-when-due [:id :name]]
+                   [:terms-overrides [[:client [:id :name]] :id :terms]]
+                   [:schedule-payment-dom [[:client [:id :name]] :id :dom]]
+                   [:usage [:client-id :count]]
+                   [:primary-contact [:name :phone :email :id]]
+                   [:secondary-contact [:id :name :phone :email]]
+                   :print-as :invoice-reminder-schedule :code
+                   :legal-entity-first-name :legal-entity-middle-name :legal-entity-last-name
+                   :legal-entity-tin :legal-entity-tin-type
+                   :legal-entity-1099-type
+                   [:address [:street1 :street2 :city :state :zip]]])
 
 (re-frame/reg-event-fx
  ::params-change
- (fn [_ [_ params]]
-   {:set-uri-params params}))
-
-(re-frame/reg-sub
- ::vendor-page
- :<- [::params]
- :<- [::subs/sorted-all-vendors]
- (fn [[params all-vendors]]
-   (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 ) (:per-page params) matching-vendors)
-            :data (grid/virtual-paginate (:start params) (:per-page params) matching-vendors)))))
-
-
+ [with-user]
+ (fn [{:keys [user]} [_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [{:query/data [:vendor
+                                                        {:sort      (:sort params)
+                                                         :start     (:start params 0)
+                                                         :per-page  (:per-page params)
+                                                         :name-like (:name-like params)}
+                                                        [[:vendors default-read]
+                                                         :total
+                                                         :start
+                                                         :end]]
+                                           :query/alias :result}]}
+              :on-success (fn [result]
+                            [::data-page/received ::page
+                             (set/rename-keys (:result result)
+                                              {:vendors :data})])}}))
 
+(re-frame/reg-event-fx
+  ::mounted
+  (fn  [_ _]
+    {::forward/register [{:id       ::merge-complete
+                          :events   #{::merge-dialog/complete}
+                          :event-fn (fn [_]
+                                      [::params-change {}])}
+                         {:id       ::save-complete
+                          :events   #{::vendor-dialog/save-complete}
+                          :event-fn (fn [_]
+                                      [::params-change {}])}]
+     ::track/register   {:id           ::params
+                         :subscription [::data-page/params ::page]
+                         :event-fn     (fn [params]
+                                         [::params-change params])}}))
 
+(re-frame/reg-event-fx
+  ::unmounted
+  (fn [_ _]
+    {:dispatch [::data-page/dispose ::page]
+     ::forward/dispose [{:id ::merge-complete} {:id ::save-complete}]
+     ::track/dispose   {:id ::params}}))
 
 (defn admin-vendors-content []
   [(with-meta
@@ -95,17 +78,15 @@
        [:div.inbox-messages
         (when-let [banner (:banner @(re-frame/subscribe [::subs/admin]))]
           [:div.notification banner])
-        (let [vendors (re-frame/subscribe [::subs/vendors])
-              editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))]
-          [:div
-           [:h1.title "Vendors"]
-           [:div.is-pulled-right [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::merge-dialog/show])} "Merge vendors"]]
-           [table/vendors-table {:page @(re-frame/subscribe [::vendor-page])
-                                 :status @(re-frame/subscribe [::status/single ::vendor-page])}]])])
+        [:div
+         [:h1.title "Vendors"]
+         [:div.is-pulled-right [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::merge-dialog/show])} "Merge vendors"]]
+         [table/vendors-table {:id :vendors
+                               :data-page ::page}]]])
      {:component-did-mount #(re-frame/dispatch [::mounted])
       :component-will-unmount #(re-frame/dispatch-sync [::unmounted])})])
 
 (defn admin-vendors-page []
   [side-bar-layout {:side-bar [admin-side-bar {}
-                               [side-bar/vendor-side-bar]]
+                               [side-bar/vendor-side-bar {:data-page ::page}]]
                     :main [admin-vendors-content]}])

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

@@ -0,0 +1,15 @@
+(ns auto-ap.views.pages.admin.vendors.common)
+
+(def default-read [:id :name :hidden :terms [:default-account [:name :id :location]]
+                   [:account-overrides [[:client [:id :name]] :id [:account [:id :numeric-code :name]]]]
+                   [:automatically-paid-when-due [:id :name]]
+                   [:terms-overrides [[:client [:id :name]] :id :terms]]
+                   [:schedule-payment-dom [[:client [:id :name]] :id :dom]]
+                   [:usage [:client-id :count]]
+                   [:primary-contact [:name :phone :email :id]]
+                   [:secondary-contact [:id :name :phone :email]]
+                   :print-as :invoice-reminder-schedule :code
+                   :legal-entity-first-name :legal-entity-middle-name :legal-entity-last-name
+                   :legal-entity-tin :legal-entity-tin-type
+                   :legal-entity-1099-type
+                   [:address [:street1 :street2 :city :state :zip]]])

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

@@ -2,69 +2,17 @@
   (:require
    [re-frame.core :as re-frame]
    [auto-ap.subs :as subs]
-   [auto-ap.views.utils :refer [active-when dispatch-value-change]]))
-
-(re-frame/reg-sub
- ::specific-filters
- (fn [db ]
-   (::filters db nil)))
-
-(re-frame/reg-sub
- ::filters
- :<- [::specific-filters]
- :<- [::subs/vendors-by-id]
- :<- [::subs/query-params]
- (fn [[specific-filters vendors-by-id query-params] ]
-   (let [url-filters (-> query-params
-                         (select-keys #{:name-like})
-                         (update :name-like #(some-> % str)))]
-     (merge url-filters specific-filters ))))
-
-(re-frame/reg-sub
- ::filter
- :<- [::filters]
- (fn [filters [_ which]]
-   (get 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)]
-     {:name-like (:name-like filters)})))
-
-(re-frame/reg-event-fx
- ::filters-settled
- (fn [{:keys [db]} [_ & params]]
-   {:db (assoc db ::settled-filters @(re-frame/subscribe [::filters]))}))
-
-(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}})))
+   [auto-ap.views.utils :refer [dispatch-value-change]]
+   [auto-ap.views.pages.data-page :as data-page]))
 
 
-(defn vendor-side-bar []
+(defn vendor-side-bar [{:keys [data-page]}]
   [:div
    [:p.menu-label "Name"]
-
-   [:div.field
-    [:div.control [:input.input {:placeholder "Harry's Food Products"
-                                 :value @(re-frame/subscribe [::filter :name-like])
-                                 :on-change (dispatch-value-change [::filter-changed :name-like])} ]]]])
+   [:div
+    [:div.field
+     [:div.control [:input.input {:placeholder "HOME DEPOT"
+                                  :value       @(re-frame/subscribe [::data-page/filter data-page :name-like])
+                                  :on-change   (dispatch-value-change [::data-page/filter-changed data-page :name-like])} ]]]]])
 
 

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

@@ -1,34 +1,21 @@
 (ns auto-ap.views.pages.admin.vendors.table
-  (:require 
-   [re-frame.core :as re-frame]
-   [reagent.core :as reagent]
+  (:require
    [auto-ap.subs :as subs]
-   [auto-ap.status :as status]
-   [auto-ap.views.components.vendor-dialog :refer [vendor-dialog] :as vendor-dialog]
+   [auto-ap.views.components.buttons :as buttons]
    [auto-ap.views.components.grid :as grid]
-   [auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field action-cell-width]]
-   [auto-ap.views.components.buttons :as buttons]))
+   [auto-ap.views.components.vendor-dialog :as vendor-dialog]
+   [auto-ap.views.pages.data-page :as data-page]
+   [auto-ap.views.utils :refer [action-cell-width]]
+   [re-frame.core :as re-frame]))
 
-(re-frame/reg-event-fx
- ::params-changed
- (fn [{:keys [db]} [_ p]]
-   {:db (assoc db ::params p)}))
-
-(re-frame/reg-sub
- ::params
- (fn [db]
-   (-> db ::params)))
-
-(defn vendors-table [{:keys [status page]}]
-  (let [params @(re-frame/subscribe [::params])
+(defn vendors-table [{:keys [data-page]}]
+  (let [{:keys [data]} @(re-frame/subscribe [::data-page/page data-page])
         accounts @(re-frame/subscribe [::subs/all-accounts-by-id])]
+    (println "DATA COUNT" (keys data))
     
-    [grid/grid {:status status
-                :on-params-change (fn [p]
-                                    (re-frame/dispatch [::params-changed p]))
-                :params params
+    [grid/grid {:data-page data-page
                 :column-count 4}
-     [grid/controls page]
+     [grid/controls data]
      [grid/table {:fullwidth true}
       [grid/header
        [grid/row {}
@@ -37,7 +24,7 @@
         [grid/header-cell {} "Default Account"]
         [grid/header-cell {:style {:width (action-cell-width 1)}}]]]
       [grid/body
-       (for [v (:data page)]
+       (for [v (:data data)]
          ^{:key (str (:id v))}
          [grid/row {:class (:class v) :id (:id v)}
           [grid/cell {} (:name v)