feat: Sync validation with CM and core

https://harperdb.atlassian.net/browse/STUDIO-13

Author: dawsontoth

src/features/auth/SignUp.tsx

@@ -14,23 +14,26 @@ import { toast } from 'sonner';
 import { z } from 'zod';
 
 const SignInSchema = z.object({
+	email: z
+		.email({
+			error: 'Please enter a valid email address.',
+		})
+		.trim()
+		.toLowerCase()
+		.max(80, { error: 'Email cannot be longer than 80 characters.' }),
 	firstname: z
 		.string()
+		.trim()
 		.min(2, { error: 'Please enter your first name.' })
-		.max(50, { error: 'First name cannot be longer than 50 characters.' }),
+		.max(40, { error: 'First name cannot be longer than 40 characters.' }),
 	lastname: z
 		.string()
+		.trim()
 		.min(2, { error: 'Please enter your last name.' })
-		.max(50, { error: 'Last name cannot be longer than 50 characters.' }),
-	email: z
-		.email({
-			error: 'Please enter a valid email address.',
-		})
-		.max(75, { error: 'Email cannot be longer than 75 characters.' }),
+		.max(80, { error: 'Last name cannot be longer than 80 characters.' }),
 	password: z
 		.string()
-		.min(8, { error: 'Password must be at least 8 characters long.' })
-		.max(50, { error: 'Password cannot be longer than 50 characters.' }),
+		.min(8, { error: 'Password must be at least 8 characters long.' }),
 });
 
 export function SignUp() {

src/features/clusters/upsert/upsertClusterSchema.tsx

@@ -8,7 +8,7 @@ export const UpsertClusterSchema = z.object({
 		.max(255, 'System name cannot be longer than 255 characters long.'),
 	abbreviatedName: z
 		.string()
-		.max(10, 'Must be at most 10 characters long.')
+		.max(20, 'Must be at most 20 characters long.')
 		.regex(/^[a-zA-Z0-9-]*$/, 'Can only contain letters, numbers and dashes'),
 	fqdn: z
 		.string()
@@ -23,7 +23,7 @@ export const UpsertClusterSchema = z.object({
 			regionName: z.string().nonempty('Please select a region.'),
 			latencyDescription: z.string().nonempty('Please select a latency tier.'),
 		}),
-	),
+	).max(50, { error: 'A maximum of 50 regions can be selected for each cluster. ' }),
 
 	instances: z.array(
 		z.object({
@@ -36,5 +36,5 @@ export const UpsertClusterSchema = z.object({
 				.max(maxPortNumber, 'That port number is too high.')
 				.optional(),
 		}),
-	),
+	).max(100, { error: 'A maximum of 100 instances can be added to each cluster.' }),
 });

src/features/instance/databases/modals/CreateNewTableModal.tsx

@@ -26,31 +26,33 @@ import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 import { z } from 'zod';
 
+const schemaRegex = /^[\x20-\x2E|\x30-\x5F|\x61-\x7E]*$/;
+
 const CreateTableSchema = z.object({
 	databaseName: z
 		.string()
-		.regex(/^[a-zA-Z0-9_]*$/, {
-			error: 'Database name can only contain letters, numbers, and underscores.',
+		.regex(schemaRegex, {
+			error: 'Database name cannot include backticks or forward slashes.',
 		})
 		.max(75, { error: 'Database name cannot be longer than 75 characters.' }),
 	tableName: z
 		.string()
 		.nonempty({
 			error: 'Table name is required.',
 		})
-		.regex(/^[a-zA-Z0-9_]*$/, {
-			error: 'Table name can only contain letters, numbers, and underscores.',
+		.regex(schemaRegex, {
+			error: 'Table name cannot include backticks or forward slashes.',
 		})
-		.max(30, {
-			error: 'Table name cannot be longer than 30 characters.',
+		.max(250, {
+			error: 'Table name cannot be longer than 250 characters.',
 		}),
 	primaryKey: z
 		.string()
-		.regex(/^[a-zA-Z0-9_]*$/, {
-			error: 'Primary key can only contain letters, numbers, and underscores.',
+		.regex(schemaRegex, {
+			error: 'Primary key cannot include backticks or forward slashes.',
 		})
-		.max(14, {
-			error: 'Primary key cannot be longer than 14 characters.',
+		.max(250, {
+			error: 'Primary key cannot be longer than 250 characters.',
 		}),
 });
 

src/features/instance/operations/schemas/addUserFormSchema.ts

@@ -4,6 +4,8 @@ export const AddUserFormSchema = z
 	.object({
 		username: z
 			.string()
+			.trim()
+			.toLowerCase()
 			.nonempty({ error: 'Please enter a username.' }),
 		role: z
 			.string()
@@ -12,8 +14,7 @@ export const AddUserFormSchema = z
 			}),
 		password: z
 			.string()
-			.min(8, { error: 'Password must be at least 8 characters long.' })
-			.max(50, { error: 'Password cannot be longer than 50 characters.' }),
+			.min(8, { error: 'Password must be at least 8 characters long.' }),
 		confirmPassword: z.string(),
 	})
 	.refine((data) => data.password === data.confirmPassword, {

src/features/organizations/hooks/useCreateNewOrganization.ts

@@ -2,7 +2,7 @@ import { apiClient } from '@/config/apiClient';
 import { useMutation } from '@tanstack/react-query';
 import { SchemaOrganization } from '@/lib/api.gen';
 
-export async function onNewOrganizationSubmit(newOrg: Omit<SchemaOrganization, 'id' | 'type'>): Promise<SchemaOrganization> {
+async function onNewOrganizationSubmit(newOrg: Omit<SchemaOrganization, 'id' | 'type'>): Promise<SchemaOrganization> {
 	const { data } = await apiClient.post('/Organization/', {
 		...newOrg,
 	});

src/features/organizations/modals/newOrganizationSchema.ts

@@ -11,8 +11,8 @@ export const NewOrganizationSchema = z.object({
 		}),
 	subdomain: z
 		.string()
-		.max(10, {
-			error: 'The subdomain cannot be longer than 10 characters.',
+		.max(62, {
+			error: 'The subdomain cannot be longer than 62 characters.',
 		})
 		.regex(/^[a-zA-Z0-9-]*$/, {
 			error: 'Please only use letters, digits and dashes (-) in the subdomain.',