From 7497371b32d9fe920c00b2a03aacf2f1761969d8 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 11 Feb 2025 16:38:36 +0100
Subject: [PATCH] :bug: Fix issue on renaming group

---
 frontend/src/app/main/data/tokens.cljs                    | 8 ++++----
 frontend/src/app/main/ui/workspace/tokens/sets.cljs       | 3 ++-
 .../app/main/ui/workspace/tokens/sets_context_menu.cljs   | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index 4fc18c170..576a3eb94 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -181,7 +181,8 @@
         (rx/of (dch/commit-changes changes)
                (wtu/update-workspace-tokens))))))
 
-(defn delete-token-set-path [group? path]
+(defn delete-token-set-path
+  [group? path]
   (ptk/reify ::delete-token-set-path
     ptk/WatchEvent
     (watch [it state _]
@@ -189,9 +190,8 @@
             changes (-> (pcb/empty-changes it)
                         (pcb/with-library-data data)
                         (pcb/delete-token-set-path group? path))]
-        (rx/of
-         (dch/commit-changes changes)
-         (wtu/update-workspace-tokens))))))
+        (rx/of (dch/commit-changes changes)
+               (wtu/update-workspace-tokens))))))
 
 (defn drop-error [{:keys [error to-path]}]
   (ptk/reify ::drop-error
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index 14a2ad4a0..0f9e47f92 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -48,7 +48,8 @@
             (dt/update-token-set (:name token-set) (ctob/update-name token-set name))))
 
 (defn- on-update-token-set-group [path name]
-  (st/emit! (dt/rename-token-set-group path name)))
+  (st/emit! (dt/clear-token-set-edition)
+            (dt/rename-token-set-group path name)))
 
 (defn- on-create-token-set [name token-set]
   (st/emit! (ptk/data-event ::ev/event {::ev/name "create-token-set" :name name})
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
index b82bc8970..cf0c46ddf 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
@@ -39,14 +39,14 @@
   (let [create-set-at-path
         (mf/use-fn (mf/deps path) #(st/emit! (dt/start-token-set-creation path)))
 
-        edit-name
+        on-edit
         (mf/use-fn
          (mf/deps path)
          (fn []
            (let [name (ctob/join-set-path path)]
              (st/emit! (dt/start-token-set-edition name)))))
 
-        delete-set
+        on-delete
         (mf/use-fn
          (mf/deps is-group path)
          #(st/emit! (dt/delete-token-set-path is-group path)))]
@@ -54,8 +54,8 @@
     [:ul {:class (stl/css :context-list)}
      (when is-group
        [:> menu-entry* {:title (tr "workspace.token.add-set-to-group") :on-click create-set-at-path}])
-     [:> menu-entry* {:title (tr "labels.rename") :on-click edit-name}]
-     [:> menu-entry* {:title (tr "labels.delete")  :on-click delete-set}]]))
+     [:> menu-entry* {:title (tr "labels.rename") :on-click on-edit}]
+     [:> menu-entry* {:title (tr "labels.delete")  :on-click on-delete}]]))
 
 (mf/defc token-set-context-menu*
   []