From c86dddce77efca0d5c99c4fe3dcc84f067bda37c Mon Sep 17 00:00:00 2001
From: Xavier Julian <xavier.julian@kaleidos.net>
Date: Tue, 10 Feb 2026 14:16:18 +0100
Subject: [PATCH] :tada: Rename token group - modal data

---
 .../main/ui/workspace/tokens/management.cljs  | 21 ++++++-------
 .../management/forms/rename_node_modal.cljs   | 31 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/tokens/management.cljs b/frontend/src/app/main/ui/workspace/tokens/management.cljs
index f688aa6f3c..c6c70ec301 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management.cljs
@@ -165,15 +165,6 @@
                 (st/emit! (dwtl/toggle-token-path (str (name type) "." path)))
                 (st/emit! (dwtl/toggle-token-path (name type)))))))
 
-        rename-node
-        (mf/use-fn
-         (mf/deps selected-token-set-tokens)
-         (fn [node type]
-           (prn "Open rename node modal")
-           (modal/show! :tokens/rename-node {:node node
-                                             :type type
-                                             :tokens-in-active-set selected-token-set-tokens})))
-
         delete-node
         (mf/with-memo [selected-token-set-tokens selected-token-set-id]
           (fn [node type]
@@ -187,7 +178,15 @@
               ;; Remove from unfolded tree path
               (if remaining-tokens?
                 (st/emit! (dwtl/toggle-token-path (str (name type) "." path)))
-                (st/emit! (dwtl/toggle-token-path (name type)))))))]
+                (st/emit! (dwtl/toggle-token-path (name type)))))))
+
+        open-rename-node-modal
+        (mf/use-fn
+         (mf/deps selected-token-set-tokens)
+         (fn [node type]
+           (modal/show! :tokens/rename-node {:node node
+                                             :type type
+                                             :tokens-in-active-set selected-token-set-tokens})))]
 
     (mf/with-effect [tokens-lib selected-token-set-id]
       (when (and tokens-lib
@@ -201,7 +200,7 @@
 
     [:*
      [:& token-context-menu {:on-delete-token delete-token}]
-     [:> token-node-context-menu* {:on-rename-node rename-node
+     [:> token-node-context-menu* {:on-rename-node open-rename-node-modal
                                    :on-delete-node delete-node}]
 
      [:> selected-set-info* {:tokens-lib tokens-lib
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs
index aabfb2d591..034941d22d 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs
@@ -40,17 +40,12 @@
         form (fm/use-form :schema schema
                           :initial initial)
 
-        submit (mf/use-fn
-                (mf/deps form on-submit node)
-                (fn []
-                  (let [name (get-in @form [:clean-data :name])
-                        old-path (str (d/name type) "." (:name node))
-                        new-path (str (d/name type) "." name)
-                        _ (prn {:old-path old-path :new-path new-path})]
-                    (prn "Submitting rename node form with name: " name " and path: " new-path)
-                    (if (not= old-path new-path)
-                      (on-submit {:name name})
-                      (on-close)))))
+        on-submit (mf/use-fn
+                   (mf/deps form on-submit node type)
+                   (fn []
+                     (let [name (get-in @form [:clean-data :name])]
+                       (on-submit {:new-name name}))))
+
         #_(let [{:keys [clean-data valid extra-errors async-errors]} @form]
             (when (and valid
                        (empty? extra-errors)
@@ -96,8 +91,8 @@
       (tr "workspace.tokens.rename-group")]
      [:> fc/form* {:class (stl/css :form-wrapper)
                    :form form
-                   :on-submit submit}
-      [:> fc/form-input* {:id (:name node)
+                   :on-submit on-submit}
+      [:> fc/form-input* {:id "kmscdkmcsdkmcvd"
                           :name :name
                           :label (tr "workspace.tokens.token-name")
                           :placeholder (tr "workspace.tokens.token-name")
@@ -113,6 +108,7 @@
                     :name "cancel"
                     :on-click on-close} (tr "labels.cancel")]
        [:> fc/form-submit* {:variant "primary"
+                            :disabled (not (:valid @form))
                             :name "rename"} (tr "labels.rename")]]]]))
 
 (mf/defc rename-node-modal*
@@ -125,6 +121,12 @@
           (-> (ctob/tokens-tree tokens-in-active-set)
               (d/dissoc-in (:name node))))
 
+        rename
+        (mf/use-fn
+         (mf/deps [])
+         (fn [new-name]
+           (prn "Renaming " node " to: " new-name " with type: " type)))
+
         close-modal
         (mf/use-fn
          (mf/deps [])
@@ -148,4 +150,5 @@
       [:> rename-node-form* {:node node
                              :type type
                              :tokens-tree tokens-tree-in-selected-set
-                             :on-close close-modal}]]]))
+                             :on-close close-modal
+                             :on-submit rename}]]]))