From f298c79fa6322db6e16522cb5fc273e794102cbf Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 21 Nov 2024 12:28:52 +0100 Subject: [PATCH] handle better non required inputs with strings --- .../lib/components/LightweightArgInput.svelte | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/frontend/src/lib/components/LightweightArgInput.svelte b/frontend/src/lib/components/LightweightArgInput.svelte index 58722b848e..232bdc6516 100644 --- a/frontend/src/lib/components/LightweightArgInput.svelte +++ b/frontend/src/lib/components/LightweightArgInput.svelte @@ -170,18 +170,23 @@ error = 'Required' valid && (valid = false) } else { - if (pattern && !testRegex(pattern, v)) { - if (!emptyString(customErrorMessage)) { - error = customErrorMessage ?? '' - } else if (format == 'email') { - error = 'invalid email address' - } else { - error = `should match ${pattern}` - } - valid && (valid = false) - } else { + if (!required && (v == undefined || v == null || v === '')) { error = '' !valid && (valid = true) + } else { + if (pattern && !testRegex(pattern, v)) { + if (!emptyString(customErrorMessage)) { + error = customErrorMessage ?? '' + } else if (format == 'email') { + error = 'invalid email address' + } else { + error = `should match ${pattern}` + } + valid && (valid = false) + } else { + error = '' + !valid && (valid = true) + } } } }