From 89b110fce4d4bdbc3e30c928a59d53928008afb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Thu, 29 Sep 2022 09:20:06 +0300 Subject: [PATCH] Fix validation.js/isValidId for a missing entry This may or may not be related to surprising behavior seen while addressing AE-1799. --- src/utils/validation.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/validation.js b/src/utils/validation.js index 4ec4412a8..58a4f343e 100644 --- a/src/utils/validation.js +++ b/src/utils/validation.js @@ -57,8 +57,9 @@ export const isSome = { }; export const isValidId = (values, i18nKey) => ({ - predicate: R.compose(R.prop('valid'), id => - R.find(R.propEq('id', id), values) + predicate: R.compose( + R.ifElse(R.isNil, R.always(false), R.prop('valid')), + id => R.find(R.propEq('id', id), values) ), label: R.applyTo(i18nKey) });