-
+
+
+
+
-
-
- {form}
+ {childComponent}
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessGroupEdit.tsx b/ui/src/components/certimate/AccessGroupEdit.tsx
index 8f809fd3..68d881a3 100644
--- a/ui/src/components/certimate/AccessGroupEdit.tsx
+++ b/ui/src/components/certimate/AccessGroupEdit.tsx
@@ -12,7 +12,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
import { update } from "@/repository/access_group";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessGroupEditProps = {
className?: string;
@@ -20,7 +20,7 @@ type AccessGroupEditProps = {
};
const AccessGroupEdit = ({ className, trigger }: AccessGroupEditProps) => {
- const { reloadAccessGroups } = useConfig();
+ const { reloadAccessGroups } = useConfigContext();
const [open, setOpen] = useState(false);
const { t } = useTranslation();
diff --git a/ui/src/components/certimate/AccessGroupList.tsx b/ui/src/components/certimate/AccessGroupList.tsx
index a5b97998..e07344ca 100644
--- a/ui/src/components/certimate/AccessGroupList.tsx
+++ b/ui/src/components/certimate/AccessGroupList.tsx
@@ -19,16 +19,16 @@ import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle }
import { ScrollArea } from "@/components/ui/scroll-area";
import { useToast } from "@/components/ui/use-toast";
import AccessGroupEdit from "./AccessGroupEdit";
-import { getProviderInfo } from "@/domain/access";
+import { accessProvidersMap } from "@/domain/access";
import { getErrMessage } from "@/lib/error";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
import { remove } from "@/repository/access_group";
const AccessGroupList = () => {
const {
config: { accessGroups },
reloadAccessGroups,
- } = useConfig();
+ } = useConfigContext();
const { toast } = useToast();
@@ -86,11 +86,11 @@ const AccessGroupList = () => {
- ![1]})
+ !.icon})
{access.name}
- {getProviderInfo(access.configType)![0]}
+ {accessProvidersMap.get(access.configType)!.name}
-
-
-
+
+
+
+
+
);
};
export default AccessHttpreqForm;
-
diff --git a/ui/src/components/certimate/AccessHuaweicloudForm.tsx b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
index 41e4b165..af07611a 100644
--- a/ui/src/components/certimate/AccessHuaweicloudForm.tsx
+++ b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
@@ -8,9 +8,9 @@ import { Input } from "@/components/ui/input";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Button } from "@/components/ui/button";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, HuaweiCloudConfig, getUsageByConfigType } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type HuaweiCloudConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessHuaweiCloudFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessHuaweiCloudFormProps = {
};
const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
region: z
.string()
.min(1, "access.authorization.form.region.placeholder")
@@ -66,7 +66,7 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
region: data.region,
accessKeyId: data.accessKeyId,
@@ -104,113 +104,111 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
return (
<>
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessKubernetesForm.tsx b/ui/src/components/certimate/AccessKubernetesForm.tsx
index a088cb99..bb84c89c 100644
--- a/ui/src/components/certimate/AccessKubernetesForm.tsx
+++ b/ui/src/components/certimate/AccessKubernetesForm.tsx
@@ -5,14 +5,14 @@ import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
import { ClientResponseError } from "pocketbase";
-import { Access, accessFormType, getUsageByConfigType, KubernetesConfig } from "@/domain/access";
import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { readFileContent } from "@/lib/file";
import { PbErrorData } from "@/domain/base";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type KubernetesConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessKubernetesFormProps = {
op: "add" | "edit" | "copy";
@@ -21,7 +21,7 @@ type AccessKubernetesFormProps = {
};
const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const fileInputRef = useRef
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessLocalForm.tsx b/ui/src/components/certimate/AccessLocalForm.tsx
index f80512f6..23184b66 100644
--- a/ui/src/components/certimate/AccessLocalForm.tsx
+++ b/ui/src/components/certimate/AccessLocalForm.tsx
@@ -8,9 +8,9 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { Input } from "@/components/ui/input";
import { Button } from "@/components/ui/button";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, getUsageByConfigType } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessLocalFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessLocalFormProps = {
};
const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
- const { addAccess, updateAccess, reloadAccessGroups } = useConfig();
+ const { addAccess, updateAccess, reloadAccessGroups } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
@@ -28,7 +28,7 @@ const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
});
const form = useForm
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessNamesiloForm.tsx b/ui/src/components/certimate/AccessNamesiloForm.tsx
index 0a1bb4ee..ee8df30f 100644
--- a/ui/src/components/certimate/AccessNamesiloForm.tsx
+++ b/ui/src/components/certimate/AccessNamesiloForm.tsx
@@ -8,9 +8,9 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, getUsageByConfigType, NamesiloConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type NamesiloConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessNamesiloFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessNamesiloFormProps = {
};
const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
apiKey: z
.string()
.min(1, "access.authorization.form.namesilo_api_key.placeholder")
@@ -54,7 +54,7 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
apiKey: data.apiKey,
},
@@ -88,81 +88,79 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
return (
<>
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessPdnsForm.tsx b/ui/src/components/certimate/AccessPdnsForm.tsx
index a3c0813f..f527fc0c 100644
--- a/ui/src/components/certimate/AccessPdnsForm.tsx
+++ b/ui/src/components/certimate/AccessPdnsForm.tsx
@@ -8,9 +8,9 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
-import { Access, PdnsConfig, accessFormType, getUsageByConfigType } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type PdnsConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessPdnsFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessPdnsFormProps = {
};
const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
apiUrl: z.string().url("common.errmsg.url_invalid"),
apiKey: z
.string()
@@ -57,7 +57,7 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
apiUrl: data.apiUrl,
apiKey: data.apiKey,
@@ -95,101 +95,98 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
return (
<>
-
-
-
-
+
+
+
+
+
);
};
export default AccessPdnsForm;
-
diff --git a/ui/src/components/certimate/AccessQiniuForm.tsx b/ui/src/components/certimate/AccessQiniuForm.tsx
index 7d872027..bf9d93c4 100644
--- a/ui/src/components/certimate/AccessQiniuForm.tsx
+++ b/ui/src/components/certimate/AccessQiniuForm.tsx
@@ -8,9 +8,9 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, getUsageByConfigType, QiniuConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type QiniuConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessQiniuFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessQiniuFormProps = {
};
const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
accessKey: z.string().min(1, "access.authorization.form.access_key.placeholder").max(64),
secretKey: z.string().min(1, "access.authorization.form.secret_key.placeholder").max(64),
});
@@ -54,7 +54,7 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
accessKey: data.accessKey,
secretKey: data.secretKey,
@@ -91,98 +91,96 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
return (
<>
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessSSHForm.tsx b/ui/src/components/certimate/AccessSSHForm.tsx
index 4151d341..440c585c 100644
--- a/ui/src/components/certimate/AccessSSHForm.tsx
+++ b/ui/src/components/certimate/AccessSSHForm.tsx
@@ -6,7 +6,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { Plus } from "lucide-react";
import { ClientResponseError } from "pocketbase";
-import { Access, accessFormType, getUsageByConfigType, SSHConfig } from "@/domain/access";
import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
@@ -15,9 +14,10 @@ import AccessGroupEdit from "./AccessGroupEdit";
import { readFileContent } from "@/lib/file";
import { cn } from "@/lib/utils";
import { PbErrorData } from "@/domain/base";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type SSHConfig } from "@/domain/access";
import { save } from "@/repository/access";
import { updateById } from "@/repository/access_group";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessSSHFormProps = {
op: "add" | "edit" | "copy";
@@ -31,7 +31,7 @@ const AccessSSHForm = ({ data, op, onAfterReq }: AccessSSHFormProps) => {
updateAccess,
reloadAccessGroups,
config: { accessGroups },
- } = useConfig();
+ } = useConfigContext();
const fileInputRef = useRef
-
- }
- />
-
-
- (
-
- {t("access.authorization.form.ssh_host.label")}
-
-
-
-
-
- )}
- />
-
- (
-
- {t("access.authorization.form.ssh_port.label")}
-
-
-
-
-
- )}
- />
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessTencentForm.tsx b/ui/src/components/certimate/AccessTencentForm.tsx
index 0e47fdde..40037d1e 100644
--- a/ui/src/components/certimate/AccessTencentForm.tsx
+++ b/ui/src/components/certimate/AccessTencentForm.tsx
@@ -8,9 +8,9 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, getUsageByConfigType, TencentConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type Access, type TencentConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessTencentFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessTencentFormProps = {
};
const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
secretId: z
.string()
.min(1, "access.authorization.form.secret_id.placeholder")
@@ -60,7 +60,7 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
secretId: data.secretId,
secretKey: data.secretKey,
@@ -95,96 +95,94 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
return (
<>
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/AccessWebhookForm.tsx b/ui/src/components/certimate/AccessWebhookForm.tsx
index 6cde4c59..1b8824d5 100644
--- a/ui/src/components/certimate/AccessWebhookForm.tsx
+++ b/ui/src/components/certimate/AccessWebhookForm.tsx
@@ -8,9 +8,9 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, getUsageByConfigType, WebhookConfig } from "@/domain/access";
+import { Access, accessProvidersMap, accessTypeFormSchema, WebhookConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
type AccessWebhookFormProps = {
op: "add" | "edit" | "copy";
@@ -19,7 +19,7 @@ type AccessWebhookFormProps = {
};
const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) => {
- const { addAccess, updateAccess } = useConfig();
+ const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -27,7 +27,7 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
.string()
.min(1, "access.authorization.form.name.placeholder")
.max(64, t("common.errmsg.string_max", { max: 64 })),
- configType: accessFormType,
+ configType: accessTypeFormSchema,
url: z.string().url("common.errmsg.url_invalid"),
});
@@ -51,7 +51,7 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
id: data.id as string,
name: data.name,
configType: data.configType,
- usage: getUsageByConfigType(data.configType),
+ usage: accessProvidersMap.get(data.configType)!.usage,
config: {
url: data.url,
},
@@ -85,81 +85,79 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
return (
<>
-
-
-
-
+
+
+
+
+
);
};
diff --git a/ui/src/components/certimate/DeployEdit.tsx b/ui/src/components/certimate/DeployEdit.tsx
new file mode 100644
index 00000000..0b22fcd2
--- /dev/null
+++ b/ui/src/components/certimate/DeployEdit.tsx
@@ -0,0 +1,16 @@
+import { createContext, useContext } from "react";
+
+import { DeployConfig } from "@/domain/domain";
+
+type DeployEditContext = {
+ deploy: DeployConfig;
+ error: Record
+
+ );
};
type DeployListProps = {
@@ -128,765 +169,3 @@ const DeployList = ({ deploys, onChange }: DeployListProps) => {
};
export default DeployList;
-
-type DeployItemProps = {
- item: DeployConfig;
- onDelete: () => void;
- onSave: (deploy: DeployConfig) => void;
-};
-
-const DeployItem = ({ item, onDelete, onSave }: DeployItemProps) => {
- const {
- config: { accesses },
- } = useConfig();
- const { t } = useTranslation();
-
- const access = accesses.find((access) => access.id === item.access);
-
- const getTypeIcon = () => {
- if (!access) {
- return "";
- }
-
- const accessType = accessTypeMap.get(access.configType);
-
- if (accessType) {
- return accessType[1];
- }
-
- return "";
- };
-
- const getTypeName = () => {
- if (!access) {
- return "";
- }
-
- const accessType = targetTypeMap.get(item.type);
-
- if (accessType) {
- return t(accessType[0]);
- }
-
- return "";
- };
-
- return (
-
+
+
+ })
+
+
+
+ {getTypeName()}
+ {access?.name}
+
+ {
+ onDelete();
+ }}
+ />
+
+
-
- );
-};
-
-type DeployEditDialogProps = {
- trigger: React.ReactNode;
- deployConfig?: DeployConfig;
- onSave: (deploy: DeployConfig) => void;
-};
-
-const DeployEditDialog = ({ trigger, deployConfig, onSave }: DeployEditDialogProps) => {
- const {
- config: { accesses },
- } = useConfig();
-
- const [deployType, setDeployType] = useState
-
-
-
-
-
-
- {getTypeName()}
- {access?.name}
-
- {
- onDelete();
- }}
- />
-
-
-
-
- );
-};
-
-const DeployToWebhook = () => {
- const { deploy: data, setDeploy } = useDeployEditContext();
-
- const { setError } = useDeployEditContext();
-
- useEffect(() => {
- setError({});
- }, []);
-
- return (
- <>
-
-
- {
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.certPath = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
-
- {
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.keyPath = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-const DeployToCDN = () => {
- const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
-
- const { t } = useTranslation();
-
- useEffect(() => {
- setError({});
- }, []);
-
- useEffect(() => {
- const resp = domainSchema.safeParse(data.config?.domain);
- if (!resp.success) {
- setError({
- ...error,
- domain: JSON.parse(resp.error.message)[0].message,
- });
- } else {
- setError({
- ...error,
- domain: "",
- });
- }
- }, [data]);
-
- const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
- message: t("common.errmsg.domain_invalid"),
- });
-
- return (
-
-
-
- {
- const temp = e.target.value;
-
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.endpoint = temp;
- });
- setDeploy(newData);
- }}
- />
-
- {error?.endpoint}
-
-
- {
- const temp = e.target.value;
-
- const resp = bucketSchema.safeParse(temp);
- if (!resp.success) {
- setError({
- ...error,
- bucket: JSON.parse(resp.error.message)[0].message,
- });
- } else {
- setError({
- ...error,
- bucket: "",
- });
- }
-
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.bucket = temp;
- });
- setDeploy(newData);
- }}
- />
- {error?.bucket}
-
-
- {
- const temp = e.target.value;
-
- const resp = domainSchema.safeParse(temp);
- if (!resp.success) {
- setError({
- ...error,
- domain: JSON.parse(resp.error.message)[0].message,
- });
- } else {
- setError({
- ...error,
- domain: "",
- });
- }
-
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.domain = temp;
- });
- setDeploy(newData);
- }}
- />
- {error?.domain}
-
-
- );
-};
-
-const DeployToKubernetes = () => {
- const { t } = useTranslation();
- const { setError } = useDeployEditContext();
-
- useEffect(() => {
- setError({});
- }, []);
-
- const { deploy: data, setDeploy } = useDeployEditContext();
-
- useEffect(() => {
- if (!data.id) {
- setDeploy({
- ...data,
- config: {
- namespace: "default",
- secretName: "",
- secretDataKeyForCrt: "tls.crt",
- secretDataKeyForKey: "tls.key",
- },
- });
- }
- }, []);
-
- return (
- <>
-
-
- {
- const temp = e.target.value;
-
- const resp = domainSchema.safeParse(temp);
- if (!resp.success) {
- setError({
- ...error,
- domain: JSON.parse(resp.error.message)[0].message,
- });
- } else {
- setError({
- ...error,
- domain: "",
- });
- }
-
- const newData = produce(data, (draft) => {
- if (!draft.config) {
- draft.config = {};
- }
- draft.config.domain = temp;
- });
- setDeploy(newData);
- }}
- />
-
- {error?.domain}
-
-
-
- );
-};
-
diff --git a/ui/src/components/certimate/DeployToAliyunCDN.tsx b/ui/src/components/certimate/DeployToAliyunCDN.tsx
new file mode 100644
index 00000000..d6735473
--- /dev/null
+++ b/ui/src/components/certimate/DeployToAliyunCDN.tsx
@@ -0,0 +1,77 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToAliyunCDN = () => {
+ const { t } = useTranslation();
+
+ const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ useEffect(() => {
+ const resp = domainSchema.safeParse(data.config?.domain);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+ }, [data]);
+
+ const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+ message: t("common.errmsg.domain_invalid"),
+ });
+
+ return (
+
-
- {
- const newData = produce(data, (draft) => {
- draft.config ??= {};
- draft.config.namespace = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
-
- {
- const newData = produce(data, (draft) => {
- draft.config ??= {};
- draft.config.secretName = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
-
- {
- const newData = produce(data, (draft) => {
- draft.config ??= {};
- draft.config.secretDataKeyForCrt = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
-
- {
- const newData = produce(data, (draft) => {
- draft.config ??= {};
- draft.config.secretDataKeyForKey = e.target.value;
- });
- setDeploy(newData);
- }}
- />
-
-
+
+ );
+};
+
+export default DeployToAliyunCDN;
diff --git a/ui/src/components/certimate/DeployToAliyunOSS.tsx b/ui/src/components/certimate/DeployToAliyunOSS.tsx
new file mode 100644
index 00000000..7a79da2c
--- /dev/null
+++ b/ui/src/components/certimate/DeployToAliyunOSS.tsx
@@ -0,0 +1,164 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToAliyunOSS = () => {
+ const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+ const { t } = useTranslation();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ useEffect(() => {
+ const resp = domainSchema.safeParse(data.config?.domain);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+ }, [data]);
+
+ useEffect(() => {
+ const bucketResp = bucketSchema.safeParse(data.config?.domain);
+ if (!bucketResp.success) {
+ setError({
+ ...error,
+ bucket: JSON.parse(bucketResp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ bucket: "",
+ });
+ }
+ }, []);
+
+ useEffect(() => {
+ if (!data.id) {
+ setDeploy({
+ ...data,
+ config: {
+ endpoint: "oss-cn-hangzhou.aliyuncs.com",
+ bucket: "",
+ domain: "",
+ },
+ });
+ }
+ }, []);
+
+ const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+ message: t("common.errmsg.domain_invalid"),
+ });
+
+ const bucketSchema = z.string().min(1, {
+ message: t("domain.deployment.form.oss_bucket.placeholder"),
+ });
+
+ return (
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = domainSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.domain = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+ {error?.domain}
+
+
+ );
+};
+
+export default DeployToAliyunOSS;
diff --git a/ui/src/components/certimate/DeployToHuaweiCloudCDN.tsx b/ui/src/components/certimate/DeployToHuaweiCloudCDN.tsx
new file mode 100644
index 00000000..4e61c652
--- /dev/null
+++ b/ui/src/components/certimate/DeployToHuaweiCloudCDN.tsx
@@ -0,0 +1,77 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToHuaweiCloudCDN = () => {
+ const { t } = useTranslation();
+
+ const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ useEffect(() => {
+ const resp = domainSchema.safeParse(data.config?.domain);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+ }, [data]);
+
+ const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+ message: t("common.errmsg.domain_invalid"),
+ });
+
+ return (
+
+
+ {
+ const temp = e.target.value;
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.endpoint = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+ {error?.endpoint}
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = bucketSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ bucket: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ bucket: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.bucket = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+ {error?.bucket}
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = domainSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.domain = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+ {error?.domain}
+
+
+ );
+};
+
+export default DeployToHuaweiCloudCDN;
diff --git a/ui/src/components/certimate/DeployToKubernetesSecret.tsx b/ui/src/components/certimate/DeployToKubernetesSecret.tsx
new file mode 100644
index 00000000..c5129324
--- /dev/null
+++ b/ui/src/components/certimate/DeployToKubernetesSecret.tsx
@@ -0,0 +1,104 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToKubernetesSecret = () => {
+ const { t } = useTranslation();
+ const { setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ const { deploy: data, setDeploy } = useDeployEditContext();
+
+ useEffect(() => {
+ if (!data.id) {
+ setDeploy({
+ ...data,
+ config: {
+ namespace: "default",
+ secretName: "",
+ secretDataKeyForCrt: "tls.crt",
+ secretDataKeyForKey: "tls.key",
+ },
+ });
+ }
+ }, []);
+
+ return (
+ <>
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = domainSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.domain = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+ {error?.domain}
+
+
+
+ );
+};
+
+export default DeployToKubernetesSecret;
diff --git a/ui/src/components/certimate/DeployToQiniuCDN.tsx b/ui/src/components/certimate/DeployToQiniuCDN.tsx
new file mode 100644
index 00000000..327edce8
--- /dev/null
+++ b/ui/src/components/certimate/DeployToQiniuCDN.tsx
@@ -0,0 +1,77 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToQiniuCDN = () => {
+ const { t } = useTranslation();
+
+ const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ useEffect(() => {
+ const resp = domainSchema.safeParse(data.config?.domain);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+ }, [data]);
+
+ const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+ message: t("common.errmsg.domain_invalid"),
+ });
+
+ return (
+
+
+ {
+ const newData = produce(data, (draft) => {
+ draft.config ??= {};
+ draft.config.namespace = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+
+ {
+ const newData = produce(data, (draft) => {
+ draft.config ??= {};
+ draft.config.secretName = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+
+ {
+ const newData = produce(data, (draft) => {
+ draft.config ??= {};
+ draft.config.secretDataKeyForCrt = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+
+ {
+ const newData = produce(data, (draft) => {
+ draft.config ??= {};
+ draft.config.secretDataKeyForKey = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+ );
+};
+
+export default DeployToQiniuCDN;
diff --git a/ui/src/components/certimate/DeployToSSH.tsx b/ui/src/components/certimate/DeployToSSH.tsx
new file mode 100644
index 00000000..80eb15fb
--- /dev/null
+++ b/ui/src/components/certimate/DeployToSSH.tsx
@@ -0,0 +1,113 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToSSH = () => {
+ const { t } = useTranslation();
+ const { setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ const { deploy: data, setDeploy } = useDeployEditContext();
+
+ useEffect(() => {
+ if (!data.id) {
+ setDeploy({
+ ...data,
+ config: {
+ certPath: "/etc/nginx/ssl/nginx.crt",
+ keyPath: "/etc/nginx/ssl/nginx.key",
+ preCommand: "",
+ command: "sudo service nginx reload",
+ },
+ });
+ }
+ }, []);
+
+ return (
+ <>
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = domainSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.domain = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+ {error?.domain}
+
+
+
+ );
+};
+
+export default DeployToSSH;
diff --git a/ui/src/components/certimate/DeployToTencentCDN.tsx b/ui/src/components/certimate/DeployToTencentCDN.tsx
new file mode 100644
index 00000000..dd13b3b2
--- /dev/null
+++ b/ui/src/components/certimate/DeployToTencentCDN.tsx
@@ -0,0 +1,77 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToTencentCDN = () => {
+ const { t } = useTranslation();
+
+ const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ useEffect(() => {
+ const resp = domainSchema.safeParse(data.config?.domain);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+ }, [data]);
+
+ const domainSchema = z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+ message: t("common.errmsg.domain_invalid"),
+ });
+
+ return (
+
+
+ {
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.certPath = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+
+ {
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.keyPath = e.target.value;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default DeployToTencentCDN;
diff --git a/ui/src/components/certimate/DeployToWebhook.tsx b/ui/src/components/certimate/DeployToWebhook.tsx
new file mode 100644
index 00000000..3134983a
--- /dev/null
+++ b/ui/src/components/certimate/DeployToWebhook.tsx
@@ -0,0 +1,35 @@
+import { useEffect } from "react";
+import { produce } from "immer";
+
+import { useDeployEditContext } from "./DeployEdit";
+import KVList from "./KVList";
+import { type KVType } from "@/domain/domain";
+
+const DeployToWebhook = () => {
+ const { deploy: data, setDeploy } = useDeployEditContext();
+
+ const { setError } = useDeployEditContext();
+
+ useEffect(() => {
+ setError({});
+ }, []);
+
+ return (
+ <>
+
+
+ {
+ const temp = e.target.value;
+
+ const resp = domainSchema.safeParse(temp);
+ if (!resp.success) {
+ setError({
+ ...error,
+ domain: JSON.parse(resp.error.message)[0].message,
+ });
+ } else {
+ setError({
+ ...error,
+ domain: "",
+ });
+ }
+
+ const newData = produce(data, (draft) => {
+ if (!draft.config) {
+ draft.config = {};
+ }
+ draft.config.domain = temp;
+ });
+ setDeploy(newData);
+ }}
+ />
+
+ {error?.domain}
+ {t("domain.deployment.form.variables.empty")}
-
-
+
+ 0}>
- {
- addVal(val);
- }}
- valueType={valueType}
- value={""}
- trigger={
-
{t(titles[valueType])}
+ {t(titles[valueType])}
-
- 0}>
+ {
+ addVal(val);
+ }}
+ valueType={valueType}
+ value={""}
+ trigger={
+
+
+
+ 0}
+ fallback={
+
-
-
- 0}
- fallback={
- (false);
@@ -241,4 +241,3 @@ const DingTalk = () => {
};
export default DingTalk;
-
diff --git a/ui/src/components/notify/Lark.tsx b/ui/src/components/notify/Lark.tsx
index eb6aa8f1..f8bf7534 100644
--- a/ui/src/components/notify/Lark.tsx
+++ b/ui/src/components/notify/Lark.tsx
@@ -2,7 +2,7 @@ import { Input } from "@/components/ui/input";
import { Button } from "@/components/ui/button";
import { Switch } from "@/components/ui/switch";
import { Label } from "@/components/ui/label";
-import { useNotify } from "@/providers/notify";
+import { useNotifyContext } from "@/providers/notify";
import { NotifyChannelLark, NotifyChannels } from "@/domain/settings";
import { useEffect, useState } from "react";
import { update } from "@/repository/settings";
@@ -19,7 +19,7 @@ type LarkSetting = {
};
const Lark = () => {
- const { config, setChannels } = useNotify();
+ const { config, setChannels } = useNotifyContext();
const { t } = useTranslation();
const [changed, setChanged] = useState(false);
@@ -222,4 +222,3 @@ const Lark = () => {
};
export default Lark;
-
diff --git a/ui/src/components/notify/Telegram.tsx b/ui/src/components/notify/Telegram.tsx
index 7f30e03b..419126fc 100644
--- a/ui/src/components/notify/Telegram.tsx
+++ b/ui/src/components/notify/Telegram.tsx
@@ -9,7 +9,7 @@ import { useToast } from "@/components/ui/use-toast";
import { getErrMessage } from "@/lib/error";
import { NotifyChannels, NotifyChannelTelegram } from "@/domain/settings";
import { update } from "@/repository/settings";
-import { useNotify } from "@/providers/notify";
+import { useNotifyContext } from "@/providers/notify";
import { notifyTest } from "@/api/notify";
import Show from "@/components/Show";
@@ -20,7 +20,7 @@ type TelegramSetting = {
};
const Telegram = () => {
- const { config, setChannels } = useNotify();
+ const { config, setChannels } = useNotifyContext();
const { t } = useTranslation();
const [changed, setChanged] = useState(false);
@@ -244,4 +244,3 @@ const Telegram = () => {
};
export default Telegram;
-
diff --git a/ui/src/components/notify/Webhook.tsx b/ui/src/components/notify/Webhook.tsx
index 09409ded..b614b50c 100644
--- a/ui/src/components/notify/Webhook.tsx
+++ b/ui/src/components/notify/Webhook.tsx
@@ -10,7 +10,7 @@ import { getErrMessage } from "@/lib/error";
import { isValidURL } from "@/lib/url";
import { NotifyChannels, NotifyChannelWebhook } from "@/domain/settings";
import { update } from "@/repository/settings";
-import { useNotify } from "@/providers/notify";
+import { useNotifyContext } from "@/providers/notify";
import { notifyTest } from "@/api/notify";
import Show from "@/components/Show";
@@ -21,7 +21,7 @@ type WebhookSetting = {
};
const Webhook = () => {
- const { config, setChannels } = useNotify();
+ const { config, setChannels } = useNotifyContext();
const { t } = useTranslation();
const [changed, setChanged] = useState(false);
@@ -234,4 +234,3 @@ const Webhook = () => {
};
export default Webhook;
-
diff --git a/ui/src/domain/access.ts b/ui/src/domain/access.ts
index 988374b8..bc7733bc 100644
--- a/ui/src/domain/access.ts
+++ b/ui/src/domain/access.ts
@@ -1,27 +1,34 @@
import { z } from "zod";
-export const accessTypeMap: Map = new Map([
- ["aliyun", ["common.provider.aliyun", "/imgs/providers/aliyun.svg"]],
- ["tencent", ["common.provider.tencent", "/imgs/providers/tencent.svg"]],
- ["huaweicloud", ["common.provider.huaweicloud", "/imgs/providers/huaweicloud.svg"]],
- ["qiniu", ["common.provider.qiniu", "/imgs/providers/qiniu.svg"]],
- ["aws", ["common.provider.aws", "/imgs/providers/aws.svg"]],
- ["cloudflare", ["common.provider.cloudflare", "/imgs/providers/cloudflare.svg"]],
- ["namesilo", ["common.provider.namesilo", "/imgs/providers/namesilo.svg"]],
- ["godaddy", ["common.provider.godaddy", "/imgs/providers/godaddy.svg"]],
- ["pdns", ["common.provider.pdns", "/imgs/providers/pdns.svg"]],
- ["httpreq", ["common.provider.httpreq", "/imgs/providers/httpreq.svg"]],
- ["local", ["common.provider.local", "/imgs/providers/local.svg"]],
- ["ssh", ["common.provider.ssh", "/imgs/providers/ssh.svg"]],
- ["webhook", ["common.provider.webhook", "/imgs/providers/webhook.svg"]],
- ["k8s", ["common.provider.kubernetes", "/imgs/providers/k8s.svg"]],
-]);
+type AccessUsages = "apply" | "deploy" | "all";
-export const getProviderInfo = (t: string) => {
- return accessTypeMap.get(t);
+type AccessProvider = {
+ type: string;
+ name: string;
+ icon: string;
+ usage: AccessUsages;
};
-export const accessFormType = z.union(
+export const accessProvidersMap: Map = new Map(
+ [
+ ["aliyun", "common.provider.aliyun", "/imgs/providers/aliyun.svg", "all"],
+ ["tencent", "common.provider.tencent", "/imgs/providers/tencent.svg", "all"],
+ ["huaweicloud", "common.provider.huaweicloud", "/imgs/providers/huaweicloud.svg", "all"],
+ ["qiniu", "common.provider.qiniu", "/imgs/providers/qiniu.svg", "deploy"],
+ ["aws", "common.provider.aws", "/imgs/providers/aws.svg", "apply"],
+ ["cloudflare", "common.provider.cloudflare", "/imgs/providers/cloudflare.svg", "apply"],
+ ["namesilo", "common.provider.namesilo", "/imgs/providers/namesilo.svg", "apply"],
+ ["godaddy", "common.provider.godaddy", "/imgs/providers/godaddy.svg", "apply"],
+ ["pdns", "common.provider.pdns", "/imgs/providers/pdns.svg", "apply"],
+ ["httpreq", "common.provider.httpreq", "/imgs/providers/httpreq.svg", "apply"],
+ ["local", "common.provider.local", "/imgs/providers/local.svg", "deploy"],
+ ["ssh", "common.provider.ssh", "/imgs/providers/ssh.svg", "deploy"],
+ ["webhook", "common.provider.webhook", "/imgs/providers/webhook.svg", "deploy"],
+ ["k8s", "common.provider.kubernetes", "/imgs/providers/k8s.svg", "deploy"],
+ ].map(([type, name, icon, usage]) => [type, { type, name, icon, usage: usage as AccessUsages }])
+);
+
+export const accessTypeFormSchema = z.union(
[
z.literal("aliyun"),
z.literal("tencent"),
@@ -41,13 +48,11 @@ export const accessFormType = z.union(
{ message: "access.authorization.form.type.placeholder" }
);
-type AccessUsage = "apply" | "deploy" | "all";
-
export type Access = {
id: string;
name: string;
configType: string;
- usage: AccessUsage;
+ usage: AccessUsages;
group?: string;
config:
| AliyunConfig
@@ -141,30 +146,3 @@ export type WebhookConfig = {
export type KubernetesConfig = {
kubeConfig: string;
};
-
-export const getUsageByConfigType = (configType: string): AccessUsage => {
- switch (configType) {
- case "aliyun":
- case "tencent":
- case "huaweicloud":
- return "all";
-
- case "qiniu":
- case "local":
- case "ssh":
- case "webhook":
- case "k8s":
- return "deploy";
-
- case "aws":
- case "cloudflare":
- case "namesilo":
- case "godaddy":
- case "pdns":
- case "httpreq":
- return "apply";
-
- default:
- return "all";
- }
-};
diff --git a/ui/src/domain/domain.ts b/ui/src/domain/domain.ts
index 6d31ee63..234abe2c 100644
--- a/ui/src/domain/domain.ts
+++ b/ui/src/domain/domain.ts
@@ -63,21 +63,23 @@ export type Statistic = {
disabled: number;
};
-export const getLastDeployment = (domain: Domain): Deployment | undefined => {
- return domain.expand?.lastDeployment;
+type DeployTarget = {
+ type: string;
+ name: string;
+ icon: string;
};
-export const targetTypeMap: Map = new Map([
- ["aliyun-oss", ["common.provider.aliyun.oss", "/imgs/providers/aliyun.svg"]],
- ["aliyun-cdn", ["common.provider.aliyun.cdn", "/imgs/providers/aliyun.svg"]],
- ["aliyun-dcdn", ["common.provider.aliyun.dcdn", "/imgs/providers/aliyun.svg"]],
- ["tencent-cdn", ["common.provider.tencent.cdn", "/imgs/providers/tencent.svg"]],
- ["huaweicloud-cdn", ["common.provider.huaweicloud.cdn", "/imgs/providers/huaweicloud.svg"]],
- ["qiniu-cdn", ["common.provider.qiniu.cdn", "/imgs/providers/qiniu.svg"]],
- ["local", ["common.provider.local", "/imgs/providers/local.svg"]],
- ["ssh", ["common.provider.ssh", "/imgs/providers/ssh.svg"]],
- ["webhook", ["common.provider.webhook", "/imgs/providers/webhook.svg"]],
- ["k8s-secret", ["common.provider.kubernetes.secret", "/imgs/providers/k8s.svg"]],
-]);
-
-export const targetTypeKeys = Array.from(targetTypeMap.keys());
+export const deployTargetsMap: Map = new Map(
+ [
+ ["aliyun-oss", "common.provider.aliyun.oss", "/imgs/providers/aliyun.svg"],
+ ["aliyun-cdn", "common.provider.aliyun.cdn", "/imgs/providers/aliyun.svg"],
+ ["aliyun-dcdn", "common.provider.aliyun.dcdn", "/imgs/providers/aliyun.svg"],
+ ["tencent-cdn", "common.provider.tencent.cdn", "/imgs/providers/tencent.svg"],
+ ["huaweicloud-cdn", "common.provider.huaweicloud.cdn", "/imgs/providers/huaweicloud.svg"],
+ ["qiniu-cdn", "common.provider.qiniu.cdn", "/imgs/providers/qiniu.svg"],
+ ["local", "common.provider.local", "/imgs/providers/local.svg"],
+ ["ssh", "common.provider.ssh", "/imgs/providers/ssh.svg"],
+ ["webhook", "common.provider.webhook", "/imgs/providers/webhook.svg"],
+ ["k8s-secret", "common.provider.kubernetes.secret", "/imgs/providers/k8s.svg"],
+ ].map(([type, name, icon]) => [type, { type, name, icon }])
+);
diff --git a/ui/src/i18n/locales/en/nls.access.json b/ui/src/i18n/locales/en/nls.access.json
index 15ae27ca..100b6fbe 100644
--- a/ui/src/i18n/locales/en/nls.access.json
+++ b/ui/src/i18n/locales/en/nls.access.json
@@ -38,6 +38,8 @@
"access.authorization.form.godaddy_api_key.placeholder": "Please enter GO_DADDY_API_KEY",
"access.authorization.form.godaddy_api_secret.label": "GO_DADDY_API_SECRET",
"access.authorization.form.godaddy_api_secret.placeholder": "Please enter GO_DADDY_API_SECRET",
+ "access.authorization.form.namesilo_api_key.label": "NAMESILO_API_KEY",
+ "access.authorization.form.namesilo_api_key.placeholder": "Please enter NAMESILO_API_KEY",
"access.authorization.form.pdns_api_url.label": "PDNS_API_URL",
"access.authorization.form.pdns_api_url.placeholder": "Please enter PDNS_API_URL",
"access.authorization.form.pdns_api_key.label": "PDNS_API_KEY",
@@ -46,8 +48,6 @@
"access.authorization.form.httpreq_endpoint.placeholder": "Please enter HTTPREQ_ENDPOINT",
"access.authorization.form.httpreq_mode.label": "HTTPREQ_MODE",
"access.authorization.form.httpreq_mode.placeholder": "Please enter HTTPREQ_MODE(RAW or '')",
- "access.authorization.form.namesilo_api_key.label": "NAMESILO_API_KEY",
- "access.authorization.form.namesilo_api_key.placeholder": "Please enter NAMESILO_API_KEY",
"access.authorization.form.username.label": "Username",
"access.authorization.form.username.placeholder": "Please enter username",
"access.authorization.form.password.label": "Password",
diff --git a/ui/src/i18n/locales/en/nls.domain.json b/ui/src/i18n/locales/en/nls.domain.json
index 74e5ee57..36552760 100644
--- a/ui/src/i18n/locales/en/nls.domain.json
+++ b/ui/src/i18n/locales/en/nls.domain.json
@@ -37,7 +37,7 @@
"domain.application.form.access.placeholder": "Please select DNS provider authorization configuration",
"domain.application.form.access.list": "Provider Authorization Configurations",
"domain.application.form.advanced_settings.label": "Advanced Settings",
- "domain.application.form.key_algorithm.label": "Certificate Key Algorithm",
+ "domain.application.form.key_algorithm.label": "Certificate Key Algorithm (Default: RSA2048)",
"domain.application.form.key_algorithm.placeholder": "Please select certificate key algorithm",
"domain.application.form.timeout.label": "DNS Propagation Timeout (Seconds)",
"domain.application.form.timeoue.placeholder": "Please enter maximum waiting time for DNS propagation",
diff --git a/ui/src/i18n/locales/zh/nls.access.json b/ui/src/i18n/locales/zh/nls.access.json
index 70e2074f..41f761a2 100644
--- a/ui/src/i18n/locales/zh/nls.access.json
+++ b/ui/src/i18n/locales/zh/nls.access.json
@@ -39,6 +39,7 @@
"access.authorization.form.godaddy_api_secret.label": "GO_DADDY_API_SECRET",
"access.authorization.form.godaddy_api_secret.placeholder": "请输入 GO_DADDY_API_SECRET",
"access.authorization.form.namesilo_api_key.label": "NAMESILO_API_KEY",
+ "access.authorization.form.namesilo_api_key.placeholder": "请输入 NAMESILO_API_KEY",
"access.authorization.form.pdns_api_url.label": "PDNS_API_URL",
"access.authorization.form.pdns_api_url.placeholder": "请输入 PDNS_API_URL",
"access.authorization.form.pdns_api_key.label": "PDNS_API_KEY",
@@ -47,7 +48,6 @@
"access.authorization.form.httpreq_endpoint.placeholder": "请输入 请求端点",
"access.authorization.form.httpreq_mode.label": "模式",
"access.authorization.form.httpreq_mode.placeholder": "请输入模式( RAW or '')",
- "access.authorization.form.namesilo_api_key.placeholder": "请输入 NAMESILO_API_KEY",
"access.authorization.form.username.label": "用户名",
"access.authorization.form.username.placeholder": "请输入用户名",
"access.authorization.form.password.label": "密码",
diff --git a/ui/src/i18n/locales/zh/nls.domain.json b/ui/src/i18n/locales/zh/nls.domain.json
index 62767c5d..e2d87fc6 100644
--- a/ui/src/i18n/locales/zh/nls.domain.json
+++ b/ui/src/i18n/locales/zh/nls.domain.json
@@ -35,9 +35,9 @@
"domain.application.form.email.list": "邮箱列表",
"domain.application.form.access.label": "DNS 服务商授权配置",
"domain.application.form.access.placeholder": "请选择 DNS 服务商授权配置",
- "domain.application.form.access.list": "已有的 DNS 服务商授权配置",
+ "domain.application.form.access.list": "DNS 服务商授权配置列表",
"domain.application.form.advanced_settings.label": "高级设置",
- "domain.application.form.key_algorithm.label": "数字证书算法",
+ "domain.application.form.key_algorithm.label": "数字证书算法（默认：RSA2048）",
"domain.application.form.key_algorithm.placeholder": "请选择数字证书算法",
"domain.application.form.timeout.label": "DNS 传播检查超时时间（单位：秒）",
"domain.application.form.timeoue.placeholder": "请输入 DNS 传播检查超时时间",
@@ -50,10 +50,10 @@
"domain.deployment.nodata": "暂无部署配置，请添加后开始部署证书吧",
"domain.deployment.form.type.label": "部署方式",
"domain.deployment.form.type.placeholder": "请选择部署方式",
- "domain.deployment.form.type.list": "支持的部署方式",
+ "domain.deployment.form.type.list": "部署方式列表",
"domain.deployment.form.access.label": "授权配置",
"domain.deployment.form.access.placeholder": "请选择授权配置",
- "domain.deployment.form.access.list": "已有的服务商授权配置",
+ "domain.deployment.form.access.list": "服务商授权配置列表",
"domain.deployment.form.domain.label": "部署到域名（仅支持单个域名；不支持泛域名）",
"domain.deployment.form.domain.placeholder": "请输入部署到的域名",
"domain.deployment.form.ssh_key_path.label": "私钥保存路径",
diff --git a/ui/src/pages/access/Access.tsx b/ui/src/pages/access/Access.tsx
index e596f876..6fb3cd66 100644
--- a/ui/src/pages/access/Access.tsx
+++ b/ui/src/pages/access/Access.tsx
@@ -16,18 +16,18 @@ import {
import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import AccessEdit from "@/components/certimate/AccessEdit";
+import AccessEditDialog from "@/components/certimate/AccessEditDialog";
import AccessGroupEdit from "@/components/certimate/AccessGroupEdit";
import AccessGroupList from "@/components/certimate/AccessGroupList";
import XPagination from "@/components/certimate/XPagination";
import { convertZulu2Beijing } from "@/lib/time";
-import { Access as AccessType, accessTypeMap } from "@/domain/access";
+import { Access as AccessType, accessProvidersMap } from "@/domain/access";
import { remove } from "@/repository/access";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
const Access = () => {
const { t } = useTranslation();
- const { config, deleteAccess } = useConfig();
+ const { config, deleteAccess } = useConfigContext();
const { accesses } = config;
const perPage = 10;
@@ -62,7 +62,7 @@ const Access = () => {
{t("access.authorization.add")}} op="add" />
+ {t("access.authorization.add")}} op="add" />
) : (
{t("access.group.add")}} />
)}
@@ -95,7 +95,7 @@ const Access = () => {
{t("access.authorization.add")}} op="add" className="mt-3" />
+ {t("access.authorization.add")}} op="add" className="mt-3" />
) : (
<>
@@ -119,14 +119,14 @@ const Access = () => {
>
+
+ }
+ />
+ {t("common.add")}
+ {t("common.add")}
+
+
}
- />
- {t("common.text." + valueType + ".empty")}
+
+
-
- }
- >
- {t("common.text." + valueType + ".empty")}
-
-
- {list.map((item, index) => (
-
);
diff --git a/ui/src/components/notify/DingTalk.tsx b/ui/src/components/notify/DingTalk.tsx
index 585642f7..c3841144 100644
--- a/ui/src/components/notify/DingTalk.tsx
+++ b/ui/src/components/notify/DingTalk.tsx
@@ -8,7 +8,7 @@ import { Switch } from "@/components/ui/switch";
import { useToast } from "@/components/ui/use-toast";
import { getErrMessage } from "@/lib/error";
import { NotifyChannelDingTalk, NotifyChannels } from "@/domain/settings";
-import { useNotify } from "@/providers/notify";
+import { useNotifyContext } from "@/providers/notify";
import { update } from "@/repository/settings";
import Show from "@/components/Show";
import { notifyTest } from "@/api/notify";
@@ -20,7 +20,7 @@ type DingTalkSetting = {
};
const DingTalk = () => {
- const { config, setChannels } = useNotify();
+ const { config, setChannels } = useNotifyContext();
const { t } = useTranslation();
const [changed, setChanged] = useState
-
+
+
+
{item}
-
- {
- onRemoveClick(index);
- }}
- />
+ >
+
-
-
+ ))}
+
+ {list.map((item, index) => (
+
- ))}
-
+
- {item}
+
+ {
+ onRemoveClick(index);
+ }}
+ />
+
{t("access.page.title")}
{tab != "access_group" ? (
- {t("access.authorization.nodata")}
- {access.name}
- ?.[1]})
- ?.icon})
+
{t(accessTypeMap.get(access.configType)?.[0] || "")}
+ {t(accessProvidersMap.get(access.configType)?.name || "")}
{access.created && convertZulu2Beijing(access.created)}
{access.updated && convertZulu2Beijing(access.updated)}
-
{t("common.edit")}
@@ -136,7 +136,7 @@ const Access = () => {
data={access}
/>
{t("common.copy")}
diff --git a/ui/src/pages/domains/Edit.tsx b/ui/src/pages/domains/Edit.tsx
index dc1d2bb9..fbd57444 100644
--- a/ui/src/pages/domains/Edit.tsx
+++ b/ui/src/pages/domains/Edit.tsx
@@ -15,24 +15,24 @@ import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Toaster } from "@/components/ui/toaster";
import { useToast } from "@/components/ui/use-toast";
-import AccessEdit from "@/components/certimate/AccessEdit";
+import AccessEditDialog from "@/components/certimate/AccessEditDialog";
import DeployList from "@/components/certimate/DeployList";
import EmailsEdit from "@/components/certimate/EmailsEdit";
import StringList from "@/components/certimate/StringList";
import { cn } from "@/lib/utils";
import { PbErrorData } from "@/domain/base";
-import { accessTypeMap } from "@/domain/access";
+import { accessProvidersMap } from "@/domain/access";
import { EmailsSetting } from "@/domain/settings";
import { DeployConfig, Domain } from "@/domain/domain";
import { save, get } from "@/repository/domains";
-import { useConfig } from "@/providers/config";
+import { useConfigContext } from "@/providers/config";
import { Switch } from "@/components/ui/switch";
import { TooltipFast } from "@/components/ui/tooltip";
const Edit = () => {
const {
config: { accesses, emails },
- } = useConfig();
+ } = useConfigContext();
const [domain, setDomain] = useState({} as Domain);
@@ -301,7 +301,7 @@ const Edit = () => {
diff --git a/ui/src/providers/config/index.tsx b/ui/src/providers/config/index.tsx
index ccc884f1..0b98c129 100644
--- a/ui/src/providers/config/index.tsx
+++ b/ui/src/providers/config/index.tsx
@@ -16,23 +16,23 @@ export type ConfigData = {
export type ConfigContext = {
config: ConfigData;
- deleteAccess: (id: string) => void;
+ setEmails: (email: Setting) => void;
addAccess: (access: Access) => void;
updateAccess: (access: Access) => void;
- setEmails: (email: Setting) => void;
+ deleteAccess: (id: string) => void;
setAccessGroups: (accessGroups: AccessGroup[]) => void;
reloadAccessGroups: () => void;
};
const Context = createContext({} as ConfigContext);
-export const useConfig = () => useContext(Context);
+export const useConfigContext = () => useContext(Context);
-interface ContainerProps {
+interface ConfigProviderProps {
children: ReactNode;
}
-export const ConfigProvider = ({ children }: ContainerProps) => {
+export const ConfigProvider = ({ children }: ConfigProviderProps) => {
const [config, dispatchConfig] = useReducer(configReducer, {
accesses: [],
emails: { content: { emails: [] } },
@@ -96,10 +96,10 @@ export const ConfigProvider = ({ children }: ContainerProps) => {
emails: config.emails,
accessGroups: config.accessGroups,
},
- deleteAccess,
- addAccess,
setEmails,
+ addAccess,
updateAccess,
+ deleteAccess,
setAccessGroups,
reloadAccessGroups,
}}
diff --git a/ui/src/providers/notify/index.tsx b/ui/src/providers/notify/index.tsx
index 66cdda27..a0e9c195 100644
--- a/ui/src/providers/notify/index.tsx
+++ b/ui/src/providers/notify/index.tsx
@@ -12,12 +12,13 @@ export type NotifyContext = {
const Context = createContext({} as NotifyContext);
-export const useNotify = () => useContext(Context);
-interface ContainerProps {
+export const useNotifyContext = () => useContext(Context);
+
+interface NotifyProviderProps {
children: ReactNode;
}
-export const NotifyProvider = ({ children }: ContainerProps) => {
+export const NotifyProvider = ({ children }: NotifyProviderProps) => {
const [notify, dispatchNotify] = useReducer(notifyReducer, {});
useEffect(() => {
{t("domain.application.form.access.label")}
-
- ?.[1]})
+ ?.icon})
{item.name}