From 4c327f38ef493e82bb94f6fed910520c6500ea51 Mon Sep 17 00:00:00 2001
From: Florian Schroedl <flo.schroedl@gmail.com>
Date: Mon, 23 Sep 2024 15:18:46 +0200
Subject: [PATCH] Replace sets

---
 frontend/src/app/main/refs.cljs               | 10 +++----
 .../app/main/ui/workspace/tokens/sets.cljs    | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 1d423608d9..6650c48282 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -468,6 +468,9 @@
 (def workspace-selected-token-set-id
   (l/derived wtts/get-selected-token-set-id st/state))
 
+(def workspace-ordered-token-sets
+  (l/derived #(or (some-> % ctob/get-sets) []) tokens-lib))
+
 (dm/legacy
  (def workspace-active-theme-ids
    (l/derived wtts/get-active-theme-ids st/state))
@@ -478,13 +481,6 @@
  (def workspace-active-set-ids
    (l/derived wtts/get-active-set-ids st/state))
 
- (def workspace-ordered-token-sets
-   (l/derived
-    (fn [data]
-      (or (wtts/get-workspace-ordered-sets data) {}))
-    st/state
-    =))
-
  (def workspace-active-theme-sets-tokens
    (l/derived wtts/get-active-theme-sets-tokens-names-map st/state =))
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index c4f95f992a..994214ed23 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -146,20 +146,21 @@
     :as _props}]
   (let [{:keys [editing? new? on-edit on-create on-reset] :as ctx} (or context (sets-context/use-context))]
     [:ul {:class (stl/css :sets-list)}
-     (for [[id token-set] token-sets]
+     (for [token-set token-sets]
        (when token-set
-         [:& sets-tree {:key id
-                        :token-set token-set
-                        :token-set-selected? (if new? (constantly false) token-set-selected?)
-                        :token-set-active? token-set-active?
-                        :editing? editing?
-                        :on-select on-select
-                        :on-edit on-edit
-                        :on-toggle on-toggle-token-set
-                        :on-submit #(do
-                                      (on-update-token-set %)
-                                      (on-reset))
-                        :on-cancel on-reset}]))
+         [:& sets-tree
+          {:key (:name token-set)
+           :token-set token-set
+           :token-set-selected? (if new? (constantly false) token-set-selected?)
+           :token-set-active? token-set-active?
+           :editing? editing?
+           :on-select on-select
+           :on-edit on-edit
+           :on-toggle on-toggle-token-set
+           :on-submit #(do
+                         (on-update-token-set %)
+                         (on-reset))
+           :on-cancel on-reset}]))
      (when new?
        [:& sets-tree {:token-set {:name ""}
                       :token-set-selected? (constantly true)