From c9761684c1b336651a1a1b97ae1038f8b800e1b9 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 13 Oct 2025 16:35:17 +0200 Subject: [PATCH] :bug: Fix regression introduced on duplicate-id on token-sets commit --- common/src/app/common/files/migrations.cljc | 2 +- common/src/app/common/types/tokens_lib.cljc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc index c72a76c706..91f5793e99 100644 --- a/common/src/app/common/files/migrations.cljc +++ b/common/src/app/common/files/migrations.cljc @@ -1615,7 +1615,7 @@ (defmethod migrate-data "0014-fix-tokens-lib-duplicate-ids" [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 (into (d/ordered-set) diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc index 48a17afbd0..9191aa3a2f 100644 --- a/common/src/app/common/types/tokens_lib.cljc +++ b/common/src/app/common/types/tokens_lib.cljc @@ -1899,9 +1899,10 @@ Will return a value that matches this schema: node)) (d/update-vals node recurse)))] - (-> (datafy tokens-lib) - (update :sets d/update-vals migrate-set-node) - (map->tokens-lib)))) + (some-> tokens-lib + (-> (datafy) + (update :sets d/update-vals migrate-set-node) + (map->tokens-lib))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; SERIALIZATION (FRESIAN)