🐛 Fix shadow token reference validation

common/src/app/common/data/undo_stack.cljc

@@ -25,8 +25,7 @@
 (defn append
   [{index :index items :items :as stack} value]
 
-  (if (and (some? stack)
-           (not= value (peek stack)))
+  (if (and (some? stack) (not= value (peek stack)))
     (let [items (cond-> items
                   (> index 0)
                   (subvec 0 (inc index))
@@ -36,6 +35,7 @@
 
                   :always
                   (conj value))
+
           index (min (dec MAX-UNDO-SIZE) (inc index))]
       {:index index
        :items items})

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

@@ -15,8 +15,6 @@
 
 (declare clear-edition-mode)
 
-;; FIXME: rename to `enter-edition-mode`
-
 (defn start-edition-mode
   "Mark a shape in edition mode"
   [id]
@@ -44,8 +42,6 @@
 ;; update namespace reference in the
 ;; app/main/data/workspace/path/undo.cljs file.
 
-;; FIXME: rename to `exit-edition-mode`
-
 (defn clear-edition-mode
   []
   (ptk/reify ::clear-edition-mode

frontend/src/app/main/data/workspace/path/changes.cljs

@@ -17,12 +17,14 @@
 
 (defn generate-path-changes
   "Generates changes to update the new content of the shape"
-  [it objects page-id shape-id old-content new-content]
+  [it objects page-id shape old-content new-content]
 
   (assert (path/content? old-content))
   (assert (path/content? new-content))
 
-  (let [;; We set the old values so the update-shapes works
+  (let [shape-id (:id shape)
+
+        ;; We set the old values so the update-shapes works
         objects
         (update objects shape-id
                 (fn [shape]
@@ -56,32 +58,32 @@
                                    (path/update-geometry))))
           (pcb/resize-parents [shape-id])))))
 
-;; (defn save-path-content
-;;   ([]
-;;    (save-path-content {}))
-;;   ([{:keys [preserve-move-to] :or {preserve-move-to false}}]
-;;    (ptk/reify ::save-path-content
-;;      ptk/UpdateEvent
-;;      (update [_ state]
-;;        (let [content (st/get-path state :content)
-;;              content (if (and (not preserve-move-to)
-;;                               (= (-> content last :command) :move-to))
-;;                        (into [] (take (dec (count content)) content))
-;;                        content)]
-;;          (-> state
-;;              (st/set-content content))))
+(defn save-path-content
+  ([]
+   (save-path-content {}))
+  ([{:keys [preserve-move-to] :or {preserve-move-to false}}]
+   (ptk/reify ::save-path-content
+     ptk/UpdateEvent
+     (update [_ state]
+       (let [content (st/get-path state :content)
+             content (if (and (not preserve-move-to)
+                              (= (-> content last :command) :move-to))
+                       (into [] (take (dec (count content)) content))
+                       content)]
+         (-> state
+             (st/set-content content))))
 
-;;      ptk/WatchEvent
-;;      (watch [it state _]
-;;        (let [page-id     (:current-page-id state)
-;;              objects     (dsh/lookup-page-objects state page-id)
-;;              id          (dm/get-in state [:workspace-local :edition])
-;;              old-content (dm/get-in state [:workspace-local :edit-path id :old-content])
-;;              shape       (st/get-path state)]
+     ptk/WatchEvent
+     (watch [it state _]
+       (let [page-id     (:current-page-id state)
+             objects     (dsh/lookup-page-objects state page-id)
+             id          (dm/get-in state [:workspace-local :edition])
+             old-content (dm/get-in state [:workspace-local :edit-path id :old-content])
+             shape       (st/get-path state)]
 
-;;          (if (and (some? old-content) (some? (:id shape)))
-;;            (let [changes (generate-path-changes it objects page-id id old-content (:content shape))]
-;;              (rx/of (dch/commit-changes changes)))
-;;            (rx/empty)))))))
+         (if (and (some? old-content) (some? (:id shape)))
+           (let [changes (generate-path-changes it objects page-id shape old-content (:content shape))]
+             (rx/of (dch/commit-changes changes)))
+           (rx/empty)))))))
 
 

frontend/src/app/main/data/workspace/path/drawing.cljs

@@ -17,7 +17,6 @@
    [app.common.types.shape :as cts]
    [app.common.types.shape-tree :as ctst]
    [app.common.types.shape.layout :as ctl]
-   [app.main.data.changes :as dch]
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.drawing.common :as dwdc]
    [app.main.data.workspace.edition :as dwe]
@@ -121,15 +120,13 @@
   (ptk/reify ::finish-drag
     ptk/UpdateEvent
     (update [_ state]
-      (let [id        (st/get-path-id state)
+      (let [id (st/get-path-id state)
 
             modifiers (get-in state [:workspace-local :edit-path id :content-modifiers])
-            content   (-> (st/get-path state :content)
-                          (path/apply-content-modifiers modifiers))
+            content (-> (st/get-path state :content)
+                        (path/apply-content-modifiers modifiers))
 
-            handler   (get-in state [:workspace-local :edit-path id :drag-handler])]
-
-        (prn "finish-drag")
+            handler (get-in state [:workspace-local :edit-path id :drag-handler])]
         (-> state
             (st/set-content content)
             (update-in [:workspace-local :edit-path id] dissoc :drag-handler)
@@ -228,7 +225,7 @@
        (rx/of (finish-drag)))))))
 
 (defn- start-edition
-  [id]
+  [_id]
   (ptk/reify ::start-edition
     ptk/UpdateEvent
     (update [_ state]
@@ -354,8 +351,6 @@
       (let [id      (dm/get-in state [:workspace-local :edition])
             objects (dsh/lookup-page-objects state)
             content (dm/get-in objects [id :content])]
-        (prn "start-draw-mode" id)
-
         (if content
           (update-in state [:workspace-local :edit-path id] assoc :old-content content)
           state)))
@@ -364,15 +359,14 @@
     (watch [_ _ _]
       (rx/of (start-draw-mode*)))))
 
-(defn- start-draw-mode*
-  [id]
+(defn start-draw-mode*
+  []
   (ptk/reify ::start-draw-mode*
     ptk/WatchEvent
     (watch [_ state stream]
       (let [local (get state :workspace-local)
             id    (get local :edition)
             mode  (dm/get-in local [:edit-path id :edit-mode])]
-        (prn "start-draw-mode*" id)
 
         (if (= :draw mode)
           (rx/concat
@@ -382,7 +376,7 @@
                 (rx/filter (ptk/type? ::end-edition))
                 (rx/take 1)
                 (rx/mapcat (fn [_]
-                             (rx/of (check-changed-content id)
+                             (rx/of (check-changed-content)
                                     (start-draw-mode*))))))
           (rx/empty))))))
 
@@ -392,7 +386,7 @@
     ptk/UpdateEvent
     (update [_ state]
       (if-let [id (dm/get-in state [:workspace-local :edition])]
-        (update-in state [:workspace-local :edit-path id] assoc :edit-mode mode)
+        (d/update-in-when state [:workspace-local :edit-path id] assoc :edit-mode mode)
         state))
 
     ptk/WatchEvent
@@ -413,29 +407,21 @@
         (assoc-in state [:workspace-local :edit-path id :prev-handler] nil)))))
 
 (defn check-changed-content
-  [id]
+  []
   (ptk/reify ::check-changed-content
     ptk/WatchEvent
-    (watch [it state _]
-      (let [
-            ;; id             (st/get-path-id state)
-            content        (st/get-path state :content)
-            empty-content? (empty? content)
+    (watch [_ state _]
+      (let [id (st/get-path-id state)
+            content (st/get-path state :content)
+            old-content (get-in state [:workspace-local :edit-path id :old-content])
+            mode (get-in state [:workspace-local :edit-path id :edit-mode])
+            empty-content? (empty? content)]
 
-            local          (get-in state [:workspace-local :edit-path id])
-            old-content    (get local :old-content)
-            edit-mode      (get local :edit-mode)]
-
-        (prn "check-changed-content" old-content)
-        (prn "check-changed-content" content)
         (cond
           (and (not= content old-content) (not empty-content?))
-          (let [page-id (:current-page-id state)
-                objects (dsh/lookup-page-objects state page-id)
-                changes (changes/generate-path-changes it objects page-id id old-content content)]
-            (rx/of (dch/commit-changes changes)))
+          (rx/of (changes/save-path-content))
 
-          (= :draw edit-mode)
+          (= mode :draw)
           (rx/of :interrupt)
 
           :else

frontend/src/app/main/data/workspace/path/edition.cljs

@@ -65,7 +65,7 @@
                 point-change (->> (map hash-map old-points new-points) (reduce merge))]
 
             (when (and (some? new-content) (some? shape))
-              (let [changes (changes/generate-path-changes it objects page-id (:id shape) (:content shape) new-content)]
+              (let [changes (changes/generate-path-changes it objects page-id shape (:content shape) new-content)]
                 (if (empty? new-content)
                   (rx/of (dch/commit-changes changes)
                          (dwe/clear-edition-mode))
@@ -298,8 +298,8 @@
             edit-path (dm/get-in state [:workspace-local :edit-path id])
             content   (st/get-path state :content)
             state     (cond-> state
-                        #_(cfh/path-shape? objects id)
-                        #_(st/set-content (path/close-subpaths content)))]
+                        (cfh/path-shape? objects id)
+                        (st/set-content (path/close-subpaths content)))]
 
         (cond-> state
           (or (not edit-path)
@@ -338,25 +338,19 @@
 (defn split-segments
   [{:keys [from-p to-p t]}]
   (ptk/reify ::split-segments
+    ptk/UpdateEvent
+    (update [_ state]
+      (let [id (st/get-path-id state)
+            content (st/get-path state :content)]
+        (-> state
+            (assoc-in [:workspace-local :edit-path id :old-content] content)
+            (st/set-content (-> content
+                                (path.segment/split-segments #{from-p to-p} t)
+                                (path/content))))))
+
     ptk/WatchEvent
-    (watch [it state _]
-      (let [page-id      (get state :current-page-id)
-            objects      (dsh/lookup-page-objects state page-id)
-
-            shape        (st/get-path state)
-            shape-id     (get shape :id)
-            old-content  (get shape :content)
-
-            new-content  (-> old-content
-                             (path.segment/split-segments #{from-p to-p} t)
-                             (path/content))
-            changes     (changes/generate-path-changes it objects page-id shape-id old-content new-content)]
-
-
-        (prn "split-segments" old-content)
-        (prn "split-segments" new-content)
-
-        (rx/of (dch/commit-changes changes))))))
+    (watch [_ _ _]
+      (rx/of (changes/save-path-content {:preserve-move-to true})))))
 
 (defn create-node-at-position
   [event]

frontend/src/app/main/data/workspace/path/tools.cljs

@@ -44,7 +44,7 @@
                      (path/close-subpaths))
 
                  changes
-                 (changes/generate-path-changes it objects page-id (:id shape) (:content shape) new-content)]
+                 (changes/generate-path-changes it objects page-id shape (:content shape) new-content)]
 
              (rx/concat
               (rx/of (dwsh/update-shapes [id] path/convert-to-path)

frontend/src/app/main/data/workspace/path/undo.cljs

@@ -10,9 +10,7 @@
    [app.common.data.undo-stack :as u]
    [app.common.uuid :as uuid]
    [app.main.data.workspace.common :as dwc]
-   [app.main.data.changes :as dch]
    [app.main.data.workspace.edition :as-alias dwe]
-   [app.main.data.helpers :as dsh]
    [app.main.data.workspace.pages :as-alias dwpg]
    [app.main.data.workspace.path.changes :as changes]
    [app.main.data.workspace.path.common :as common]
@@ -59,63 +57,44 @@
   (ptk/reify ::undo-path
     ptk/UpdateEvent
     (update [_ state]
-      (let [id (st/get-path-id state)]
-        (update-in state [:workspace-local :edit-path id :undo-stack] u/undo)))
+      (let [id (st/get-path-id state)
+            undo-stack (-> (get-in state [:workspace-local :edit-path id :undo-stack])
+                           (u/undo))
+            entry (u/peek undo-stack)]
+        (cond-> state
+          (some? entry)
+          (-> (load-entry entry)
+              (d/assoc-in-when
+               [:workspace-local :edit-path id :undo-stack]
+               undo-stack)))))
 
     ptk/WatchEvent
-    (watch [it state _]
-      (let [id          (st/get-path-id state)
-            shape       (st/get-path state)
-
-            page-id     (:current-page-id state)
-            objects     (dsh/lookup-page-objects state page-id)
-
-            edition?    (= (get-in state [:workspace-local :edition]) id)
-
-            ustack      (get-in state [:workspace-local :edit-path id :undo-stack])
-            entry       (u/peek ustack)
-
-            old-content (get shape :content)
-            new-content (get entry :content)
-            changes     (changes/generate-path-changes it objects page-id id old-content new-content)]
-
-        (rx/concat
-         (rx/of #(load-entry % entry))
-         (if edition?
-           (rx/of (dch/commit-changes changes))
-           (rx/empty))
-         (if (zero? (:index ustack))
-           (rx/of (common/finish-path)
-                  (dwc/show-toolbar))
-           (rx/empty)))))))
+    (watch [_ state _]
+      (let [id (st/get-path-id state)
+            undo-stack (get-in state [:workspace-local :edit-path id :undo-stack])]
+        (if (> (:index undo-stack) 0)
+          (rx/of (changes/save-path-content {:preserve-move-to true}))
+          (rx/of (changes/save-path-content {:preserve-move-to true})
+                 (common/finish-path)
+                 (dwc/show-toolbar)))))))
 
 (defn redo-path []
   (ptk/reify ::redo-path
     ptk/UpdateEvent
     (update [_ state]
-      (let [id     (st/get-path-id state)
-            ustack (-> (get-in state [:workspace-local :edit-path id :undo-stack])
-                       (u/redo))
-            entry  (u/peek ustack)]
+      (let [id (st/get-path-id state)
+            undo-stack (-> (get-in state [:workspace-local :edit-path id :undo-stack])
+                           (u/redo))
+            entry (u/peek undo-stack)]
         (-> state
-            (d/assoc-in-when [:workspace-local :edit-path id :undo-stack] ustack))))
+            (load-entry entry)
+            (d/assoc-in-when
+             [:workspace-local :edit-path id :undo-stack]
+             undo-stack))))
 
     ptk/WatchEvent
-    (watch [it state _]
-
-      (let [id          (st/get-path-id state)
-            shape       (st/get-path state)
-
-            page-id     (:current-page-id state)
-            objects     (dsh/lookup-page-objects state page-id)
-
-            ustack      (get-in state [:workspace-local :edit-path id :undo-stack])
-            entry       (u/peek ustack)
-            old-content (get shape :content)
-            new-content (get entry :content)
-            changes     (changes/generate-path-changes it objects page-id id old-content new-content)]
-
-        (rx/of (dch/commit-changes changes))))))
+    (watch [_ _ _]
+      (rx/of (changes/save-path-content)))))
 
 (defn merge-head
   "Joins the head with the previous undo in one. This is done so when the user changes a
@@ -170,7 +149,6 @@
     (ptk/reify ::start-path-undo
       ptk/UpdateEvent
       (update [_ state]
-
         (let [undo-lock (get-in state [:workspace-local :edit-path (st/get-path-id state) :undo-lock])]
           (cond-> state
             (not undo-lock)

frontend/src/app/main/ui/forms.cljs

@@ -52,7 +52,8 @@
   (let [form      (mf/use-ctx context)
         disabled? (or (and (some? form)
                            (or (not (:valid @form))
-                               (seq (:external-errors @form))))
+                               (seq (:reference-errors @form))
+                               (seq (:extra-errors @form))))
                       (true? disabled))
         handle-key-down-save
         (mf/use-fn

frontend/src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs

@@ -332,6 +332,7 @@
                                  message (tr "workspace.tokens.resolved-value" (or resolved-value value))]
                              (swap! form update :errors dissoc :value)
                              (swap! form update :extra-errors dissoc :value)
+                             (swap! form update :reference-errors dissoc :reference)
                              (if (= input-value (str resolved-value))
                                (reset! hint* {})
                                (reset! hint* {:message message :type "hint"})))))))]

frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs

@@ -101,13 +101,6 @@
         active-tab* (mf/use-state #(if (cft/is-reference? token) :reference :composite))
         active-tab (deref active-tab*)
 
-        on-toggle-tab
-        (mf/use-fn
-         (mf/deps)
-         (fn [new-tab]
-           (let [new-tab (keyword new-tab)]
-             (reset! active-tab* new-tab))))
-
         token
         (mf/with-memo [token]
           (or token {:type token-type}))
@@ -144,6 +137,17 @@
         (fm/use-form :schema schema
                      :initial initial)
 
+        on-toggle-tab
+        (mf/use-fn
+         (mf/deps form)
+         (fn [new-tab]
+           (let [new-tab (keyword new-tab)]
+             (if (= new-tab :reference)
+               (swap! form assoc-in [:reference-errors :reference]
+                      {:message "Need valid reference"})
+               (swap! form update :reference-errors dissoc :reference))
+             (reset! active-tab* new-tab))))
+
         warning-name-change?
         (not= (get-in @form [:data :name])
               (:name initial))