+ {MessageContextHolder}
- ) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -81,7 +83,7 @@ const AccessAliyunForm = ({ data, op, onAfterReq }: AccessAliyunFormProps) => {
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -184,7 +186,7 @@ const AccessAliyunForm = ({ data, op, onAfterReq }: AccessAliyunFormProps) => {
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -94,7 +96,8 @@ const AccessAwsForm = ({ data, op, onAfterReq }: AccessAwsFormProps) => {
updateAccess(req);
return;
}
- addAccess(req);
+
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -227,7 +230,7 @@ const AccessAwsForm = ({ data, op, onAfterReq }: AccessAwsFormProps) => {
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -80,7 +82,8 @@ const AccessBaiduCloudForm = ({ data, op, onAfterReq }: AccessBaiduCloudFormProp
updateAccess(req);
return;
}
- addAccess(req);
+
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -183,7 +186,7 @@ const AccessBaiduCloudForm = ({ data, op, onAfterReq }: AccessBaiduCloudFormProp
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -80,7 +80,7 @@ const AccessByteplusForm = ({ data, op, onAfterReq }: AccessByteplusFormProps) =
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -183,7 +183,7 @@ const AccessByteplusForm = ({ data, op, onAfterReq }: AccessByteplusFormProps) =
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -73,7 +73,7 @@ const AccessCloudflareForm = ({ data, op, onAfterReq }: AccessCloudflareFormProp
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -157,7 +157,7 @@ const AccessCloudflareForm = ({ data, op, onAfterReq }: AccessCloudflareFormProp
/>
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -74,7 +74,7 @@ const AccessDogeCloudForm = ({ data, op, onAfterReq }: AccessDogeCloudFormProps)
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -177,7 +177,7 @@ const AccessDogeCloudForm = ({ data, op, onAfterReq }: AccessDogeCloudFormProps)
{
{
- ["add"]: t("access.authorization.add"),
- ["edit"]: t("access.authorization.edit"),
- ["copy"]: t("access.authorization.copy"),
+ ["add"]: t("access.action.add"),
+ ["edit"]: t("access.action.edit"),
+ ["copy"]: t("access.action.copy"),
}[op]
}
diff --git a/ui/src/components/certimate/AccessGodaddyForm.tsx b/ui/src/components/certimate/AccessGodaddyForm.tsx
index 4c8b4eca..1c8f40a5 100644
--- a/ui/src/components/certimate/AccessGodaddyForm.tsx
+++ b/ui/src/components/certimate/AccessGodaddyForm.tsx
@@ -8,18 +8,18 @@ import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { PbErrorData } from "@/domain/base";
-import { accessProvidersMap, accessTypeFormSchema, type Access, type GodaddyConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type GodaddyConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessGodaddyFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessGodaddyForm = ({ data, op, onAfterReq }: AccessGodaddyFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -56,7 +56,7 @@ const AccessGodaddyForm = ({ data, op, onAfterReq }: AccessGodaddyFormProps) =>
});
const onSubmit = async (data: z.infer) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -80,7 +80,7 @@ const AccessGodaddyForm = ({ data, op, onAfterReq }: AccessGodaddyFormProps) =>
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -179,7 +179,7 @@ const AccessGodaddyForm = ({ data, op, onAfterReq }: AccessGodaddyFormProps) =>
/>
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -89,7 +89,7 @@ const AccessHttpreqForm = ({ data, op, onAfterReq }: AccessHttpreqFormProps) =>
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -222,7 +222,7 @@ const AccessHttpreqForm = ({ data, op, onAfterReq }: AccessHttpreqFormProps) =>
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -87,7 +87,7 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -205,7 +205,7 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
(null);
const [fileName, setFileName] = useState("");
@@ -60,7 +60,7 @@ const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProp
});
const onSubmit = async (data: z.infer) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -82,7 +82,7 @@ const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProp
if (data.id && op == "edit") {
updateAccess(req);
} else {
- addAccess(req);
+ createAccess(req);
}
} catch (e) {
const err = e as ClientResponseError;
@@ -182,7 +182,7 @@ const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProp
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -62,7 +62,7 @@ const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
if (data.id && op == "edit") {
updateAccess(req);
} else {
- addAccess(req);
+ createAccess(req);
}
} catch (e) {
const err = e as ClientResponseError;
@@ -136,7 +136,7 @@ const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -73,7 +73,7 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -157,7 +157,7 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
/>
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -78,7 +78,7 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -181,7 +181,7 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -74,7 +74,7 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -177,7 +177,7 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
(null);
@@ -103,7 +103,7 @@ const AccessSSHForm = ({ data, op, onAfterReq }: AccessSSHFormProps) => {
let group = data.group;
if (group == "emptyId") group = "";
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -131,7 +131,7 @@ const AccessSSHForm = ({ data, op, onAfterReq }: AccessSSHFormProps) => {
if (data.id && op == "edit") {
updateAccess(req);
} else {
- addAccess(req);
+ createAccess(req);
}
} catch (e) {
const err = e as ClientResponseError;
@@ -337,7 +337,7 @@ const AccessSSHForm = ({ data, op, onAfterReq }: AccessSSHFormProps) => {
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -80,7 +80,7 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -179,7 +179,7 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
/>
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -80,7 +80,7 @@ const AccessVolcengineForm = ({ data, op, onAfterReq }: AccessVolcengineFormProp
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -183,7 +183,7 @@ const AccessVolcengineForm = ({ data, op, onAfterReq }: AccessVolcengineFormProp
) => {
- const req: Access = {
+ const req: AccessModel = {
id: data.id as string,
name: data.name,
configType: data.configType,
@@ -70,7 +70,7 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
updateAccess(req);
return;
}
- addAccess(req);
+ createAccess(req);
} catch (e) {
const err = e as ClientResponseError;
@@ -154,7 +154,7 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
/>
) => {
- if ((emails.content as EmailsSetting).emails.includes(data.email)) {
+ if (emails.includes(data.email)) {
form.setError("email", {
message: "common.errmsg.email_duplicate",
});
return;
}
- // 保存到 config
- const newEmails = [...(emails.content as EmailsSetting).emails, data.email];
-
try {
- const resp = await update({
- ...emails,
- name: "emails",
- content: {
- emails: newEmails,
- },
- });
+ await setEmails([...emails, data.email]);
- // 更新本地状态
- setEmails(resp);
-
- // 关闭弹窗
form.reset();
form.clearErrors();
@@ -115,7 +101,7 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
/>
diff --git a/ui/src/components/certimate/StringList.tsx b/ui/src/components/certimate/StringList.tsx
index 754f2d2b..8c8293d6 100644
--- a/ui/src/components/certimate/StringList.tsx
+++ b/ui/src/components/certimate/StringList.tsx
@@ -3,12 +3,12 @@ import { z } from "zod";
import { useTranslation } from "react-i18next";
import { Edit, Plus, Trash2 } from "lucide-react";
+import { cn } from "@/components/ui/utils";
import Show from "@/components/Show";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { FormControl, FormItem, FormLabel } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
-import { cn } from "@/lib/utils";
type StringListProps = {
className?: string;
@@ -79,7 +79,7 @@ const StringList = ({ value, className, onValueChange, valueType = "domain" }: S
-
+ {data ?
+ );
+};
+
+export default CertificateDetailDrawer;
diff --git a/ui/src/components/certificate/CertificateList.tsx b/ui/src/components/certificate/CertificateList.tsx
deleted file mode 100644
index bd628be7..00000000
--- a/ui/src/components/certificate/CertificateList.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import CertificateDetail from "@/components/certificate/CertificateDetail";
-import { Button } from "@/components/ui/button";
-import { DataTable } from "@/components/workflow/DataTable";
-import { Certificate as CertificateType } from "@/domain/certificate";
-import { diffDays, getLeftDays } from "@/lib/time";
-import { list } from "@/repository/certificate";
-import { ColumnDef } from "@tanstack/react-table";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useNavigate, useSearchParams } from "react-router-dom";
-
-type CertificateListProps = {
- withPagination?: boolean;
-};
-
-const CertificateList = ({ withPagination }: CertificateListProps) => {
- const [data, setData] = useState([]);
- const [pageCount, setPageCount] = useState(0);
- const [open, setOpen] = useState(false);
- const [selectedCertificate, setSelectedCertificate] = useState();
-
- const { t } = useTranslation();
-
- const [searchParams] = useSearchParams();
-
- const fetchData = async (page: number, pageSize?: number) => {
- const state = searchParams.get("state");
- const resp = await list({ page: page, perPage: pageSize, state: state ?? "" });
- setData(resp.items);
- setPageCount(resp.totalPages);
- };
-
- const navigate = useNavigate();
-
- const columns: ColumnDef[] = [
- {
- accessorKey: "san",
- header: t("certificate.props.domain"),
- cell: ({ row }) => {
- let san: string = row.getValue("san");
- if (!san) {
- san = "";
- }
-
- return (
-
-
- }
- />
-
-
-
+
+
+
);
};
diff --git a/ui/src/components/certificate/CertificateDetailDrawer.tsx b/ui/src/components/certificate/CertificateDetailDrawer.tsx
new file mode 100644
index 00000000..6aefd7d6
--- /dev/null
+++ b/ui/src/components/certificate/CertificateDetailDrawer.tsx
@@ -0,0 +1,26 @@
+import { useEffect, useState } from "react";
+import { Drawer } from "antd";
+
+import { type CertificateModel } from "@/domain/certificate";
+import CertificateDetail from "./CertificateDetail";
+
+type CertificateDetailDrawerProps = {
+ data?: CertificateModel;
+ open?: boolean;
+ onClose?: () => void;
+};
+
+const CertificateDetailDrawer = ({ data, open, onClose }: CertificateDetailDrawerProps) => {
+ const [loading, setLoading] = useState(true);
+ useEffect(() => {
+ setLoading(data == null);
+ }, [data]);
+
+ return (
+
+
+
- {san.split(";").map((item, i) => {
- return (
-
- );
- },
- },
- {
- accessorKey: "expireAt",
- header: t("certificate.props.expiry"),
- cell: ({ row }) => {
- const expireAt: string = row.getValue("expireAt");
- const data = row.original;
- const leftDays = getLeftDays(expireAt);
- const allDays = diffDays(data.expireAt, data.created);
- return (
-
- {item}
-
- );
- })}
-
- {leftDays > 0 ? (
-
- );
- },
- },
- {
- accessorKey: "workflow",
- header: t("certificate.props.workflow"),
- cell: ({ row }) => {
- const name = row.original.expand.workflow?.name;
- const workflowId: string = row.getValue("workflow");
- return (
-
- {leftDays} / {allDays} {t("certificate.props.expiry.days")}
-
- ) : (
- {t("certificate.props.expiry.expired")}
- )}
-
-
- {new Date(expireAt).toLocaleString().split(" ")[0]} {t("certificate.props.expiry.text.expire")}
-
-
-
-
- );
- },
- },
- {
- accessorKey: "created",
- header: t("certificate.props.created"),
- cell: ({ row }) => {
- const date: string = row.getValue("created");
- return new Date(date).toLocaleString();
- },
- },
- {
- id: "actions",
- cell: ({ row }) => {
- return (
-
-
-
- );
- },
- },
- ];
-
- const handleWorkflowClick = (id: string) => {
- navigate(`/workflow/detail?id=${id}`);
- };
-
- const handleView = (id: string) => {
- setOpen(true);
- const certificate = data.find((item) => item.id === id);
- setSelectedCertificate(certificate);
- };
-
- return (
- <>
- {t("certificate.nodata")}
-
-
-
+
diff --git a/ui/src/components/certimate/AccessAwsForm.tsx b/ui/src/components/certimate/AccessAwsForm.tsx
index 7b69a77f..28f3c69d 100644
--- a/ui/src/components/certimate/AccessAwsForm.tsx
+++ b/ui/src/components/certimate/AccessAwsForm.tsx
@@ -8,19 +8,21 @@ 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, accessProvidersMap, accessTypeFormSchema, type AwsConfig } from "@/domain/access";
+import { AccessModel, accessProvidersMap, accessTypeFormSchema, type AwsConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessAwsFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessAwsForm = ({ data, op, onAfterReq }: AccessAwsFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
+
+ const { createAccess, updateAccess } = useAccessStore();
+
const formSchema = z.object({
id: z.string().optional(),
name: z
@@ -68,7 +70,7 @@ const AccessAwsForm = ({ data, op, onAfterReq }: AccessAwsFormProps) => {
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessBaiduCloudForm.tsx b/ui/src/components/certimate/AccessBaiduCloudForm.tsx
index 2a6e4781..033d34e4 100644
--- a/ui/src/components/certimate/AccessBaiduCloudForm.tsx
+++ b/ui/src/components/certimate/AccessBaiduCloudForm.tsx
@@ -8,19 +8,21 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type BaiduCloudConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type BaiduCloudConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessBaiduCloudFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessBaiduCloudForm = ({ data, op, onAfterReq }: AccessBaiduCloudFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
const { t } = useTranslation();
+
+ const { createAccess, updateAccess } = useAccessStore();
+
const formSchema = z.object({
id: z.string().optional(),
name: z
@@ -56,7 +58,7 @@ const AccessBaiduCloudForm = ({ data, op, onAfterReq }: AccessBaiduCloudFormProp
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessByteplusForm.tsx b/ui/src/components/certimate/AccessByteplusForm.tsx
index 82b3dbad..f7fc213b 100644
--- a/ui/src/components/certimate/AccessByteplusForm.tsx
+++ b/ui/src/components/certimate/AccessByteplusForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type ByteplusConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type ByteplusConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessByteplusFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessByteplusForm = ({ data, op, onAfterReq }: AccessByteplusFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -56,7 +56,7 @@ const AccessByteplusForm = ({ data, op, onAfterReq }: AccessByteplusFormProps) =
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessCloudflareForm.tsx b/ui/src/components/certimate/AccessCloudflareForm.tsx
index a03c39b1..0a347223 100644
--- a/ui/src/components/certimate/AccessCloudflareForm.tsx
+++ b/ui/src/components/certimate/AccessCloudflareForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type CloudflareConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type CloudflareConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessCloudflareFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessCloudflareForm = ({ data, op, onAfterReq }: AccessCloudflareFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -50,7 +50,7 @@ const AccessCloudflareForm = ({ data, op, onAfterReq }: AccessCloudflareFormProp
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessDogeCloudForm.tsx b/ui/src/components/certimate/AccessDogeCloudForm.tsx
index 66c8db6f..13283ee1 100644
--- a/ui/src/components/certimate/AccessDogeCloudForm.tsx
+++ b/ui/src/components/certimate/AccessDogeCloudForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type DogeCloudConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type DogeCloudConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessDogeCloudFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessDogeCloudForm = ({ data, op, onAfterReq }: AccessDogeCloudFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -50,7 +50,7 @@ const AccessDogeCloudForm = ({ data, op, onAfterReq }: AccessDogeCloudFormProps)
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessEditDialog.tsx b/ui/src/components/certimate/AccessEditDialog.tsx
index 10bede52..a9e8986f 100644
--- a/ui/src/components/certimate/AccessEditDialog.tsx
+++ b/ui/src/components/certimate/AccessEditDialog.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
-import { cn } from "@/lib/utils";
+import { cn } from "@/components/ui/utils";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Label } from "@/components/ui/label";
import { ScrollArea } from "@/components/ui/scroll-area";
@@ -23,14 +23,14 @@ import AccessWebhookForm from "./AccessWebhookForm";
import AccessKubernetesForm from "./AccessKubernetesForm";
import AccessVolcengineForm from "./AccessVolcengineForm";
import AccessByteplusForm from "./AccessByteplusForm";
-import { Access } from "@/domain/access";
+import { AccessModel } from "@/domain/access";
import { AccessTypeSelect } from "./AccessTypeSelect";
type AccessEditProps = {
op: "add" | "edit" | "copy";
className?: string;
trigger: React.ReactNode;
- data?: Access;
+ data?: AccessModel;
outConfigType?: string;
};
@@ -273,9 +273,9 @@ const AccessEditDialog = ({ trigger, op, data, className, outConfigType }: Acces
-
+
diff --git a/ui/src/components/certimate/AccessHttpreqForm.tsx b/ui/src/components/certimate/AccessHttpreqForm.tsx
index bf398170..38abf92f 100644
--- a/ui/src/components/certimate/AccessHttpreqForm.tsx
+++ b/ui/src/components/certimate/AccessHttpreqForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type HttpreqConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type HttpreqConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessHttpreqFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessHttpreqForm = ({ data, op, onAfterReq }: AccessHttpreqFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -62,7 +62,7 @@ const AccessHttpreqForm = ({ data, op, onAfterReq }: AccessHttpreqFormProps) =>
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessHuaweicloudForm.tsx b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
index af07611a..16c7c746 100644
--- a/ui/src/components/certimate/AccessHuaweicloudForm.tsx
+++ b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type HuaweiCloudConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type HuaweiCloudConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessHuaweiCloudFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -62,7 +62,7 @@ const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormPr
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessKubernetesForm.tsx b/ui/src/components/certimate/AccessKubernetesForm.tsx
index 23a696a9..55ccc204 100644
--- a/ui/src/components/certimate/AccessKubernetesForm.tsx
+++ b/ui/src/components/certimate/AccessKubernetesForm.tsx
@@ -8,20 +8,20 @@ import { ClientResponseError } from "pocketbase";
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 { readFileContent } from "@/utils/file";
import { PbErrorData } from "@/domain/base";
-import { accessProvidersMap, accessTypeFormSchema, type Access, type KubernetesConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type KubernetesConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessKubernetesFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const fileInputRef = useRef
-
+
@@ -191,4 +191,3 @@ const AccessKubernetesForm = ({ data, op, onAfterReq }: AccessKubernetesFormProp
};
export default AccessKubernetesForm;
-
diff --git a/ui/src/components/certimate/AccessLocalForm.tsx b/ui/src/components/certimate/AccessLocalForm.tsx
index ba5611a2..427fad63 100644
--- a/ui/src/components/certimate/AccessLocalForm.tsx
+++ b/ui/src/components/certimate/AccessLocalForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessLocalFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
@@ -41,7 +41,7 @@ const AccessLocalForm = ({ data, op, onAfterReq }: AccessLocalFormProps) => {
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessNamesiloForm.tsx b/ui/src/components/certimate/AccessNamesiloForm.tsx
index ee8df30f..31bce833 100644
--- a/ui/src/components/certimate/AccessNamesiloForm.tsx
+++ b/ui/src/components/certimate/AccessNamesiloForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type NamesiloConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type NamesiloConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessNamesiloFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -50,7 +50,7 @@ const AccessNamesiloForm = ({ data, op, onAfterReq }: AccessNamesiloFormProps) =
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessPdnsForm.tsx b/ui/src/components/certimate/AccessPdnsForm.tsx
index f527fc0c..e75df10a 100644
--- a/ui/src/components/certimate/AccessPdnsForm.tsx
+++ b/ui/src/components/certimate/AccessPdnsForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type PdnsConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type PdnsConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessPdnsFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -53,7 +53,7 @@ const AccessPdnsForm = ({ data, op, onAfterReq }: AccessPdnsFormProps) => {
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessQiniuForm.tsx b/ui/src/components/certimate/AccessQiniuForm.tsx
index bf9d93c4..36b644cb 100644
--- a/ui/src/components/certimate/AccessQiniuForm.tsx
+++ b/ui/src/components/certimate/AccessQiniuForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type QiniuConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type QiniuConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessQiniuFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -50,7 +50,7 @@ const AccessQiniuForm = ({ data, op, onAfterReq }: AccessQiniuFormProps) => {
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessSSHForm.tsx b/ui/src/components/certimate/AccessSSHForm.tsx
index ed9f3cb3..d9b40774 100644
--- a/ui/src/components/certimate/AccessSSHForm.tsx
+++ b/ui/src/components/certimate/AccessSSHForm.tsx
@@ -8,20 +8,20 @@ import { ClientResponseError } from "pocketbase";
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 { readFileContent } from "@/utils/file";
import { PbErrorData } from "@/domain/base";
-import { accessProvidersMap, accessTypeFormSchema, type Access, type SSHConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type SSHConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessSSHFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessSSHForm = ({ data, op, onAfterReq }: AccessSSHFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const fileInputRef = useRef
-
+
diff --git a/ui/src/components/certimate/AccessTencentForm.tsx b/ui/src/components/certimate/AccessTencentForm.tsx
index 40037d1e..aa3246d5 100644
--- a/ui/src/components/certimate/AccessTencentForm.tsx
+++ b/ui/src/components/certimate/AccessTencentForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type TencentConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type TencentConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessTencentFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -56,7 +56,7 @@ const AccessTencentForm = ({ data, op, onAfterReq }: AccessTencentFormProps) =>
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessTypeSelect.tsx b/ui/src/components/certimate/AccessTypeSelect.tsx
index a2e7944c..23f60dea 100644
--- a/ui/src/components/certimate/AccessTypeSelect.tsx
+++ b/ui/src/components/certimate/AccessTypeSelect.tsx
@@ -1,6 +1,6 @@
import { Check, ChevronsUpDown } from "lucide-react";
-import { cn } from "@/lib/utils";
+import { cn } from "@/components/ui/utils";
import { Button } from "@/components/ui/button";
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
diff --git a/ui/src/components/certimate/AccessVolcengineForm.tsx b/ui/src/components/certimate/AccessVolcengineForm.tsx
index 4d7b8d0c..1a62ac1b 100644
--- a/ui/src/components/certimate/AccessVolcengineForm.tsx
+++ b/ui/src/components/certimate/AccessVolcengineForm.tsx
@@ -8,18 +8,18 @@ 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 { accessProvidersMap, accessTypeFormSchema, type Access, type VolcengineConfig } from "@/domain/access";
+import { accessProvidersMap, accessTypeFormSchema, type AccessModel, type VolcengineConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessVolcengineFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessVolcengineForm = ({ data, op, onAfterReq }: AccessVolcengineFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -56,7 +56,7 @@ const AccessVolcengineForm = ({ data, op, onAfterReq }: AccessVolcengineFormProp
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/AccessWebhookForm.tsx b/ui/src/components/certimate/AccessWebhookForm.tsx
index 1b8824d5..6450d4d7 100644
--- a/ui/src/components/certimate/AccessWebhookForm.tsx
+++ b/ui/src/components/certimate/AccessWebhookForm.tsx
@@ -8,18 +8,18 @@ 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, accessProvidersMap, accessTypeFormSchema, WebhookConfig } from "@/domain/access";
+import { AccessModel, accessProvidersMap, accessTypeFormSchema, WebhookConfig } from "@/domain/access";
import { save } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
+import { useAccessStore } from "@/stores/access";
type AccessWebhookFormProps = {
op: "add" | "edit" | "copy";
- data?: Access;
+ data?: AccessModel;
onAfterReq: () => void;
};
const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) => {
- const { addAccess, updateAccess } = useConfigContext();
+ const { createAccess, updateAccess } = useAccessStore();
const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
@@ -47,7 +47,7 @@ const AccessWebhookForm = ({ data, op, onAfterReq }: AccessWebhookFormProps) =>
});
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/EmailsEdit.tsx b/ui/src/components/certimate/EmailsEdit.tsx
index d4bd5af4..49bad862 100644
--- a/ui/src/components/certimate/EmailsEdit.tsx
+++ b/ui/src/components/certimate/EmailsEdit.tsx
@@ -1,19 +1,17 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
import { ClientResponseError } from "pocketbase";
+import { cn } from "@/components/ui/utils";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
-import { cn } from "@/lib/utils";
-import { PbErrorData } from "@/domain/base";
-import { EmailsSetting } from "@/domain/settings";
-import { update } from "@/repository/settings";
-import { useConfigContext } from "@/providers/config";
+import { type PbErrorData } from "@/domain/base";
+import { useContactStore } from "@/stores/contact";
type EmailsEditProps = {
className?: string;
@@ -21,10 +19,7 @@ type EmailsEditProps = {
};
const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
- const {
- config: { emails },
- setEmails,
- } = useConfigContext();
+ const { emails, setEmails, fetchEmails } = useContactStore();
const [open, setOpen] = useState(false);
const { t } = useTranslation();
@@ -40,30 +35,21 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
},
});
+ useEffect(() => {
+ fetchEmails();
+ }, []);
+
const onSubmit = async (data: z.infer
-
+
diff --git a/ui/src/components/certimate/KVList.tsx b/ui/src/components/certimate/KVList.tsx
index 4a6b4b10..9c0800f4 100644
--- a/ui/src/components/certimate/KVList.tsx
+++ b/ui/src/components/certimate/KVList.tsx
@@ -75,7 +75,7 @@ const KVList = ({ variables, onValueChange }: KVListProps) => {
{t("common.add")}
+ {t("common.button.add")}
{t("common.add")}
+ {t("common.button.add")}
{t("common.add")}
+ {t("common.button.add")}
{t("common.text." + valueType + ".empty")}
-
-
-
+
+
+ {t("settings.notification.template.variables.tips.content")}
-
+
);
diff --git a/ui/src/components/notify/ServerChan.tsx b/ui/src/components/notify/ServerChan.tsx
index ee9b23eb..cb2ff1a6 100644
--- a/ui/src/components/notify/ServerChan.tsx
+++ b/ui/src/components/notify/ServerChan.tsx
@@ -6,10 +6,10 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
import { useToast } from "@/components/ui/use-toast";
-import { getErrMessage } from "@/lib/error";
-import { isValidURL } from "@/lib/url";
+import { getErrMsg } from "@/utils/error";
+import { isValidURL } from "@/utils/url";
import { NotifyChannels, NotifyChannelServerChan } from "@/domain/settings";
-import { update } from "@/repository/settings";
+import { save } from "@/repository/settings";
import { useNotifyContext } from "@/providers/notify";
import { notifyTest } from "@/api/notify";
import Show from "@/components/Show";
@@ -96,14 +96,14 @@ const ServerChan = () => {
serverchan.data.url = serverchan.data.url.trim();
if (!isValidURL(serverchan.data.url)) {
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: t("common.errmsg.url_invalid"),
variant: "destructive",
});
return;
}
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -116,14 +116,14 @@ const ServerChan = () => {
setChannels(resp);
toast({
- title: t("common.save.succeeded.message"),
+ title: t("common.text.operation_succeeded"),
description: t("settings.notification.config.saved.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -144,7 +144,7 @@ const ServerChan = () => {
description: t("settings.notification.push_test_message.succeeded.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
title: t("settings.notification.push_test_message.failed.message"),
@@ -167,7 +167,7 @@ const ServerChan = () => {
setServerChan(newData);
try {
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -180,10 +180,10 @@ const ServerChan = () => {
setChannels(resp);
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -225,7 +225,7 @@ const ServerChan = () => {
handleSaveClick();
}}
>
- {t("common.save")}
+ {t("common.button.save")}
diff --git a/ui/src/components/notify/Telegram.tsx b/ui/src/components/notify/Telegram.tsx
index 63f6079c..0fb3ad40 100644
--- a/ui/src/components/notify/Telegram.tsx
+++ b/ui/src/components/notify/Telegram.tsx
@@ -6,9 +6,9 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
import { useToast } from "@/components/ui/use-toast";
-import { getErrMessage } from "@/lib/error";
+import { getErrMsg } from "@/utils/error";
import { NotifyChannels, NotifyChannelTelegram } from "@/domain/settings";
-import { update } from "@/repository/settings";
+import { save } from "@/repository/settings";
import { useNotifyContext } from "@/providers/notify";
import { notifyTest } from "@/api/notify";
import Show from "@/components/Show";
@@ -96,7 +96,7 @@ const Telegram = () => {
const handleSaveClick = async () => {
try {
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -109,14 +109,14 @@ const Telegram = () => {
setChannels(resp);
toast({
- title: t("common.save.succeeded.message"),
+ title: t("common.text.operation_succeeded"),
description: t("settings.notification.config.saved.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -137,7 +137,7 @@ const Telegram = () => {
description: t("settings.notification.push_test_message.succeeded.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
title: t("settings.notification.push_test_message.failed.message"),
@@ -160,7 +160,7 @@ const Telegram = () => {
setTelegram(newData);
try {
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -173,10 +173,10 @@ const Telegram = () => {
setChannels(resp);
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -238,7 +238,7 @@ const Telegram = () => {
handleSaveClick();
}}
>
- {t("common.save")}
+ {t("common.button.save")}
diff --git a/ui/src/components/notify/Webhook.tsx b/ui/src/components/notify/Webhook.tsx
index 70c8d052..13145f21 100644
--- a/ui/src/components/notify/Webhook.tsx
+++ b/ui/src/components/notify/Webhook.tsx
@@ -6,10 +6,10 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
import { useToast } from "@/components/ui/use-toast";
-import { getErrMessage } from "@/lib/error";
-import { isValidURL } from "@/lib/url";
+import { getErrMsg } from "@/utils/error";
+import { isValidURL } from "@/utils/url";
import { NotifyChannels, NotifyChannelWebhook } from "@/domain/settings";
-import { update } from "@/repository/settings";
+import { save } from "@/repository/settings";
import { useNotifyContext } from "@/providers/notify";
import { notifyTest } from "@/api/notify";
import Show from "@/components/Show";
@@ -96,14 +96,14 @@ const Webhook = () => {
webhook.data.url = webhook.data.url.trim();
if (!isValidURL(webhook.data.url)) {
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: t("common.errmsg.url_invalid"),
variant: "destructive",
});
return;
}
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -116,14 +116,14 @@ const Webhook = () => {
setChannels(resp);
toast({
- title: t("common.save.succeeded.message"),
+ title: t("common.text.operation_succeeded"),
description: t("settings.notification.config.saved.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -144,7 +144,7 @@ const Webhook = () => {
description: t("settings.notification.push_test_message.succeeded.message"),
});
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
title: t("settings.notification.push_test_message.failed.message"),
@@ -167,7 +167,7 @@ const Webhook = () => {
setWebhook(newData);
try {
- const resp = await update({
+ const resp = await save({
...config,
name: "notifyChannels",
content: {
@@ -180,10 +180,10 @@ const Webhook = () => {
setChannels(resp);
} catch (e) {
- const msg = getErrMessage(e);
+ const msg = getErrMsg(e);
toast({
- title: t("common.save.failed.message"),
+ title: t("common.text.operation_failed"),
description: `${t("settings.notification.config.failed.message")}: ${msg}`,
variant: "destructive",
});
@@ -225,7 +225,7 @@ const Webhook = () => {
handleSaveClick();
}}
>
- {t("common.save")}
+ {t("common.button.save")}
diff --git a/ui/src/components/ui/accordion.tsx b/ui/src/components/ui/accordion.tsx
index 13d3fec9..1b7fcd37 100644
--- a/ui/src/components/ui/accordion.tsx
+++ b/ui/src/components/ui/accordion.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
import * as AccordionPrimitive from "@radix-ui/react-accordion";
import { ChevronDown } from "lucide-react";
-import { cn } from "@/lib/utils";
+import { cn } from "./utils";
const Accordion = AccordionPrimitive.Root;
diff --git a/ui/src/components/ui/alert-dialog.tsx b/ui/src/components/ui/alert-dialog.tsx
deleted file mode 100644
index 3edeed91..00000000
--- a/ui/src/components/ui/alert-dialog.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import * as React from "react";
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
-
-import { cn } from "@/lib/utils";
-import { buttonVariants } from "@/components/ui/button";
-
-const AlertDialog = AlertDialogPrimitive.Root;
-
-const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
-
-const AlertDialogPortal = AlertDialogPrimitive.Portal;
-
-const AlertDialogOverlay = React.forwardRef<
- React.ElementRef
-
-));
-NavigationMenuViewport.displayName = NavigationMenuPrimitive.Viewport.displayName;
-
-const NavigationMenuIndicator = React.forwardRef<
- React.ElementRef
-
+
-))
-Table.displayName = "Table"
+));
+Table.displayName = "Table";
-const TableHeader = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes{item}
-
+
diff --git a/ui/src/components/workflow/BranchNode.tsx b/ui/src/components/workflow/BranchNode.tsx
index f062b33e..b09b2fd3 100644
--- a/ui/src/components/workflow/BranchNode.tsx
+++ b/ui/src/components/workflow/BranchNode.tsx
@@ -4,7 +4,7 @@ import { WorkflowBranchNode, WorkflowNode } from "@/domain/workflow";
import NodeRender from "./NodeRender";
import { memo } from "react";
import { BrandNodeProps } from "./types";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { useTranslation } from "react-i18next";
diff --git a/ui/src/components/workflow/ConditionNode.tsx b/ui/src/components/workflow/ConditionNode.tsx
index e4f31f34..d35d80cc 100644
--- a/ui/src/components/workflow/ConditionNode.tsx
+++ b/ui/src/components/workflow/ConditionNode.tsx
@@ -1,4 +1,4 @@
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import AddNode from "./AddNode";
import { NodeProps } from "./types";
import { useShallow } from "zustand/shallow";
diff --git a/ui/src/components/workflow/CustomAlertDialog.tsx b/ui/src/components/workflow/CustomAlertDialog.tsx
deleted file mode 100644
index 74c79721..00000000
--- a/ui/src/components/workflow/CustomAlertDialog.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
-import { useTranslation } from "react-i18next";
-
-type CustomAlertDialogProps = {
- open: boolean;
- onOpenChange?: (open: boolean) => void;
- title?: string;
- description?: string;
- confirm?: () => void;
-};
-
-const CustomAlertDialog = ({ open, title, description, confirm, onOpenChange }: CustomAlertDialogProps) => {
- const { t } = useTranslation();
-
- return (
-
-
+
diff --git a/ui/src/components/workflow/DeployToAliyunCDN.tsx b/ui/src/components/workflow/DeployToAliyunCDN.tsx
index 6161255e..3e4da4b7 100644
--- a/ui/src/components/workflow/DeployToAliyunCDN.tsx
+++ b/ui/src/components/workflow/DeployToAliyunCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToAliyunCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToAliyunCLB.tsx b/ui/src/components/workflow/DeployToAliyunCLB.tsx
index 59f69445..b7edb9bc 100644
--- a/ui/src/components/workflow/DeployToAliyunCLB.tsx
+++ b/ui/src/components/workflow/DeployToAliyunCLB.tsx
@@ -6,7 +6,7 @@ import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "@/components/ui/select";
import { DeployFormProps } from "./DeployForm";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { useForm } from "react-hook-form";
@@ -110,7 +110,7 @@ const DeployToAliyunCLB = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToAliyunNLB.tsx b/ui/src/components/workflow/DeployToAliyunNLB.tsx
index c1018023..5f183dae 100644
--- a/ui/src/components/workflow/DeployToAliyunNLB.tsx
+++ b/ui/src/components/workflow/DeployToAliyunNLB.tsx
@@ -6,7 +6,7 @@ import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "@/components/ui/select";
import { DeployFormProps } from "./DeployForm";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { useForm } from "react-hook-form";
@@ -213,7 +213,7 @@ const DeployToAliyunNLB = ({ data }: DeployFormProps) => {
)}
-
+
diff --git a/ui/src/components/workflow/DeployToAliyunOss.tsx b/ui/src/components/workflow/DeployToAliyunOss.tsx
index 98058237..7434d658 100644
--- a/ui/src/components/workflow/DeployToAliyunOss.tsx
+++ b/ui/src/components/workflow/DeployToAliyunOss.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -101,7 +101,7 @@ const DeployToAliyunOSS = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToBaiduCloudCDN.tsx b/ui/src/components/workflow/DeployToBaiduCloudCDN.tsx
index 6fb00ea4..c0d20a0b 100644
--- a/ui/src/components/workflow/DeployToBaiduCloudCDN.tsx
+++ b/ui/src/components/workflow/DeployToBaiduCloudCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToBaiduCloudCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToByteplusCDN.tsx b/ui/src/components/workflow/DeployToByteplusCDN.tsx
index 08210b3b..22121ea7 100644
--- a/ui/src/components/workflow/DeployToByteplusCDN.tsx
+++ b/ui/src/components/workflow/DeployToByteplusCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToByteplusCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToDogeCloudCDN.tsx b/ui/src/components/workflow/DeployToDogeCloudCDN.tsx
index 2ffdb1fc..4a8a0f92 100644
--- a/ui/src/components/workflow/DeployToDogeCloudCDN.tsx
+++ b/ui/src/components/workflow/DeployToDogeCloudCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -91,7 +91,7 @@ const DeployToDogeCloudCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToHuaweiCloudCDN.tsx b/ui/src/components/workflow/DeployToHuaweiCloudCDN.tsx
index b5a252c5..2c337f9a 100644
--- a/ui/src/components/workflow/DeployToHuaweiCloudCDN.tsx
+++ b/ui/src/components/workflow/DeployToHuaweiCloudCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -96,7 +96,7 @@ const DeployToHuaweiCloudCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToHuaweiCloudELB.tsx b/ui/src/components/workflow/DeployToHuaweiCloudELB.tsx
index 0e1ed85c..bb6a87c5 100644
--- a/ui/src/components/workflow/DeployToHuaweiCloudELB.tsx
+++ b/ui/src/components/workflow/DeployToHuaweiCloudELB.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -118,7 +118,7 @@ const DeployToHuaweiCloudELB = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToKubernetesSecret.tsx b/ui/src/components/workflow/DeployToKubernetesSecret.tsx
index b4091a0a..f24c8c64 100644
--- a/ui/src/components/workflow/DeployToKubernetesSecret.tsx
+++ b/ui/src/components/workflow/DeployToKubernetesSecret.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -105,7 +105,7 @@ const DeployToKubernetesSecret = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToLocal.tsx b/ui/src/components/workflow/DeployToLocal.tsx
index 8b23a690..30f48e91 100644
--- a/ui/src/components/workflow/DeployToLocal.tsx
+++ b/ui/src/components/workflow/DeployToLocal.tsx
@@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "../ui/select";
import { Button } from "../ui/button";
import { DeployFormProps } from "./DeployForm";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { useEffect, useState } from "react";
@@ -215,7 +215,7 @@ Remove-Item -Path "$pfxPath" -Force
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToQiniuCDN.tsx b/ui/src/components/workflow/DeployToQiniuCDN.tsx
index c52bb5f4..bb9935fb 100644
--- a/ui/src/components/workflow/DeployToQiniuCDN.tsx
+++ b/ui/src/components/workflow/DeployToQiniuCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -91,7 +91,7 @@ const DeployToQiniuCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToSSH.tsx b/ui/src/components/workflow/DeployToSSH.tsx
index f0876b7b..339a7cd7 100644
--- a/ui/src/components/workflow/DeployToSSH.tsx
+++ b/ui/src/components/workflow/DeployToSSH.tsx
@@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "../ui/select";
import { Button } from "../ui/button";
import { DeployFormProps } from "./DeployForm";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { useEffect, useState } from "react";
@@ -133,7 +133,7 @@ const DeployToSSH = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToTencentCDN.tsx b/ui/src/components/workflow/DeployToTencentCDN.tsx
index 1e82a015..a8626d08 100644
--- a/ui/src/components/workflow/DeployToTencentCDN.tsx
+++ b/ui/src/components/workflow/DeployToTencentCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToTencentCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToTencentCLB.tsx b/ui/src/components/workflow/DeployToTencentCLB.tsx
index 9e38a28d..77690e25 100644
--- a/ui/src/components/workflow/DeployToTencentCLB.tsx
+++ b/ui/src/components/workflow/DeployToTencentCLB.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -130,7 +130,7 @@ const DeployToTencentCLB = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToTencentCOS.tsx b/ui/src/components/workflow/DeployToTencentCOS.tsx
index dcffa661..1cdb6e91 100644
--- a/ui/src/components/workflow/DeployToTencentCOS.tsx
+++ b/ui/src/components/workflow/DeployToTencentCOS.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -96,7 +96,7 @@ const DeployToTencentCOS = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToTencentTEO.tsx b/ui/src/components/workflow/DeployToTencentTEO.tsx
index f40514ea..dcb5d9cc 100644
--- a/ui/src/components/workflow/DeployToTencentTEO.tsx
+++ b/ui/src/components/workflow/DeployToTencentTEO.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -93,7 +93,7 @@ const DeployToTencentTEO = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToVolcengineCDN.tsx b/ui/src/components/workflow/DeployToVolcengineCDN.tsx
index 662fee1d..320bd0c9 100644
--- a/ui/src/components/workflow/DeployToVolcengineCDN.tsx
+++ b/ui/src/components/workflow/DeployToVolcengineCDN.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToVolcengineCDN = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToVolcengineLive.tsx b/ui/src/components/workflow/DeployToVolcengineLive.tsx
index ae464e51..80da9e30 100644
--- a/ui/src/components/workflow/DeployToVolcengineLive.tsx
+++ b/ui/src/components/workflow/DeployToVolcengineLive.tsx
@@ -7,7 +7,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -90,7 +90,7 @@ const DeployToVolcengineLive = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DeployToWebhook.tsx b/ui/src/components/workflow/DeployToWebhook.tsx
index f62e3896..0f5698b6 100644
--- a/ui/src/components/workflow/DeployToWebhook.tsx
+++ b/ui/src/components/workflow/DeployToWebhook.tsx
@@ -6,7 +6,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { WorkflowNode, WorkflowNodeConfig } from "@/domain/workflow";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
import { Button } from "../ui/button";
@@ -94,7 +94,7 @@ const DeployToWebhook = ({ data }: DeployFormProps) => {
trigger={
-
+
diff --git a/ui/src/components/workflow/DropdownMenuItemIcon.tsx b/ui/src/components/workflow/DropdownMenuItemIcon.tsx
index 95c937a0..537d8efa 100644
--- a/ui/src/components/workflow/DropdownMenuItemIcon.tsx
+++ b/ui/src/components/workflow/DropdownMenuItemIcon.tsx
@@ -1,4 +1,4 @@
-import { WorkflowwNodeDropdwonItemIcon, WorkflowwNodeDropdwonItemIconType } from "@/domain/workflow";
+import { WorkflowNodeDropdwonItemIcon, WorkflowNodeDropdwonItemIconType } from "@/domain/workflow";
import { CloudUpload, GitFork, Megaphone, NotebookPen } from "lucide-react";
const icons = new Map([
@@ -8,9 +8,9 @@ const icons = new Map([
["Megaphone",
-
+
diff --git a/ui/src/components/workflow/StartForm.tsx b/ui/src/components/workflow/StartForm.tsx
index ae4fd559..f7986e77 100644
--- a/ui/src/components/workflow/StartForm.tsx
+++ b/ui/src/components/workflow/StartForm.tsx
@@ -10,7 +10,7 @@ import { RadioGroup, RadioGroupItem } from "../ui/radio-group";
import { Label } from "../ui/label";
import { useTranslation } from "react-i18next";
import { parseExpression } from "cron-parser";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { usePanel } from "./PanelProvider";
@@ -135,7 +135,7 @@ const StartForm = ({ data }: StartFormProps) => {
/>
-
+
diff --git a/ui/src/components/workflow/WorkflowBaseInfoEditDialog.tsx b/ui/src/components/workflow/WorkflowBaseInfoEditDialog.tsx
index 0e1f74d2..0ed4162a 100644
--- a/ui/src/components/workflow/WorkflowBaseInfoEditDialog.tsx
+++ b/ui/src/components/workflow/WorkflowBaseInfoEditDialog.tsx
@@ -1,6 +1,6 @@
import { z } from "zod";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "../ui/dialog";
-import { useWorkflowStore, WorkflowState } from "@/providers/workflow";
+import { useWorkflowStore, WorkflowState } from "@/stores/workflow";
import { useShallow } from "zustand/shallow";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
@@ -115,7 +115,7 @@ const WorkflowNameBaseInfoDialog = ({ trigger }: WorkflowNameEditDialogProps) =>
/>
-
+
diff --git a/ui/src/components/workflow/WorkflowProvider.tsx b/ui/src/components/workflow/WorkflowProvider.tsx
index 8299a228..5e260348 100644
--- a/ui/src/components/workflow/WorkflowProvider.tsx
+++ b/ui/src/components/workflow/WorkflowProvider.tsx
@@ -1,15 +1,13 @@
-import { ConfigProvider } from "@/providers/config";
import React from "react";
-import { PanelProvider } from "./PanelProvider";
+
import { NotifyProvider } from "@/providers/notify";
+import { PanelProvider } from "./PanelProvider";
const WorkflowProvider = ({ children }: { children: React.ReactNode }) => {
return (
-
+
+ );
+};
+
+export default AuthLayout;
diff --git a/ui/src/pages/ConsoleLayout.tsx b/ui/src/pages/ConsoleLayout.tsx
new file mode 100644
index 00000000..7f0824b7
--- /dev/null
+++ b/ui/src/pages/ConsoleLayout.tsx
@@ -0,0 +1,252 @@
+import React, { useEffect, useState } from "react";
+import { Link, Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { Button, Drawer, Dropdown, Layout, Menu, Tooltip, theme, type ButtonProps, type MenuProps } from "antd";
+import {
+ Languages as LanguagesIcon,
+ LogOut as LogOutIcon,
+ Home as HomeIcon,
+ Menu as MenuIcon,
+ Moon as MoonIcon,
+ Server as ServerIcon,
+ Settings as SettingsIcon,
+ ShieldCheck as ShieldCheckIcon,
+ Sun as SunIcon,
+ Workflow as WorkflowIcon,
+} from "lucide-react";
+
+import Version from "@/components/certimate/Version";
+import { useTheme } from "@/hooks";
+import { getPocketBase } from "@/repository/pocketbase";
+
+const ConsoleLayout = () => {
+ const navigate = useNavigate();
+
+ const { t } = useTranslation();
+
+ const { token: themeToken } = theme.useToken();
+
+ const [siderOpen, setSiderOpen] = useState(false);
+
+ const handleSiderOpen = () => {
+ setSiderOpen(true);
+ };
+
+ const handleSiderClose = () => {
+ setSiderOpen(false);
+ };
+
+ const handleLogoutClick = () => {
+ auth.clear();
+ navigate("/login");
+ };
+
+ const handleSettingsClick = () => {
+ navigate("/settings/account");
+ };
+
+ const auth = getPocketBase().authStore;
+ if (!auth.isValid || !auth.isAdmin) {
+ return
+
+
+
+
+
+
+
+
+ } size="large" onClick={handleSiderOpen} />
+
+ handleSiderClose()} />
+
+
+
+
+
+
+
+
+ } size="large" onClick={handleSettingsClick} />
+
+
+ } size="large" onClick={handleLogoutClick} />
+
+
+
+
+ 
+ Certimate
+
+
+
+
+ );
+});
+
+const ThemeToggleButton = React.memo(({ size }: { size?: ButtonProps["size"] }) => {
+ const { t } = useTranslation();
+
+ const { theme, setThemeMode } = useTheme();
+
+ const items: Required
-
-
-
-
-
-
-
- 
- Certimate
-
-
-
- Certimate
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {t("common.menu.settings")}
- {t("common.menu.logout")}
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default LoginLayout;
diff --git a/ui/src/pages/SettingLayout.tsx b/ui/src/pages/SettingsLayout.tsx
similarity index 88%
rename from ui/src/pages/SettingLayout.tsx
rename to ui/src/pages/SettingsLayout.tsx
index 0f5fc024..2097b3bc 100644
--- a/ui/src/pages/SettingLayout.tsx
+++ b/ui/src/pages/SettingsLayout.tsx
@@ -1,12 +1,13 @@
import { useEffect, useState } from "react";
import { Outlet, useLocation, useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
+import { Card } from "antd";
import { KeyRound, Megaphone, ShieldCheck, UserRound } from "lucide-react";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Toaster } from "@/components/ui/toaster";
-const SettingLayout = () => {
+const SettingsLayout = () => {
const location = useLocation();
const [tabValue, setTabValue] = useState("account");
const navigate = useNavigate();
@@ -19,7 +20,7 @@ const SettingLayout = () => {
}, [location]);
return (
-
+
+
);
};
-export default SettingLayout;
+export default SettingsLayout;
diff --git a/ui/src/pages/access/Access.tsx b/ui/src/pages/access/Access.tsx
deleted file mode 100644
index f9096bd5..00000000
--- a/ui/src/pages/access/Access.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import { useLocation, useNavigate } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { Key } from "lucide-react";
-
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
- AlertDialogTrigger,
-} from "@/components/ui/alert-dialog.tsx";
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
-import AccessEditDialog from "@/components/certimate/AccessEditDialog";
-import XPagination from "@/components/certimate/XPagination";
-import { convertZulu2Beijing } from "@/lib/time";
-import { Access as AccessType, accessProvidersMap } from "@/domain/access";
-import { remove } from "@/repository/access";
-import { useConfigContext } from "@/providers/config";
-
-const Access = () => {
- const { t } = useTranslation();
- const { config, deleteAccess } = useConfigContext();
- const { accesses } = config;
-
- const perPage = 10;
-
- const totalPages = Math.ceil(accesses.length / perPage);
-
- const navigate = useNavigate();
- const location = useLocation();
- const query = new URLSearchParams(location.search);
- const page = query.get("page");
- const pageNumber = page ? Number(page) : 1;
-
- const startIndex = (pageNumber - 1) * perPage;
- const endIndex = startIndex + perPage;
-
- const handleDelete = async (data: AccessType) => {
- const rs = await remove(data);
- deleteAccess(rs.id);
- };
-
- return (
- {t("settings.page.title")}
@@ -28,7 +29,7 @@ const SettingLayout = () => {
{
- navigate("/setting/account");
+ navigate("/settings/account");
}}
className="px-5"
>
@@ -39,7 +40,7 @@ const SettingLayout = () => {
{
- navigate("/setting/password");
+ navigate("/settings/password");
}}
className="px-5"
>
@@ -50,7 +51,7 @@ const SettingLayout = () => {
{
- navigate("/setting/notify");
+ navigate("/settings/notify");
}}
className="px-5"
>
@@ -61,7 +62,7 @@ const SettingLayout = () => {
{
- navigate("/setting/ssl-provider");
+ navigate("/settings/ssl-provider");
}}
className="px-5"
>
@@ -76,8 +77,8 @@ const SettingLayout = () => {
-
- {
- query.set("page", page.toString());
- navigate({ search: query.toString() });
- }}
- />
-
- )}
-
- );
-};
-
-export default Access;
diff --git a/ui/src/pages/accesses/AccessList.tsx b/ui/src/pages/accesses/AccessList.tsx
new file mode 100644
index 00000000..ee346d2f
--- /dev/null
+++ b/ui/src/pages/accesses/AccessList.tsx
@@ -0,0 +1,209 @@
+import { useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Avatar, Button, Empty, Modal, notification, Space, Table, Tooltip, Typography, type TableProps } from "antd";
+import { PageHeader } from "@ant-design/pro-components";
+import { Copy as CopyIcon, Pencil as PencilIcon, Plus as PlusIcon, Trash2 as Trash2Icon } from "lucide-react";
+import dayjs from "dayjs";
+import { ClientResponseError } from "pocketbase";
+
+import AccessEditDialog from "@/components/certimate/AccessEditDialog";
+import { accessProvidersMap, type AccessModel } from "@/domain/access";
+import { useAccessStore } from "@/stores/access";
+
+const AccessList = () => {
+ const { t } = useTranslation();
+
+ const [modalApi, ModelContextHolder] = Modal.useModal();
+ const [notificationApi, NotificationContextHolder] = notification.useNotification();
+
+ const { accesses, fetchAccesses, deleteAccess } = useAccessStore();
+
+ const [loading, setLoading] = useState
- {t("access.authorization.add")}} op="add" />
-
-
- {accesses.length === 0 ? (
- {t("access.page.title")}
-
-
- {t("access.authorization.add")}} op="add" className="mt-3" />
-
- ) : (
- <>
- {t("access.authorization.nodata")}
-
-
- {accesses.slice(startIndex, endIndex).map((access) => (
- {t("common.text.name")}
- {t("common.text.provider")}
-
- {t("common.text.created_at")}
- {t("common.text.updated_at")}
- {t("common.text.operations")}
-
-
- ))}
-
-
- {access.name}
-
- ?.icon})
-
-
- {t(accessProvidersMap.get(access.configType)?.name || "")}
- {access.created && convertZulu2Beijing(access.created)}
- {access.updated && convertZulu2Beijing(access.updated)}
-
-
- {t("common.edit")}
-
- }
- op="edit"
- data={access}
- />
-
- {t("common.copy")}
-
- }
- op="copy"
- data={access}
- />
-
-
-
-
-
-
- {t("access.authorization.delete")}
- {t("access.authorization.delete.confirm")}
-
-
- {t("common.cancel")}
- {
- handleDelete(access);
- }}
- >
- {t("common.confirm")}
-
-
-
-
-
-
-
- );
-};
-
-export default Certificate;
diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx
new file mode 100644
index 00000000..9938c011
--- /dev/null
+++ b/ui/src/pages/certificates/CertificateList.tsx
@@ -0,0 +1,260 @@
+import { useCallback, useEffect, useState } from "react";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { Button, Divider, Empty, Menu, notification, Radio, Space, Table, theme, Tooltip, Typography, type MenuProps, type TableProps } from "antd";
+import { PageHeader } from "@ant-design/pro-components";
+import { Eye as EyeIcon, Filter as FilterIcon } from "lucide-react";
+import dayjs from "dayjs";
+import { ClientResponseError } from "pocketbase";
+
+import CertificateDetailDrawer from "@/components/certificate/CertificateDetailDrawer";
+import { CertificateModel } from "@/domain/certificate";
+import { list as listCertificate, type CertificateListReq } from "@/repository/certificate";
+
+const CertificateList = () => {
+ const navigate = useNavigate();
+ const [searchParams] = useSearchParams();
+
+ const { t } = useTranslation();
+
+ const { token: themeToken } = theme.useToken();
+
+ const [notificationApi, NotificationContextHolder] = notification.useNotification();
+
+ const [loading, setLoading] = useState{t("certificate.page.title")}
-
-
+
+
+
+
+
+
+ );
+ },
+ filterIcon: () =>
-
+const StatisticCard = ({
+ label,
+ icon,
+ value,
+ suffix,
+ onClick,
+}: {
+ label: React.ReactNode;
+ icon: React.ReactNode;
+ value?: string | number | React.ReactNode;
+ suffix?: React.ReactNode;
+ onClick?: () => void;
+}) => {
+ return (
+
-
- {t("dashboard.page.title")}
-
-
+
-
+
-
+ <>
+ {NotificationContextHolder}
-
-
-
-
- {t("dashboard.statistics.all.certificate")}
-
-
-
- {statistic?.certificateTotal ? (
-
- {statistic?.certificateTotal}
-
- ) : (
- 0
- )}
-
- {t("dashboard.statistics.unit")}
-
-
+
-
-
-
- {t("dashboard.statistics.near_expired.certificate")}
-
-
-
- {statistic?.certificateExpireSoon ? (
-
- {statistic?.certificateExpireSoon}
-
- ) : (
- 0
- )}
-
- {t("dashboard.statistics.unit")}
-
-
+
-
-
-
- {t("dashboard.statistics.expired.certificate")}
-
-
-
- {statistic?.certificateExpired ? (
-
- {statistic?.certificateExpired}
-
- ) : (
- 0
- )}
-
- {t("dashboard.statistics.unit")}
-
-
+
-
-
-
- {t("dashboard.statistics.all.workflow")}
-
-
-
- {statistic?.workflowTotal ? (
-
- {statistic?.workflowTotal}
-
- ) : (
- 0
- )}
-
- {t("dashboard.statistics.unit")}
-
-
-
-
-
-
- {t("dashboard.statistics.enabled.workflow")}
-
-
-
- {statistic?.workflowEnabled ? (
-
- {statistic?.workflowEnabled}
-
- ) : (
- 0
- )}
-
- {t("dashboard.statistics.unit")}
- TODO: {t("dashboard.latest_workflow_run")}
+
+ );
+};
-
-
-
-
- -
-
- {t("dashboard.certificate")}
-
-
-
+
-
-
-
-
-
-
{changed ? (
-
+
) : (
)}
diff --git a/ui/src/pages/setting/Notify.tsx b/ui/src/pages/settings/Notify.tsx
similarity index 100%
rename from ui/src/pages/setting/Notify.tsx
rename to ui/src/pages/settings/Notify.tsx
diff --git a/ui/src/pages/setting/Password.tsx b/ui/src/pages/settings/Password.tsx
similarity index 89%
rename from ui/src/pages/setting/Password.tsx
rename to ui/src/pages/settings/Password.tsx
index 7bd7371d..fa527627 100644
--- a/ui/src/pages/setting/Password.tsx
+++ b/ui/src/pages/settings/Password.tsx
@@ -8,8 +8,8 @@ import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { useToast } from "@/components/ui/use-toast";
-import { getErrMessage } from "@/lib/error";
-import { getPb } from "@/repository/api";
+import { getErrMsg } from "@/utils/error";
+import { getPocketBase } from "@/repository/pocketbase";
const formSchema = z
.object({
@@ -44,19 +44,19 @@ const Password = () => {
const onSubmit = async (values: z.infer
-
+
diff --git a/ui/src/pages/setting/SSLProvider.tsx b/ui/src/pages/settings/SSLProvider.tsx
similarity index 91%
rename from ui/src/pages/setting/SSLProvider.tsx
rename to ui/src/pages/settings/SSLProvider.tsx
index f4c07632..34477613 100644
--- a/ui/src/pages/setting/SSLProvider.tsx
+++ b/ui/src/pages/settings/SSLProvider.tsx
@@ -4,22 +4,22 @@ import { useTranslation } from "react-i18next";
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
+import { cn } from "@/components/ui/utils";
import { Button } from "@/components/ui/button";
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { useToast } from "@/components/ui/use-toast";
-import { getErrMessage } from "@/lib/error";
-import { cn } from "@/lib/utils";
-import { SSLProvider as SSLProviderType, SSLProviderSetting, Setting } from "@/domain/settings";
-import { getSetting, update } from "@/repository/settings";
+import { getErrMsg } from "@/utils/error";
+import { SSLProvider as SSLProviderType, SSLProviderSetting, SettingsModel } from "@/domain/settings";
+import { get, save } from "@/repository/settings";
import { produce } from "immer";
type SSLProviderContext = {
- setting: Setting
-
+
@@ -328,7 +327,7 @@ const SSLProviderZeroSSLForm = () => {
-
+
@@ -435,7 +434,7 @@ const SSLProviderGtsForm = () => {
-
+
@@ -443,4 +442,3 @@ const SSLProviderGtsForm = () => {
};
export default SSLProvider;
-
diff --git a/ui/src/pages/workflow/index.tsx b/ui/src/pages/workflow/index.tsx
deleted file mode 100644
index bb8460ce..00000000
--- a/ui/src/pages/workflow/index.tsx
+++ /dev/null
@@ -1,224 +0,0 @@
-import { Button } from "@/components/ui/button";
-import { MoreHorizontal, Plus } from "lucide-react";
-import { useNavigate, useSearchParams } from "react-router-dom";
-import { ColumnDef } from "@tanstack/react-table";
-import { Workflow as WorkflowType } from "@/domain/workflow";
-import { DataTable } from "@/components/workflow/DataTable";
-import { useState } from "react";
-import { list, remove, save, WorkflowListReq } from "@/repository/workflow";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
-import { Switch } from "@/components/ui/switch";
-
-import { useTranslation } from "react-i18next";
-import CustomAlertDialog from "@/components/workflow/CustomAlertDialog";
-
-const Workflow = () => {
- const navigate = useNavigate();
-
- const [data, setData] = useState{name}
;
- },
- },
- {
- accessorKey: "description",
- header: t("workflow.props.description"),
- cell: ({ row }) => {
- let description: string = row.getValue("description");
- if (!description) {
- description = "-";
- }
- return {description}
;
- },
- },
- {
- accessorKey: "type",
- header: t("workflow.props.executionMethod"),
- cell: ({ row }) => {
- const method = row.getValue("type");
- if (!method) {
- return "-";
- } else if (method === "manual") {
- return t("workflow.node.start.form.executionMethod.options.manual");
- } else if (method === "auto") {
- const crontab: string = row.original.crontab ?? "";
- return (
-
-
- );
- }
- },
- },
- {
- accessorKey: "enabled",
- header: t("workflow.props.enabled"),
- cell: ({ row }) => {
- const enabled: boolean = row.getValue("enabled");
-
- return (
- <>
- {t("workflow.node.start.form.executionMethod.options.auto")}
- {crontab}
-
-
-
- {t("workflow.page.title")}
-
-
-
-
-
+
+
+
+
+
+
+ );
+ },
+ filterIcon: () =>