From 40ad9ab077d43efec4a186b618347968cea66fc5 Mon Sep 17 00:00:00 2001 From: TZGyn Date: Thu, 15 Aug 2024 21:40:05 +0800 Subject: [PATCH] improve edit shortener form schema ios and android link validation --- .../routes/(app)/dashboard/links/[id]/edit/schema.ts | 11 ++++++----- .../projects/[id]/links/[linkid]/edit/schema.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts b/frontend/src/routes/(app)/dashboard/links/[id]/edit/schema.ts index fe26f16..88634ef 100644 --- 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(), }) diff --git 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 index fe26f16..88634ef 100644 --- 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(), })