Merge pull request #952 from fudiwei/dev

This commit is contained in:
RHQYZ
2025-09-05 12:35:49 +08:00
committed by GitHub
66 changed files with 2182 additions and 1043 deletions
+1 -1
View File
@@ -69,7 +69,7 @@ func internalCertApplyCommand(app core.App) *cobra.Command {
return nil, fmt.Errorf("failed to initialize acme client: %w", err)
}
resp, err := client.ObtainCertificateWithContext(ctx, params.Request)
resp, err := client.ObtainCertificate(ctx, params.Request)
if err != nil {
return nil, fmt.Errorf("failed to obtain certificate: %w", err)
}
+51
View File
@@ -0,0 +1,51 @@
package applicators
import (
"fmt"
"github.com/go-acme/lego/v4/challenge"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/pkg/core/ssl-applicator/acme-http01/providers/ssh"
xmaps "github.com/certimate-go/certimate/pkg/utils/maps"
)
func init() {
if err := ACMEHttp01Registries.Register(domain.ACMEHttp01ProviderTypeSSH, func(options *ProviderFactoryOptions) (challenge.Provider, error) {
credentials := domain.AccessConfigForSSH{}
if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil {
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
}
jumpServers := make([]ssh.ServerConfig, len(credentials.JumpServers))
for i, jumpServer := range credentials.JumpServers {
jumpServers[i] = ssh.ServerConfig{
SshHost: jumpServer.Host,
SshPort: jumpServer.Port,
SshAuthMethod: jumpServer.AuthMethod,
SshUsername: jumpServer.Username,
SshPassword: jumpServer.Password,
SshKey: jumpServer.Key,
SshKeyPassphrase: jumpServer.KeyPassphrase,
}
}
provider, err := ssh.NewChallengeProvider(&ssh.ChallengeProviderConfig{
ServerConfig: ssh.ServerConfig{
SshHost: credentials.Host,
SshPort: credentials.Port,
SshAuthMethod: credentials.AuthMethod,
SshUsername: credentials.Username,
SshPassword: credentials.Password,
SshKey: credentials.Key,
SshKeyPassphrase: credentials.KeyPassphrase,
},
JumpServers: jumpServers,
UseSCP: xmaps.GetBool(options.ProviderExtendedConfig, "useSCP"),
WebRootPath: xmaps.GetString(options.ProviderExtendedConfig, "webRootPath"),
})
return provider, err
}); err != nil {
panic(err)
}
}
+3 -3
View File
@@ -63,7 +63,7 @@ type ObtainCertificateResponse struct {
ARIReplaced bool
}
func (c *ACMEClient) ObtainCertificateWithContext(ctx context.Context, request *ObtainCertificateRequest) (*ObtainCertificateResponse, error) {
func (c *ACMEClient) ObtainCertificate(ctx context.Context, request *ObtainCertificateRequest) (*ObtainCertificateResponse, error) {
type result struct {
res *ObtainCertificateResponse
err error
@@ -72,7 +72,7 @@ func (c *ACMEClient) ObtainCertificateWithContext(ctx context.Context, request *
done := make(chan result, 1)
go func() {
res, err := c.ObtainCertificate(request)
res, err := c.sendObtainCertificateRequest(request)
done <- result{res, err}
}()
@@ -84,7 +84,7 @@ func (c *ACMEClient) ObtainCertificateWithContext(ctx context.Context, request *
}
}
func (c *ACMEClient) ObtainCertificate(request *ObtainCertificateRequest) (*ObtainCertificateResponse, error) {
func (c *ACMEClient) sendObtainCertificateRequest(request *ObtainCertificateRequest) (*ObtainCertificateResponse, error) {
if request == nil {
return nil, errors.New("the request is nil")
}
+25
View File
@@ -0,0 +1,25 @@
package certdeploy
import (
"log/slog"
)
type Client struct {
logger *slog.Logger
}
type ClientConfigure func(*Client)
func NewClient(configures ...ClientConfigure) *Client {
client := &Client{}
for _, configure := range configures {
configure(client)
}
return client
}
func WithLogger(logger *slog.Logger) ClientConfigure {
return func(c *Client) {
c.logger = logger
}
}
+49
View File
@@ -0,0 +1,49 @@
package certdeploy
import (
"context"
"errors"
"fmt"
"github.com/certimate-go/certimate/internal/certdeploy/deployers"
"github.com/certimate-go/certimate/internal/domain"
)
type DeployCertificateRequest struct {
// 提供商相关
Provider string
ProviderAccessConfig map[string]any
ProviderExtendedConfig map[string]any
// 证书相关
Certificate string
PrivateKey string
}
type DeployCertificateResponse struct{}
func (c *Client) DeployCertificate(ctx context.Context, request *DeployCertificateRequest) (*DeployCertificateResponse, error) {
if request == nil {
return nil, errors.New("the request is nil")
}
providerFactory, err := deployers.Registries.Get(domain.DeploymentProviderType(request.Provider))
if err != nil {
return nil, err
}
provider, err := providerFactory(&deployers.ProviderFactoryOptions{
ProviderAccessConfig: request.ProviderAccessConfig,
ProviderExtendedConfig: request.ProviderExtendedConfig,
})
if err != nil {
return nil, fmt.Errorf("failed to initialize deployment provider '%s': %w", request.Provider, err)
}
provider.SetLogger(c.logger)
if _, err := provider.Deploy(ctx, request.Certificate, request.PrivateKey); err != nil {
return nil, err
}
return &DeployCertificateResponse{}, nil
}
+11 -9
View File
@@ -16,9 +16,9 @@ func init() {
return nil, fmt.Errorf("failed to populate provider access config: %w", err)
}
jumpServers := make([]ssh.JumpServerConfig, len(credentials.JumpServers))
jumpServers := make([]ssh.ServerConfig, len(credentials.JumpServers))
for i, jumpServer := range credentials.JumpServers {
jumpServers[i] = ssh.JumpServerConfig{
jumpServers[i] = ssh.ServerConfig{
SshHost: jumpServer.Host,
SshPort: jumpServer.Port,
SshAuthMethod: jumpServer.AuthMethod,
@@ -30,13 +30,15 @@ func init() {
}
provider, err := ssh.NewSSLDeployerProvider(&ssh.SSLDeployerProviderConfig{
SshHost: credentials.Host,
SshPort: credentials.Port,
SshAuthMethod: credentials.AuthMethod,
SshUsername: credentials.Username,
SshPassword: credentials.Password,
SshKey: credentials.Key,
SshKeyPassphrase: credentials.KeyPassphrase,
ServerConfig: ssh.ServerConfig{
SshHost: credentials.Host,
SshPort: credentials.Port,
SshAuthMethod: credentials.AuthMethod,
SshUsername: credentials.Username,
SshPassword: credentials.Password,
SshKey: credentials.Key,
SshKeyPassphrase: credentials.KeyPassphrase,
},
JumpServers: jumpServers,
UseSCP: xmaps.GetBool(options.ProviderExtendedConfig, "useSCP"),
PreCommand: xmaps.GetString(options.ProviderExtendedConfig, "preCommand"),
-75
View File
@@ -1,75 +0,0 @@
package deployer
import (
"context"
"fmt"
"log/slog"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/repository"
"github.com/certimate-go/certimate/pkg/core"
)
type Deployer interface {
Deploy(ctx context.Context) error
}
type DeployerWithWorkflowNodeConfig struct {
Node *domain.WorkflowNode
Logger *slog.Logger
CertificatePEM string
PrivateKeyPEM string
}
// TODO: refactor
func NewWithWorkflowNode(config DeployerWithWorkflowNodeConfig) (Deployer, error) {
if config.Node == nil {
return nil, fmt.Errorf("the node is nil")
}
if config.Node.Type != domain.WorkflowNodeTypeBizDeploy {
return nil, fmt.Errorf("the node type is '%s', expected '%s'", string(config.Node.Type), string(domain.WorkflowNodeTypeBizDeploy))
}
nodeCfg := config.Node.Data.Config.AsBizDeploy()
options := &deployerProviderOptions{
Provider: domain.DeploymentProviderType(nodeCfg.Provider),
ProviderAccessConfig: make(map[string]any),
ProviderExtendedConfig: nodeCfg.ProviderConfig,
}
accessRepo := repository.NewAccessRepository()
if nodeCfg.ProviderAccessId != "" {
access, err := accessRepo.GetById(context.Background(), nodeCfg.ProviderAccessId)
if err != nil {
return nil, fmt.Errorf("failed to get access #%s record: %w", nodeCfg.ProviderAccessId, err)
} else {
options.ProviderAccessConfig = access.Config
}
}
deployer, err := createSSLDeployerProvider(options)
if err != nil {
return nil, err
} else {
deployer.SetLogger(config.Logger)
}
return &deployerImpl{
provider: deployer,
certPEM: config.CertificatePEM,
privkeyPEM: config.PrivateKeyPEM,
}, nil
}
type deployerImpl struct {
provider core.SSLDeployer
certPEM string
privkeyPEM string
}
var _ Deployer = (*deployerImpl)(nil)
func (d *deployerImpl) Deploy(ctx context.Context) error {
_, err := d.provider.Deploy(ctx, d.certPEM, d.privkeyPEM)
return err
}
-25
View File
@@ -1,25 +0,0 @@
package deployer
import (
"github.com/certimate-go/certimate/internal/certdeploy/deployers"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/pkg/core"
)
type deployerProviderOptions struct {
Provider domain.DeploymentProviderType
ProviderAccessConfig map[string]any
ProviderExtendedConfig map[string]any
}
func createSSLDeployerProvider(options *deployerProviderOptions) (core.SSLDeployer, error) {
provider, err := deployers.Registries.Get(options.Provider)
if err != nil {
return nil, err
}
return provider(&deployers.ProviderFactoryOptions{
ProviderAccessConfig: options.ProviderAccessConfig,
ProviderExtendedConfig: options.ProviderExtendedConfig,
})
}
+1
View File
@@ -185,6 +185,7 @@ NOTICE: If you add new constant, please keep ASCII order.
*/
const (
ACMEHttp01ProviderTypeLocal = ACMEHttp01ProviderType(AccessProviderTypeLocal)
ACMEHttp01ProviderTypeSSH = ACMEHttp01ProviderType(AccessProviderTypeSSH)
)
type DeploymentProviderType string
+25
View File
@@ -0,0 +1,25 @@
package notify
import (
"log/slog"
)
type Client struct {
logger *slog.Logger
}
type ClientConfigure func(*Client)
func NewClient(configures ...ClientConfigure) *Client {
client := &Client{}
for _, configure := range configures {
configure(client)
}
return client
}
func WithLogger(logger *slog.Logger) ClientConfigure {
return func(c *Client) {
c.logger = logger
}
}
+49
View File
@@ -0,0 +1,49 @@
package notify
import (
"context"
"errors"
"fmt"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/notify/notifiers"
)
type SendNotificationRequest struct {
// 提供商相关
Provider string
ProviderAccessConfig map[string]any
ProviderExtendedConfig map[string]any
// 通知相关
Subject string
Message string
}
type SendNotificationResponse struct{}
func (c *Client) SendNotification(ctx context.Context, request *SendNotificationRequest) (*SendNotificationResponse, error) {
if request == nil {
return nil, errors.New("the request is nil")
}
providerFactory, err := notifiers.Registries.Get(domain.NotificationProviderType(request.Provider))
if err != nil {
return nil, err
}
provider, err := providerFactory(&notifiers.ProviderFactoryOptions{
ProviderAccessConfig: request.ProviderAccessConfig,
ProviderExtendedConfig: request.ProviderExtendedConfig,
})
if err != nil {
return nil, fmt.Errorf("failed to initialize notification provider '%s': %w", request.Provider, err)
}
provider.SetLogger(c.logger)
if _, err := provider.Notify(ctx, request.Subject, request.Message); err != nil {
return nil, err
}
return &SendNotificationResponse{}, nil
}
-75
View File
@@ -1,75 +0,0 @@
package notify
import (
"context"
"fmt"
"log/slog"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/repository"
"github.com/certimate-go/certimate/pkg/core"
)
type Notifier interface {
Notify(ctx context.Context) error
}
type NotifierWithWorkflowNodeConfig struct {
Node *domain.WorkflowNode
Logger *slog.Logger
Subject string
Message string
}
// TODO: refactor
func NewWithWorkflowNode(config NotifierWithWorkflowNodeConfig) (Notifier, error) {
if config.Node == nil {
return nil, fmt.Errorf("the node is nil")
}
if config.Node.Type != domain.WorkflowNodeTypeBizNotify {
return nil, fmt.Errorf("the node type is '%s', expected '%s'", string(config.Node.Type), string(domain.WorkflowNodeTypeBizNotify))
}
nodeCfg := config.Node.Data.Config.AsBizNotify()
options := &notifierProviderOptions{
Provider: domain.NotificationProviderType(nodeCfg.Provider),
ProviderAccessConfig: make(map[string]any),
ProviderExtendedConfig: nodeCfg.ProviderConfig,
}
accessRepo := repository.NewAccessRepository()
if nodeCfg.ProviderAccessId != "" {
access, err := accessRepo.GetById(context.Background(), nodeCfg.ProviderAccessId)
if err != nil {
return nil, fmt.Errorf("failed to get access #%s record: %w", nodeCfg.ProviderAccessId, err)
} else {
options.ProviderAccessConfig = access.Config
}
}
notifier, err := createNotifierProvider(options)
if err != nil {
return nil, err
} else {
notifier.SetLogger(config.Logger)
}
return &notifierImpl{
provider: notifier,
subject: config.Subject,
message: config.Message,
}, nil
}
type notifierImpl struct {
provider core.Notifier
subject string
message string
}
var _ Notifier = (*notifierImpl)(nil)
func (n *notifierImpl) Notify(ctx context.Context) error {
_, err := n.provider.Notify(ctx, n.subject, n.message)
return err
}
-25
View File
@@ -1,25 +0,0 @@
package notify
import (
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/notify/notifiers"
"github.com/certimate-go/certimate/pkg/core"
)
type notifierProviderOptions struct {
Provider domain.NotificationProviderType
ProviderAccessConfig map[string]any
ProviderExtendedConfig map[string]any
}
func createNotifierProvider(options *notifierProviderOptions) (core.Notifier, error) {
provider, err := notifiers.Registries.Get(options.Provider)
if err != nil {
return nil, err
}
return provider(&notifiers.ProviderFactoryOptions{
ProviderAccessConfig: options.ProviderAccessConfig,
ProviderExtendedConfig: options.ProviderExtendedConfig,
})
}
+2 -2
View File
@@ -8,8 +8,8 @@ import (
)
const (
notifyTestTitle = "[Certimate] Notification Test"
notifyTestBody = "Welcome to use Certimate!"
notifyTestSubject = "[Certimate] Notification Testing"
notifyTestMessage = "Welcome to use Certimate!"
)
type NotifyService struct{}
@@ -343,8 +343,8 @@ func (ne *bizApplyNodeExecutor) executeObtain(execCtx *NodeExecutionContext, nod
return nil, err
}
// 申请证书
obtainResp, err := legoClient.ObtainCertificateWithContext(execCtx.ctx, obtainReq)
// 执行申请证书请求
obtainResp, err := legoClient.ObtainCertificate(execCtx.ctx, obtainReq)
if err != nil {
ne.logger.Warn("failed to obtain certificate")
return nil, err
+22 -13
View File
@@ -6,7 +6,7 @@ import (
"maps"
"strings"
"github.com/certimate-go/certimate/internal/deployer"
"github.com/certimate-go/certimate/internal/certdeploy"
"github.com/certimate-go/certimate/internal/domain"
"github.com/certimate-go/certimate/internal/repository"
)
@@ -18,6 +18,7 @@ import (
type bizDeployNodeExecutor struct {
nodeExecutor
accessRepo accessRepository
certificateRepo certificateRepository
wfoutputRepo workflowOutputRepository
}
@@ -66,21 +67,28 @@ func (ne *bizDeployNodeExecutor) Execute(execCtx *NodeExecutionContext) (*NodeEx
}
}
// 初始化部署器
// TODO: 解耦
deployer, err := deployer.NewWithWorkflowNode(deployer.DeployerWithWorkflowNodeConfig{
Node: execCtx.Node,
Logger: ne.logger,
CertificatePEM: inputCertificate.Certificate,
PrivateKeyPEM: inputCertificate.PrivateKey,
})
if err != nil {
ne.logger.Warn("failed to create deployer provider")
return execRes, err
// 读取部署提供商授权
providerAccessConfig := make(map[string]any)
if nodeCfg.ProviderAccessId != "" {
if access, err := ne.accessRepo.GetById(execCtx.ctx, nodeCfg.ProviderAccessId); err != nil {
return nil, fmt.Errorf("failed to get access #%s record: %w", nodeCfg.ProviderAccessId, err)
} else {
providerAccessConfig = access.Config
}
}
// 初始化部署器
deployClient := certdeploy.NewClient(certdeploy.WithLogger(ne.logger))
// 部署证书
if err := deployer.Deploy(execCtx.ctx); err != nil {
deployReq := &certdeploy.DeployCertificateRequest{
Provider: nodeCfg.Provider,
ProviderAccessConfig: providerAccessConfig,
ProviderExtendedConfig: nodeCfg.ProviderConfig,
Certificate: inputCertificate.Certificate,
PrivateKey: inputCertificate.PrivateKey,
}
if _, err := deployClient.DeployCertificate(execCtx.ctx, deployReq); err != nil {
ne.logger.Warn("failed to deploy certificate")
return execRes, err
}
@@ -127,6 +135,7 @@ func (ne *bizDeployNodeExecutor) checkCanSkip(execCtx *NodeExecutionContext, las
func newBizDeployNodeExecutor() NodeExecutor {
return &bizDeployNodeExecutor{
nodeExecutor: nodeExecutor{logger: slog.Default()},
accessRepo: repository.NewAccessRepository(),
certificateRepo: repository.NewCertificateRepository(),
wfoutputRepo: repository.NewWorkflowOutputRepository(),
}
+21 -11
View File
@@ -11,6 +11,7 @@ import (
type bizNotifyNodeExecutor struct {
nodeExecutor
accessRepo accessRepository
settingsRepo settingsRepository
}
@@ -26,20 +27,28 @@ func (ne *bizNotifyNodeExecutor) Execute(execCtx *NodeExecutionContext) (*NodeEx
return execRes, nil
}
// 初始化通知器
deployer, err := notify.NewWithWorkflowNode(notify.NotifierWithWorkflowNodeConfig{
Node: execCtx.Node,
Logger: ne.logger,
Subject: nodeCfg.Subject,
Message: nodeCfg.Message,
})
if err != nil {
ne.logger.Warn("failed to create notifier provider")
return execRes, err
// 读取部署提供商授权
providerAccessConfig := make(map[string]any)
if nodeCfg.ProviderAccessId != "" {
if access, err := ne.accessRepo.GetById(execCtx.ctx, nodeCfg.ProviderAccessId); err != nil {
return nil, fmt.Errorf("failed to get access #%s record: %w", nodeCfg.ProviderAccessId, err)
} else {
providerAccessConfig = access.Config
}
}
// 初始化通知器
notifyClient := notify.NewClient(notify.WithLogger(ne.logger))
// 推送通知
if err := deployer.Notify(execCtx.ctx); err != nil {
notifyReq := &notify.SendNotificationRequest{
Provider: nodeCfg.Provider,
ProviderAccessConfig: providerAccessConfig,
ProviderExtendedConfig: nodeCfg.ProviderConfig,
Subject: nodeCfg.Subject,
Message: nodeCfg.Message,
}
if _, err := notifyClient.SendNotification(execCtx.ctx, notifyReq); err != nil {
ne.logger.Warn("failed to send notification")
return execRes, err
}
@@ -69,6 +78,7 @@ func (ne *bizNotifyNodeExecutor) checkCanSkip(execCtx *NodeExecutionContext) (_s
func newBizNotifyNodeExecutor() NodeExecutor {
return &bizNotifyNodeExecutor{
nodeExecutor: nodeExecutor{logger: slog.Default()},
accessRepo: repository.NewAccessRepository(),
settingsRepo: repository.NewSettingsRepository(),
}
}
@@ -9,6 +9,7 @@ import (
)
type ChallengeProviderConfig struct {
// 网站根目录路径。
WebRootPath string `json:"webRootPath"`
}
@@ -0,0 +1,292 @@
package ssh
import (
"errors"
"fmt"
"net"
"path/filepath"
"strconv"
"strings"
"github.com/go-acme/lego/v4/challenge/http01"
"golang.org/x/crypto/ssh"
"github.com/certimate-go/certimate/pkg/core"
xssh "github.com/certimate-go/certimate/pkg/utils/ssh"
)
type ServerConfig struct {
// SSH 主机。
// 零值时默认值 "localhost"。
SshHost string `json:"sshHost,omitempty"`
// SSH 端口。
// 零值时默认值 22。
SshPort int32 `json:"sshPort,omitempty"`
// SSH 认证方式。
// 可取值 "none"、"password"、"key"。
// 零值时根据有无密码或私钥字段决定。
SshAuthMethod string `json:"sshAuthMethod,omitempty"`
// SSH 登录用户名。
// 零值时默认值 "root"。
SshUsername string `json:"sshUsername,omitempty"`
// SSH 登录密码。
SshPassword string `json:"sshPassword,omitempty"`
// SSH 登录私钥。
SshKey string `json:"sshKey,omitempty"`
// SSH 登录私钥口令。
SshKeyPassphrase string `json:"sshKeyPassphrase,omitempty"`
}
type ChallengeProviderConfig struct {
ServerConfig
// 跳板机配置数组。
JumpServers []ServerConfig `json:"jumpServers,omitempty"`
// 是否回退使用 SCP。
UseSCP bool `json:"useSCP,omitempty"`
// 网站根目录路径。
WebRootPath string `json:"webRootPath"`
}
func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil {
return nil, errors.New("the configuration of the acme challenge provider is nil")
}
provider := &provider{config: config}
return provider, nil
}
type provider struct {
config *ChallengeProviderConfig
}
func (p *provider) Present(domain, token, keyAuth string) error {
var err error
// 创建 TCP 链接
var targetConn net.Conn
if len(p.config.JumpServers) > 0 {
var jumpClient *ssh.Client
for i, jumpServerConf := range p.config.JumpServers {
var jumpConn net.Conn
// 第一个连接是主机发起,后续通过跳板机发起
if jumpClient == nil {
jumpConn, err = net.Dial("tcp", net.JoinHostPort(jumpServerConf.SshHost, strconv.Itoa(int(jumpServerConf.SshPort))))
} else {
jumpConn, err = jumpClient.Dial("tcp", net.JoinHostPort(jumpServerConf.SshHost, strconv.Itoa(int(jumpServerConf.SshPort))))
}
if err != nil {
return fmt.Errorf("failed to connect to jump server [%d]: %w", i+1, err)
}
defer jumpConn.Close()
newClient, err := p.createSshClient(
jumpConn,
jumpServerConf.SshHost,
jumpServerConf.SshPort,
jumpServerConf.SshAuthMethod,
jumpServerConf.SshUsername,
jumpServerConf.SshPassword,
jumpServerConf.SshKey,
jumpServerConf.SshKeyPassphrase,
)
if err != nil {
return fmt.Errorf("failed to create jump server ssh client[%d]: %w", i+1, err)
}
defer newClient.Close()
jumpClient = newClient
}
// 通过跳板机发起 TCP 连接到目标服务器
targetConn, err = jumpClient.Dial("tcp", net.JoinHostPort(p.config.SshHost, strconv.Itoa(int(p.config.SshPort))))
if err != nil {
return fmt.Errorf("failed to connect to target server: %w", err)
}
} else {
// 直接发起 TCP 连接到目标服务器
targetConn, err = net.Dial("tcp", net.JoinHostPort(p.config.SshHost, strconv.Itoa(int(p.config.SshPort))))
if err != nil {
return fmt.Errorf("failed to connect to target server: %w", err)
}
}
defer targetConn.Close()
// 创建 SSH 客户端
client, err := p.createSshClient(
targetConn,
p.config.SshHost,
p.config.SshPort,
p.config.SshAuthMethod,
p.config.SshUsername,
p.config.SshPassword,
p.config.SshKey,
p.config.SshKeyPassphrase,
)
if err != nil {
return fmt.Errorf("failed to create ssh client: %w", err)
}
defer client.Close()
// 写入质询文件
challengeFilePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token))
if err := xssh.WriteRemoteString(client, challengeFilePath, keyAuth, p.config.UseSCP); err != nil {
return fmt.Errorf("failed to write file in webroot for HTTP challenge: %w", err)
}
return nil
}
func (p *provider) CleanUp(domain, token, keyAuth string) error {
var err error
// 创建 TCP 链接
var targetConn net.Conn
if len(p.config.JumpServers) > 0 {
var jumpClient *ssh.Client
for i, jumpServerConf := range p.config.JumpServers {
var jumpConn net.Conn
// 第一个连接是主机发起,后续通过跳板机发起
if jumpClient == nil {
jumpConn, err = net.Dial("tcp", net.JoinHostPort(jumpServerConf.SshHost, strconv.Itoa(int(jumpServerConf.SshPort))))
} else {
jumpConn, err = jumpClient.Dial("tcp", net.JoinHostPort(jumpServerConf.SshHost, strconv.Itoa(int(jumpServerConf.SshPort))))
}
if err != nil {
return fmt.Errorf("failed to connect to jump server [%d]: %w", i+1, err)
}
defer jumpConn.Close()
newClient, err := p.createSshClient(
jumpConn,
jumpServerConf.SshHost,
jumpServerConf.SshPort,
jumpServerConf.SshAuthMethod,
jumpServerConf.SshUsername,
jumpServerConf.SshPassword,
jumpServerConf.SshKey,
jumpServerConf.SshKeyPassphrase,
)
if err != nil {
return fmt.Errorf("failed to create jump server ssh client[%d]: %w", i+1, err)
}
defer newClient.Close()
jumpClient = newClient
}
// 通过跳板机发起 TCP 连接到目标服务器
targetConn, err = jumpClient.Dial("tcp", net.JoinHostPort(p.config.SshHost, strconv.Itoa(int(p.config.SshPort))))
if err != nil {
return fmt.Errorf("failed to connect to target server: %w", err)
}
} else {
// 直接发起 TCP 连接到目标服务器
targetConn, err = net.Dial("tcp", net.JoinHostPort(p.config.SshHost, strconv.Itoa(int(p.config.SshPort))))
if err != nil {
return fmt.Errorf("failed to connect to target server: %w", err)
}
}
defer targetConn.Close()
// 创建 SSH 客户端
client, err := p.createSshClient(
targetConn,
p.config.SshHost,
p.config.SshPort,
p.config.SshAuthMethod,
p.config.SshUsername,
p.config.SshPassword,
p.config.SshKey,
p.config.SshKeyPassphrase,
)
if err != nil {
return fmt.Errorf("failed to create ssh client: %w", err)
}
defer client.Close()
// 删除质询文件
challengeFilePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token))
xssh.RemoveRemote(client, challengeFilePath, p.config.UseSCP)
return nil
}
func (p *provider) createSshClient(conn net.Conn, host string, port int32, authMethod string, username, password, key, keyPassphrase string) (*ssh.Client, error) {
if host == "" {
host = "localhost"
}
if port == 0 {
port = 22
}
if username == "" {
username = "root"
}
const AUTH_METHOD_NONE = "none"
const AUTH_METHOD_PASSWORD = "password"
const AUTH_METHOD_KEY = "key"
if authMethod == "" {
if key != "" {
authMethod = AUTH_METHOD_KEY
} else if password != "" {
authMethod = AUTH_METHOD_PASSWORD
} else {
authMethod = AUTH_METHOD_NONE
}
}
authentications := make([]ssh.AuthMethod, 0)
switch authMethod {
case AUTH_METHOD_NONE:
{
}
case AUTH_METHOD_PASSWORD:
{
authentications = append(authentications, ssh.Password(password))
authentications = append(authentications, ssh.KeyboardInteractive(func(user, instruction string, questions []string, echos []bool) ([]string, error) {
if len(questions) == 1 {
return []string{password}, nil
}
return nil, fmt.Errorf("unexpected keyboard interactive question [%s]", strings.Join(questions, ", "))
}))
}
case AUTH_METHOD_KEY:
{
var signer ssh.Signer
var err error
if keyPassphrase != "" {
signer, err = ssh.ParsePrivateKeyWithPassphrase([]byte(key), []byte(keyPassphrase))
} else {
signer, err = ssh.ParsePrivateKey([]byte(key))
}
if err != nil {
return nil, err
}
authentications = append(authentications, ssh.PublicKeys(signer))
}
default:
return nil, fmt.Errorf("unsupported auth method '%s'", authMethod)
}
addr := net.JoinHostPort(host, strconv.Itoa(int(port)))
sshConn, chans, reqs, err := ssh.NewClientConn(conn, addr, &ssh.ClientConfig{
User: username,
Auth: authentications,
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
})
if err != nil {
return nil, err
}
return ssh.NewClient(sshConn, chans, reqs), nil
}
+15 -99
View File
@@ -7,20 +7,17 @@ import (
"fmt"
"log/slog"
"net"
"os"
"path/filepath"
"strconv"
"strings"
"github.com/pkg/sftp"
"github.com/povsister/scp"
"golang.org/x/crypto/ssh"
"github.com/certimate-go/certimate/pkg/core"
xcert "github.com/certimate-go/certimate/pkg/utils/cert"
xssh "github.com/certimate-go/certimate/pkg/utils/ssh"
)
type JumpServerConfig struct {
type ServerConfig struct {
// SSH 主机。
// 零值时默认值 "localhost"。
SshHost string `json:"sshHost,omitempty"`
@@ -43,27 +40,10 @@ type JumpServerConfig struct {
}
type SSLDeployerProviderConfig struct {
// SSH 主机。
// 零值时默认值 "localhost"。
SshHost string `json:"sshHost,omitempty"`
// SSH 端口。
// 零值时默认值 22。
SshPort int32 `json:"sshPort,omitempty"`
// SSH 认证方式。
// 可取值 "none"、"password" 或 "key"。
// 零值时根据有无密码或私钥字段决定。
SshAuthMethod string `json:"sshAuthMethod,omitempty"`
// SSH 登录用户名。
// 零值时默认值 "root"。
SshUsername string `json:"sshUsername,omitempty"`
// SSH 登录密码。
SshPassword string `json:"sshPassword,omitempty"`
// SSH 登录私钥。
SshKey string `json:"sshKey,omitempty"`
// SSH 登录私钥口令。
SshKeyPassphrase string `json:"sshKeyPassphrase,omitempty"`
ServerConfig
// 跳板机配置数组。
JumpServers []JumpServerConfig `json:"jumpServers,omitempty"`
JumpServers []ServerConfig `json:"jumpServers,omitempty"`
// 是否回退使用 SCP。
UseSCP bool `json:"useSCP,omitempty"`
// 前置命令。
@@ -123,15 +103,16 @@ func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) {
}
func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) {
var err error
// 提取服务器证书和中间证书
serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM)
if err != nil {
return nil, fmt.Errorf("failed to extract certs: %w", err)
}
// 创建 TCP 链接
var targetConn net.Conn
// 连接到跳板机
if len(d.config.JumpServers) > 0 {
var jumpClient *ssh.Client
for i, jumpServerConf := range d.config.JumpServers {
@@ -182,7 +163,7 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
}
defer targetConn.Close()
// 通过已有的连接创建目标服务器 SSH 客户端
// 创建 SSH 客户端
client, err := createSshClient(
targetConn,
d.config.SshHost,
@@ -197,7 +178,6 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
return nil, fmt.Errorf("failed to create ssh client: %w", err)
}
defer client.Close()
d.logger.Info("ssh connected")
// 执行前置命令
@@ -212,26 +192,26 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
// 上传证书和私钥文件
switch d.config.OutputFormat {
case OUTPUT_FORMAT_PEM:
if err := writeFileString(client, d.config.UseSCP, d.config.OutputCertPath, certPEM); err != nil {
if err := xssh.WriteRemoteString(client, d.config.OutputCertPath, certPEM, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
}
d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath))
if d.config.OutputServerCertPath != "" {
if err := writeFileString(client, d.config.UseSCP, d.config.OutputServerCertPath, serverCertPEM); err != nil {
if err := xssh.WriteRemoteString(client, d.config.OutputServerCertPath, serverCertPEM, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to save server certificate file: %w", err)
}
d.logger.Info("ssl server certificate file uploaded", slog.String("path", d.config.OutputServerCertPath))
}
if d.config.OutputIntermediaCertPath != "" {
if err := writeFileString(client, d.config.UseSCP, d.config.OutputIntermediaCertPath, intermediaCertPEM); err != nil {
if err := xssh.WriteRemoteString(client, d.config.OutputIntermediaCertPath, intermediaCertPEM, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to save intermedia certificate file: %w", err)
}
d.logger.Info("ssl intermedia certificate file uploaded", slog.String("path", d.config.OutputIntermediaCertPath))
}
if err := writeFileString(client, d.config.UseSCP, d.config.OutputKeyPath, privkeyPEM); err != nil {
if err := xssh.WriteRemoteString(client, d.config.OutputKeyPath, privkeyPEM, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to upload private key file: %w", err)
}
d.logger.Info("ssl private key file uploaded", slog.String("path", d.config.OutputKeyPath))
@@ -243,7 +223,7 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
}
d.logger.Info("ssl certificate transformed to pfx")
if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, pfxData); err != nil {
if err := xssh.WriteRemote(client, d.config.OutputCertPath, pfxData, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
}
d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath))
@@ -255,7 +235,7 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
}
d.logger.Info("ssl certificate transformed to jks")
if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, jksData); err != nil {
if err := xssh.WriteRemote(client, d.config.OutputCertPath, jksData, d.config.UseSCP); err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
}
d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath))
@@ -372,67 +352,3 @@ func execSshCommand(sshCli *ssh.Client, command string) (string, string, error)
return stdoutBuf.String(), stderrBuf.String(), nil
}
func writeFileString(sshCli *ssh.Client, useSCP bool, path string, content string) error {
if useSCP {
return writeFileStringWithSCP(sshCli, path, content)
}
return writeFileStringWithSFTP(sshCli, path, content)
}
func writeFile(sshCli *ssh.Client, useSCP bool, path string, data []byte) error {
if useSCP {
return writeFileWithSCP(sshCli, path, data)
}
return writeFileWithSFTP(sshCli, path, data)
}
func writeFileStringWithSCP(sshCli *ssh.Client, path string, content string) error {
return writeFileWithSCP(sshCli, path, []byte(content))
}
func writeFileWithSCP(sshCli *ssh.Client, path string, data []byte) error {
scpCli, err := scp.NewClientFromExistingSSH(sshCli, &scp.ClientOption{})
if err != nil {
return fmt.Errorf("failed to create scp client: %w", err)
}
reader := bytes.NewReader(data)
err = scpCli.CopyToRemote(reader, path, &scp.FileTransferOption{})
if err != nil {
return fmt.Errorf("failed to write to remote file: %w", err)
}
return nil
}
func writeFileStringWithSFTP(sshCli *ssh.Client, path string, content string) error {
return writeFileWithSFTP(sshCli, path, []byte(content))
}
func writeFileWithSFTP(sshCli *ssh.Client, path string, data []byte) error {
sftpCli, err := sftp.NewClient(sshCli)
if err != nil {
return fmt.Errorf("failed to create sftp client: %w", err)
}
defer sftpCli.Close()
if err := sftpCli.MkdirAll(filepath.ToSlash(filepath.Dir(path))); err != nil {
return fmt.Errorf("failed to create remote directory: %w", err)
}
file, err := sftpCli.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC)
if err != nil {
return fmt.Errorf("failed to open remote file: %w", err)
}
defer file.Close()
_, err = file.Write(data)
if err != nil {
return fmt.Errorf("failed to write to remote file: %w", err)
}
return nil
}
+134
View File
@@ -0,0 +1,134 @@
package ssh
import (
"bytes"
"errors"
"fmt"
"os"
"path/filepath"
"github.com/pkg/sftp"
"github.com/povsister/scp"
"golang.org/x/crypto/ssh"
)
// 与 [WriteRemote] 类似,但写入的是字符串内容。
//
// 入参:
// - sshCli: SSH 客户端。
// - path: 文件远程路径。
// - data: 文件数据字节数组。
// - useSCP: 是否使用 SCP 进行传输,否则使用 SFTP。
//
// 出参:
// - 错误。
func WriteRemoteString(sshCli *ssh.Client, path string, content string, useSCP bool) error {
if useSCP {
return writeRemoteStringWithSCP(sshCli, path, content)
}
return writeRemoteStringWithSFTP(sshCli, path, content)
}
// 将数据写入指定远程路径的文件。
// 如果目录不存在,将会递归创建目录。
// 如果文件不存在,将会创建该文件;如果文件已存在,将会覆盖原有内容。
//
// 入参:
// - sshCli: SSH 客户端。
// - path: 文件远程路径。
// - data: 文件数据字节数组。
// - useSCP: 是否使用 SCP 进行传输,否则使用 SFTP。
//
// 出参:
// - 错误。
func WriteRemote(sshCli *ssh.Client, path string, data []byte, useSCP bool) error {
if useSCP {
return writeRemoteWithSCP(sshCli, path, data)
}
return writeRemoteWithSFTP(sshCli, path, data)
}
// 删除指定远程路径的文件。
//
// 入参:
// - sshCli: SSH 客户端。
// - path: 文件远程路径。
// - useSCP: 是否使用 SCP 进行传输,否则使用 SFTP。
//
// 出参:
// - 错误。
func RemoveRemote(sshCli *ssh.Client, path string, useSCP bool) error {
if useSCP {
return errors.ErrUnsupported
}
return removeRemoteWithSFTP(sshCli, path)
}
func writeRemoteStringWithSCP(sshCli *ssh.Client, path string, content string) error {
return writeRemoteWithSCP(sshCli, path, []byte(content))
}
func writeRemoteStringWithSFTP(sshCli *ssh.Client, path string, content string) error {
return writeRemoteWithSFTP(sshCli, path, []byte(content))
}
func writeRemoteWithSCP(sshCli *ssh.Client, path string, data []byte) error {
scpCli, err := scp.NewClientFromExistingSSH(sshCli, &scp.ClientOption{})
if err != nil {
return fmt.Errorf("failed to create scp client: %w", err)
}
reader := bytes.NewReader(data)
err = scpCli.CopyToRemote(reader, path, &scp.FileTransferOption{})
if err != nil {
return fmt.Errorf("failed to write to remote file: %w", err)
}
return nil
}
func writeRemoteWithSFTP(sshCli *ssh.Client, path string, data []byte) error {
sftpCli, err := sftp.NewClient(sshCli)
if err != nil {
return fmt.Errorf("failed to create sftp client: %w", err)
}
defer sftpCli.Close()
if err := sftpCli.MkdirAll(filepath.ToSlash(filepath.Dir(path))); err != nil {
return fmt.Errorf("failed to create remote directory: %w", err)
}
file, err := sftpCli.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC)
if err != nil {
return fmt.Errorf("failed to open remote file: %w", err)
}
defer file.Close()
_, err = file.Write(data)
if err != nil {
return fmt.Errorf("failed to write to remote file: %w", err)
}
return nil
}
func removeRemoteWithSFTP(sshCli *ssh.Client, path string) error {
sftpCli, err := sftp.NewClient(sshCli)
if err != nil {
return fmt.Errorf("failed to create sftp client: %w", err)
}
defer sftpCli.Close()
if err := sftpCli.MkdirAll(filepath.ToSlash(filepath.Dir(path))); err != nil {
return fmt.Errorf("failed to create remote directory: %w", err)
}
if err := sftpCli.Remove(path); err != nil {
return fmt.Errorf("failed to remove remote file: %w", err)
}
return nil
}
@@ -56,7 +56,7 @@ const MultipleSplitValueInput = ({
name: "componentMultipleSplitValueInput_" + nanoid(),
initialValues: { value: value?.split(delimiter) },
onSubmit: (values) => {
const temp = values.value ?? [];
const temp = (values.value ?? []) as string[];
if (splitOptions.trimSpace) {
temp.map((e) => e.trim());
}
@@ -146,6 +146,7 @@ const AccessEditDrawer = ({ afterClose, afterSubmit, mode, data, loading, trigge
gap="large"
placeholder={t("access.form.provider.search.placeholder")}
showOptionTags={usage == null || (usage === "dns-hosting" ? { [ACCESS_USAGES.DNS]: true, [ACCESS_USAGES.HOSTING]: true } : false)}
showSearch
onFilter={providerFilter}
onSelect={handleProviderPick}
/>
+1 -1
View File
@@ -112,7 +112,7 @@ const AccessForm = ({ className, style, disabled, initialValues, mode, usage, ..
reserve: z.string().nullish(),
});
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "accessForm",
initialValues: initialValues,
@@ -50,13 +50,11 @@ const AccessConfigFormFieldsProviderSSH = ({ disabled }: { disabled?: boolean })
label={t("access.form.ssh_auth_method.label")}
rules={[formRule]}
>
<Radio.Group
options={[AUTH_METHOD_NONE, AUTH_METHOD_PASSWORD, AUTH_METHOD_KEY].map((s) => ({
key: s,
label: t(`access.form.ssh_auth_method.option.${s}.label`),
value: s,
}))}
/>
<Radio.Group block>
<Radio.Button value={AUTH_METHOD_NONE}>{t("access.form.ssh_auth_method.option.none.label")}</Radio.Button>
<Radio.Button value={AUTH_METHOD_PASSWORD}>{t("access.form.ssh_auth_method.option.password.label")}</Radio.Button>
<Radio.Button value={AUTH_METHOD_KEY}>{t("access.form.ssh_auth_method.option.key.label")}</Radio.Button>
</Radio.Group>
</Form.Item>
<Form.Item name={[parentNamePath, "username"]} initialValue={initialValues.username} label={t("access.form.ssh_username.label")} rules={[formRule]}>
@@ -1,35 +1,47 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Typography, theme } from "antd";
import { Avatar, Select, Typography, theme } from "antd";
import { type ACMEDns01Provider, acmeDns01ProvidersMap } from "@/domain/provider";
export interface ACMEDns01ProviderSelectProps
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
onFilter?: (value: string, option: ACMEDns01Provider) => boolean;
import { type SharedSelectProps, useSelectDataSource } from "./_shared";
export interface ACMEDns01ProviderSelectProps extends SharedSelectProps<ACMEDns01Provider> {
showAvailability?: boolean;
}
const ACMEDns01ProviderSelect = ({ onFilter, ...props }: ACMEDns01ProviderSelectProps) => {
const ACMEDns01ProviderSelect = ({ showAvailability, onFilter, ...props }: ACMEDns01ProviderSelectProps) => {
const { t } = useTranslation();
const { token: themeToken } = theme.useToken();
const options = useMemo<Array<{ key: string; value: string; label: string; data: ACMEDns01Provider }>>(() => {
return Array.from(acmeDns01ProvidersMap.values())
.filter((provider) => {
if (onFilter) {
return onFilter(provider.type, provider);
}
return true;
})
.map((provider) => ({
const dataSources = useSelectDataSource({
dataSource: Array.from(acmeDns01ProvidersMap.values()),
filters: [onFilter!],
});
const options = useMemo(() => {
const convert = (providers: ACMEDns01Provider[]): Array<{ key: string; value: string; label: string; data: ACMEDns01Provider }> => {
return providers.map((provider) => ({
key: provider.type,
value: provider.type,
label: t(provider.name),
data: provider,
}));
}, [onFilter]);
};
return showAvailability
? [
{
label: t("provider.text.available_group"),
options: convert(dataSources.available),
},
{
label: t("provider.text.unavailable_group"),
options: convert(dataSources.unavailable),
},
].filter((group) => group.options.length > 0)
: convert(dataSources.filtered);
}, [showAvailability, dataSources]);
const renderOption = (key: string) => {
const provider = acmeDns01ProvidersMap.get(key);
@@ -46,9 +58,11 @@ const ACMEDns01ProviderSelect = ({ onFilter, ...props }: ACMEDns01ProviderSelect
{...props}
filterOption={(inputValue, option) => {
if (!option) return false;
if (!option.label) return false;
if (!option.value) return false;
const value = inputValue.toLowerCase();
return option.value.toLowerCase().includes(value) || option.label.toLowerCase().includes(value);
return String(option.value).toLowerCase().includes(value) || String(option.label).toLowerCase().includes(value);
}}
labelRender={({ value }) => {
if (value != null) {
@@ -60,7 +74,7 @@ const ACMEDns01ProviderSelect = ({ onFilter, ...props }: ACMEDns01ProviderSelect
options={options}
optionFilterProp={void 0}
optionLabelProp={void 0}
optionRender={(option) => renderOption(option.data.value)}
optionRender={(option) => renderOption(option.data.value as string)}
/>
);
};
@@ -0,0 +1,82 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, Typography, theme } from "antd";
import { type ACMEHttp01Provider, acmeHttp01ProvidersMap } from "@/domain/provider";
import { type SharedSelectProps, useSelectDataSource } from "./_shared";
export interface ACMEHttp01ProviderSelectProps extends SharedSelectProps<ACMEHttp01Provider> {
showAvailability?: boolean;
}
const ACMEHttp01ProviderSelect = ({ showAvailability, onFilter, ...props }: ACMEHttp01ProviderSelectProps) => {
const { t } = useTranslation();
const { token: themeToken } = theme.useToken();
const dataSources = useSelectDataSource({
dataSource: Array.from(acmeHttp01ProvidersMap.values()),
filters: [onFilter!],
});
const options = useMemo(() => {
const convert = (providers: ACMEHttp01Provider[]): Array<{ key: string; value: string; label: string; data: ACMEHttp01Provider }> => {
return providers.map((provider) => ({
key: provider.type,
value: provider.type,
label: t(provider.name),
data: provider,
}));
};
return showAvailability
? [
{
label: t("provider.text.available_group"),
options: convert(dataSources.available),
},
{
label: t("provider.text.unavailable_group"),
options: convert(dataSources.unavailable),
},
].filter((group) => group.options.length > 0)
: convert(dataSources.filtered);
}, [showAvailability, dataSources]);
const renderOption = (key: string) => {
const provider = acmeHttp01ProvidersMap.get(key);
return (
<div className="flex items-center gap-2 truncate overflow-hidden">
<Avatar shape="square" src={provider?.icon} size="small" />
<Typography.Text ellipsis>{t(provider?.name ?? "")}</Typography.Text>
</div>
);
};
return (
<Select
{...props}
filterOption={(inputValue, option) => {
if (!option) return false;
if (!option.label) return false;
if (!option.value) return false;
const value = inputValue.toLowerCase();
return String(option.value).toLowerCase().includes(value) || String(option.label).toLowerCase().includes(value);
}}
labelRender={({ value }) => {
if (value != null) {
return renderOption(value as string);
}
return <span style={{ color: themeToken.colorTextPlaceholder }}>{props.placeholder}</span>;
}}
options={options}
optionFilterProp={void 0}
optionLabelProp={void 0}
optionRender={(option) => renderOption(option.data.value as string)}
/>
);
};
export default ACMEHttp01ProviderSelect;
@@ -1,37 +1,31 @@
import { useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useMount, useSize } from "ahooks";
import { useMount } from "ahooks";
import { Avatar, Card, Empty, Input, type InputRef, Tag, Tooltip, Typography } from "antd";
import Show from "@/components/Show";
import { ACCESS_USAGES, type AccessProvider, type AccessUsageType, accessProvidersMap } from "@/domain/provider";
import { mergeCls } from "@/utils/css";
export interface AccessProviderPickerProps {
className?: string;
style?: React.CSSProperties;
autoFocus?: boolean;
gap?: number | "small" | "middle" | "large";
placeholder?: string;
import { type SharedPickerProps, usePickerDataSource, usePickerWrapperCols } from "./_shared";
export interface AccessProviderPickerProps extends SharedPickerProps<AccessProvider> {
showOptionTags?: boolean | { [key in AccessUsageType]?: boolean };
onFilter?: (value: string, option: AccessProvider) => boolean;
onSelect?: (value: string) => void;
}
const AccessProviderPicker = ({ className, style, autoFocus, gap = "middle", placeholder, showOptionTags, onFilter, onSelect }: AccessProviderPickerProps) => {
const AccessProviderPicker = ({
className,
style,
autoFocus,
gap = "middle",
placeholder,
showOptionTags,
showSearch = false,
onFilter,
onSelect,
}: AccessProviderPickerProps) => {
const { t } = useTranslation();
const wrapperRef = useRef<HTMLDivElement>(null);
const wrapperSize = useSize(wrapperRef);
const [keyword, setKeyword] = useState<string>();
const keywordInputRef = useRef<InputRef>(null);
useMount(() => {
if (autoFocus) {
setTimeout(() => keywordInputRef.current?.focus(), 1);
}
});
const showOptionTagForDNS = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.DNS] : !!showOptionTags;
}, [showOptionTags]);
@@ -48,104 +42,97 @@ const AccessProviderPicker = ({ className, style, autoFocus, gap = "middle", pla
return showOptionTagForDNS || showOptionTagForHosting || showOptionTagForCA || showOptionTagForNotification;
}, [showOptionTagForDNS, showOptionTagForHosting, showOptionTagForCA, showOptionTagForNotification]);
const providers = useMemo(() => {
return Array.from(accessProvidersMap.values())
.filter((provider) => {
if (onFilter) {
return onFilter(provider.type, provider);
}
const { wrapperElRef, cols } = usePickerWrapperCols(showOptionTagAnyhow ? 240 : 200);
return true;
})
.filter((provider) => {
if (keyword) {
const value = keyword.toLowerCase();
return provider.type.toLowerCase().includes(value) || t(provider.name).toLowerCase().includes(value);
}
return true;
});
}, [onFilter, keyword]);
const providerCols = useMemo(() => {
if (!wrapperSize) {
return 1;
const [keyword, setKeyword] = useState<string>();
const keywordInputRef = useRef<InputRef>(null);
useMount(() => {
if (autoFocus) {
setTimeout(() => keywordInputRef.current?.focus(), 1);
}
});
const cols = Math.floor(wrapperSize.width / (showOptionTagAnyhow ? 240 : 200));
return Math.min(9, Math.max(1, cols));
}, [wrapperSize, showOptionTagAnyhow]);
const dataSources = usePickerDataSource({
dataSource: Array.from(accessProvidersMap.values()),
filters: [onFilter!],
keyword: keyword,
});
const renderOption = (provider: AccessProvider) => {
return (
<div key={provider.type}>
<Card
className={mergeCls("w-full overflow-hidden shadow", provider.builtin ? " cursor-not-allowed" : "", showOptionTagAnyhow ? "h-32" : "h-28")}
styles={{ body: { height: "100%", padding: "0.5rem 1rem" } }}
hoverable
onClick={() => {
if (provider.builtin) {
return;
}
handleProviderTypeSelect(provider.type);
}}
>
<div className="flex size-full flex-col items-center justify-center gap-3 overflow-hidden p-2">
<div className="flex items-center justify-center">
<Avatar className="bg-stone-100" icon={<img src={provider.icon} />} shape="square" size={32} />
</div>
<div className="w-full overflow-hidden text-center">
<div className={mergeCls("w-full truncate", { "mb-1": showOptionTagAnyhow })}>
<Tooltip title={t(provider.name)} mouseEnterDelay={1}>
<Typography.Text type={provider.builtin ? "secondary" : void 0}>{t(provider.name) || "\u00A0"}</Typography.Text>
</Tooltip>
</div>
<Show when={showOptionTagAnyhow}>
<div className="origin-top scale-80 whitespace-nowrap" style={{ marginInlineEnd: "-8px" }}>
<Show when={provider.builtin}>
<Tag>{t("access.props.provider.builtin")}</Tag>
</Show>
<Show when={showOptionTagForDNS && provider.usages.includes(ACCESS_USAGES.DNS)}>
<Tag color="#d93f0b99">{t("access.props.provider.usage.dns")}</Tag>
</Show>
<Show when={showOptionTagForHosting && provider.usages.includes(ACCESS_USAGES.HOSTING)}>
<Tag color="#0052cc99">{t("access.props.provider.usage.hosting")}</Tag>
</Show>
<Show when={showOptionTagForCA && provider.usages.includes(ACCESS_USAGES.CA)}>
<Tag color="#0e8a1699">{t("access.props.provider.usage.ca")}</Tag>
</Show>
<Show when={showOptionTagForNotification && provider.usages.includes(ACCESS_USAGES.NOTIFICATION)}>
<Tag color="#1d76db99">{t("access.props.provider.usage.notification")}</Tag>
</Show>
</div>
</Show>
</div>
</div>
</Card>
</div>
);
};
const handleProviderTypeSelect = (value: string) => {
onSelect?.(value);
};
return (
<div className={className} style={style} ref={wrapperRef}>
<Input.Search ref={keywordInputRef} placeholder={placeholder ?? t("common.text.search")} onChange={(e) => setKeyword(e.target.value.trim())} />
<div className={className} style={style} ref={wrapperElRef}>
<Show when={showSearch}>
<div className="mb-4">
<Input.Search ref={keywordInputRef} placeholder={placeholder ?? t("common.text.search")} onChange={(e) => setKeyword(e.target.value.trim())} />
</div>
</Show>
<div className="mt-4">
<Show when={providers.length > 0} fallback={<Empty description={t("common.text.nodata")} image={Empty.PRESENTED_IMAGE_SIMPLE} />}>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${providerCols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{providers.map((provider) => {
return (
<div key={provider.type}>
<Card
className={mergeCls("w-full overflow-hidden shadow", provider.builtin ? " cursor-not-allowed" : "", showOptionTagAnyhow ? "h-32" : "h-28")}
styles={{ body: { height: "100%", padding: "0.5rem 1rem" } }}
hoverable
onClick={() => {
if (provider.builtin) {
return;
}
handleProviderTypeSelect(provider.type);
}}
>
<div className="flex size-full flex-col items-center justify-center gap-3 overflow-hidden p-2">
<div className="flex items-center justify-center">
<Avatar className="bg-stone-100" icon={<img src={provider.icon} />} shape="square" size={32} />
</div>
<div className="w-full overflow-hidden text-center">
<div className={mergeCls("w-full truncate", { "mb-1": showOptionTagAnyhow })}>
<Tooltip title={t(provider.name)} mouseEnterDelay={1}>
<Typography.Text type={provider.builtin ? "secondary" : void 0}>{t(provider.name) || "\u00A0"}</Typography.Text>
</Tooltip>
</div>
<Show when={showOptionTagAnyhow}>
<div className="origin-top scale-80 whitespace-nowrap" style={{ marginInlineEnd: "-8px" }}>
<Show when={provider.builtin}>
<Tag>{t("access.props.provider.builtin")}</Tag>
</Show>
<Show when={showOptionTagForDNS && provider.usages.includes(ACCESS_USAGES.DNS)}>
<Tag color="#d93f0b99">{t("access.props.provider.usage.dns")}</Tag>
</Show>
<Show when={showOptionTagForHosting && provider.usages.includes(ACCESS_USAGES.HOSTING)}>
<Tag color="#0052cc99">{t("access.props.provider.usage.hosting")}</Tag>
</Show>
<Show when={showOptionTagForCA && provider.usages.includes(ACCESS_USAGES.CA)}>
<Tag color="#0e8a1699">{t("access.props.provider.usage.ca")}</Tag>
</Show>
<Show when={showOptionTagForNotification && provider.usages.includes(ACCESS_USAGES.NOTIFICATION)}>
<Tag color="#1d76db99">{t("access.props.provider.usage.notification")}</Tag>
</Show>
</div>
</Show>
</div>
</div>
</Card>
</div>
);
})}
</div>
</Show>
</div>
<Show when={dataSources.filtered.length > 0} fallback={<Empty description={t("provider.text.nodata")} image={Empty.PRESENTED_IMAGE_SIMPLE} />}>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${cols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{dataSources.filtered.map((provider) => renderOption(provider))}
</div>
</Show>
</div>
);
};
@@ -1,14 +1,14 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Tag, Typography, theme } from "antd";
import { Avatar, Select, Tag, Typography, theme } from "antd";
import Show from "@/components/Show";
import { ACCESS_USAGES, type AccessProvider, type AccessUsageType, accessProvidersMap } from "@/domain/provider";
export interface AccessProviderSelectProps
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
import { type SharedSelectProps } from "./_shared";
export interface AccessProviderSelectProps extends SharedSelectProps<AccessProvider> {
showOptionTags?: boolean | { [key in AccessUsageType]?: boolean };
onFilter?: (value: string, option: AccessProvider) => boolean;
}
const AccessProviderSelect = ({ showOptionTags, onFilter, ...props }: AccessProviderSelectProps = { showOptionTags: true }) => {
@@ -16,6 +16,19 @@ const AccessProviderSelect = ({ showOptionTags, onFilter, ...props }: AccessProv
const { token: themeToken } = theme.useToken();
const showOptionTagForDNS = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.DNS] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForHosting = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.HOSTING] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForCA = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.CA] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForNotification = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.NOTIFICATION] : !!showOptionTags;
}, [showOptionTags]);
const options = useMemo<Array<{ key: string; value: string; label: string; data: AccessProvider }>>(() => {
return Array.from(accessProvidersMap.values())
.filter((provider) => {
@@ -34,19 +47,6 @@ const AccessProviderSelect = ({ showOptionTags, onFilter, ...props }: AccessProv
}));
}, [onFilter]);
const showOptionTagForDNS = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.DNS] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForHosting = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.HOSTING] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForCA = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.CA] : !!showOptionTags;
}, [showOptionTags]);
const showOptionTagForNotification = useMemo(() => {
return typeof showOptionTags === "object" ? !!showOptionTags?.[ACCESS_USAGES.NOTIFICATION] : !!showOptionTags;
}, [showOptionTags]);
const renderOption = (key: string) => {
const provider = accessProvidersMap.get(key) ?? ({ type: "", name: "", icon: "", usages: [] } as unknown as AccessProvider);
return (
@@ -1,13 +1,12 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Typography, theme } from "antd";
import { Avatar, Select, Typography, theme } from "antd";
import { type CAProvider, caProvidersMap } from "@/domain/provider";
export interface CAProviderSelectProps
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
onFilter?: (value: string, option: CAProvider) => boolean;
}
import { type SharedSelectProps } from "./_shared";
export interface CAProviderSelectProps extends SharedSelectProps<CAProvider> {}
const CAProviderSelect = ({ onFilter, ...props }: CAProviderSelectProps) => {
const { t } = useTranslation();
@@ -1,34 +1,32 @@
import { useMemo, useRef, useState } from "react";
import { useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useMount, useSize } from "ahooks";
import { Avatar, Card, Checkbox, Empty, Flex, Input, type InputRef, Tabs, Tooltip, Typography } from "antd";
import { useMount } from "ahooks";
import { Avatar, Card, Divider, Empty, Flex, Input, type InputRef, Tabs, Tooltip, Typography } from "antd";
import Show from "@/components/Show";
import { DEPLOYMENT_CATEGORIES, type DeploymentProvider, deploymentProvidersMap } from "@/domain/provider";
import { useZustandShallowSelector } from "@/hooks";
import { useAccessesStore } from "@/stores/access";
import { mergeCls } from "@/utils/css";
export interface DeploymentProviderPickerProps {
className?: string;
style?: React.CSSProperties;
autoFocus?: boolean;
gap?: number | "small" | "middle" | "large";
placeholder?: string;
onFilter?: (value: string, option: DeploymentProvider) => boolean;
onSelect?: (value: string) => void;
import { type SharedPickerProps, usePickerDataSource, usePickerWrapperCols } from "./_shared";
export interface DeploymentProviderPickerProps extends SharedPickerProps<DeploymentProvider> {
showAvailability?: boolean;
}
const DeploymentProviderPicker = ({ className, style, autoFocus, gap = "middle", placeholder, onFilter, onSelect }: DeploymentProviderPickerProps) => {
const DeploymentProviderPicker = ({
className,
style,
autoFocus,
gap = "middle",
placeholder,
showAvailability = false,
showSearch = false,
onFilter,
onSelect,
}: DeploymentProviderPickerProps) => {
const { t } = useTranslation();
const { accesses, fetchAccesses } = useAccessesStore(useZustandShallowSelector(["accesses", "fetchAccesses"]));
useMount(() => fetchAccesses(false));
const wrapperRef = useRef<HTMLDivElement>(null);
const wrapperSize = useSize(wrapperRef);
const [isAvailableOnly, setIsAvailableOnly] = useState(true);
const { wrapperElRef, cols } = usePickerWrapperCols(320);
const [category, setCategory] = useState<string>(DEPLOYMENT_CATEGORIES.ALL);
@@ -40,131 +38,123 @@ const DeploymentProviderPicker = ({ className, style, autoFocus, gap = "middle",
}
});
const providers = useMemo(() => {
return Array.from(deploymentProvidersMap.values())
.filter((provider) => {
if (onFilter) {
return onFilter(provider.type, provider);
}
return true;
})
.filter((provider) => {
if (isAvailableOnly) {
return provider.builtin || accesses.some((access) => access.provider === provider.provider);
}
return true;
})
.filter((provider) => {
const dataSources = usePickerDataSource({
dataSource: Array.from(deploymentProvidersMap.values()),
filters: [
onFilter!,
(_, provider) => {
if (category && category !== DEPLOYMENT_CATEGORIES.ALL) {
return provider.category === category;
}
return true;
})
.filter((provider) => {
if (keyword) {
const value = keyword.toLowerCase();
return provider.type.toLowerCase().includes(value) || t(provider.name).toLowerCase().includes(value);
}
},
],
keyword: keyword,
deps: [category],
});
return true;
});
}, [onFilter, accesses, isAvailableOnly, category, keyword]);
const providerCols = useMemo(() => {
if (!wrapperSize) {
return 1;
}
const cols = Math.floor(wrapperSize.width / 320);
return Math.min(9, Math.max(1, cols));
}, [wrapperSize]);
const renderOption = (provider: DeploymentProvider, transparent: boolean = false) => {
return (
<div key={provider.type}>
<Card
className="group/provider h-16 w-full overflow-hidden shadow"
styles={{ body: { height: "100%", padding: "0.5rem 1rem" } }}
hoverable
onClick={() => {
handleProviderTypeSelect(provider.type);
}}
>
<div className={mergeCls("size-full", transparent ? "transition-opacity opacity-75 group-hover/provider:opacity-100" : void 0)}>
<div className="flex size-full items-center gap-4 overflow-hidden">
<Avatar className="bg-stone-100" icon={<img src={provider.icon} />} shape="square" size={28} />
<div className="flex-1 overflow-hidden">
<div className="line-clamp-2 max-w-full">
<Tooltip title={t(provider.name)} mouseEnterDelay={1}>
<Typography.Text>{t(provider.name) || "\u00A0"}</Typography.Text>
</Tooltip>
</div>
</div>
</div>
</div>
</Card>
</div>
);
};
const handleProviderTypeSelect = (value: string) => {
onSelect?.(value);
};
return (
<div className={className} style={style} ref={wrapperRef}>
<Input.Search ref={keywordInputRef} placeholder={placeholder ?? t("common.text.search")} onChange={(e) => setKeyword(e.target.value.trim())} />
<div className={className} style={style} ref={wrapperElRef}>
<Show when={showSearch}>
<div className="mb-4">
<Input.Search ref={keywordInputRef} placeholder={placeholder ?? t("common.text.search")} onChange={(e) => setKeyword(e.target.value.trim())} />
</div>
</Show>
<div className="mt-4">
<Flex justify="end">
<Checkbox checked={isAvailableOnly} onClick={() => setIsAvailableOnly(!isAvailableOnly)}>
{t("provider.text.show_available_hosting_provider_only")}
</Checkbox>
</Flex>
</div>
<Flex>
<Tabs
defaultActiveKey={DEPLOYMENT_CATEGORIES.ALL}
items={[
DEPLOYMENT_CATEGORIES.ALL,
DEPLOYMENT_CATEGORIES.CDN,
DEPLOYMENT_CATEGORIES.STORAGE,
DEPLOYMENT_CATEGORIES.LOADBALANCE,
DEPLOYMENT_CATEGORIES.FIREWALL,
DEPLOYMENT_CATEGORIES.AV,
DEPLOYMENT_CATEGORIES.ACCELERATOR,
DEPLOYMENT_CATEGORIES.APIGATEWAY,
DEPLOYMENT_CATEGORIES.SERVERLESS,
DEPLOYMENT_CATEGORIES.WEBSITE,
DEPLOYMENT_CATEGORIES.SSL,
DEPLOYMENT_CATEGORIES.NAS,
DEPLOYMENT_CATEGORIES.OTHER,
].map((key) => ({
key: key,
label: t(`provider.category.${key}`),
}))}
size="small"
tabBarStyle={{ marginLeft: "-1rem" }}
tabPosition="left"
onChange={(key) => setCategory(key)}
/>
<div className="mt-4">
<Flex>
<Tabs
defaultActiveKey={DEPLOYMENT_CATEGORIES.ALL}
items={[
DEPLOYMENT_CATEGORIES.ALL,
DEPLOYMENT_CATEGORIES.CDN,
DEPLOYMENT_CATEGORIES.STORAGE,
DEPLOYMENT_CATEGORIES.LOADBALANCE,
DEPLOYMENT_CATEGORIES.FIREWALL,
DEPLOYMENT_CATEGORIES.AV,
DEPLOYMENT_CATEGORIES.ACCELERATOR,
DEPLOYMENT_CATEGORIES.APIGATEWAY,
DEPLOYMENT_CATEGORIES.SERVERLESS,
DEPLOYMENT_CATEGORIES.WEBSITE,
DEPLOYMENT_CATEGORIES.SSL,
DEPLOYMENT_CATEGORIES.NAS,
DEPLOYMENT_CATEGORIES.OTHER,
].map((key) => ({
key: key,
label: t(`provider.category.${key}`),
}))}
size="small"
tabBarStyle={{ marginLeft: "-1rem" }}
tabPosition="left"
onChange={(key) => setCategory(key)}
/>
<div className="flex-1">
<Show when={dataSources.filtered.length > 0} fallback={<Empty description={t("provider.text.nodata")} image={Empty.PRESENTED_IMAGE_SIMPLE} />}>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${cols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{(showAvailability ? dataSources.available : dataSources.filtered).map((provider) => renderOption(provider))}
</div>
<Show when={showAvailability && dataSources.unavailable.length > 0}>
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("provider.text.unavailable_divider")}
</Typography.Text>
</Divider>
<div className="flex-1">
<Show when={providers.length > 0} fallback={<Empty description={t("common.text.nodata")} image={Empty.PRESENTED_IMAGE_SIMPLE} />}>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${providerCols}`, {
className={mergeCls("grid w-full gap-2", `grid-cols-${cols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{providers.map((provider) => {
return (
<div key={provider.type}>
<Card
className="h-16 w-full overflow-hidden shadow"
styles={{ body: { height: "100%", padding: "0.5rem 1rem" } }}
hoverable
onClick={() => {
handleProviderTypeSelect(provider.type);
}}
>
<div className="flex size-full items-center gap-4 overflow-hidden">
<Avatar className="bg-stone-100" icon={<img src={provider.icon} />} shape="square" size={28} />
<div className="flex-1 overflow-hidden">
<div className="line-clamp-2 max-w-full">
<Tooltip title={t(provider.name)} mouseEnterDelay={1}>
<Typography.Text>{t(provider.name) || "\u00A0"}</Typography.Text>
</Tooltip>
</div>
</div>
</div>
</Card>
</div>
);
})}
{dataSources.unavailable.map((provider) => renderOption(provider, true))}
</div>
</Show>
</div>
</Flex>
</div>
</Show>
</div>
</Flex>
</div>
);
};
@@ -1,35 +1,47 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Typography, theme } from "antd";
import { Avatar, Select, Typography, theme } from "antd";
import { type DeploymentProvider, deploymentProvidersMap } from "@/domain/provider";
export interface DeploymentProviderSelectProps
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
onFilter?: (value: string, option: DeploymentProvider) => boolean;
import { type SharedSelectProps, useSelectDataSource } from "./_shared";
export interface DeploymentProviderSelectProps extends SharedSelectProps<DeploymentProvider> {
showAvailability?: boolean;
}
const DeploymentProviderSelect = ({ onFilter, ...props }: DeploymentProviderSelectProps) => {
const DeploymentProviderSelect = ({ showAvailability = false, onFilter, ...props }: DeploymentProviderSelectProps) => {
const { t } = useTranslation();
const { token: themeToken } = theme.useToken();
const options = useMemo<Array<{ key: string; value: string; label: string; data: DeploymentProvider }>>(() => {
return Array.from(deploymentProvidersMap.values())
.filter((provider) => {
if (onFilter) {
return onFilter(provider.type, provider);
}
return true;
})
.map((provider) => ({
const dataSources = useSelectDataSource({
dataSource: Array.from(deploymentProvidersMap.values()),
filters: [onFilter!],
});
const options = useMemo(() => {
const convert = (providers: DeploymentProvider[]): Array<{ key: string; value: string; label: string; data: DeploymentProvider }> => {
return providers.map((provider) => ({
key: provider.type,
value: provider.type,
label: t(provider.name),
data: provider,
}));
}, [onFilter]);
};
return showAvailability
? [
{
label: t("provider.text.available_group"),
options: convert(dataSources.available),
},
{
label: t("provider.text.unavailable_group"),
options: convert(dataSources.unavailable),
},
].filter((group) => group.options.length > 0)
: convert(dataSources.filtered);
}, [showAvailability, dataSources]);
const renderOption = (key: string) => {
const provider = deploymentProvidersMap.get(key);
@@ -46,9 +58,11 @@ const DeploymentProviderSelect = ({ onFilter, ...props }: DeploymentProviderSele
{...props}
filterOption={(inputValue, option) => {
if (!option) return false;
if (!option.label) return false;
if (!option.value) return false;
const value = inputValue.toLowerCase();
return option.value.toLowerCase().includes(value) || option.label.toLowerCase().includes(value);
return String(option.value).toLowerCase().includes(value) || String(option.label).toLowerCase().includes(value);
}}
labelRender={({ value }) => {
if (value != null) {
@@ -60,7 +74,7 @@ const DeploymentProviderSelect = ({ onFilter, ...props }: DeploymentProviderSele
options={options}
optionFilterProp={void 0}
optionLabelProp={void 0}
optionRender={(option) => renderOption(option.data.value)}
optionRender={(option) => renderOption(option.data.value as string)}
/>
);
};
@@ -0,0 +1,120 @@
import { useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useMount } from "ahooks";
import { Avatar, Card, Divider, Empty, Input, type InputRef, Tooltip, Typography } from "antd";
import Show from "@/components/Show";
import { type NotificationProvider, notificationProvidersMap } from "@/domain/provider";
import { mergeCls } from "@/utils/css";
import { type SharedPickerProps, usePickerDataSource, usePickerWrapperCols } from "./_shared";
export interface NotificationProviderPickerProps extends SharedPickerProps<NotificationProvider> {
showAvailability?: boolean;
}
const NotificationProviderPicker = ({
className,
style,
autoFocus,
gap = "middle",
placeholder,
showAvailability = false,
showSearch = false,
onFilter,
onSelect,
}: NotificationProviderPickerProps) => {
const { t } = useTranslation();
const { wrapperElRef, cols } = usePickerWrapperCols(320);
const [keyword, setKeyword] = useState<string>();
const keywordInputRef = useRef<InputRef>(null);
useMount(() => {
if (autoFocus) {
setTimeout(() => keywordInputRef.current?.focus(), 1);
}
});
const dataSources = usePickerDataSource({
dataSource: Array.from(notificationProvidersMap.values()),
filters: [onFilter!],
keyword: keyword,
});
const renderOption = (provider: NotificationProvider, transparent: boolean = false) => {
return (
<div key={provider.type}>
<Card
className="group/provider h-16 w-full overflow-hidden shadow"
styles={{ body: { height: "100%", padding: "0.5rem 1rem" } }}
hoverable
onClick={() => {
handleProviderTypeSelect(provider.type);
}}
>
<div className={mergeCls("size-full", transparent ? "transition-opacity opacity-75 group-hover/provider:opacity-100" : void 0)}>
<div className="flex size-full items-center gap-4 overflow-hidden">
<Avatar className="bg-stone-100" icon={<img src={provider.icon} />} shape="square" size={28} />
<div className="flex-1 overflow-hidden">
<div className="line-clamp-2 max-w-full">
<Tooltip title={t(provider.name)} mouseEnterDelay={1}>
<Typography.Text>{t(provider.name) || "\u00A0"}</Typography.Text>
</Tooltip>
</div>
</div>
</div>
</div>
</Card>
</div>
);
};
const handleProviderTypeSelect = (value: string) => {
onSelect?.(value);
};
return (
<div className={className} style={style} ref={wrapperElRef}>
<Show when={showSearch}>
<div className="mb-4">
<Input.Search ref={keywordInputRef} placeholder={placeholder ?? t("common.text.search")} onChange={(e) => setKeyword(e.target.value.trim())} />
</div>
</Show>
<Show when={dataSources.filtered.length > 0} fallback={<Empty description={t("provider.text.nodata")} image={Empty.PRESENTED_IMAGE_SIMPLE} />}>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${cols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{(showAvailability ? dataSources.available : dataSources.filtered).map((provider) => renderOption(provider))}
</div>
<Show when={showAvailability && dataSources.unavailable.length > 0}>
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("provider.text.unavailable_divider")}
</Typography.Text>
</Divider>
<div
className={mergeCls("grid w-full gap-2", `grid-cols-${cols}`, {
"gap-4": gap === "large",
"gap-2": gap === "middle",
"gap-1": gap === "small",
[`gap-${+gap || "2"}`]: typeof gap === "number",
})}
>
{dataSources.unavailable.map((provider) => renderOption(provider, true))}
</div>
</Show>
</Show>
</div>
);
};
export default NotificationProviderPicker;
@@ -1,35 +1,47 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Avatar, Select, type SelectProps, Typography, theme } from "antd";
import { Avatar, Select, Typography, theme } from "antd";
import { type NotificationProvider, notificationProvidersMap } from "@/domain/provider";
export interface NotificationProviderSelectProps
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
onFilter?: (value: string, option: NotificationProvider) => boolean;
import { type SharedSelectProps, useSelectDataSource } from "./_shared";
export interface NotificationProviderSelectProps extends SharedSelectProps<NotificationProvider> {
showAvailability?: boolean;
}
const NotificationProviderSelect = ({ onFilter, ...props }: NotificationProviderSelectProps) => {
const NotificationProviderSelect = ({ showAvailability = false, onFilter, ...props }: NotificationProviderSelectProps) => {
const { t } = useTranslation();
const { token: themeToken } = theme.useToken();
const options = useMemo<Array<{ key: string; value: string; label: string; data: NotificationProvider }>>(() => {
return Array.from(notificationProvidersMap.values())
.filter((provider) => {
if (onFilter) {
return onFilter(provider.type, provider);
}
return true;
})
.map((provider) => ({
const dataSources = useSelectDataSource({
dataSource: Array.from(notificationProvidersMap.values()),
filters: [onFilter!],
});
const options = useMemo(() => {
const convert = (providers: NotificationProvider[]): Array<{ key: string; value: string; label: string; data: NotificationProvider }> => {
return providers.map((provider) => ({
key: provider.type,
value: provider.type,
label: t(provider.name),
data: provider,
}));
}, [onFilter]);
};
return showAvailability
? [
{
label: t("provider.text.available_group"),
options: convert(dataSources.available),
},
{
label: t("provider.text.unavailable_group"),
options: convert(dataSources.unavailable),
},
].filter((group) => group.options.length > 0)
: convert(dataSources.filtered);
}, [showAvailability, dataSources]);
const renderOption = (key: string) => {
const provider = notificationProvidersMap.get(key);
@@ -46,9 +58,11 @@ const NotificationProviderSelect = ({ onFilter, ...props }: NotificationProvider
{...props}
filterOption={(inputValue, option) => {
if (!option) return false;
if (!option.label) return false;
if (!option.value) return false;
const value = inputValue.toLowerCase();
return option.value.toLowerCase().includes(value) || option.label.toLowerCase().includes(value);
return String(option.value).toLowerCase().includes(value) || String(option.label).toLowerCase().includes(value);
}}
labelRender={({ value }) => {
if (value != null) {
@@ -60,7 +74,7 @@ const NotificationProviderSelect = ({ onFilter, ...props }: NotificationProvider
options={options}
optionFilterProp={void 0}
optionLabelProp={void 0}
optionRender={(option) => renderOption(option.data.value)}
optionRender={(option) => renderOption(option.data.value as string)}
/>
);
};
+151
View File
@@ -0,0 +1,151 @@
import { useMemo, useRef } from "react";
import { useTranslation } from "react-i18next";
import { useMount, useSize } from "ahooks";
import { type SelectProps } from "antd";
import { useZustandShallowSelector } from "@/hooks";
import { useAccessesStore } from "@/stores/access";
type Provider = { type: string; name: string };
export interface SharedSelectProps<T extends Provider>
extends Omit<SelectProps, "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"> {
className?: string;
style?: React.CSSProperties;
onFilter?: (value: string, option: T) => boolean;
}
export const useSelectDataSource = <T extends Provider>({
dataSource,
filters,
deps,
}: {
dataSource: T[];
filters?: Array<(value: string, option: T) => boolean>;
deps?: React.DependencyList;
}) => {
const { accesses, fetchAccesses } = useAccessesStore(useZustandShallowSelector(["accesses", "fetchAccesses"]));
useMount(() => fetchAccesses(false));
const filteredDataSource = useMemo(() => {
return dataSource.filter((provider) => {
if (filters) {
for (const filter of filters) {
if (!filter) continue;
if (!filter(provider.type, provider)) return false;
}
}
return true;
});
}, [dataSource, filters, ...(deps ?? [])]);
const availableDataSource = useMemo(() => {
return filteredDataSource.filter((provider) => {
return accesses.some((access) => {
if ("builtin" in provider && provider.builtin) return true;
if ("provider" in provider) return access.provider === provider.provider;
return access.provider === provider.type;
});
});
}, [accesses, filteredDataSource, ...(deps ?? [])]);
const unavailableDataSource = useMemo(() => {
return filteredDataSource.filter((item) => !availableDataSource.includes(item));
}, [filteredDataSource, availableDataSource, ...(deps ?? [])]);
return {
raw: dataSource,
filtered: filteredDataSource,
available: availableDataSource,
unavailable: unavailableDataSource,
};
};
export interface SharedPickerProps<T extends Provider> {
className?: string;
style?: React.CSSProperties;
autoFocus?: boolean;
gap?: number | "small" | "middle" | "large";
placeholder?: string;
showSearch?: boolean;
onFilter?: (value: string, option: T) => boolean;
onSelect?: (value: string) => void;
}
export const usePickerWrapperCols = (width: number) => {
const wrapperElRef = useRef<HTMLDivElement>(null);
const wrapperSize = useSize(wrapperElRef);
const columns = useMemo(() => {
const wWidth = wrapperSize?.width ?? document.body.clientWidth - 256;
const wCols = Math.floor(wWidth / width);
return Math.min(9, Math.max(1, wCols));
}, [wrapperSize, width]);
return {
wrapperElRef,
cols: columns,
};
};
export const usePickerDataSource = <T extends Provider>({
dataSource,
filters,
keyword,
deps,
}: {
dataSource: T[];
filters?: Array<(value: string, option: T) => boolean>;
keyword?: string;
deps?: React.DependencyList;
}) => {
const { t } = useTranslation();
const { accesses, fetchAccesses } = useAccessesStore(useZustandShallowSelector(["accesses", "fetchAccesses"]));
useMount(() => fetchAccesses(false));
const filteredDataSource = useMemo(() => {
return dataSource
.filter((provider) => {
if (filters) {
for (const filter of filters) {
if (!filter) continue;
if (!filter(provider.type, provider)) return false;
}
}
return true;
})
.filter((provider) => {
if (keyword) {
const value = keyword.toLowerCase();
return provider.type.toLowerCase().includes(value) || t(provider.name).toLowerCase().includes(value);
}
return true;
});
}, [dataSource, filters, keyword, ...(deps ?? [])]);
const availableDataSource = useMemo(() => {
return filteredDataSource.filter((provider) => {
return accesses.some((access) => {
if ("builtin" in provider && provider.builtin) return true;
if ("provider" in provider) return access.provider === provider.provider;
return access.provider === provider.type;
});
});
}, [accesses, filteredDataSource, ...(deps ?? [])]);
const unavailableDataSource = useMemo(() => {
return filteredDataSource.filter((item) => !availableDataSource.includes(item));
}, [filteredDataSource, availableDataSource, ...(deps ?? [])]);
return {
raw: dataSource,
filtered: filteredDataSource,
available: availableDataSource,
unavailable: unavailableDataSource,
};
};
@@ -111,13 +111,9 @@ const WorkflowGraphExportBox = ({ className, style, data }: WorkflowGraphExportB
return (
<Form className={className} style={style} layout="vertical">
<Form.Item className="mb-4" label={t("workflow.detail.design.action.export.form.format.label")}>
<Radio.Group className="w-full" value={format} onChange={(e) => setFormat(e.target.value)}>
<Radio.Button className="w-1/2 text-center" value="yaml">
YAML
</Radio.Button>
<Radio.Button className="w-1/2 text-center" value="json">
JSON
</Radio.Button>
<Radio.Group block value={format} onChange={(e) => setFormat(e.target.value)}>
<Radio.Button value="yaml">YAML</Radio.Button>
<Radio.Button value="json">JSON</Radio.Button>
</Radio.Group>
</Form.Item>
@@ -229,13 +229,9 @@ const WorkflowGraphImportInputBox = forwardRef<WorkflowGraphImportInputBoxInstan
return (
<Form className={className} style={style} {...formProps} clearOnDestroy={true} form={formInst} layout="vertical" preserve={false} scrollToFirstError>
<Form.Item className="mb-4" name="format" label={t("workflow.detail.design.action.import.form.format.label")} rules={[formRule]}>
<Radio.Group className="w-full" onChange={(e) => handleFormatChange(e.target.value)}>
<Radio.Button className="w-1/2 text-center" value="yaml">
YAML
</Radio.Button>
<Radio.Button className="w-1/2 text-center" value="json">
JSON
</Radio.Button>
<Radio.Group block onChange={(e) => handleFormatChange(e.target.value)}>
<Radio.Button value="yaml">YAML</Radio.Button>
<Radio.Button value="json">JSON</Radio.Button>
</Radio.Group>
</Form.Item>
@@ -0,0 +1,52 @@
import { getI18n, useTranslation } from "react-i18next";
import { Form, Input } from "antd";
import { createSchemaFieldRule } from "antd-zod";
import { z } from "zod";
import { useFormNestedFieldsContext } from "./_context";
const BizApplyNodeConfigFieldsProviderLocal = () => {
const { i18n, t } = useTranslation();
const { parentNamePath } = useFormNestedFieldsContext();
const formSchema = z.object({
[parentNamePath]: getSchema({ i18n }),
});
const formRule = createSchemaFieldRule(formSchema);
const initialValues = getInitialValues();
return (
<>
<Form.Item
name={[parentNamePath, "webRootPath"]}
initialValue={initialValues.webRootPath}
label={t("workflow_node.apply.form.local_webroot_path.label")}
rules={[formRule]}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.local_webroot_path.tooltip") }}></span>}
>
<Input placeholder={t("workflow_node.apply.form.local_webroot_path.placeholder")} />
</Form.Item>
</>
);
};
const getInitialValues = (): Nullish<z.infer<ReturnType<typeof getSchema>>> => {
return {
webRootPath: "/var/www/html/",
};
};
const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> }) => {
const { t } = i18n;
return z.object({
webRootPath: z.string().nonempty(t("workflow_node.apply.form.local_webroot_path.placeholder")),
});
};
const _default = Object.assign(BizApplyNodeConfigFieldsProviderLocal, {
getInitialValues,
getSchema,
});
export default _default;
@@ -0,0 +1,52 @@
import { getI18n, useTranslation } from "react-i18next";
import { Form, Input } from "antd";
import { createSchemaFieldRule } from "antd-zod";
import { z } from "zod";
import { useFormNestedFieldsContext } from "./_context";
const BizApplyNodeConfigFieldsProviderSSH = () => {
const { i18n, t } = useTranslation();
const { parentNamePath } = useFormNestedFieldsContext();
const formSchema = z.object({
[parentNamePath]: getSchema({ i18n }),
});
const formRule = createSchemaFieldRule(formSchema);
const initialValues = getInitialValues();
return (
<>
<Form.Item
name={[parentNamePath, "webRootPath"]}
initialValue={initialValues.webRootPath}
label={t("workflow_node.apply.form.ssh_webroot_path.label")}
rules={[formRule]}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.ssh_webroot_path.tooltip") }}></span>}
>
<Input placeholder={t("workflow_node.apply.form.ssh_webroot_path.placeholder")} />
</Form.Item>
</>
);
};
const getInitialValues = (): Nullish<z.infer<ReturnType<typeof getSchema>>> => {
return {
webRootPath: "/var/www/html/",
};
};
const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> }) => {
const { t } = i18n;
return z.object({
webRootPath: z.string().nonempty(t("workflow_node.apply.form.ssh_webroot_path.placeholder")),
});
};
const _default = Object.assign(BizApplyNodeConfigFieldsProviderSSH, {
getInitialValues,
getSchema,
});
export default _default;
@@ -4,7 +4,22 @@ import { Link } from "react-router";
import { type FlowNodeEntity, getNodeForm } from "@flowgram.ai/fixed-layout-editor";
import { IconChevronRight, IconCircleMinus, IconPlus } from "@tabler/icons-react";
import { useControllableValue, useMount } from "ahooks";
import { type AnchorProps, AutoComplete, Button, Divider, Flex, Form, type FormInstance, Input, InputNumber, Select, Space, Switch, Typography } from "antd";
import {
type AnchorProps,
AutoComplete,
Button,
Divider,
Flex,
Form,
type FormInstance,
Input,
InputNumber,
Radio,
Select,
Space,
Switch,
Typography,
} from "antd";
import { createSchemaFieldRule } from "antd-zod";
import { z } from "zod";
@@ -12,9 +27,11 @@ import AccessEditDrawer from "@/components/access/AccessEditDrawer";
import AccessSelect from "@/components/access/AccessSelect";
import MultipleSplitValueInput from "@/components/MultipleSplitValueInput";
import ACMEDns01ProviderSelect from "@/components/provider/ACMEDns01ProviderSelect";
import ACMEHttp01ProviderSelect from "@/components/provider/ACMEHttp01ProviderSelect";
import CAProviderSelect from "@/components/provider/CAProviderSelect";
import Show from "@/components/Show";
import { ACCESS_USAGES, ACME_DNS01_PROVIDERS, accessProvidersMap, acmeDns01ProvidersMap, caProvidersMap } from "@/domain/provider";
import { type AccessModel } from "@/domain/access";
import { ACME_DNS01_PROVIDERS, ACME_HTTP01_PROVIDERS, acmeDns01ProvidersMap, acmeHttp01ProvidersMap, caProvidersMap } from "@/domain/provider";
import { type WorkflowNodeConfigForBizApply, defaultNodeConfigForBizApply } from "@/domain/workflow";
import { useAntdForm, useZustandShallowSelector } from "@/hooks";
import { useAccessesStore } from "@/stores/access";
@@ -26,11 +43,16 @@ import BizApplyNodeConfigFieldsProviderAliyunESA from "./BizApplyNodeConfigField
import BizApplyNodeConfigFieldsProviderAWSRoute53 from "./BizApplyNodeConfigFieldsProviderAWSRoute53";
import BizApplyNodeConfigFieldsProviderHuaweiCloudDNS from "./BizApplyNodeConfigFieldsProviderHuaweiCloudDNS";
import BizApplyNodeConfigFieldsProviderJDCloudDNS from "./BizApplyNodeConfigFieldsProviderJDCloudDNS";
import BizApplyNodeConfigFieldsProviderLocal from "./BizApplyNodeConfigFieldsProviderLocal";
import BizApplyNodeConfigFieldsProviderSSH from "./BizApplyNodeConfigFieldsProviderSSH";
import BizApplyNodeConfigFieldsProviderTencentCloudEO from "./BizApplyNodeConfigFieldsProviderTencentCloudEO";
import { NodeType } from "../nodes/typings";
const MULTIPLE_INPUT_SEPARATOR = ";";
const CHALLENGE_TYPE_DNS01 = "dns-01";
const CHALLENGE_TYPE_HTTP01 = "http-01";
export interface BizApplyNodeConfigFormProps {
form: FormInstance;
node: FlowNodeEntity;
@@ -44,6 +66,16 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
const { i18n, t } = useTranslation();
const { accesses } = useAccessesStore(useZustandShallowSelector("accesses"));
const accessOptionFilter = (_: string, option: AccessModel) => {
if (option.reserve) return false;
if (fieldChallengeType === CHALLENGE_TYPE_DNS01) return acmeDns01ProvidersMap.get(fieldProvider)?.provider === option.provider;
if (fieldChallengeType === CHALLENGE_TYPE_HTTP01) return acmeHttp01ProvidersMap.get(fieldProvider)?.provider === option.provider;
return false;
};
const accessOptionFilterForCA = (_: string, option: AccessModel) => {
if (option.reserve !== "ca") return false;
return caProvidersMap.get(fieldCAProvider)?.provider === option.provider;
};
const initialValues = useMemo(() => {
return getNodeForm(node)?.getValueIn("config") as WorkflowNodeConfigForBizApply | undefined;
@@ -51,55 +83,95 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBizApplyConfigForm",
initialValues: initialValues ?? getInitialValues(),
});
const fieldChallengeType = Form.useWatch<string>("challengeType", { form: formInst, preserve: true });
const fieldProvider = Form.useWatch<string>("provider", { form: formInst, preserve: true });
const fieldProviderAccessId = Form.useWatch<string>("providerAccessId", { form: formInst, preserve: true });
const fieldCAProvider = Form.useWatch<string>("caProvider", { form: formInst, preserve: true });
const fieldCAProviderAccessId = Form.useWatch<string>("caProviderAccessId", { form: formInst, preserve: true });
const NestedProviderConfigFields = useMemo(() => {
/*
注意:如果追加新的子组件,请保持以 ASCII 排序。
NOTICE: If you add new child component, please keep ASCII order.
*/
switch (fieldProvider) {
case ACME_DNS01_PROVIDERS.ALIYUN_ESA: {
return BizApplyNodeConfigFieldsProviderAliyunESA;
}
case ACME_DNS01_PROVIDERS.AWS:
case ACME_DNS01_PROVIDERS.AWS_ROUTE53: {
return BizApplyNodeConfigFieldsProviderAWSRoute53;
}
case ACME_DNS01_PROVIDERS.HUAWEICLOUD:
case ACME_DNS01_PROVIDERS.HUAWEICLOUD_DNS: {
return BizApplyNodeConfigFieldsProviderHuaweiCloudDNS;
}
case ACME_DNS01_PROVIDERS.JDCLOUD:
case ACME_DNS01_PROVIDERS.JDCLOUD_DNS: {
return BizApplyNodeConfigFieldsProviderJDCloudDNS;
}
case ACME_DNS01_PROVIDERS.TENCENTCLOUD_EO: {
return BizApplyNodeConfigFieldsProviderTencentCloudEO;
}
}
}, [fieldProvider]);
switch (fieldChallengeType) {
case CHALLENGE_TYPE_DNS01:
{
switch (fieldProvider) {
case ACME_DNS01_PROVIDERS.ALIYUN_ESA: {
return BizApplyNodeConfigFieldsProviderAliyunESA;
}
case ACME_DNS01_PROVIDERS.AWS:
case ACME_DNS01_PROVIDERS.AWS_ROUTE53: {
return BizApplyNodeConfigFieldsProviderAWSRoute53;
}
case ACME_DNS01_PROVIDERS.HUAWEICLOUD:
case ACME_DNS01_PROVIDERS.HUAWEICLOUD_DNS: {
return BizApplyNodeConfigFieldsProviderHuaweiCloudDNS;
}
case ACME_DNS01_PROVIDERS.JDCLOUD:
case ACME_DNS01_PROVIDERS.JDCLOUD_DNS: {
return BizApplyNodeConfigFieldsProviderJDCloudDNS;
}
case ACME_DNS01_PROVIDERS.TENCENTCLOUD_EO: {
return BizApplyNodeConfigFieldsProviderTencentCloudEO;
}
}
}
break;
const [showProvider, setShowProvider] = useState(false);
useEffect(() => {
// 通常情况下每个授权信息只对应一个 DNS 提供商,此时无需显示 DNS 提供商字段;
// 如果对应多个(如 AWS 的 Route53、Lightsail,阿里云的 DNS、ESA,腾讯云的 DNS、EdgeOne 等),则显示。
if (fieldProviderAccessId) {
const access = accesses.find((e) => e.id === fieldProviderAccessId);
const providers = Array.from(acmeDns01ProvidersMap.values()).filter((e) => e.provider === access?.provider);
setShowProvider(providers.length > 1);
} else {
setShowProvider(false);
case CHALLENGE_TYPE_HTTP01:
switch (fieldProvider) {
case ACME_HTTP01_PROVIDERS.LOCAL: {
return BizApplyNodeConfigFieldsProviderLocal;
}
case ACME_HTTP01_PROVIDERS.SSH: {
return BizApplyNodeConfigFieldsProviderSSH;
}
}
break;
}
}, [accesses, fieldProviderAccessId]);
}, [fieldChallengeType, fieldProvider]);
const [showProviderAccess, setShowProviderAccess] = useState(false);
useEffect(() => {
// 内置的质询提供商(如本地主机)无需显示授权信息字段
switch (fieldChallengeType) {
case CHALLENGE_TYPE_DNS01:
{
if (fieldProvider) {
const provider = acmeDns01ProvidersMap.get(fieldProvider);
setShowProviderAccess(!provider?.builtin);
} else {
setShowProviderAccess(false);
}
}
break;
case CHALLENGE_TYPE_HTTP01:
{
if (fieldProvider) {
const provider = acmeHttp01ProvidersMap.get(fieldProvider);
setShowProviderAccess(!provider?.builtin);
} else {
setShowProviderAccess(false);
}
}
break;
default:
{
setShowProviderAccess(false);
}
break;
}
}, [fieldChallengeType, fieldProvider]);
const [showCAProviderAccess, setShowCAProviderAccess] = useState(false);
useEffect(() => {
@@ -112,31 +184,92 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
}
}, [fieldCAProvider]);
const handleProviderSelect = (value: string) => {
if (fieldProvider === value) return;
useEffect(() => {
// 如果未选择质询提供商,则清空授权信息
if (!fieldProvider && fieldProviderAccessId) {
formInst.setFieldValue("providerAccessId", void 0);
return;
}
// 切换 DNS 提供商时联动授权信息
if (initialValues?.provider === value) {
formInst.setFieldValue("providerAccessId", initialValues?.providerAccessId);
} else {
if (acmeDns01ProvidersMap.get(fieldProvider)?.provider !== acmeDns01ProvidersMap.get(value)?.provider) {
formInst.setFieldValue("providerAccessId", void 0);
// 如果已选择质询提供商只有一个授权信息,则自动选择该授权信息
if (fieldProvider && !fieldProviderAccessId) {
const availableAccesses = accesses
.filter((access) => accessOptionFilter(access.provider, access))
.filter((access) => {
if (fieldChallengeType === CHALLENGE_TYPE_DNS01) return acmeDns01ProvidersMap.get(fieldProvider)?.provider === access.provider;
if (fieldChallengeType === CHALLENGE_TYPE_HTTP01) return acmeHttp01ProvidersMap.get(fieldProvider)?.provider === access.provider;
return false;
});
if (availableAccesses.length === 1) {
formInst.setFieldValue("providerAccessId", availableAccesses[0].id);
}
}
}, [fieldChallengeType, fieldProvider, fieldProviderAccessId]);
useEffect(() => {
// 如果未选择 CA 提供商,则清空授权信息
if (!fieldCAProvider && fieldCAProviderAccessId) {
formInst.setFieldValue("caProviderAccessId", void 0);
return;
}
// 如果已选择 CA 提供商只有一个授权信息,则自动选择该授权信息
if (fieldCAProvider && !fieldCAProviderAccessId) {
const availableAccesses = accesses
.filter((access) => accessOptionFilterForCA(access.provider, access))
.filter((access) => caProvidersMap.get(fieldCAProvider)?.provider === access.provider);
if (availableAccesses.length === 1) {
formInst.setFieldValue("caProviderAccessId", availableAccesses[0].id);
}
}
}, [fieldCAProvider, fieldCAProviderAccessId]);
const handleChallengeTypeChange = (value: string) => {
const resetFieldIfInvalid = (field: keyof z.infer<typeof formSchema>) => {
const fieldSchame = formSchema.pick({ [field]: true });
const fieldValue = formInst.getFieldValue(field);
if (!fieldSchame.safeParse({ [field]: fieldValue }).success) {
formInst.setFieldValue(field, void 0);
}
};
switch (value) {
case CHALLENGE_TYPE_DNS01:
{
formInst.setFieldValue("provider", void 0);
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
}
break;
case CHALLENGE_TYPE_HTTP01:
{
formInst.setFieldValue("provider", void 0);
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
resetFieldIfInvalid("dnsPropagationWait");
resetFieldIfInvalid("dnsPropagationTimeout");
resetFieldIfInvalid("dnsTTL");
}
break;
}
};
const handleProviderAccessSelect = (value: string) => {
// 切换授权信息时联动 DNS 提供商
const access = accesses.find((access) => access.id === value);
const provider = Array.from(acmeDns01ProvidersMap.values()).find((provider) => provider.provider === access?.provider);
if (fieldProvider !== provider?.type) {
formInst.setFieldValue("provider", provider?.type);
const handleProviderSelect = (value?: string | undefined) => {
// 切换质询提供商时重置表单,避免其他提供商的配置字段影响当前提供商
if (initialValues?.provider === value) {
formInst.setFieldValue("providerAccessId", void 0);
formInst.resetFields(["providerConfig"]);
} else {
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
}
};
const handleCAProviderSelect = (value?: string | undefined) => {
// 切换 CA 提供商时联动授权信息
if (value === "") {
if (value == null || value === "") {
setTimeout(() => {
formInst.setFieldValue("caProvider", void 0);
formInst.setFieldValue("caProviderAccessId", void 0);
@@ -154,7 +287,21 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
<NodeFormContextProvider value={{ node }}>
<Form {...formProps} clearOnDestroy={true} form={formInst} layout="vertical" preserve={false} scrollToFirstError>
<div id="parameters" data-anchor="parameters">
<Form.Item name="domains" label={t("workflow_node.apply.form.domains.label")} extra={t("workflow_node.apply.form.domains.help")} rules={[formRule]}>
<Form.Item
name="domains"
label={t("workflow_node.apply.form.domains.label")}
extra={
<span
dangerouslySetInnerHTML={{
__html:
fieldChallengeType === CHALLENGE_TYPE_HTTP01
? t("workflow_node.apply.form.domains.help_no_wildcard")
: t("workflow_node.apply.form.domains.help"),
}}
></span>
}
rules={[formRule]}
>
<MultipleSplitValueInput
modalTitle={t("workflow_node.apply.form.domains.multiple_input_modal.title")}
placeholder={t("workflow_node.apply.form.domains.placeholder")}
@@ -172,37 +319,69 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
>
<InternalEmailInput placeholder={t("workflow_node.apply.form.contact_email.placeholder")} />
</Form.Item>
</div>
<Form.Item name="challengeType" label={t("workflow_node.apply.form.challenge_type.label")} rules={[formRule]} hidden>
<Select
options={["DNS-01"].map((e) => ({
label: e,
value: e.toLowerCase(),
}))}
placeholder={t("workflow_node.apply.form.challenge_type.placeholder")}
/>
<div id="challenge" data-anchor="challenge">
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.apply.form_anchor.challenge.title")}
</Typography.Text>
</Divider>
<Form.Item
name="challengeType"
label={t("workflow_node.apply.form.challenge_type.label")}
rules={[formRule]}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.challenge_type.tooltip") }}></span>}
>
<Radio.Group block onChange={(e) => handleChallengeTypeChange(e.target.value)}>
<Radio.Button value={CHALLENGE_TYPE_DNS01}>DNS-01</Radio.Button>
<Radio.Button value={CHALLENGE_TYPE_HTTP01}>HTTP-01</Radio.Button>
</Radio.Group>
</Form.Item>
<Form.Item name="provider" label={t("workflow_node.apply.form.provider.label")} hidden={!showProvider} rules={[formRule]}>
<ACMEDns01ProviderSelect
disabled={!showProvider}
placeholder={t("workflow_node.apply.form.provider.placeholder")}
showSearch
onFilter={(_, option) => {
if (fieldProviderAccessId) {
return accesses.find((e) => e.id === fieldProviderAccessId)?.provider === option.provider;
}
return true;
}}
onSelect={handleProviderSelect}
/>
<Form.Item
name="provider"
label={
fieldChallengeType === CHALLENGE_TYPE_DNS01
? t("workflow_node.apply.form.provider_dns01.label")
: fieldChallengeType === CHALLENGE_TYPE_HTTP01
? t("workflow_node.apply.form.provider_http01.label")
: t("workflow_node.apply.form.provider.label")
}
rules={[formRule]}
>
{fieldChallengeType === CHALLENGE_TYPE_DNS01 ? (
<ACMEDns01ProviderSelect
placeholder={t("workflow_node.apply.form.provider_dns01.placeholder")}
showAvailability
showSearch
onSelect={handleProviderSelect}
onClear={handleProviderSelect}
/>
) : fieldChallengeType === CHALLENGE_TYPE_HTTP01 ? (
<ACMEHttp01ProviderSelect
placeholder={t("workflow_node.apply.form.provider_http01.placeholder")}
showAvailability
showSearch
onSelect={handleProviderSelect}
onClear={handleProviderSelect}
/>
) : (
<Select disabled placeholder={t("workflow_node.apply.form.provider.placeholder")} />
)}
</Form.Item>
<Form.Item
className="relative"
label={t("workflow_node.apply.form.provider_access.label")}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.provider_access.tooltip") }}></span>}
hidden={!showProviderAccess}
label={
fieldChallengeType === CHALLENGE_TYPE_DNS01
? t("workflow_node.apply.form.provider_access_dns01.label")
: fieldChallengeType === CHALLENGE_TYPE_HTTP01
? t("workflow_node.apply.form.provider_access_http01.label")
: t("workflow_node.apply.form.provider_access.label")
}
>
<div className="absolute -top-[6px] right-0 -translate-y-full">
<AccessEditDrawer
@@ -213,27 +392,27 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
<IconPlus size="1.25em" />
</Button>
}
usage="dns"
usage={fieldChallengeType === CHALLENGE_TYPE_DNS01 ? "dns" : fieldChallengeType === CHALLENGE_TYPE_HTTP01 ? "hosting" : "dns-hosting"}
afterSubmit={(record) => {
const provider = accessProvidersMap.get(record.provider);
if (provider?.usages?.includes(ACCESS_USAGES.DNS)) {
formInst.setFieldValue("providerAccessId", record.id);
handleProviderAccessSelect(record.id);
}
if (!accessOptionFilter(record.provider, record)) return;
if (fieldChallengeType === CHALLENGE_TYPE_DNS01 && acmeDns01ProvidersMap.get(fieldProvider!)?.provider !== record.provider) return;
if (fieldChallengeType === CHALLENGE_TYPE_HTTP01 && acmeHttp01ProvidersMap.get(fieldProvider!)?.provider !== record.provider) return;
formInst.setFieldValue("providerAccessId", record.id);
}}
/>
</div>
<Form.Item name="providerAccessId" rules={[formRule]} noStyle>
<AccessSelect
placeholder={t("workflow_node.apply.form.provider_access.placeholder")}
disabled={!fieldProvider}
placeholder={
fieldChallengeType === CHALLENGE_TYPE_DNS01
? t("workflow_node.apply.form.provider_access_dns01.placeholder")
: fieldChallengeType === CHALLENGE_TYPE_HTTP01
? t("workflow_node.apply.form.provider_access_http01.placeholder")
: t("workflow_node.apply.form.provider_access.placeholder")
}
showSearch
onChange={handleProviderAccessSelect}
onFilter={(_, option) => {
if (option.reserve) return false;
const provider = accessProvidersMap.get(option.provider);
return !!provider?.usages?.includes(ACCESS_USAGES.DNS);
}}
onFilter={accessOptionFilter}
/>
</Form.Item>
</Form.Item>
@@ -295,24 +474,18 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
}
usage="ca"
afterSubmit={(record) => {
const provider = accessProvidersMap.get(record.provider);
if (provider?.usages?.includes(ACCESS_USAGES.CA)) {
formInst.setFieldValue("caProviderAccessId", record.id);
}
if (accessOptionFilterForCA(record.provider, record)) return;
if (caProvidersMap.get(fieldProvider!)?.provider !== record.provider) return;
formInst.setFieldValue("caProviderAccessId", record.id);
}}
/>
</div>
<Form.Item name="caProviderAccessId" noStyle rules={[formRule]}>
<AccessSelect
disabled={!fieldCAProvider}
placeholder={t("workflow_node.apply.form.ca_provider_access.placeholder")}
showSearch
onFilter={(_, option) => {
if (option.reserve !== "ca") return false;
if (fieldCAProvider) return caProvidersMap.get(fieldCAProvider)?.provider === option.provider;
const provider = accessProvidersMap.get(option.provider);
return !!provider?.usages?.includes(ACCESS_USAGES.CA);
}}
onFilter={accessOptionFilterForCA}
/>
</Form.Item>
</Form.Item>
@@ -367,6 +540,7 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
<Form.Item
name="dnsPropagationWait"
hidden={fieldChallengeType !== CHALLENGE_TYPE_DNS01}
label={t("workflow_node.apply.form.dns_propagation_wait.label")}
rules={[formRule]}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.dns_propagation_wait.tooltip") }}></span>}
@@ -383,6 +557,7 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
<Form.Item
name="dnsPropagationTimeout"
hidden={fieldChallengeType !== CHALLENGE_TYPE_DNS01}
label={t("workflow_node.apply.form.dns_propagation_timeout.label")}
rules={[formRule]}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.apply.form.dns_propagation_timeout.tooltip") }}></span>}
@@ -399,6 +574,7 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps)
<Form.Item
name="dnsTTL"
hidden={fieldChallengeType !== CHALLENGE_TYPE_DNS01}
label={t("workflow_node.apply.form.dns_ttl.label")}
extra={t("workflow_node.apply.form.dns_ttl.help")}
rules={[formRule]}
@@ -616,7 +792,7 @@ const InternalValidityLifetimeInput = memo(
const getAnchorItems = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> }): Required<AnchorProps>["items"] => {
const { t } = i18n;
return ["parameters", "certificate", "advanced", "strategy"].map((key) => ({
return ["parameters", "challenge", "certificate", "advanced", "strategy"].map((key) => ({
key: key,
title: t(`workflow_node.apply.form_anchor.${key}.tab`),
href: "#" + key,
@@ -626,8 +802,7 @@ const getAnchorItems = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n
const getInitialValues = (): Nullish<z.infer<ReturnType<typeof getSchema>>> => {
return {
domains: "",
provider: "",
providerAccessId: "",
contactEmail: "",
...defaultNodeConfigForBizApply(),
};
};
@@ -637,16 +812,16 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> })
return z
.object({
domains: z.string().refine((v) => {
domains: z.string(t("workflow_node.apply.form.domains.placeholder")).refine((v) => {
if (!v) return false;
return String(v)
.split(MULTIPLE_INPUT_SEPARATOR)
.every((e) => validDomainName(e, { allowWildcard: true }));
}, t("common.errmsg.domain_invalid")),
contactEmail: z.email(t("common.errmsg.email_invalid")),
challengeType: z.string().nullish(),
challengeType: z.string(t("workflow_node.apply.form.challenge_type.placeholder")).nonempty(t("workflow_node.apply.form.challenge_type.placeholder")),
provider: z.string(t("workflow_node.apply.form.provider.placeholder")).nonempty(t("workflow_node.apply.form.provider.placeholder")),
providerAccessId: z.string(t("workflow_node.apply.form.provider_access.placeholder")).nonempty(t("workflow_node.apply.form.provider_access.placeholder")),
providerAccessId: z.string(t("workflow_node.apply.form.provider_access.placeholder")).nullish(),
providerConfig: z.any().nullish(),
caProvider: z.string().nullish(),
caProviderAccessId: z.string().nullish(),
@@ -701,6 +876,36 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> })
),
})
.superRefine((values, ctx) => {
if (values.provider) {
switch (values.challengeType) {
case CHALLENGE_TYPE_DNS01:
{
const provider = acmeDns01ProvidersMap.get(values.provider);
if (!provider?.builtin && !values.providerAccessId) {
ctx.addIssue({
code: "custom",
message: t("workflow_node.deploy.form.provider_access.placeholder"),
path: ["providerAccessId"],
});
}
}
break;
case CHALLENGE_TYPE_HTTP01:
{
const provider = acmeHttp01ProvidersMap.get(values.provider);
if (!provider?.builtin && !values.providerAccessId) {
ctx.addIssue({
code: "custom",
message: t("workflow_node.deploy.form.provider_access.placeholder"),
path: ["providerAccessId"],
});
}
}
break;
}
}
if (values.caProvider) {
const provider = caProvidersMap.get(values.caProvider);
if (!provider?.builtin && !values.caProviderAccessId) {
@@ -28,7 +28,7 @@ const BizDeployNodeConfigDrawer = ({ node, ...props }: BizDeployNodeConfigDrawer
return (
<NodeConfigDrawer
anchor={fieldProvider ? { items: BizDeployNodeConfigForm.getAnchorItems({ i18n }) } : false}
footer={fieldProvider ? true : false}
footer={fieldProvider ? void 0 : false}
form={formInst}
node={node}
{...props}
@@ -11,9 +11,11 @@ import AccessSelect from "@/components/access/AccessSelect";
import DeploymentProviderPicker from "@/components/provider/DeploymentProviderPicker";
import DeploymentProviderSelect from "@/components/provider/DeploymentProviderSelect";
import Show from "@/components/Show";
import { ACCESS_USAGES, DEPLOYMENT_PROVIDERS, accessProvidersMap, deploymentProvidersMap } from "@/domain/provider";
import { type AccessModel } from "@/domain/access";
import { DEPLOYMENT_PROVIDERS, deploymentProvidersMap } from "@/domain/provider";
import { type WorkflowNodeConfigForBizDeploy, defaultNodeConfigForBizDeploy } from "@/domain/workflow";
import { useAntdForm } from "@/hooks";
import { useAntdForm, useZustandShallowSelector } from "@/hooks";
import { useAccessesStore } from "@/stores/access";
import { getAllPreviousNodes } from "../_util";
import { FormNestedFieldsContextProvider, NodeFormContextProvider } from "./_context";
@@ -126,6 +128,12 @@ const BizDeployNodeConfigForm = ({ node, ...props }: BizDeployNodeConfigFormProp
const { token: themeToken } = theme.useToken();
const { accesses } = useAccessesStore(useZustandShallowSelector("accesses"));
const accessOptionFilter = (_: string, option: AccessModel) => {
if (option.reserve) return false;
return deploymentProvidersMap.get(fieldProvider)?.provider === option.provider;
};
const initialValues = useMemo(() => {
return getNodeForm(node)?.getValueIn("config") as WorkflowNodeConfigForBizDeploy | undefined;
}, [node]);
@@ -142,13 +150,14 @@ const BizDeployNodeConfigForm = ({ node, ...props }: BizDeployNodeConfigFormProp
}
});
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBizDeployConfigForm",
initialValues: initialValues ?? getInitialValues(),
});
const fieldProvider = Form.useWatch<string>("provider", { form: formInst, preserve: true });
const fieldProviderAccessId = Form.useWatch<string>("providerAccessId", { form: formInst, preserve: true });
const certificateOutputNodeIdOptions = useMemo(() => {
return getAllPreviousNodes(node)
@@ -460,29 +469,38 @@ const BizDeployNodeConfigForm = ({ node, ...props }: BizDeployNodeConfigFormProp
}
}, [fieldProvider]);
useEffect(() => {
// 如果未选择部署目标,则清空授权信息
if (!fieldProvider && fieldProviderAccessId) {
formInst.setFieldValue("providerAccessId", void 0);
return;
}
// 如果已选择部署目标只有一个授权信息,则自动选择该授权信息
if (fieldProvider && !fieldProviderAccessId) {
const availableAccesses = accesses
.filter((access) => accessOptionFilter(access.provider, access))
.filter((access) => deploymentProvidersMap.get(fieldProvider)?.provider === access.provider);
if (availableAccesses.length === 1) {
formInst.setFieldValue("providerAccessId", availableAccesses[0].id);
}
}
}, [fieldProvider, fieldProviderAccessId]);
const handleProviderPick = (value: string) => {
formInst.setFieldValue("provider", value);
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
};
const handleProviderSelect = (value?: string | undefined) => {
// 切换部署目标时重置表单,避免其他部署目标的配置字段影响当前部署目标
if (initialValues?.provider === value) {
formInst.resetFields();
formInst.setFieldValue("providerAccessId", void 0);
formInst.resetFields(["providerConfig"]);
} else {
const oldValues = formInst.getFieldsValue();
const newValues: Record<string, unknown> = {};
for (const key in oldValues) {
if (key === "certificateOutputNodeId" || key === "provider" || key === "providerAccessId" || key === "skipOnLastSucceeded") {
newValues[key] = oldValues[key];
} else {
delete newValues[key];
}
}
formInst.setFieldsValue(newValues);
if (deploymentProvidersMap.get(fieldProvider)?.provider !== deploymentProvidersMap.get(value!)?.provider) {
formInst.setFieldValue("providerAccessId", void 0);
}
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
}
};
@@ -490,62 +508,17 @@ const BizDeployNodeConfigForm = ({ node, ...props }: BizDeployNodeConfigFormProp
<NodeFormContextProvider value={{ node }}>
<Form {...formProps} clearOnDestroy={true} form={formInst} layout="vertical" preserve={false} scrollToFirstError>
<Show when={!fieldProvider}>
<DeploymentProviderPicker autoFocus placeholder={t("workflow_node.deploy.form.provider.search.placeholder")} onSelect={handleProviderPick} />
<DeploymentProviderPicker
autoFocus
placeholder={t("workflow_node.deploy.form.provider.search.placeholder")}
showAvailability
showSearch
onSelect={handleProviderPick}
/>
</Show>
<div style={{ display: fieldProvider ? "block" : "none" }}>
<div id="parameters" data-anchor="parameters">
<Form.Item name="provider" label={t("workflow_node.deploy.form.provider.label")} rules={[formRule]}>
<DeploymentProviderSelect
allowClear
disabled={!!initialValues?.provider}
placeholder={t("workflow_node.deploy.form.provider.placeholder")}
showSearch
onSelect={handleProviderSelect}
onClear={handleProviderSelect}
/>
</Form.Item>
<Form.Item
className="relative"
hidden={!showProviderAccess}
label={t("workflow_node.deploy.form.provider_access.label")}
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.provider_access.tooltip") }}></span>}
>
<div className="absolute -top-[6px] right-0 -translate-y-full">
<AccessEditDrawer
data={{ provider: deploymentProvidersMap.get(fieldProvider!)?.provider }}
mode="create"
trigger={
<Button size="small" type="link">
{t("workflow_node.deploy.form.provider_access.button")}
<IconPlus size="1.25em" />
</Button>
}
usage="hosting"
afterSubmit={(record) => {
const provider = accessProvidersMap.get(record.provider);
if (provider?.usages?.includes(ACCESS_USAGES.HOSTING)) {
formInst.setFieldValue("providerAccessId", record.id);
}
}}
/>
</div>
<Form.Item name="providerAccessId" rules={[formRule]} noStyle>
<AccessSelect
placeholder={t("workflow_node.deploy.form.provider_access.placeholder")}
showSearch
onFilter={(_, option) => {
if (option.reserve) return false;
if (fieldProvider) return deploymentProvidersMap.get(fieldProvider)?.provider === option.provider;
const provider = accessProvidersMap.get(option.provider);
return !!provider?.usages?.includes(ACCESS_USAGES.HOSTING);
}}
/>
</Form.Item>
</Form.Item>
<Form.Item
name="certificateOutputNodeId"
label={t("workflow_node.deploy.form.certificate_output_node_id.label")}
@@ -570,18 +543,55 @@ const BizDeployNodeConfigForm = ({ node, ...props }: BizDeployNodeConfigFormProp
</div>
<div id="deployment" data-anchor="deployment">
<FormNestedFieldsContextProvider value={{ parentNamePath: "providerConfig" }}>
{NestedProviderConfigFields && (
<>
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.deploy.form_anchor.deployment.title")}
</Typography.Text>
</Divider>
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.deploy.form_anchor.deployment.title")}
</Typography.Text>
</Divider>
<NestedProviderConfigFields />
</>
)}
<Form.Item name="provider" label={t("workflow_node.deploy.form.provider.label")} rules={[formRule]}>
<DeploymentProviderSelect
allowClear
disabled={!!initialValues?.provider}
placeholder={t("workflow_node.deploy.form.provider.placeholder")}
showAvailability
showSearch
onSelect={handleProviderSelect}
onClear={handleProviderSelect}
/>
</Form.Item>
<Form.Item className="relative" hidden={!showProviderAccess} label={t("workflow_node.deploy.form.provider_access.label")}>
<div className="absolute -top-[6px] right-0 -translate-y-full">
<AccessEditDrawer
data={{ provider: deploymentProvidersMap.get(fieldProvider!)?.provider }}
mode="create"
trigger={
<Button size="small" type="link">
{t("workflow_node.deploy.form.provider_access.button")}
<IconPlus size="1.25em" />
</Button>
}
usage="hosting"
afterSubmit={(record) => {
if (!accessOptionFilter(record.provider, record)) return;
if (deploymentProvidersMap.get(fieldProvider!)?.provider !== record.provider) return;
formInst.setFieldValue("providerAccessId", record.id);
}}
/>
</div>
<Form.Item name="providerAccessId" rules={[formRule]} noStyle>
<AccessSelect
disabled={!fieldProvider}
placeholder={t("workflow_node.deploy.form.provider_access.placeholder")}
showSearch
onFilter={accessOptionFilter}
/>
</Form.Item>
</Form.Item>
<FormNestedFieldsContextProvider value={{ parentNamePath: "providerConfig" }}>
{NestedProviderConfigFields && <NestedProviderConfigFields />}
</FormNestedFieldsContextProvider>
</div>
@@ -31,7 +31,7 @@ const BizMonitorNodeConfigForm = ({ node, ...props }: BizMonitorNodeConfigFormPr
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBizMonitorConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -90,7 +90,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> })
const { t } = i18n;
return z.object({
host: z.string().refine((v) => {
host: z.string(t("workflow_node.monitor.form.host.placeholder")).refine((v) => {
return validDomainName(v) || validIPv4Address(v) || validIPv6Address(v);
}, t("common.errmsg.host_invalid")),
port: z.preprocess(
@@ -23,11 +23,12 @@ const BizNotifyNodeConfigDrawer = ({ node, ...props }: BizNotifyNodeConfigDrawer
const [formInst] = Form.useForm();
const fieldProvider = Form.useWatch<string>("provider", { form: formInst, preserve: true });
return (
<NodeConfigDrawer
anchor={{
items: BizNotifyNodeConfigForm.getAnchorItems({ i18n }),
}}
anchor={fieldProvider ? { items: BizNotifyNodeConfigForm.getAnchorItems({ i18n }) } : false}
footer={fieldProvider ? void 0 : false}
form={formInst}
node={node}
{...props}
@@ -1,4 +1,4 @@
import { useEffect, useMemo, useState } from "react";
import { useEffect, useMemo } from "react";
import { getI18n, useTranslation } from "react-i18next";
import { type FlowNodeEntity, getNodeForm } from "@flowgram.ai/fixed-layout-editor";
import { IconPlus } from "@tabler/icons-react";
@@ -8,8 +8,11 @@ import { z } from "zod";
import AccessEditDrawer from "@/components/access/AccessEditDrawer";
import AccessSelect from "@/components/access/AccessSelect";
import NotificationProviderPicker from "@/components/provider/NotificationProviderPicker";
import NotificationProviderSelect from "@/components/provider/NotificationProviderSelect";
import { ACCESS_USAGES, NOTIFICATION_PROVIDERS, accessProvidersMap, notificationProvidersMap } from "@/domain/provider";
import Show from "@/components/Show";
import { type AccessModel } from "@/domain/access";
import { NOTIFICATION_PROVIDERS, notificationProvidersMap } from "@/domain/provider";
import { type WorkflowNodeConfigForBizNotify, defaultNodeConfigForBizNotify } from "@/domain/workflow";
import { useAntdForm, useZustandShallowSelector } from "@/hooks";
import { useAccessesStore } from "@/stores/access";
@@ -36,6 +39,10 @@ const BizNotifyNodeConfigForm = ({ node, ...props }: BizNotifyNodeConfigFormProp
const { i18n, t } = useTranslation();
const { accesses } = useAccessesStore(useZustandShallowSelector("accesses"));
const accessOptionFilter = (_: string, option: AccessModel) => {
if (option.reserve !== "notif") return false;
return notificationProvidersMap.get(fieldProvider)?.provider === option.provider;
};
const initialValues = useMemo(() => {
return getNodeForm(node)?.getValueIn("config") as WorkflowNodeConfigForBizNotify | undefined;
@@ -43,7 +50,7 @@ const BizNotifyNodeConfigForm = ({ node, ...props }: BizNotifyNodeConfigFormProp
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBizNotifyNodeConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -79,134 +86,138 @@ const BizNotifyNodeConfigForm = ({ node, ...props }: BizNotifyNodeConfigFormProp
}
}, [fieldProvider]);
const [showProvider, setShowProvider] = useState(false);
useEffect(() => {
// 通常情况下每个授权信息只对应一个消息通知提供商,此时无需显示消息通知提供商字段;
// 如果对应多个,则显示。
if (fieldProviderAccessId) {
const access = accesses.find((e) => e.id === fieldProviderAccessId);
const providers = Array.from(notificationProvidersMap.values()).filter((e) => e.provider === access?.provider);
setShowProvider(providers.length > 1);
} else {
setShowProvider(false);
// 如果未选择通知渠道,则清空授权信息
if (!fieldProvider && fieldProviderAccessId) {
formInst.setFieldValue("providerAccessId", void 0);
return;
}
}, [accesses, fieldProviderAccessId]);
const handleProviderSelect = (value: string) => {
// 切换消息通知提供商时联动授权信息
if (initialValues?.provider === value) {
formInst.setFieldValue("providerAccessId", initialValues?.providerAccessId);
} else {
if (notificationProvidersMap.get(fieldProvider)?.provider !== notificationProvidersMap.get(value)?.provider) {
formInst.setFieldValue("providerAccessId", void 0);
// 如果已选择通知渠道只有一个授权信息,则自动选择该授权信息
if (fieldProvider && !fieldProviderAccessId) {
const availableAccesses = accesses
.filter((access) => accessOptionFilter(access.provider, access))
.filter((access) => notificationProvidersMap.get(fieldProvider)?.provider === access.provider);
if (availableAccesses.length === 1) {
formInst.setFieldValue("providerAccessId", availableAccesses[0].id);
}
}
}, [fieldProvider, fieldProviderAccessId]);
const handleProviderPick = (value: string) => {
formInst.setFieldValue("provider", value);
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
};
const handleProviderAccessSelect = (value: string) => {
// 切换授权信息时联动消息通知提供商
const access = accesses.find((access) => access.id === value);
const provider = Array.from(notificationProvidersMap.values()).find((provider) => provider.provider === access?.provider);
if (fieldProvider !== provider?.type) {
formInst.setFieldValue("provider", provider?.type);
const handleProviderSelect = (value?: string | undefined) => {
// 切换通知渠道时重置表单,避免其他通知渠道的配置字段影响当前通知渠道
if (initialValues?.provider === value) {
formInst.setFieldValue("providerAccessId", void 0);
formInst.resetFields(["providerConfig"]);
} else {
formInst.setFieldValue("providerAccessId", void 0);
formInst.setFieldValue("providerConfig", void 0);
}
};
return (
<NodeFormContextProvider value={{ node }}>
<Form {...formProps} clearOnDestroy={true} form={formInst} layout="vertical" preserve={false} scrollToFirstError>
<div id="parameters" data-anchor="parameters">
<Form.Item name="subject" label={t("workflow_node.notify.form.subject.label")} rules={[formRule]}>
<Input placeholder={t("workflow_node.notify.form.subject.placeholder")} />
</Form.Item>
<Show when={!fieldProvider}>
<NotificationProviderPicker
autoFocus
placeholder={t("workflow_node.notify.form.provider.search.placeholder")}
showAvailability
showSearch
onSelect={handleProviderPick}
/>
</Show>
<Form.Item name="message" label={t("workflow_node.notify.form.message.label")} rules={[formRule]}>
<Input.TextArea autoSize={{ minRows: 3, maxRows: 10 }} placeholder={t("workflow_node.notify.form.message.placeholder")} />
</Form.Item>
</div>
<div style={{ display: fieldProvider ? "block" : "none" }}>
<div id="parameters" data-anchor="parameters">
<Form.Item name="subject" label={t("workflow_node.notify.form.subject.label")} rules={[formRule]}>
<Input placeholder={t("workflow_node.notify.form.subject.placeholder")} />
</Form.Item>
<div id="channel" data-anchor="channel">
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.notify.form_anchor.channel.title")}
</Typography.Text>
</Divider>
<Form.Item name="message" label={t("workflow_node.notify.form.message.label")} rules={[formRule]}>
<Input.TextArea autoSize={{ minRows: 3, maxRows: 10 }} placeholder={t("workflow_node.notify.form.message.placeholder")} />
</Form.Item>
</div>
<Form.Item name="provider" label={t("workflow_node.notify.form.provider.label")} hidden={!showProvider} rules={[formRule]}>
<NotificationProviderSelect
disabled={!showProvider}
placeholder={t("workflow_node.notify.form.provider.placeholder")}
showSearch
onFilter={(_, option) => {
if (fieldProviderAccessId) {
return accesses.find((e) => e.id === fieldProviderAccessId)?.provider === option.provider;
}
<div id="channel" data-anchor="channel">
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.notify.form_anchor.channel.title")}
</Typography.Text>
</Divider>
return true;
}}
onSelect={handleProviderSelect}
/>
</Form.Item>
<Form.Item label={t("workflow_node.notify.form.provider_access.label")}>
<div className="absolute -top-[6px] right-0 -translate-y-full">
<AccessEditDrawer
mode="create"
trigger={
<Button size="small" type="link">
{t("workflow_node.notify.form.provider_access.button")}
<IconPlus size="1.25em" />
</Button>
}
usage="notification"
afterSubmit={(record) => {
const provider = accessProvidersMap.get(record.provider);
if (provider?.usages?.includes(ACCESS_USAGES.NOTIFICATION)) {
formInst.setFieldValue("providerAccessId", record.id);
handleProviderAccessSelect(record.id);
}
}}
/>
</div>
<Form.Item name="providerAccessId" noStyle rules={[formRule]}>
<AccessSelect
placeholder={t("workflow_node.notify.form.provider_access.placeholder")}
<Form.Item name="provider" label={t("workflow_node.notify.form.provider.label")} rules={[formRule]}>
<NotificationProviderSelect
allowClear
disabled={!!initialValues?.provider}
placeholder={t("workflow_node.notify.form.provider.placeholder")}
showAvailability
showSearch
onChange={handleProviderAccessSelect}
onFilter={(_, option) => {
if (option.reserve !== "notif") return false;
const provider = accessProvidersMap.get(option.provider);
return !!provider?.usages?.includes(ACCESS_USAGES.NOTIFICATION);
}}
onSelect={handleProviderSelect}
onClear={handleProviderSelect}
/>
</Form.Item>
</Form.Item>
<FormNestedFieldsContextProvider value={{ parentNamePath: "providerConfig" }}>
{NestedProviderConfigFields && <NestedProviderConfigFields />}
</FormNestedFieldsContextProvider>
</div>
<div id="strategy" data-anchor="strategy">
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.notify.form_anchor.strategy.title")}
</Typography.Text>
</Divider>
<Form.Item label={t("workflow_node.notify.form.skip_on_all_prev_skipped.label")}>
<Flex align="center" gap={8} wrap="wrap">
<div>{t("workflow_node.notify.form.skip_on_all_prev_skipped.prefix")}</div>
<Form.Item name="skipOnAllPrevSkipped" noStyle rules={[formRule]}>
<Switch
checkedChildren={t("workflow_node.notify.form.skip_on_all_prev_skipped.switch.on")}
unCheckedChildren={t("workflow_node.notify.form.skip_on_all_prev_skipped.switch.off")}
<Form.Item label={t("workflow_node.notify.form.provider_access.label")}>
<div className="absolute -top-[6px] right-0 -translate-y-full">
<AccessEditDrawer
data={{ provider: notificationProvidersMap.get(fieldProvider!)?.provider }}
mode="create"
trigger={
<Button size="small" type="link">
{t("workflow_node.notify.form.provider_access.button")}
<IconPlus size="1.25em" />
</Button>
}
usage="notification"
afterSubmit={(record) => {
if (!accessOptionFilter(record.provider, record)) return;
if (notificationProvidersMap.get(fieldProvider!)?.provider !== record.provider) return;
formInst.setFieldValue("providerAccessId", record.id);
}}
/>
</div>
<Form.Item name="providerAccessId" noStyle rules={[formRule]}>
<AccessSelect
disabled={!fieldProvider}
placeholder={t("workflow_node.notify.form.provider_access.placeholder")}
showSearch
onFilter={accessOptionFilter}
/>
</Form.Item>
<div>{t("workflow_node.notify.form.skip_on_all_prev_skipped.suffix")}</div>
</Flex>
</Form.Item>
</Form.Item>
<FormNestedFieldsContextProvider value={{ parentNamePath: "providerConfig" }}>
{NestedProviderConfigFields && <NestedProviderConfigFields />}
</FormNestedFieldsContextProvider>
</div>
<div id="strategy" data-anchor="strategy">
<Divider size="small">
<Typography.Text className="text-xs font-normal" type="secondary">
{t("workflow_node.notify.form_anchor.strategy.title")}
</Typography.Text>
</Divider>
<Form.Item label={t("workflow_node.notify.form.skip_on_all_prev_skipped.label")}>
<Flex align="center" gap={8} wrap="wrap">
<div>{t("workflow_node.notify.form.skip_on_all_prev_skipped.prefix")}</div>
<Form.Item name="skipOnAllPrevSkipped" noStyle rules={[formRule]}>
<Switch
checkedChildren={t("workflow_node.notify.form.skip_on_all_prev_skipped.switch.on")}
unCheckedChildren={t("workflow_node.notify.form.skip_on_all_prev_skipped.switch.off")}
/>
</Form.Item>
<div>{t("workflow_node.notify.form.skip_on_all_prev_skipped.suffix")}</div>
</Flex>
</Form.Item>
</div>
</div>
</Form>
</NodeFormContextProvider>
@@ -32,7 +32,7 @@ const BizUploadNodeConfigForm = ({ node, ...props }: BizUploadNodeConfigFormProp
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBizUploadConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -54,7 +54,7 @@ const BranchBlockNodeConfigForm = ({ node, ...props }: BranchBlockNodeConfigForm
}
});
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeBranchBlockConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -29,7 +29,7 @@ const DelayNodeConfigForm = ({ node, ...props }: DelayNodeConfigFormProps) => {
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeDelayConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -34,7 +34,7 @@ const StartNodeConfigForm = ({ node, ...props }: StartNodeConfigFormProps) => {
const formSchema = getSchema({ i18n });
const formRule = createSchemaFieldRule(formSchema);
const { form: formInst, formProps } = useAntdForm({
const { form: formInst, formProps } = useAntdForm<z.infer<typeof formSchema>>({
form: props.form,
name: "workflowNodeStartConfigForm",
initialValues: initialValues ?? getInitialValues(),
@@ -134,7 +134,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> })
return z
.object({
trigger: z.string().nonempty(t("workflow_node.start.form.trigger.placeholder")),
trigger: z.string(t("workflow_node.start.form.trigger.placeholder")).nonempty(t("workflow_node.start.form.trigger.placeholder")),
triggerCron: z.string().nullish(),
})
.superRefine((values, ctx) => {
@@ -31,7 +31,7 @@ export const NodeConfigDrawer = ({ children, afterClose, anchor, footer = true,
const refresh = useRefresh();
const { modal, notification } = App.useApp();
const { message, modal, notification } = App.useApp();
const [open, setOpen] = useControllableValue<boolean>(props, {
valuePropName: "open",
@@ -84,6 +84,8 @@ export const NodeConfigDrawer = ({ children, afterClose, anchor, footer = true,
try {
await formInst.validateFields();
} catch (err) {
message.warning(t("workflow.detail.design.drawer.errmsg.invalid_form"));
setFormPending(false);
throw err;
}
@@ -3,7 +3,7 @@ import { FeedbackLevel, Field } from "@flowgram.ai/fixed-layout-editor";
import { IconContract } from "@tabler/icons-react";
import { Avatar } from "antd";
import { acmeDns01ProvidersMap } from "@/domain/provider";
import { acmeDns01ProvidersMap, acmeHttp01ProvidersMap } from "@/domain/provider";
import { newNode } from "@/domain/workflow";
import { BaseNode } from "./_shared";
@@ -43,6 +43,12 @@ export const BizApplyNodeRegistry: NodeRegistry = {
render: () => {
const { t } = getI18n();
type MapValueType<M> = M extends Map<string, infer V> ? V : never;
const acmeProvidersMap = new Map<string, MapValueType<typeof acmeDns01ProvidersMap | typeof acmeHttp01ProvidersMap>>([
...acmeDns01ProvidersMap,
...acmeHttp01ProvidersMap,
]);
return (
<BaseNode
description={
@@ -53,7 +59,7 @@ export const BizApplyNodeRegistry: NodeRegistry = {
}}
</Field>
<Field<string> name="config.provider">
{({ field: { value } }) => (value ? <Avatar shape="square" src={acmeDns01ProvidersMap.get(value)?.icon} size={20} /> : <></>)}
{({ field: { value } }) => (value ? <Avatar shape="square" src={acmeProvidersMap.get(value)?.icon} size={20} /> : <></>)}
</Field>
</div>
}
+57 -32
View File
@@ -1,3 +1,14 @@
interface BaseProvider<P> {
type: P;
name: string;
icon: string;
builtin: boolean;
}
interface BaseProviderWithAccess<P> extends BaseProvider<P> {
provider: AccessProviderType;
}
// #region AccessProvider
/*
注意:如果追加新的常量值,请保持以 ASCII 排序。
@@ -95,13 +106,9 @@ export const ACCESS_USAGES = Object.freeze({
export type AccessUsageType = (typeof ACCESS_USAGES)[keyof typeof ACCESS_USAGES];
export type AccessProvider = {
type: AccessProviderType;
name: string;
icon: string;
export interface AccessProvider extends BaseProvider<AccessProviderType> {
usages: AccessUsageType[];
builtin: boolean;
};
}
export const accessProvidersMap: Map<AccessProvider["type"] | string, AccessProvider> = new Map(
/*
@@ -224,13 +231,7 @@ export const CA_PROVIDERS = Object.freeze({
export type CAProviderType = (typeof CA_PROVIDERS)[keyof typeof CA_PROVIDERS];
export type CAProvider = {
type: CAProviderType;
name: string;
icon: string;
provider: AccessProviderType;
builtin: boolean;
};
export interface CAProvider extends BaseProviderWithAccess<CAProviderType> {}
export const caProvidersMap: Map<CAProvider["type"] | string, CAProvider> = new Map(
/*
@@ -320,12 +321,7 @@ export const ACME_DNS01_PROVIDERS = Object.freeze({
export type ACMEDns01ProviderType = (typeof ACME_DNS01_PROVIDERS)[keyof typeof ACME_DNS01_PROVIDERS];
export type ACMEDns01Provider = {
type: ACMEDns01ProviderType;
name: string;
icon: string;
provider: AccessProviderType;
};
export interface ACMEDns01Provider extends BaseProviderWithAccess<ACMEDns01ProviderType> {}
export const acmeDns01ProvidersMap: Map<ACMEDns01Provider["type"] | string, ACMEDns01Provider> = new Map(
/*
@@ -382,6 +378,44 @@ export const acmeDns01ProvidersMap: Map<ACMEDns01Provider["type"] | string, ACME
name: name,
icon: accessProvidersMap.get(type.split("-")[0])!.icon,
provider: type.split("-")[0] as AccessProviderType,
builtin: false,
},
])
);
// #endregion
// #region ACMEHTTP01Provider
/*
注意:如果追加新的常量值,请保持以 ASCII 排序。
NOTICE: If you add new constant, please keep ASCII order.
*/
export const ACME_HTTP01_PROVIDERS = Object.freeze({
LOCAL: `${ACCESS_PROVIDERS.LOCAL}`,
SSH: `${ACCESS_PROVIDERS.SSH}`,
} as const);
export type ACMEHttp01ProviderType = (typeof ACME_HTTP01_PROVIDERS)[keyof typeof ACME_HTTP01_PROVIDERS];
export interface ACMEHttp01Provider extends BaseProviderWithAccess<ACMEHttp01ProviderType> {}
export const acmeHttp01ProvidersMap: Map<ACMEHttp01Provider["type"] | string, ACMEHttp01Provider> = new Map(
/*
注意:此处的顺序决定显示在前端的顺序。
NOTICE: The following order determines the order displayed at the frontend.
*/
(
[
[ACME_HTTP01_PROVIDERS.LOCAL, "provider.local", "builtin"],
[ACME_HTTP01_PROVIDERS.SSH, "provider.ssh"],
] satisfies Array<[ACMEHttp01ProviderType, string, "builtin"] | [ACMEHttp01ProviderType, string]>
).map(([type, name, builtin]) => [
type,
{
type: type,
name: name,
icon: accessProvidersMap.get(type.split("-")[0])!.icon,
provider: type.split("-")[0] as AccessProviderType,
builtin: builtin === "builtin",
},
])
);
@@ -514,14 +548,9 @@ export const DEPLOYMENT_CATEGORIES = Object.freeze({
export type DeploymentCategoryType = (typeof DEPLOYMENT_CATEGORIES)[keyof typeof DEPLOYMENT_CATEGORIES];
export type DeploymentProvider = {
type: DeploymentProviderType;
name: string;
icon: string;
provider: AccessProviderType;
export interface DeploymentProvider extends BaseProviderWithAccess<DeploymentProviderType> {
category: DeploymentCategoryType;
builtin: boolean;
};
}
export const deploymentProvidersMap: Map<DeploymentProvider["type"] | string, DeploymentProvider> = new Map(
/*
@@ -663,12 +692,7 @@ export const NOTIFICATION_PROVIDERS = Object.freeze({
export type NotificationProviderType = (typeof NOTIFICATION_PROVIDERS)[keyof typeof NOTIFICATION_PROVIDERS];
export type NotificationProvider = {
type: NotificationProviderType;
name: string;
icon: string;
provider: AccessProviderType;
};
export interface NotificationProvider extends BaseProviderWithAccess<NotificationProviderType> {}
export const notificationProvidersMap: Map<NotificationProvider["type"] | string, NotificationProvider> = new Map(
/*
@@ -694,6 +718,7 @@ export const notificationProvidersMap: Map<NotificationProvider["type"] | string
name: accessProvidersMap.get(type.split("-")[0])!.name,
icon: accessProvidersMap.get(type.split("-")[0])!.icon,
provider: type.split("-")[0] as AccessProviderType,
builtin: false,
},
])
);
+2 -2
View File
@@ -114,8 +114,8 @@ export type WorkflowNodeConfigForBizApply = {
export const defaultNodeConfigForBizApply = (): Partial<WorkflowNodeConfigForBizApply> => {
return {
challengeType: "dns-01",
keyAlgorithm: "RSA2048",
challengeType: "dns-01" as const,
keyAlgorithm: "RSA2048" as const,
skipBeforeExpiryDays: 30,
};
};
+1 -1
View File
@@ -6,7 +6,7 @@ import useAntdFormName from "./useAntdFormName";
export interface UseAntdFormOptions<T extends NonNullable<unknown> = any> {
form?: FormInstance<T>;
initialValues?: Partial<T> | (() => Partial<T> | Promise<Partial<T>>);
initialValues?: Partial<T | any> | (() => Partial<T | any> | Promise<Partial<T | any>>);
name?: string;
onSubmit?: (values: T) => unknown | Promise<unknown>;
}
+4 -1
View File
@@ -194,6 +194,9 @@
"provider.category.nas": "NAS",
"provider.category.other": "Other",
"provider.text.nodata": "No providers available",
"provider.text.default_ca_provider": "(Default) Follow global settings",
"provider.text.show_available_hosting_provider_only": "Only display available providers (with added credentials)"
"provider.text.available_group": "Available (with added credentials)",
"provider.text.unavailable_group": "Unavailable (without added credentials)",
"provider.text.unavailable_divider": "The following providers are not available (without added credentials)"
}
+1
View File
@@ -76,6 +76,7 @@
"workflow.detail.design.drawer.node_id.label": "Node ID: ",
"workflow.detail.design.drawer.disabled.on.tooltip": "Disable",
"workflow.detail.design.drawer.disabled.off.tooltip": "Enable",
"workflow.detail.design.drawer.errmsg.invalid_form": "Please check the form content",
"workflow.detail.design.action.publish.button": "Publish",
"workflow.detail.design.action.publish.modal.title": "Publish changes",
"workflow.detail.design.action.publish.modal.content": "Are you sure to publish your changes?",
+28 -11
View File
@@ -22,6 +22,8 @@
"workflow_node.apply.help": "Apply for SSL certificate issuance from the certificate authority.",
"workflow_node.apply.default_name": "Application",
"workflow_node.apply.form_anchor.parameters.tab": "Parameters",
"workflow_node.apply.form_anchor.challenge.tab": "Challenge",
"workflow_node.apply.form_anchor.challenge.title": "Challenge settings",
"workflow_node.apply.form_anchor.certificate.tab": "Certificate",
"workflow_node.apply.form_anchor.certificate.title": "Certificate settings",
"workflow_node.apply.form_anchor.advanced.tab": "Advanced",
@@ -30,7 +32,8 @@
"workflow_node.apply.form_anchor.strategy.title": "Strategy settings",
"workflow_node.apply.form.domains.label": "Domains",
"workflow_node.apply.form.domains.placeholder": "Please enter domains (separated by semicolons)",
"workflow_node.apply.form.domains.help": "Notes: Multi-domains should be separated by semicolons. Wildcard domain should be written as *.example.com.",
"workflow_node.apply.form.domains.help": "Notes: Multi-domains should be separated by semicolons. Wildcard domain should be written as <em>*.example.com</em>.",
"workflow_node.apply.form.domains.help_no_wildcard": "Notes: Multi-domains should be separated by semicolons.",
"workflow_node.apply.form.domains.multiple_input_modal.title": "Change domains",
"workflow_node.apply.form.domains.multiple_input_modal.placeholder": "Please enter domain",
"workflow_node.apply.form.contact_email.label": "Contact email",
@@ -38,12 +41,20 @@
"workflow_node.apply.form.contact_email.tooltip": "Contact information required for SSL certificate application. Please pay attention to the <a href=\"https://letsencrypt.org/docs/rate-limits/\" target=\"_blank\">rate limits</a>.",
"workflow_node.apply.form.challenge_type.label": "Challenge type",
"workflow_node.apply.form.challenge_type.placeholder": "Please select challenge type",
"workflow_node.apply.form.provider.label": "DNS provider",
"workflow_node.apply.form.provider.placeholder": "Please select DNS provider of the domains",
"workflow_node.apply.form.provider_access.label": "DNS provider credential",
"workflow_node.apply.form.provider_access.placeholder": "Please select an credential of DNS provider",
"workflow_node.apply.form.provider_access.tooltip": "Used to manage DNS records automated during ACME DNS-01 challenge.",
"workflow_node.apply.form.challenge_type.tooltip": "For more information, see <a href=\"https://letsencrypt.org/docs/challenge-types/\" target=\"_blank\">https://letsencrypt.org/docs/challenge-types/</a>",
"workflow_node.apply.form.provider.label": "Provider",
"workflow_node.apply.form.provider.placeholder": "Please select provider",
"workflow_node.apply.form.provider_dns01.label": "DNS provider",
"workflow_node.apply.form.provider_dns01.placeholder": "Please select the DNS provider of the domains",
"workflow_node.apply.form.provider_http01.label": "Hosting provider",
"workflow_node.apply.form.provider_http01.placeholder": "Please select the hosting provider of the domains",
"workflow_node.apply.form.provider_access.label": "Provider credential",
"workflow_node.apply.form.provider_access.placeholder": "Please select an credential of provider",
"workflow_node.apply.form.provider_access.button": "Create",
"workflow_node.apply.form.provider_access_dns01.label": "DNS provider credential",
"workflow_node.apply.form.provider_access_dns01.placeholder": "Please select an credential of DNS provider",
"workflow_node.apply.form.provider_access_http01.label": "Hosting provider credential",
"workflow_node.apply.form.provider_access_http01.placeholder": "Please select an credential of hosting provider",
"workflow_node.apply.form.aliyun_esa_region.label": "Alibaba Cloud ESA region",
"workflow_node.apply.form.aliyun_esa_region.placeholder": "Please enter Alibaba Cloud ESA region (e.g. cn-hangzhou)",
"workflow_node.apply.form.aliyun_esa_region.tooltip": "For more information, see <a href=\"https://www.alibabacloud.com/help/en/edge-security-acceleration/esa/api-esa-2024-09-10-endpoint\" target=\"_blank\">https://www.alibabacloud.com/help/en/edge-security-acceleration/esa/api-esa-2024-09-10-endpoint</a>",
@@ -59,6 +70,12 @@
"workflow_node.apply.form.jdcloud_dns_region_id.label": "JD Cloud DNS region ID",
"workflow_node.apply.form.jdcloud_dns_region_id.placeholder": "Please enter JD Cloud DNS region ID (e.g. cn-north-1)",
"workflow_node.apply.form.jdcloud_dns_region_id.tooltip": "For more information, see <a href=\"https://docs.jdcloud.com/en/common-declaration/api/introduction\" target=\"_blank\">https://docs.jdcloud.com/en/common-declaration/api/introduction</a>",
"workflow_node.apply.form.local_webroot_path.label": "Web root path",
"workflow_node.apply.form.local_webroot_path.placeholder": "Please enter web root path",
"workflow_node.apply.form.local_webroot_path.tooltip": "It's the main directory where the website's files are stored on the server.",
"workflow_node.apply.form.ssh_webroot_path.label": "Web root path",
"workflow_node.apply.form.ssh_webroot_path.placeholder": "Please enter web root path",
"workflow_node.apply.form.ssh_webroot_path.tooltip": "It's the main directory where the website's files are stored on the server.",
"workflow_node.apply.form.tencentcloud_eo_zone_id.label": "Tencent Cloud EdgeOne zone ID",
"workflow_node.apply.form.tencentcloud_eo_zone_id.placeholder": "Please enter Tencent Cloud EdgeOne zone ID",
"workflow_node.apply.form.tencentcloud_eo_zone_id.tooltip": "For more information, see <a href=\"https://console.tencentcloud.com/edgeone\" target=\"_blank\">https://console.tencentcloud.com/edgeone</a>",
@@ -147,12 +164,11 @@
"workflow_node.deploy.form.certificate_output_node_id.label": "Certificate to deploy",
"workflow_node.deploy.form.certificate_output_node_id.placeholder": "Please select certificate to deploy",
"workflow_node.deploy.form.certificate_output_node_id.help": "Notes: The certificate to be deployed comes from the previous nodes of application or upload.",
"workflow_node.deploy.form.provider.label": "Deploy target",
"workflow_node.deploy.form.provider.placeholder": "Please select deploy target",
"workflow_node.deploy.form.provider.search.placeholder": "Search deploy target ...",
"workflow_node.deploy.form.provider.label": "Deployment target",
"workflow_node.deploy.form.provider.placeholder": "Please select deployment target",
"workflow_node.deploy.form.provider.search.placeholder": "Search deployment target ...",
"workflow_node.deploy.form.provider_access.label": "Hosting provider credential",
"workflow_node.deploy.form.provider_access.placeholder": "Please select an credential of Hosting provider",
"workflow_node.deploy.form.provider_access.tooltip": "Used to invoke API during deployment.",
"workflow_node.deploy.form.provider_access.placeholder": "Please select an credential of hosting provider",
"workflow_node.deploy.form.provider_access.button": "Create",
"workflow_node.deploy.form.1panel_console_auto_restart.label": "Auto restart 1Panel after deployment",
"workflow_node.deploy.form.1panel_site_node_name.label": "1Panel node name (Optional)",
@@ -997,6 +1013,7 @@
"workflow_node.notify.form.message.placeholder": "Please enter message",
"workflow_node.notify.form.provider.label": "Notification channel",
"workflow_node.notify.form.provider.placeholder": "Please select notification channel",
"workflow_node.notify.form.provider.search.placeholder": "Search notification channel ...",
"workflow_node.notify.form.provider_access.label": "Notification provider credential",
"workflow_node.notify.form.provider_access.placeholder": "Please select an credential of notification provider",
"workflow_node.notify.form.provider_access.button": "Create",
+4 -1
View File
@@ -194,6 +194,9 @@
"provider.category.nas": "NAS",
"provider.category.other": "其他",
"provider.text.nodata": "暂无提供商",
"provider.text.default_ca_provider": "(默认)不指定,跟随全局设置",
"provider.text.show_available_hosting_provider_only": "仅列出可用的提供商(即已添加过授权凭据的)"
"provider.text.available_group": "可用(已添加授权凭据)",
"provider.text.unavailable_group": "不可用(未添加授权凭据)",
"provider.text.unavailable_divider": "以下提供商不可用(即未添加过授权凭据)"
}
+1
View File
@@ -76,6 +76,7 @@
"workflow.detail.design.drawer.node_id.label": "节点 ID:",
"workflow.detail.design.drawer.disabled.on.tooltip": "禁用",
"workflow.detail.design.drawer.disabled.off.tooltip": "启用",
"workflow.detail.design.drawer.errmsg.invalid_form": "请检查表单内容",
"workflow.detail.design.action.publish.button": "发布更改",
"workflow.detail.design.action.publish.modal.title": "发布更改",
"workflow.detail.design.action.publish.modal.content": "确定要发布更改吗?",
+24 -7
View File
@@ -22,6 +22,8 @@
"workflow_node.apply.help": "从证书颁发机构申请签发 SSL 证书。",
"workflow_node.apply.default_name": "申请",
"workflow_node.apply.form_anchor.parameters.tab": "参数设置",
"workflow_node.apply.form_anchor.challenge.tab": "验证质询",
"workflow_node.apply.form_anchor.challenge.title": "验证质询",
"workflow_node.apply.form_anchor.certificate.tab": "证书设置",
"workflow_node.apply.form_anchor.certificate.title": "证书设置",
"workflow_node.apply.form_anchor.advanced.tab": "高级设置",
@@ -30,7 +32,8 @@
"workflow_node.apply.form_anchor.strategy.title": "执行策略",
"workflow_node.apply.form.domains.label": "域名",
"workflow_node.apply.form.domains.placeholder": "请输入域名(多个值请用半角分号隔开)",
"workflow_node.apply.form.domains.help": "提示:多域名请用半角分号隔开;泛域名表示形式为 *.example.com。",
"workflow_node.apply.form.domains.help": "提示:多域名请用半角分号隔开;泛域名表示形式为 <em>*.example.com</em>。",
"workflow_node.apply.form.domains.help_no_wildcard": "提示:多域名请用半角分号隔开。",
"workflow_node.apply.form.domains.multiple_input_modal.title": "修改域名",
"workflow_node.apply.form.domains.multiple_input_modal.placeholder": "请输入域名",
"workflow_node.apply.form.contact_email.label": "联系邮箱",
@@ -38,12 +41,20 @@
"workflow_node.apply.form.contact_email.tooltip": "申请签发 SSL 证书时所需的联系方式。请注意 Let's Encrypt 账户注册的速率限制。<a href=\"https://letsencrypt.org/zh-cn/docs/rate-limits/\" target=\"_blank\">点此了解更多</a>。",
"workflow_node.apply.form.challenge_type.label": "质询方式",
"workflow_node.apply.form.challenge_type.placeholder": "请选择质询方式",
"workflow_node.apply.form.provider.label": "DNS 提供商",
"workflow_node.apply.form.provider.placeholder": "请选择 DNS 提供商",
"workflow_node.apply.form.provider_access.label": "DNS 提供商授权",
"workflow_node.apply.form.provider_access.placeholder": "请选择 DNS 提供商授权",
"workflow_node.apply.form.provider_access.tooltip": "用于 ACME DNS-01 质询时自动化操作域名解析记录,注意与部署阶段所需的主机提供商相区分。",
"workflow_node.apply.form.challenge_type.tooltip": "这是什么?请参阅 <a href=\"https://letsencrypt.org/zh-cn/docs/challenge-types/\" target=\"_blank\">https://letsencrypt.org/zh-cn/docs/challenge-types/</a>",
"workflow_node.apply.form.provider.label": "提供商",
"workflow_node.apply.form.provider.placeholder": "请选择提供商",
"workflow_node.apply.form.provider_dns01.label": "DNS 提供商",
"workflow_node.apply.form.provider_dns01.placeholder": "请选择 DNS 提供商",
"workflow_node.apply.form.provider_http01.label": "主机提供商",
"workflow_node.apply.form.provider_http01.placeholder": "请选择主机提供商",
"workflow_node.apply.form.provider_access.label": "提供商授权",
"workflow_node.apply.form.provider_access.placeholder": "请选择提供商授权",
"workflow_node.apply.form.provider_access.button": "新建",
"workflow_node.apply.form.provider_access_dns01.label": "DNS 提供商授权",
"workflow_node.apply.form.provider_access_dns01.placeholder": "请选择 DNS 提供商授权",
"workflow_node.apply.form.provider_access_http01.label": "主机提供商授权",
"workflow_node.apply.form.provider_access_http01.placeholder": "请选择主机提供商授权",
"workflow_node.apply.form.aliyun_esa_region.label": "阿里云 ESA 服务地域",
"workflow_node.apply.form.aliyun_esa_region.placeholder": "请输入阿里云 ESA 服务地域(例如:cn-hangzhou)",
"workflow_node.apply.form.aliyun_esa_region.tooltip": "这是什么?请参阅 <a href=\"https://help.aliyun.com/zh/edge-security-acceleration/esa/api-esa-2024-09-10-endpoint\" target=\"_blank\">https://help.aliyun.com/zh/edge-security-acceleration/esa/api-esa-2024-09-10-endpoint</a>",
@@ -59,6 +70,12 @@
"workflow_node.apply.form.jdcloud_dns_region_id.label": "京东云 DNS 服务地域 ID",
"workflow_node.apply.form.jdcloud_dns_region_id.placeholder": "请输入京东云 DNS 服务地域 ID(例如:cn-north-1)",
"workflow_node.apply.form.jdcloud_dns_region_id.tooltip": "这是什么?请参阅 <a href=\"https://docs.jdcloud.com/cn/common-declaration/api/introduction\" target=\"_blank\">https://docs.jdcloud.com/cn/common-declaration/api/introduction</a>",
"workflow_node.apply.form.local_webroot_path.label": "网站根目录",
"workflow_node.apply.form.local_webroot_path.placeholder": "请输入网站根目录",
"workflow_node.apply.form.local_webroot_path.tooltip": "即服务器上存储网站文件的主文件夹。",
"workflow_node.apply.form.ssh_webroot_path.label": "网站根目录",
"workflow_node.apply.form.ssh_webroot_path.placeholder": "请输入网站根目录",
"workflow_node.apply.form.ssh_webroot_path.tooltip": "即服务器上存储网站文件的主文件夹。",
"workflow_node.apply.form.tencentcloud_eo_zone_id.label": "腾讯云 EdgeOne 站点 ID",
"workflow_node.apply.form.tencentcloud_eo_zone_id.placeholder": "请输入腾讯云 EdgeOne 站点 ID",
"workflow_node.apply.form.tencentcloud_eo_zone_id.tooltip": "这是什么?请参阅 <a href=\"https://console.cloud.tencent.com/edgeone\" target=\"_blank\">https://console.cloud.tencent.com/edgeone</a>",
@@ -151,7 +168,6 @@
"workflow_node.deploy.form.provider.search.placeholder": "搜索部署目标……",
"workflow_node.deploy.form.provider_access.label": "主机提供商授权",
"workflow_node.deploy.form.provider_access.placeholder": "请选择主机提供商授权",
"workflow_node.deploy.form.provider_access.tooltip": "用于部署证书时调用相关 API,注意与申请阶段所需的 DNS 提供商相区分。",
"workflow_node.deploy.form.provider_access.button": "新建",
"workflow_node.deploy.form.1panel_console_auto_restart.label": "部署后自动重启 1Panel 服务",
"workflow_node.deploy.form.1panel_site_node_name.label": "1Panel 子节点名称(可选)",
@@ -995,6 +1011,7 @@
"workflow_node.notify.form.message.placeholder": "请输入通知内容",
"workflow_node.notify.form.provider.label": "通知渠道",
"workflow_node.notify.form.provider.placeholder": "请选择通知渠道",
"workflow_node.notify.form.provider.search.placeholder": "搜索通知渠道……",
"workflow_node.notify.form.provider_access.label": "通知渠道授权",
"workflow_node.notify.form.provider_access.placeholder": "请选择通知渠道授权",
"workflow_node.notify.form.provider_access.button": "新建",
+11 -5
View File
@@ -407,7 +407,7 @@ const AccessList = () => {
<Table<AccessModel>
columns={tableColumns}
dataSource={tableData}
loading={!loadedAtOnce || loading}
loading={loading}
locale={{
emptyText: loading ? (
<Skeleton />
@@ -415,12 +415,18 @@ const AccessList = () => {
<Empty
className="py-24"
title={t("access.nodata.title")}
description={t("access.nodata.description")}
description={!loadedAtOnce ? getErrMsg("Network error.") : t("access.nodata.description")}
icon={<IconFingerprint size={24} />}
extra={
<Button icon={<IconCirclePlus size="1.25em" />} type="primary" onClick={handleCreateClick}>
{t("access.action.create.button")}
</Button>
!loadedAtOnce ? (
<Button ghost icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
{t("common.button.reload")}
</Button>
) : (
<Button icon={<IconCirclePlus size="1.25em" />} type="primary" onClick={handleCreateClick}>
{t("access.nodata.button")}
</Button>
)
}
/>
),
+1
View File
@@ -76,6 +76,7 @@ const AccessNew = () => {
gap="large"
placeholder={t("access.form.provider.search.placeholder")}
showOptionTags={providerUsage == null || (providerUsage === "dns-hosting" ? { [ACCESS_USAGES.DNS]: true, [ACCESS_USAGES.HOSTING]: true } : false)}
showSearch
onFilter={providerFilter}
onSelect={handleProviderPick}
/>
@@ -417,7 +417,7 @@ const CertificateList = () => {
icon={<IconCertificate size={24} />}
extra={
loadError ? (
<Button icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
<Button ghost icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
{t("common.button.reload")}
</Button>
) : (
+1 -1
View File
@@ -383,7 +383,7 @@ const WorkflowRunHistoryTable = ({ className, style }: { className?: string; sty
icon={<IconHistory size={24} />}
extra={
loadError ? (
<Button icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
<Button ghost icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
{t("common.button.reload")}
</Button>
) : (
+1 -1
View File
@@ -48,7 +48,7 @@ const SettingsAppearanceTheme = ({ className, style }: { className?: string; sty
<div className={className} style={style}>
<Form layout="vertical">
<Form.Item extra={themeChanged ? t("settings.appearance.theme.form.value.extra") : void 0}>
<Radio.Group className="w-full" value={themeMode} onChange={handleChange}>
<Radio.Group block value={themeMode} onChange={handleChange}>
<div className="flex w-full items-center gap-4 max-md:flex-wrap">
{themeItems.map((item) => (
<div className="relative max-w-44 flex-1/3 max-md:flex-1/2 max-sm:flex-1" key={item.key}>
+1 -1
View File
@@ -495,7 +495,7 @@ const WorkflowList = () => {
icon={<IconHierarchy3 size={24} />}
extra={
loadError ? (
<Button icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
<Button ghost icon={<IconReload size="1.25em" />} type="primary" onClick={handleReloadClick}>
{t("common.button.reload")}
</Button>
) : (