From 0b6c2df5b6ac021f35ddf6ec01d52364efa01471 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 28 Apr 2021 17:27:43 +0200 Subject: [PATCH] :zap: Change some verify to asserts --- common/app/common/pages/changes.cljc | 2 +- .../src/app/main/data/workspace/changes.cljs | 19 +++++++++++-------- .../src/app/main/data/workspace/undo.cljs | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/common/app/common/pages/changes.cljc b/common/app/common/pages/changes.cljc index 713ab73c9..0a792233c 100644 --- a/common/app/common/pages/changes.cljc +++ b/common/app/common/pages/changes.cljc @@ -31,7 +31,7 @@ ;; When verify? false we spec the schema validation. Currently used to make just ;; 1 validation even if the changes are applied twice (when verify? - (us/verify ::spec/changes items)) + (us/assert ::spec/changes items)) (let [pages (into #{} (map :page-id) items) result (->> items diff --git a/frontend/src/app/main/data/workspace/changes.cljs b/frontend/src/app/main/data/workspace/changes.cljs index 49ae693c5..37a95099a 100644 --- a/frontend/src/app/main/data/workspace/changes.cljs +++ b/frontend/src/app/main/data/workspace/changes.cljs @@ -68,15 +68,18 @@ ptk/WatchEvent (watch [_ state stream] (let [page-id (:current-page-id state) - objects (get-in state [:workspace-data :pages-index page-id :objects])] + objects (get-in state [:workspace-data :pages-index page-id :objects]) + reg-objects {:type :reg-objects :page-id page-id :shapes (vec ids)}] (loop [ids (seq ids) rch [] uch []] (if (nil? ids) - (rx/of (commit-changes - (cond-> rch reg-objects? (conj {:type :reg-objects :page-id page-id :shapes (vec ids)})) - (cond-> uch reg-objects? (conj {:type :reg-objects :page-id page-id :shapes (vec ids)})) - {:commit-local? true})) + (rx/of (let [has-rch? (not (empty? rch)) + has-uch? (not (empty? uch)) + rch (cond-> rch (and has-rch? reg-objects?) (conj reg-objects)) + uch (cond-> uch (and has-rch? reg-objects?) (conj reg-objects))] + (when (and has-rch? has-uch?) + (commit-changes rch uch {:commit-local? true})))) (let [id (first ids) obj1 (get objects id) @@ -161,8 +164,8 @@ :or {save-undo? true commit-local? false} :as opts}] - (us/verify ::cp/changes changes) - (us/verify ::cp/changes undo-changes) + (us/assert ::cp/changes changes) + (us/assert ::cp/changes undo-changes) (log/debug :msg "commit-changes" :js/changes changes :js/undo-changes undo-changes) @@ -183,7 +186,7 @@ [:workspace-data] [:workspace-libraries file-id :data])] (try - (us/verify ::spec/changes changes) + (us/assert ::spec/changes changes) (let [state (update-in state path1 cp/process-changes changes false)] (cond-> state commit-local? (update-in path2 cp/process-changes changes false))) diff --git a/frontend/src/app/main/data/workspace/undo.cljs b/frontend/src/app/main/data/workspace/undo.cljs index a1f5fcaf3..f0e752556 100644 --- a/frontend/src/app/main/data/workspace/undo.cljs +++ b/frontend/src/app/main/data/workspace/undo.cljs @@ -83,7 +83,7 @@ (defn- append-undo [entry] - (us/verify ::undo-entry entry) + (us/assert ::undo-entry entry) (ptk/reify ::append-undo ptk/UpdateEvent (update [_ state]