fixed common errors.

src/clj/auto_ap/graphql/accounts.clj

@@ -79,6 +79,7 @@
                     second
                     (not-empty )
                     Integer/parseInt)]
+    (if query 
       (if num
         (->> (d/q '[:find ?n (pull ?i [:db/id :account/numeric-code :account/location])
                     :in $ ?numeric-code
@@ -114,5 +115,6 @@
              (map (fn [[n a]]
                     {:name (str (:account/numeric-code a) " - " n)
                      :id   (:db/id a)
-                   :location (:account/location a)}))))))
+                     :location (:account/location a)}))))
+      [])))
 

src/clj/auto_ap/graphql/utils.clj

@@ -128,12 +128,15 @@
   (if (str/includes? q "&")
     (str "\"" q "\"~0.8")
     (let [parts   (-> q
-                    (str/replace #"[\[\]\+\*\-]" "")
+                      (str/replace #"[\[\]\+\*\-\?]" "")
                       (str/split #"\s+"))
           exacts  (butlast parts)
-          partial (last parts)]
+          partial (some-> (last parts)
-      (as-> exacts e
+                          not-empty
-        
+                          (str "*"))
+          query (as-> exacts e
+                  (filter #(not (str/blank? %)) e)  
                   (mapv #(str "+" %) e)
-        (conj e (str partial "*"))
+                  (conj e partial)
-        (str/join " " e)))))
+                  (str/join " " e))]
+      (not-empty query))))

src/clj/auto_ap/graphql/vendors.clj

@@ -182,8 +182,8 @@
     matches))
 
 (defn search [context args _]
-  (let [search-query (cleanse-query (:query args))
+  (if-let [search-query (cleanse-query (:query args))]
-        data (if (is-admin? (:id context))
+    (let [data (if (is-admin? (:id context))
                  (d/q '[:find ?n ?i ?s
                         :in $ ?q
                         :where [(fulltext $ :vendor/search-terms ?q) [[?i ?n _ ?s]]]]
@@ -200,4 +200,5 @@
            (partial-match-first (:query args))
            (map (fn [[n i]]
                   {:name n
-                 :id   i})))))
+                   :id   i}))))
+    []))

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

@@ -200,7 +200,11 @@
   ::add-and-print
   [with-user  (forms/in-form ::form)]
   (fn [{:keys [user]
-        {{:keys [invoice-number date location total expense-accounts scheduled-payment vendor client]} :data} :db} [_ bank-account-id type]]
+        {{:keys [invoice-number date location total expense-accounts scheduled-payment vendor client]
+          :as data} :data} :db} [_ bank-account-id type]]
+    (if (not (m/validate schema data))
+      {:dispatch-n [[::status/error ::form [{:message "Please fix the errors and try again."}]]
+                    [::forms/attempted-submit ::form]]}
       {:graphql
        {:token      user
         :owns-state {:single ::form}
@@ -225,13 +229,16 @@
                                                       :type            type}
                                                      [:pdf-url [:invoices invoice-read]]]}]} 
         :on-success [::added-and-printed]
-      :on-error   [::forms/save-error ::form]}}))
+        :on-error   [::forms/save-error ::form]}})
+    ))
 
 (re-frame/reg-event-fx
  ::saving
  [with-user (forms/in-form ::form) (re-frame/inject-cofx ::inject/sub [::edit-query]) (re-frame/inject-cofx ::inject/sub [::create-query])]
  (fn [{:keys [user] {:keys [data]} :db ::keys [edit-query create-query]} _]
-   (println "DATA IS" data)
+   (if (not (m/validate schema data))
+     {:dispatch-n [[::status/error ::form [{:message "Please fix the errors and try again."}]]
+                   [::forms/attempted-submit ::form]]}
      {:graphql
       {:token user
        :owns-state {:single ::form}
@@ -247,7 +254,7 @@
                       (if (:id data)
                         :edit
                         :create)])
-     :on-error [::forms/save-error ::form]}}))
+       :on-error [::forms/save-error ::form]}})))
 
 (re-frame/reg-event-fx
  ::save-requested