3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Path selector test predicate is enough

Browse source
This commit is contained in:
Florian Schroedl 2024-07-01 10:16:52 +02:00
parent 4a85ef3608
commit 9d637cbe5e
1 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
frontend/src/app/main/ui/workspace/tokens/form.cljs
View file

@ -40,27 +40,18 @@
Token names should only contain letters and digits separated by . characters.")}})) Token names should only contain letters and digits separated by . characters.")}}))
(defn token-name-schema (defn token-name-schema
"Generate a dynamic schema validation to check if a token name already exists. "Generate a dynamic schema validation to check if a token path derived from the name already exists at `tokens-tree`."
`existing-token-names` should be a set of strings." [{:keys [token tokens-tree]}]
[{:keys [existing-token-names tokens-tree]}] (let [path-exists-schema
(let [non-existing-token-schema
(m/-simple-schema (m/-simple-schema
{:type :token/name-exists {:type :token/name-exists
:pred #(not (get existing-token-names %)) :pred #(not (wtt/token-name-path-exists? % tokens-tree))
:type-properties {:error/fn #(str (:value %) " is an already existing token name") :type-properties {:error/fn #(str "A token already exists at the path: " (:value %))}})]
:existing-token-names existing-token-names}})
path-exists-schema
(m/-simple-schema
{:type :token/name-exists
:pred #(wtt/token-name-path-exists? % tokens-tree)
:type-properties {:error/fn #(str "A token already exists at the path: " (:value %))
:existing-token-names existing-token-names}})]
(m/schema (m/schema
[:and [:and
[:string {:min 1 :max 255}] [:string {:min 1 :max 255}]
valid-token-name-schema valid-token-name-schema
path-exists-schema path-exists-schema])))
non-existing-token-schema])))
(def token-description-schema (def token-description-schema
(m/schema (m/schema
@ -152,22 +143,15 @@ Token names should only contain letters and digits separated by . characters.")}
tokens-tree (mf/use-memo tokens-tree (mf/use-memo
(mf/deps tokens) (mf/deps tokens)
#(wtt/token-names-tree tokens)) #(wtt/token-names-tree tokens))
existing-token-names (mf/use-memo
(mf/deps tokens)
(fn []
(-> (into #{} (map (fn [[_ {:keys [name]}]] name) tokens))
;; Remove the currently editing token name,
;; as we don't want it to show when checking for duplicate names.
(disj (:name token)))))
;; Name ;; Name
name-ref (mf/use-var (:name token)) name-ref (mf/use-var (:name token))
name-errors (mf/use-state nil) name-errors (mf/use-state nil)
_ (js/console.log "name-errors" @name-errors) _ (js/console.log "name-errors" @name-errors)
validate-name (mf/use-callback validate-name (mf/use-callback
(mf/deps tokens-tree existing-token-names) (mf/deps tokens-tree)
(fn [value] (fn [value]
(let [schema (token-name-schema {:existing-token-names existing-token-names (let [schema (token-name-schema {:token token
:tokens-tree tokens-tree})] :tokens-tree tokens-tree})]
(m/explain schema (finalize-name value))))) (m/explain schema (finalize-name value)))))
on-update-name-debounced (mf/use-callback on-update-name-debounced (mf/use-callback