diff --git a/src/clj/auto_ap/datomic/clients.clj b/src/clj/auto_ap/datomic/clients.clj index 413158ed..2576d7c9 100644 --- a/src/clj/auto_ap/datomic/clients.clj +++ b/src/clj/auto_ap/datomic/clients.clj @@ -31,6 +31,7 @@ {:client/square-integration-status [:integration-status/message :integration-status/last-attempt :integration-status/last-updated + :db/id {:integration-status/state [:db/ident]}]} {:client/address [*]} {:client/square-locations [:square-location/square-id @@ -42,6 +43,7 @@ :bank-account/plaid-account [:plaid-account/name :db/id :plaid-account/number :plaid-account/balance] :bank-account/intuit-bank-account [:intuit-bank-account/name :intuit-bank-account/external-id :db/id] :bank-account/integration-status [:integration-status/message + :db/id :integration-status/last-attempt :integration-status/last-updated {:integration-status/state [:db/ident]}]} diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj index deae12d2..9ffec996 100644 --- a/src/clj/auto_ap/graphql.clj +++ b/src/clj/auto_ap/graphql.clj @@ -115,7 +115,8 @@ :accounts {:type '(list :yodlee_account)}}} :integration_status - {:fields {:last_attempt {:type :iso_date} + {:fields {:id {:type :id} + :last_attempt {:type :iso_date} :last_updated {:type :iso_date} :message {:type 'String} :state {:type :integration_state}}} diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj index 3b675971..377e8237 100644 --- a/src/clj/auto_ap/square/core.clj +++ b/src/clj/auto_ap/square/core.clj @@ -49,7 +49,7 @@ (defn fetch-catalog [client i] (if i (try - (log/info "looking up catalog for" (str "https://connect.squareup.com/v2/catalog/object/" i)) + (log/trace "looking up catalog for" (str "https://connect.squareup.com/v2/catalog/object/" i)) (->> (client/get (str "https://connect.squareup.com/v2/catalog/object/" i) {:headers (client-base-headers client) :query-params {"include_related_items" "true"} diff --git a/src/cljs/auto_ap/events.cljs b/src/cljs/auto_ap/events.cljs index b5a2456c..e6bc7467 100644 --- a/src/cljs/auto_ap/events.cljs +++ b/src/cljs/auto_ap/events.cljs @@ -16,12 +16,12 @@ (defn client-query [token] (cond-> [:id :name :signature-file :code :email :matches :week-a-debits :week-a-credits :week-b-debits :week-b-credits :locations :locked-until :square-auth-token - [:square-integration-status [:last-updated :last-attempt :message :state]] + [:square-integration-status [:last-updated :last-attempt :message :state :id]] [:square-locations [:square-id :id :name :client-location]] [:emails [:id :email :description]] [:location-matches [:id :location :match]] [:bank-accounts [:id :start-date :numeric-code :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id - [:integration-status [:last-updated :last-attempt :message :state]] + [:integration-status [:last-updated :last-attempt :message :state :id]] [:yodlee-account [:name :id :number]] [:plaid-account [:name :id :number]] [:intuit-bank-account [:name :id :external-id]] diff --git a/src/cljs/auto_ap/views/pages/admin/clients/table.cljs b/src/cljs/auto_ap/views/pages/admin/clients/table.cljs index a369d68e..41804de3 100644 --- a/src/cljs/auto_ap/views/pages/admin/clients/table.cljs +++ b/src/cljs/auto_ap/views/pages/admin/clients/table.cljs @@ -100,7 +100,7 @@ [grid/cell {} name] [grid/cell {} code] [grid/cell {} (str/join ", " locations)] - [grid/cell {} [:div.tags + [grid/cell {:class "expandable"} [:div.tags [:div.tag (or (some-> locked-until date->str (#(str "Locked " %))) "Not locked")] [integration-status-badge "Square" square-integration-status] @@ -108,7 +108,8 @@ (for [bank-account bank-accounts :let [code (:code bank-account) integration-status (:integration-status bank-account)] - :when integration-status] + :when (:id integration-status)] + ^{:key (:id integration-status)} [integration-status-badge code integration-status])]]] [grid/cell {} email] [grid/cell {} [:div.buttons [buttons/fa-icon {:event [::setup-sales-queries id]