From 65dab1501327452973740061247dd5d51d699bfc Mon Sep 17 00:00:00 2001 From: ernstmul Date: Fri, 18 Oct 2024 14:11:51 +0200 Subject: [PATCH 1/2] Change regex for custom project id --- src/lib/elements/forms/inputId.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elements/forms/inputId.svelte b/src/lib/elements/forms/inputId.svelte index 6100210b4..c88af7af2 100644 --- a/src/lib/elements/forms/inputId.svelte +++ b/src/lib/elements/forms/inputId.svelte @@ -8,7 +8,7 @@ let element: HTMLInputElement; let icon = 'info'; - const pattern = String.raw`^[a-zA-Z0-9][a-zA-Z0-9._\-]*$`; + const pattern = String.raw`^[a-zA-Z0-9][a-zA-Z0-9.\-]*$`; onMount(() => { if (element && autofocus) { @@ -55,6 +55,6 @@ class="u-cross-center u-line-height-1 u-color-text-gray" aria-hidden="true" /> - Allowed characters: alphanumeric, non-leading hyphen, underscore, period + Allowed characters: alphanumeric and non-leading hyphen From 440b608daa7400682140b483fb7adbcd649de4e2 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Fri, 18 Oct 2024 14:19:47 +0200 Subject: [PATCH 2/2] Also exclude . and update tests --- src/lib/elements/forms/inputId.svelte | 2 +- tests/unit/elements/inputId.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elements/forms/inputId.svelte b/src/lib/elements/forms/inputId.svelte index c88af7af2..8a10aeb2b 100644 --- a/src/lib/elements/forms/inputId.svelte +++ b/src/lib/elements/forms/inputId.svelte @@ -8,7 +8,7 @@ let element: HTMLInputElement; let icon = 'info'; - const pattern = String.raw`^[a-zA-Z0-9][a-zA-Z0-9.\-]*$`; + const pattern = String.raw`^[a-zA-Z0-9][a-zA-Z0-9\-]*$`; onMount(() => { if (element && autofocus) { diff --git a/tests/unit/elements/inputId.test.ts b/tests/unit/elements/inputId.test.ts index 0a6666cd3..c004e80ff 100644 --- a/tests/unit/elements/inputId.test.ts +++ b/tests/unit/elements/inputId.test.ts @@ -3,9 +3,9 @@ import { render } from '@testing-library/svelte'; import userEvent from '@testing-library/user-event'; import { InputId } from '../../../src/lib/elements/forms'; -const validStrings = ['valid_string', 'valid-string', 'valid.string', 'validstring123', 'valid_']; +const validStrings = ['valid-string', 'validstring', 'validstring123', 'valid-']; -const invalidStrings = ['-invalid', '.invalid', '_invalid']; +const invalidStrings = ['-invalid', '.invalid', 'in_valid', 'in.va.lid']; test('shows id input', () => { const { getByPlaceholderText } = render(InputId);