From 530c7df2ddb698f816581530b9e5ecd02a20bee9 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 4 Jul 2022 20:25:27 +0100 Subject: [PATCH] Make null values empty for regex validation --- .../src/components/app/forms/validation.js | 3 ++ packages/server/yarn.lock | 28 +++++++++---------- packages/worker/yarn.lock | 28 +++++++++---------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/packages/client/src/components/app/forms/validation.js b/packages/client/src/components/app/forms/validation.js index c98ca8467a..2a5e3c4227 100644 --- a/packages/client/src/components/app/forms/validation.js +++ b/packages/client/src/components/app/forms/validation.js @@ -278,6 +278,9 @@ const notEqualHandler = (value, rule) => { // Evaluates a regex constraint const regexHandler = (value, rule) => { const regex = parseType(rule.value, "string") + if (!value) { + value = "" + } return new RegExp(regex).test(value) } diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 95f9288183..f507121625 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.0": - version "1.0.212-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.0.tgz#6ac3448c8272e918f1af1fff0cf8c5773ae61219" - integrity sha512-hFvbQQEbF3w2u9fe/S+RhNw5HUETS6rhu9q5KDTDQ57k05D4YMPcpMBGSh7SPMqmVyEwUDgcL36mkFOc3AgjYQ== +"@budibase/backend-core@1.0.212-alpha.11": + version "1.0.212-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.11.tgz#56ce2c3d366b3e615083770b2a697abea1e8c2b5" + integrity sha512-du7i3JU/82n1U+24mdU/Fy59Izm19DC8tNeAI1INLC8Uo7VjJKMswfhO3otnjrgh11lskfV4g8jpml5kVa4Jmg== dependencies: - "@budibase/types" "^1.0.212-alpha.0" + "@budibase/types" "^1.0.212-alpha.11" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1176,12 +1176,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.212-alpha.0": - version "1.0.212-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.0.tgz#843f8291fcc0a2fbcb4d857a750bc116cdaee293" - integrity sha512-4nhWxjMcxSQBPXRy/U+37IaVLYOr4/RVe79/fUvnXrr5qAeecbEk/QbkJJd3dU1WaNxB2eGhNtH3uBUPQvcT9A== +"@budibase/pro@1.0.212-alpha.11": + version "1.0.212-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.11.tgz#8d30ac9faf4ef810c45ed2c14b09a6651c1482ee" + integrity sha512-fikNNmCw75XwcV04lH+KANl5sIhsevgeiP/mHYiwVGhOqykvflXCeHKOJmPPP2AHQOvsBBcn18pj0dNBfMYRHQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.0" + "@budibase/backend-core" "1.0.212-alpha.11" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1202,10 +1202,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@^1.0.212-alpha.0": - version "1.0.212" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212.tgz#e66a15b711544b4fab7767261fd5f2f1dd7f40d7" - integrity sha512-DhGyw6snwJQZQlx7havVYnqPZfZERueKZfmVCBySzwInZZt0+sXZaBl1BVjGjYuwpaUQBMDBf7geBgHXp6DIKg== +"@budibase/types@^1.0.212-alpha.11": + version "1.0.215" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.215.tgz#547ab0c66ca0bcf27e0c4d5f2734eb0c85400b64" + integrity sha512-Gd/Yk1Ui79YTRD58yxXlxusKpZYcVa3nkTwnefytSfXsMXPeTg1Cp8l35OFd2f83dayiETkHmqV+PXZrbByoRg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 84f23617a1..1a20e83a45 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.0": - version "1.0.212-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.0.tgz#6ac3448c8272e918f1af1fff0cf8c5773ae61219" - integrity sha512-hFvbQQEbF3w2u9fe/S+RhNw5HUETS6rhu9q5KDTDQ57k05D4YMPcpMBGSh7SPMqmVyEwUDgcL36mkFOc3AgjYQ== +"@budibase/backend-core@1.0.212-alpha.11": + version "1.0.212-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.11.tgz#56ce2c3d366b3e615083770b2a697abea1e8c2b5" + integrity sha512-du7i3JU/82n1U+24mdU/Fy59Izm19DC8tNeAI1INLC8Uo7VjJKMswfhO3otnjrgh11lskfV4g8jpml5kVa4Jmg== dependencies: - "@budibase/types" "^1.0.212-alpha.0" + "@budibase/types" "^1.0.212-alpha.11" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -323,18 +323,18 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.0.212-alpha.0": - version "1.0.212-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.0.tgz#843f8291fcc0a2fbcb4d857a750bc116cdaee293" - integrity sha512-4nhWxjMcxSQBPXRy/U+37IaVLYOr4/RVe79/fUvnXrr5qAeecbEk/QbkJJd3dU1WaNxB2eGhNtH3uBUPQvcT9A== +"@budibase/pro@1.0.212-alpha.11": + version "1.0.212-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.11.tgz#8d30ac9faf4ef810c45ed2c14b09a6651c1482ee" + integrity sha512-fikNNmCw75XwcV04lH+KANl5sIhsevgeiP/mHYiwVGhOqykvflXCeHKOJmPPP2AHQOvsBBcn18pj0dNBfMYRHQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.0" + "@budibase/backend-core" "1.0.212-alpha.11" node-fetch "^2.6.1" -"@budibase/types@^1.0.212-alpha.0": - version "1.0.212" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212.tgz#e66a15b711544b4fab7767261fd5f2f1dd7f40d7" - integrity sha512-DhGyw6snwJQZQlx7havVYnqPZfZERueKZfmVCBySzwInZZt0+sXZaBl1BVjGjYuwpaUQBMDBf7geBgHXp6DIKg== +"@budibase/types@^1.0.212-alpha.11": + version "1.0.215" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.215.tgz#547ab0c66ca0bcf27e0c4d5f2734eb0c85400b64" + integrity sha512-Gd/Yk1Ui79YTRD58yxXlxusKpZYcVa3nkTwnefytSfXsMXPeTg1Cp8l35OFd2f83dayiETkHmqV+PXZrbByoRg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"