From 1188a03823a1cf6a2b51f170ab0a79cce05ddb1d Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@brycecovertoperations.com>
Date: Tue, 8 Jun 2021 20:05:51 -0700
Subject: [PATCH] simple search fixes

---
 src/clj/auto_ap/square/core.clj                 |  2 +-
 src/cljs/auto_ap/subs.cljs                      | 17 ++++++++++-------
 .../views/pages/admin/vendors/merge_dialog.cljs |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj
index eeffa4bb..0d2dbe90 100644
--- a/src/clj/auto_ap/square/core.clj
+++ b/src/clj/auto_ap/square/core.clj
@@ -123,7 +123,7 @@
 
 (defn location_id->client-location [location]
   ({"2RVBYER6QSV7W" ["NGAK" "MH"]
-    #_#_#_#_#_#_#_#_#_#_#_#_"8JT71V8XGYAT3" ["NGKG" "NB"]
+    "8JT71V8XGYAT3" ["NGKG" "NB"]
     "SCX0Y8CTGM1S0" ["NGE1" "UC"]
     "FNH5VRT890WK8" ["NGMJ" "SC"]
     "AMQ0NPA8FGDEF" ["NGPG" "SZ"]
diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs
index 1853f006..4adbf20b 100644
--- a/src/cljs/auto_ap/subs.cljs
+++ b/src/cljs/auto_ap/subs.cljs
@@ -201,7 +201,10 @@
  :<- [::client]
  :<- [::all-vendors]
  (fn [[is-admin client all-vendors]]
-   (cond client
+   (cond is-admin
+         all-vendors
+
+         client
          (filter (fn [{:keys [hidden usage name] :as vendor}]
                    (or (not hidden)
                        (-> (first (filter #(= (:client-id %)
@@ -211,8 +214,6 @@
                            (> 0))))
                  all-vendors)
 
-         is-admin
-         all-vendors
 
          :else
 
@@ -224,10 +225,11 @@
  :<- [::searchable-vendors]
  (fn [searchable-vendors]
    (doto (MiniSearch. #js {:fields #js ["name" "content"]
-                           :storeFields #js ["id" "name" "content"]})
+                           :storeFields #js ["id" "name" "content" "usage"]})
      (.addAll (clj->js (map (fn [v] {:id (:id v)
                                      :name (:name v)
-                                     :content (:name v)})
+                                     :content (:name v)
+                                     :usage (:usage v)})
                             searchable-vendors))))))
 
 (re-frame/reg-sub
@@ -235,10 +237,11 @@
  :<- [::all-vendors]
  (fn [all-vendors]
    (doto (MiniSearch. #js {:fields #js ["name" "content"]
-                           :storeFields #js ["id" "name" "content"]})
+                           :storeFields #js ["id" "name" "content" "usage"]})
      (.addAll (clj->js (map (fn [v] {:id (:id v)
                                      :name (:name v)
-                                     :content (:name v)})
+                                     :content (:name v)
+                                     :usage (:usage v)})
                             all-vendors))))))
 
 (re-frame/reg-sub
diff --git a/src/cljs/auto_ap/views/pages/admin/vendors/merge_dialog.cljs b/src/cljs/auto_ap/views/pages/admin/vendors/merge_dialog.cljs
index b4c8ff6e..33e387e5 100644
--- a/src/cljs/auto_ap/views/pages/admin/vendors/merge_dialog.cljs
+++ b/src/cljs/auto_ap/views/pages/admin/vendors/merge_dialog.cljs
@@ -29,7 +29,7 @@
                  [:<>
                   (field "Form Vendor (will be deleted)"
                          [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
-                                        :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index])
+                                        :entity-index @(re-frame/subscribe [::subs/all-vendors-index])
                                         :type "typeahead-v3"
                                         :auto-focus true
                                         :entity->text (fn [x]