From 5c1290d5b3a0ef99e1ad650715b8ea7c8305cf76 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 22 Jan 2021 16:10:47 +0100 Subject: [PATCH] :bug: Properly deselect all shapes on posible error on saving. --- frontend/src/app/main/data/workspace/common.cljs | 2 +- frontend/src/app/main/data/workspace/persistence.cljs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs index 7f2874a30..ead0725f8 100644 --- a/frontend/src/app/main/data/workspace/common.cljs +++ b/frontend/src/app/main/data/workspace/common.cljs @@ -526,7 +526,6 @@ (defn get-shape-layer-position [objects selected attrs] - (cond (= :frame (:type attrs)) [uuid/zero uuid/zero nil] @@ -594,6 +593,7 @@ (-> attrs (assoc :id id ) (assoc :name name)))] + (rx/concat (rx/of (commit-changes rchanges uchanges {:commit-local? true}) (select-shapes (d/ordered-set id))) diff --git a/frontend/src/app/main/data/workspace/persistence.cljs b/frontend/src/app/main/data/workspace/persistence.cljs index 36db83cb4..9ce538f5b 100644 --- a/frontend/src/app/main/data/workspace/persistence.cljs +++ b/frontend/src/app/main/data/workspace/persistence.cljs @@ -23,6 +23,7 @@ [app.main.data.workspace.common :as dwc] [app.main.data.workspace.svg-upload :as svg] [app.main.data.workspace.libraries :as dwl] + [app.main.data.workspace.selection :as dws] [app.main.repo :as rp] [app.main.store :as st] [app.util.i18n :as i18n :refer [tr]] @@ -134,7 +135,13 @@ (if (or (= :bad-gateway type) (= :service-unavailable type)) (rx/of (update-persistence-status {:status :error :reason type})) - (rx/throw error)))] + (rx/concat + (rx/of update-persistence-queue) + (rx/of (update-persistence-status {:status :error :reason type})) + (rx/of (dws/deselect-all)) + (->> (rx/of nil) + (rx/delay 200) + (rx/mapcat #(rx/throw error))))))] (when (= file-id (:id file)) (->> (rp/mutation :update-file params)