This commit is contained in:
Andrés Moya
2026-05-19 17:09:34 +02:00
parent a9d0feb8fd
commit b4d8a764f9
5 changed files with 20 additions and 12 deletions

View File

@@ -141,9 +141,11 @@
:error/value to produce the message. Falls back to :message for
errors that originate from schema-validation (which have no :error/fn)."
[error]
(if-let [f (:error/fn error)]
(f (:error/value error))
(:message error)))
(if error
(if-let [f (:error/fn error)]
(f (:error/value error))
(:message error))
(tr "labels.unknown-error")))
(defn resolve-error-assoc-message
"Returns the error map with a :message key set to the resolved human-
@@ -151,9 +153,11 @@
is called with :error/value; otherwise the map is returned unchanged
(it is expected to already carry a :message from schema-validation)."
[error]
(if-let [f (:error/fn error)]
(assoc error :message (f (:error/value error)))
error))
(if error
(if-let [f (:error/fn error)]
(assoc error :message (f (:error/value error)))
error)
(assoc error :message (tr "labels.unknown-error"))))
(defn humanize-errors [errors]
(->> errors

View File

@@ -111,9 +111,6 @@
(mf/with-memo [active-tokens selected-token-set-tokens]
(merge active-tokens selected-token-set-tokens))
tokens
(sd/use-resolved-tokens* tokens)
;; Group tokens by their type
tokens-by-type
(mf/with-memo [tokens selected-token-set-tokens]

View File

@@ -13,6 +13,7 @@
[app.config :as cf]
[app.main.data.style-dictionary :as sd]
[app.main.data.tokenscript :as ts]
[app.main.data.workspace.tokens.errors :as wte]
[app.main.ui.context :as muc]
[app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
[app.main.ui.ds.controls.input :as ds]
@@ -60,7 +61,9 @@
resolved-value)]
(if resolved-value
(rx/of {:value resolved-value})
(rx/of {:error (first errors)}))))))))
(rx/of {:error (if errors
(first errors)
(wte/error-with-value :error/unknown value))}))))))))
(mf/defc value-combobox*
[{:keys [name tokens token token-type empty-to-end ref] :rest props}]

View File

@@ -78,7 +78,9 @@
resolved-value)]
(if resolved-value
(rx/of {:value resolved-value})
(rx/of {:error (first errors)}))))))))
(rx/of {:error (if errors
(first errors)
(wte/error-with-value :error/unknown value))}))))))))
(mf/defc fonts-combobox*
[{:keys [token tokens name] :rest props}]

View File

@@ -181,7 +181,9 @@
resolved-value)]
(if resolved-value
(rx/of {:value resolved-value})
(rx/of {:error (first errors)}))))))))
(rx/of {:error (if errors
(first errors)
(wte/error-with-value :error/unknown value))}))))))))
(mf/defc input*
[{:keys [name tokens token] :rest props}]