improve edit shortener form schema ios and android link validation

1 year ago · 40ad9ab077
parent 0330ed0a52
commit 40ad9ab077
2 changed files with 12 additions and 10 deletions
--- a/frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts
+++ b/frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts
@ -5,14 +5,15 @@ export const formSchema = z.object({
 	project: z.string().optional(),
 	active: z.boolean(),
 	ios: z.boolean(),
-	ios_link: z.string().url().optional().nullable().or(z.literal('')),
+	ios_link: z
+		.union([z.literal(''), z.string().url()])
+		.optional()
+		.nullable(),
 	android: z.boolean(),
 	android_link: z
-		.string()
-		.url()
+		.union([z.literal(''), z.string().url()])
 		.optional()
-		.nullable()
-		.or(z.literal('')),
+		.nullable(),
 	custom_code_enable: z.boolean(),
 	custom_code: z.string(),
 })
--- a/frontend/src/routes/(app)/dashboard/projects/[id]/links/[linkid]/edit/schema.ts
+++ b/frontend/src/routes/(app)/dashboard/projects/[id]/links/[linkid]/edit/schema.ts
@ -5,14 +5,15 @@ export const formSchema = z.object({
 	project: z.string().optional(),
 	active: z.boolean(),
 	ios: z.boolean(),
-	ios_link: z.string().url().optional().nullable().or(z.literal('')),
+	ios_link: z
+		.union([z.literal(''), z.string().url()])
+		.optional()
+		.nullable(),
 	android: z.boolean(),
 	android_link: z
-		.string()
-		.url()
+		.union([z.literal(''), z.string().url()])
 		.optional()
-		.nullable()
-		.or(z.literal('')),
+		.nullable(),
 	custom_code_enable: z.boolean(),
 	custom_code: z.string(),
 })