From 33131fa943117a738d2954a213d38c5154341d42 Mon Sep 17 00:00:00 2001
From: Florian Schroedl <flo.schroedl@gmail.com>
Date: Tue, 25 Jun 2024 11:15:43 +0200
Subject: [PATCH] Restore token saving

---
 .../app/main/ui/workspace/tokens/form.cljs    | 40 ++++++++++---------
 .../app/main/ui/workspace/tokens/modals.cljs  |  5 ++-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs
index 2d72057db..205d5c98b 100644
--- a/frontend/src/app/main/ui/workspace/tokens/form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs
@@ -8,6 +8,9 @@
   (:require-macros [app.main.style :as stl])
   (:require
    ["lodash.debounce" :as debounce]
+   [app.main.data.modal :as modal]
+   [app.main.data.tokens :as dt]
+   [app.main.store :as st]
    [app.main.ui.workspace.tokens.common :as tokens.common]
    [app.main.ui.workspace.tokens.style-dictionary :as sd]
    [app.util.dom :as dom]
@@ -47,12 +50,11 @@
   (seq (finalize-name (str name))))
 
 (defn finalize-value [value]
-  (str/trim value))
+  (-> (str value)
+      (str/trim)))
 
 (defn valid-value? [value]
-  (-> (str value)
-      (finalize-value)
-      (seq)))
+  (seq (finalize-value value)))
 
 ;; Component -------------------------------------------------------------------
 
@@ -107,7 +109,7 @@
 
 (mf/defc form
   {::mf/wrap-props false}
-  [{:keys [token] :as _args}]
+  [{:keys [token token-type] :as _args}]
   (let [tokens (sd/use-resolved-workspace-tokens)
         existing-token-names (mf/use-memo
                               (mf/deps tokens)
@@ -178,22 +180,22 @@
         ;; Form
         disabled? (or (not valid-name-field?)
                       (not valid-value-field?)
-                      (not valid-description-field?))]
+                      (not valid-description-field?))
 
-        ;; on-submit (fn [e]
-        ;;             (dom/prevent-default e)
-        ;;             (let [token-value (-> (fields->map state)
-        ;;                                   (first)
-        ;;                                   (val))
-        ;;                   token (cond-> {:name (:name state)
-        ;;                                  :type (or (:type token) token-type)
-        ;;                                  :value token-value
-        ;;                                  :description (:description state)}
-        ;;                           (:id token) (assoc :id (:id token)))]
-        ;;               (st/emit! (dt/add-token token))
-        ;;               (modal/hide!)))]
+        on-submit (mf/use-callback
+                   (fn [e]
+                     (js/console.log "@value-ref" @value-ref (finalize-value @value-ref))
+                     (dom/prevent-default e)
+                     (let [token (cond-> {:name (finalize-name @name-ref)
+                                          :type (or (:type token) token-type)
+                                          :value (finalize-value @value-ref)}
+                                   @description-ref (assoc :description @description-ref)
+                                   (:id token) (assoc :id (:id token)))]
+                       (js/console.log "token" token)
+                       (st/emit! (dt/add-token token))
+                       (modal/hide!))))]
     [:form
-     {#_#_:on-submit on-submit}
+     {:on-submit on-submit}
      [:div {:class (stl/css :token-rows)}
       [:div
        [:& tokens.common/labeled-input {:label "Name"
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals.cljs b/frontend/src/app/main/ui/workspace/tokens/modals.cljs
index eba26a68e..23edf75ed 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals.cljs
@@ -39,12 +39,13 @@
 
 (mf/defc modal
   {::mf/wrap-props false}
-  [{:keys [x y position token] :as _args}]
+  [{:keys [x y position token token-type] :as _args}]
   (let [wrapper-style (use-viewport-position-style x y position)]
     [:div
      {:class (stl/css :shadow)
       :style wrapper-style}
-     [:& form {:token token}]]))
+     [:& form {:token token
+               :token-type token-type}]]))
 
 ;; Modals ----------------------------------------------------------------------