From 7044c17d896f5589a6865378dee21ab34acc3802 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Tue, 5 Nov 2024 15:48:37 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=20Allow=20token=20set=20grouping=20-?= =?UTF-8?q?=20Remove=20slash=20to=20dash=20conversion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/app/main/ui/workspace/tokens/sets.cljs | 11 ++--------- .../main/ui/workspace/tokens/style_dictionary.cljs | 3 +-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs index 37c4d65886..44666cb6d7 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs @@ -200,13 +200,9 @@ context] :as _props}] (let [{:keys [editing? new? on-edit on-create on-reset] :as ctx} (or context (sets-context/use-context)) - avoid-token-set-grouping #(str/replace % "/" "-") submit-token #(do - ;; TODO: We don't support set grouping for now so we rename sets for now - (when (str/includes? (:name %) "/") - (warn-on-try-create-token-set-group!)) - (on-create-token-set (update % :name avoid-token-set-grouping)) + (on-create-token-set %) (on-reset))] [:ul {:class (stl/css :sets-list)} (if (and @@ -218,10 +214,7 @@ (when token-set (let [update-token #(do - ;; TODO: We don't support set grouping for now so we rename sets for now - (when (str/includes? (:name %) "/") - (warn-on-try-create-token-set-group!)) - (on-update-token-set (avoid-token-set-grouping (:name token-set)) (update % :name avoid-token-set-grouping)) + (on-update-token-set (:name token-set) %) (on-reset))] [:& sets-tree {:key (:name token-set) diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs index 72771c4fa9..e2c77d007c 100644 --- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs @@ -182,8 +182,7 @@ (->> data-stream (rx/map (fn [data] (try - (-> (str/replace data "/" "-") ;; TODO Remove when token groups work - (t/decode-str)) + (t/decode-str data) (catch js/Error e (throw (wte/error-ex-info :error.import/json-parse-error data e)))))) (rx/map (fn [json-data]