diff --git a/ui/src/components/access/forms/AccessConfigFieldsProviderEmail.tsx b/ui/src/components/access/forms/AccessConfigFieldsProviderEmail.tsx index 2a800759..a5febcc9 100644 --- a/ui/src/components/access/forms/AccessConfigFieldsProviderEmail.tsx +++ b/ui/src/components/access/forms/AccessConfigFieldsProviderEmail.tsx @@ -4,7 +4,7 @@ import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; import Show from "@/components/Show"; -import { isDomain, isEmail, isIPv4, isIPv6, isPortNumber } from "@/utils/validator"; +import { isEmail, isHostname, isPortNumber } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; @@ -127,7 +127,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n: ReturnType }) = const { t } = i18n; return z.object({ - smtpHost: z.string().refine((v) => isDomain(v) || isIPv4(v) || isIPv6(v), t("common.errmsg.host_invalid")), + smtpHost: z.string().refine((v) => isHostname(v), t("common.errmsg.host_invalid")), smtpPort: z.coerce.number().refine((v) => isPortNumber(v), t("common.errmsg.port_invalid")), smtpTls: z.boolean().nullish(), username: z.string().nonempty(t("access.form.email_username.placeholder")), diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx index fef081f3..c17d5344 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunCLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunCLB.tsx index 9b36ef4d..d4ff6ad5 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunCLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunCLB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx index 313f7dad..45cf0590 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx @@ -97,7 +97,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!); + if (!v) return true; + return isDomain(v); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunWAF.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunWAF.tsx index 9f80e8f0..b6b864b0 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunWAF.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunWAF.tsx @@ -150,7 +150,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudAppBLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudAppBLB.tsx index 8436db06..69a8b56f 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudAppBLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudAppBLB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx index 5ffe68a9..b500801b 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderJDCloudALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderJDCloudALB.tsx index 34319ee8..16f7c241 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderJDCloudALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderJDCloudALB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx index a726c4b3..ff01ceff 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx @@ -111,7 +111,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v); + if (!v) return true; + return isDomain(v); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx index 784e983b..20e85964 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx @@ -110,7 +110,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .nullish() .refine((v) => { - return !v || isDomain(v!, { allowWildcard: true }); + if (!v) return true; + return isDomain(v, { allowWildcard: true }); }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => {