Merge remote-tracking branch 'origin/staging' into develop

This commit is contained in:
Andrey Antukh 2025-10-13 16:35:53 +02:00
commit 71ed845307
2 changed files with 5 additions and 4 deletions

View File

@ -1615,7 +1615,7 @@
(defmethod migrate-data "0014-fix-tokens-lib-duplicate-ids" (defmethod migrate-data "0014-fix-tokens-lib-duplicate-ids"
[data _] [data _]
(update data :tokens-lib types.tokens-lib/fix-duplicate-token-set-ids)) (d/update-when data :tokens-lib types.tokens-lib/fix-duplicate-token-set-ids))
(def available-migrations (def available-migrations
(into (d/ordered-set) (into (d/ordered-set)

View File

@ -1899,9 +1899,10 @@ Will return a value that matches this schema:
node)) node))
(d/update-vals node recurse)))] (d/update-vals node recurse)))]
(-> (datafy tokens-lib) (some-> tokens-lib
(update :sets d/update-vals migrate-set-node) (-> (datafy)
(map->tokens-lib)))) (update :sets d/update-vals migrate-set-node)
(map->tokens-lib)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; SERIALIZATION (FRESIAN) ;; SERIALIZATION (FRESIAN)