refactor: clean code

This commit is contained in:
Fu Diwei
2025-04-24 23:14:17 +08:00
parent 794695c313
commit a117fd7d93
19 changed files with 175 additions and 107 deletions

View File

@@ -5,7 +5,7 @@ import { Avatar, Card, Col, Empty, Flex, Input, type InputRef, Row, Typography }
import Show from "@/components/Show";
import { acmeDns01ProvidersMap } from "@/domain/provider";
export type AcmeDns01ProviderPickerProps = {
export type ACMEDns01ProviderPickerProps = {
className?: string;
style?: React.CSSProperties;
autoFocus?: boolean;
@@ -13,7 +13,7 @@ export type AcmeDns01ProviderPickerProps = {
onSelect?: (value: string) => void;
};
const AcmeDns01ProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: AcmeDns01ProviderPickerProps) => {
const ACMEDns01ProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: ACMEDns01ProviderPickerProps) => {
const { t } = useTranslation();
const [keyword, setKeyword] = useState<string>();
@@ -72,4 +72,4 @@ const AcmeDns01ProviderPicker = ({ className, style, autoFocus, placeholder, onS
);
};
export default memo(AcmeDns01ProviderPicker);
export default memo(ACMEDns01ProviderPicker);

View File

@@ -2,19 +2,19 @@ import { memo, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Space, Typography } from "antd";
import { type AcmeDns01Provider, acmeDns01ProvidersMap } from "@/domain/provider";
import { type ACMEDns01Provider, acmeDns01ProvidersMap } from "@/domain/provider";
export type AcmeDns01ProviderSelectProps = Omit<
export type ACMEDns01ProviderSelectProps = Omit<
SelectProps,
"filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"
> & {
filter?: (record: AcmeDns01Provider) => boolean;
filter?: (record: ACMEDns01Provider) => boolean;
};
const AcmeDns01ProviderSelect = ({ filter, ...props }: AcmeDns01ProviderSelectProps) => {
const ACMEDns01ProviderSelect = ({ filter, ...props }: ACMEDns01ProviderSelectProps) => {
const { t } = useTranslation();
const [options, setOptions] = useState<Array<{ key: string; value: string; label: string; data: AcmeDns01Provider }>>([]);
const [options, setOptions] = useState<Array<{ key: string; value: string; label: string; data: ACMEDns01Provider }>>([]);
useEffect(() => {
const allItems = Array.from(acmeDns01ProvidersMap.values());
const filteredItems = filter != null ? allItems.filter(filter) : allItems;
@@ -64,4 +64,4 @@ const AcmeDns01ProviderSelect = ({ filter, ...props }: AcmeDns01ProviderSelectPr
);
};
export default memo(AcmeDns01ProviderSelect);
export default memo(ACMEDns01ProviderSelect);

View File

@@ -31,7 +31,7 @@ import AccessEditModal from "@/components/access/AccessEditModal";
import AccessSelect from "@/components/access/AccessSelect";
import ModalForm from "@/components/ModalForm";
import MultipleInput from "@/components/MultipleInput";
import AcmeDns01ProviderSelect from "@/components/provider/AcmeDns01ProviderSelect";
import ACMEDns01ProviderSelect from "@/components/provider/ACMEDns01ProviderSelect";
import CAProviderSelect from "@/components/provider/CAProviderSelect";
import Show from "@/components/Show";
import { ACCESS_USAGES, ACME_DNS01_PROVIDERS, accessProvidersMap, acmeDns01ProvidersMap, caProvidersMap } from "@/domain/provider";
@@ -328,7 +328,7 @@ const ApplyNodeConfigForm = forwardRef<ApplyNodeConfigFormInstance, ApplyNodeCon
</Form.Item>
<Form.Item name="provider" label={t("workflow_node.apply.form.provider.label")} hidden={!showProvider} rules={[formRule]}>
<AcmeDns01ProviderSelect
<ACMEDns01ProviderSelect
disabled={!showProvider}
filter={(record) => {
if (fieldProviderAccessId) {

View File

@@ -26,6 +26,7 @@ export interface AccessModel extends BaseModel {
| AccessConfigForDogeCloud
| AccessConfigForDynv6
| AccessConfigForEdgio
| AccessConfigForEmail
| AccessConfigForGcore
| AccessConfigForGname
| AccessConfigForGoDaddy
@@ -33,6 +34,7 @@ export interface AccessModel extends BaseModel {
| AccessConfigForHuaweiCloud
| AccessConfigForJDCloud
| AccessConfigForKubernetes
| AccessConfigForMattermost
| AccessConfigForNamecheap
| AccessConfigForNameDotCom
| AccessConfigForNameSilo
@@ -43,6 +45,7 @@ export interface AccessModel extends BaseModel {
| AccessConfigForSafeLine
| AccessConfigForSSH
| AccessConfigForSSLCom
| AccessConfigForTelegram
| AccessConfigForTencentCloud
| AccessConfigForUCloud
| AccessConfigForUpyun
@@ -158,6 +161,16 @@ export type AccessConfigForEdgio = {
clientSecret: string;
};
export type AccessConfigForEmail = {
smtpHost: string;
smtpPort: number;
smtpTls: boolean;
username: string;
password: string;
defaultSenderAddress?: string;
defaultReceiverAddress?: string;
};
export type AccessConfigForGcore = {
apiToken: string;
};
@@ -191,6 +204,13 @@ export type AccessConfigForKubernetes = {
kubeConfig?: string;
};
export type AccessConfigForMattermost = {
serverUrl: string;
username: string;
password: string;
defaultChannelId?: string;
};
export type AccessConfigForNamecheap = {
username: string;
apiKey: string;
@@ -248,6 +268,11 @@ export type AccessConfigForSSLCom = {
eabHmacKey: string;
};
export type AccessConfigForTelegram = {
botToken: string;
defaultChatId?: number;
};
export type AccessConfigForTencentCloud = {
secretId: string;
secretKey: string;

View File

@@ -25,6 +25,7 @@ export const ACCESS_PROVIDERS = Object.freeze({
DOGECLOUD: "dogecloud",
DYNV6: "dynv6",
EDGIO: "edgio",
EMAIL: "email",
GCORE: "gcore",
GNAME: "gname",
GODADDY: "godaddy",
@@ -35,6 +36,7 @@ export const ACCESS_PROVIDERS = Object.freeze({
LETSENCRYPT: "letsencrypt",
LETSENCRYPTSTAGING: "letsencryptstaging",
LOCAL: "local",
MATTERMOST: "mattermost",
NAMECHEAP: "namecheap",
NAMEDOTCOM: "namedotcom",
NAMESILO: "namesilo",
@@ -46,6 +48,7 @@ export const ACCESS_PROVIDERS = Object.freeze({
SAFELINE: "safeline",
SSH: "ssh",
SSLCOM: "sslcom",
TELEGRAM: "telegram",
TENCENTCLOUD: "tencentcloud",
UCLOUD: "ucloud",
UPYUN: "upyun",
@@ -137,6 +140,10 @@ export const accessProvidersMap: Map<AccessProvider["type"] | string, AccessProv
[ACCESS_PROVIDERS.GOOGLETRUSTSERVICES, "provider.googletrustservices", "/imgs/providers/google.svg", [ACCESS_USAGES.CA]],
[ACCESS_PROVIDERS.SSLCOM, "provider.sslcom", "/imgs/providers/sslcom.svg", [ACCESS_USAGES.CA]],
[ACCESS_PROVIDERS.ZEROSSL, "provider.zerossl", "/imgs/providers/zerossl.svg", [ACCESS_USAGES.CA]],
[ACCESS_PROVIDERS.EMAIL, "provider.email", "/imgs/providers/email.svg", [ACCESS_USAGES.NOTIFICATION]],
[ACCESS_PROVIDERS.MATTERMOST, "provider.mattermost", "/imgs/providers/mattermost.svg", [ACCESS_USAGES.NOTIFICATION]],
[ACCESS_PROVIDERS.TELEGRAM, "provider.telegram", "/imgs/providers/telegram.svg", [ACCESS_USAGES.NOTIFICATION]],
].map((e) => [
e[0] as string,
{
@@ -244,16 +251,16 @@ export const ACME_DNS01_PROVIDERS = Object.freeze({
WESTCN: `${ACCESS_PROVIDERS.WESTCN}`,
} as const);
export type AcmeDns01ProviderType = (typeof ACME_DNS01_PROVIDERS)[keyof typeof ACME_DNS01_PROVIDERS];
export type ACMEDns01ProviderType = (typeof ACME_DNS01_PROVIDERS)[keyof typeof ACME_DNS01_PROVIDERS];
export type AcmeDns01Provider = {
type: AcmeDns01ProviderType;
export type ACMEDns01Provider = {
type: ACMEDns01ProviderType;
name: string;
icon: string;
provider: AccessProviderType;
};
export const acmeDns01ProvidersMap: Map<AcmeDns01Provider["type"] | string, AcmeDns01Provider> = new Map(
export const acmeDns01ProvidersMap: Map<ACMEDns01Provider["type"] | string, ACMEDns01Provider> = new Map(
/*
注意:此处的顺序决定显示在前端的顺序。
NOTICE: The following order determines the order displayed at the frontend.
@@ -291,7 +298,7 @@ export const acmeDns01ProvidersMap: Map<AcmeDns01Provider["type"] | string, Acme
].map(([type, name]) => [
type,
{
type: type as AcmeDns01ProviderType,
type: type as ACMEDns01ProviderType,
name: name,
icon: accessProvidersMap.get(type.split("-")[0])!.icon,
provider: type.split("-")[0] as AccessProviderType,
@@ -507,6 +514,9 @@ export const deploymentProvidersMap: Map<DeploymentProvider["type"] | string, De
NOTICE: If you add new constant, please keep ASCII order.
*/
export const NOTIFICATION_PROVIDERS = Object.freeze({
EMAIL: `${ACCESS_PROVIDERS.EMAIL}`,
MATTERMOST: `${ACCESS_PROVIDERS.MATTERMOST}`,
TELEGRAM: `${ACCESS_PROVIDERS.TELEGRAM}`,
WEBHOOK: `${ACCESS_PROVIDERS.WEBHOOK}`,
} as const);
@@ -524,7 +534,7 @@ export const notificationProvidersMap: Map<NotificationProvider["type"] | string
注意:此处的顺序决定显示在前端的顺序。
NOTICE: The following order determines the order displayed at the frontend.
*/
[[NOTIFICATION_PROVIDERS.WEBHOOK]].map(([type]) => [
[[NOTIFICATION_PROVIDERS.EMAIL], [NOTIFICATION_PROVIDERS.WEBHOOK], [NOTIFICATION_PROVIDERS.MATTERMOST], [NOTIFICATION_PROVIDERS.TELEGRAM]].map(([type]) => [
type,
{
type: type as CAProviderType,

View File

@@ -58,6 +58,7 @@
"provider.dynv6": "dynv6",
"provider.edgio": "Edgio",
"provider.edgio.applications": "Edgio - Applications",
"provider.email": "Email",
"provider.fastly": "Fastly",
"provider.gcore": "Gcore",
"provider.gcore.cdn": "Gcore - CDN (Content Delivery Network)",
@@ -83,6 +84,7 @@
"provider.letsencrypt": "Let's Encrypt",
"provider.letsencryptstaging": "Let's Encrypt Staging Environment",
"provider.local": "Local deployment",
"provider.mattermost": "Mattermost",
"provider.namecheap": "Namecheap",
"provider.namedotcom": "Name.com",
"provider.namesilo": "NameSilo",
@@ -98,6 +100,7 @@
"provider.safeline": "SafeLine",
"provider.ssh": "SSH deployment",
"provider.sslcom": "SSL.com",
"provider.telegram": "Telegram",
"provider.tencentcloud": "Tencent Cloud",
"provider.tencentcloud.cdn": "Tencent Cloud - CDN (Content Delivery Network)",
"provider.tencentcloud.clb": "Tencent Cloud - CLB (Cloud Load Balancer)",

View File

@@ -82,7 +82,6 @@
"settings.notification.channel.form.pushover_user.placeholder": "Please enter User/Group Key",
"settings.notification.channel.form.pushover_user.label": "User/Group Key",
"settings.notification.channel.form.pushover_user.tooltip": "For more information, see <a href=\"https://pushover.net/api#identifiers\" target=\"_blank\">https://pushover.net/api#identifiers</a>",
"settings.notification.channel.form.pushplus_token.placeholder": "Please enter Token",
"settings.notification.channel.form.pushplus_token.label": "Token",
"settings.notification.channel.form.pushplus_token.placeholder": "Please enter token",
"settings.notification.channel.form.pushplus_token.tooltip": "For more information, see <a href=\"https://www.pushplus.plus/push1.html\" target=\"_blank\">https://www.pushplus.plus/push1.html</a>",

View File

@@ -58,6 +58,7 @@
"provider.dynv6": "dynv6",
"provider.edgio": "Edgio",
"provider.edgio.applications": "Edgio - Applications",
"provider.email": "邮件",
"provider.fastly": "Fastly",
"provider.gcore": "Gcore",
"provider.gcore.cdn": "Gcore - 内容分发网络 CDN",
@@ -83,6 +84,7 @@
"provider.letsencrypt": "Let's Encrypt",
"provider.letsencryptstaging": "Let's Encrypt 测试环境",
"provider.local": "本地部署",
"provider.mattermost": "Mattermost",
"provider.namecheap": "Namecheap",
"provider.namedotcom": "Name.com",
"provider.namesilo": "NameSilo",
@@ -98,6 +100,7 @@
"provider.safeline": "雷池",
"provider.ssh": "SSH 部署",
"provider.sslcom": "SSL.com",
"provider.telegram": "Telegram",
"provider.tencentcloud": "腾讯云",
"provider.tencentcloud.cdn": "腾讯云 - 内容分发网络 CDN",
"provider.tencentcloud.clb": "腾讯云 - 负载均衡 CLB",

View File

@@ -82,7 +82,6 @@
"settings.notification.channel.form.pushover_user.placeholder": "请输入用户/分组 Key",
"settings.notification.channel.form.pushover_user.label": "用户/分组 Key",
"settings.notification.channel.form.pushover_user.tooltip": "这是什么?请参阅 <a href=\"https://pushover.net/api#identifiers\" target=\"_blank\">https://pushover.net/api#identifiers</a>",
"settings.notification.channel.form.pushplus_token.placeholder": "请输入Token",
"settings.notification.channel.form.pushplus_token.label": "Token",
"settings.notification.channel.form.pushplus_token.placeholder": "请输入 Token",
"settings.notification.channel.form.pushplus_token.tooltip": "这是什么?请参阅 <a href=\"https://www.pushplus.plus/push1.html\" target=\"_blank\">https://www.pushplus.plus/push1.html</a>",
@@ -90,7 +89,7 @@
"settings.notification.channel.form.serverchan_url.placeholder": "请输入服务器地址(形如: https://sctapi.ftqq.com/*****.send",
"settings.notification.channel.form.serverchan_url.tooltip": "这是什么?请参阅 <a href=\"https://sct.ftqq.com/forward\" target=\"_blank\">https://sct.ftqq.com/forward</a>",
"settings.notification.channel.form.telegram_api_token.label": "机器人 API Token",
"settings.notification.channel.form.telegram_api_token.placeholder": "请输入机器人 API token",
"settings.notification.channel.form.telegram_api_token.placeholder": "请输入机器人 API Token",
"settings.notification.channel.form.telegram_api_token.tooltip": "这是什么?请参阅 <a href=\"https://gist.github.com/nafiesl/4ad622f344cd1dc3bb1ecbe468ff9f8a\" target=\"_blank\">https://gist.github.com/nafiesl/4ad622f344cd1dc3bb1ecbe468ff9f8a</a>",
"settings.notification.channel.form.telegram_chat_id.label": "会话 ID",
"settings.notification.channel.form.telegram_chat_id.placeholder": "请输入会话 ID",