diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index 2c69fa8e4..8ca3ef587 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -11,6 +11,8 @@ export let id: string; export let name: string = id; export let value = ''; + export let pattern: string = null; + export let patternError: string = ''; export let placeholder = ''; export let required = false; export let hideRequired = false; @@ -45,6 +47,11 @@ return; } + if (patternError && element.validity.patternMismatch) { + error = patternError; + return; + } + error = element.validationMessage; }; @@ -118,6 +125,7 @@ {disabled} {readonly} {required} + {pattern} {maxlength} autocomplete={autocomplete ? 'on' : 'off'} type="text" diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts index 2ef6ac191..e28a98f2d 100644 --- a/src/lib/helpers/string.ts +++ b/src/lib/helpers/string.ts @@ -48,3 +48,8 @@ const formatter = Intl.NumberFormat('en', { export function formatNum(number: number): string { return formatter.format(number); } + +/** + * Returns a regex to check hostname validity. Supports wildcards too! + */ +export const hostnameRegex = String.raw`(\*)|(\*\.)?(?!-)[A-Za-z0-9\-]+([\-\.]{1}[a-z0-9]+)*\.[A-Za-z]{2,18}`; diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte index 34aafe9b9..1d1f4520e 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte @@ -8,6 +8,7 @@ import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; + import { hostnameRegex } from '$lib/helpers/string'; let hostname: string = null; @@ -28,7 +29,7 @@ await invalidate(Dependencies.PLATFORM); addNotification({ type: 'success', - message: 'Platform Hostname has been updated' + message: 'Platform hostname has been updated' }); } catch (error) { addNotification({ @@ -49,7 +50,8 @@ id="hostname" label="Hostname" bind:value={hostname} - required + pattern={hostnameRegex} + patternError="Please enter a valid hostname" placeholder="myapp.com" /> diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte index e9bb56165..d67c3f6d9 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -8,6 +8,7 @@ import { Submit, trackEvent } from '$lib/actions/analytics'; import { PlatformType } from '@appwrite.io/console'; import { isValueOfStringEnum } from '$lib/helpers/types'; + import { hostnameRegex } from '$lib/helpers/string'; // enum Platform { // Android = 'flutter-android', @@ -173,6 +174,8 @@ placeholder={placeholder[platform].hostname} tooltip={placeholder[platform].tooltip} required + pattern={hostnameRegex} + patternError="Please enter a valid hostname" bind:value={$createPlatform.hostname} />