Merge remote-tracking branch 'origin/staging' into develop

frontend/src/app/main/data/modal.cljs

@@ -10,6 +10,7 @@
    [app.common.uuid :as uuid]
    [app.main.data.events :as ev]
    [app.main.store :as st]
+   [beicon.v2.core :as rx]
    [cljs.core :as c]
    [potok.v2.core :as ptk]))
 
@@ -30,6 +31,12 @@
            (dissoc :type)
            (assoc :name type)))
 
+     ptk/WatchEvent
+     (watch [_ _ _]
+       (rx/of (ptk/event
+               ::ev/event
+               {::ev/name "show-modal" :type type})))
+
      ptk/UpdateEvent
      (update [_ state]
        (assoc state ::modal {:id id

frontend/src/app/main/data/workspace/interactions.cljs

@@ -206,14 +206,16 @@
      (watch [_ _ _]
        (let [interactions (ctsi/update-interaction (:interactions shape) index update-fn)
              interaction (nth interactions index)]
-         (rx/of (dwsh/update-shapes
-                 [(:id shape)]
-                 (fn [shape]
-                   (assoc shape :interactions interactions))
-                 options)
+         (rx/of
+          (dwsh/update-shapes
+           [(:id shape)]
+           (fn [shape]
+             (-> shape
+                 (update :interactions ctsi/update-interaction index update-fn)))
+           options)
 
-                (when (some? (:destination interaction))
-                  (dwsh/update-shapes [(:destination interaction)] cls/show-in-viewer options))))))))
+          (when (some? (:destination interaction))
+            (dwsh/update-shapes [(:destination interaction)] cls/show-in-viewer options))))))))
 
 (defn remove-all-interactions-nav-to
   "Remove all interactions that navigate to the given frame."