From b90d470664b91a168ac22ad9b98e1ac1dc4f5e1e Mon Sep 17 00:00:00 2001 From: BC Date: Tue, 19 Feb 2019 07:52:42 -0800 Subject: [PATCH] fixing issue with accounts getting reset. --- src/clj/auto_ap/graphql/invoices.clj | 2 +- .../auto_ap/views/components/expense_accounts_dialog.cljs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/clj/auto_ap/graphql/invoices.clj b/src/clj/auto_ap/graphql/invoices.clj index 3ae29354..f80b787c 100644 --- a/src/clj/auto_ap/graphql/invoices.clj +++ b/src/clj/auto_ap/graphql/invoices.clj @@ -160,7 +160,7 @@ existing-ids (->> current-expense-accounts (map :db/id) set) - + deleted (set/difference existing-ids specified-ids) updated (map (fn [{:keys [id expense_account_id amount location]}] diff --git a/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs b/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs index 6ca92d8e..e3e0fccc 100644 --- a/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs +++ b/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs @@ -83,7 +83,10 @@ :venia/queries [{:query/data [:edit-expense-accounts {:invoice-id id - :expense-accounts (map (fn [ea] {:id (when-not (string? (:id ea)) (:id ea)) + :expense-accounts (map (fn [ea] {:id (if (clojure.string/includes? (:id ea) "new-") + nil + (:id ea) + ) :amount (:new-amount ea) :location (:location ea) :expense-account-id (:expense-account-id ea)}) @@ -101,7 +104,7 @@ (fn [db _] (let [{{{:keys [locations]} :client} :invoice} @(re-frame/subscribe [::change-expense-accounts])] (update-in db [::change-expense-accounts :invoice :expense-accounts] - conj {:amount "0.0" :id (str (random-uuid)) :expense-account-id {} :location (first locations)})))) + conj {:amount "0.0" :id (str "new-" (random-uuid)) :expense-account-id {} :location (first locations)})))) (re-frame/reg-event-db ::remove-expense-account-split