From 8dad09c944a9d04748a2211277c19df967ba1bc7 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Thu, 20 Feb 2025 11:37:53 +0100 Subject: [PATCH 1/2] fix: change validation error for workspace name --- site/src/utils/formUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/utils/formUtils.ts b/site/src/utils/formUtils.ts index 7ec2f04b23454..f68c0558388af 100644 --- a/site/src/utils/formUtils.ts +++ b/site/src/utils/formUtils.ts @@ -12,8 +12,8 @@ const Language = { nameRequired: (name: string): string => { return name ? `Please enter a ${name.toLowerCase()}.` : "Required"; }, - nameInvalidChars: (name: string): string => { - return `${name} must start with a-Z or 0-9 and can contain a-Z, 0-9 or -`; + nameInvalidChars: (): string => { + return `Special characters (e.g.: !, @, #) are not supported`; }, nameTooLong: (name: string, len: number): string => { return `${name} cannot be longer than ${len} characters`; @@ -119,7 +119,7 @@ const displayNameRE = /^[^\s](.*[^\s])?$/; export const nameValidator = (name: string): Yup.StringSchema => Yup.string() .required(Language.nameRequired(name)) - .matches(usernameRE, Language.nameInvalidChars(name)) + .matches(usernameRE, Language.nameInvalidChars()) .max(maxLenName, Language.nameTooLong(name, maxLenName)); export const displayNameValidator = (displayName: string): Yup.StringSchema => From ba735e535428c763cb73374daca59f25f76d2de5 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Thu, 20 Feb 2025 11:42:14 +0100 Subject: [PATCH 2/2] fix: lint --- site/src/utils/formUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/utils/formUtils.ts b/site/src/utils/formUtils.ts index f68c0558388af..558bb3eb47d29 100644 --- a/site/src/utils/formUtils.ts +++ b/site/src/utils/formUtils.ts @@ -13,7 +13,7 @@ const Language = { return name ? `Please enter a ${name.toLowerCase()}.` : "Required"; }, nameInvalidChars: (): string => { - return `Special characters (e.g.: !, @, #) are not supported`; + return "Special characters (e.g.: !, @, #) are not supported"; }, nameTooLong: (name: string, len: number): string => { return `${name} cannot be longer than ${len} characters`;