This commit is contained in:
Baobhan Sith
2025-04-26 20:04:01 +08:00
parent e025c4f7a1
commit 38248cfc1d
14 changed files with 149 additions and 115 deletions
@@ -272,7 +272,6 @@ const allNotificationEvents: NotificationEvent[] = [
'LOGIN_SUCCESS', 'LOGIN_FAILURE', 'LOGOUT', 'PASSWORD_CHANGED', // Added LOGOUT, PASSWORD_CHANGED
'2FA_ENABLED', '2FA_DISABLED', 'PASSKEY_REGISTERED', 'PASSKEY_DELETED', // Added 2FA, changed PASSKEY_ADDED
'CONNECTION_CREATED', 'CONNECTION_UPDATED', 'CONNECTION_DELETED', 'CONNECTION_TESTED', // Changed _ADDED, added _TESTED
'CONNECTIONS_IMPORTED', 'CONNECTIONS_EXPORTED', // Added IMPORT/EXPORT
'PROXY_CREATED', 'PROXY_UPDATED', 'PROXY_DELETED', // Changed _ADDED
'TAG_CREATED', 'TAG_UPDATED', 'TAG_DELETED', // Changed _ADDED
'SETTINGS_UPDATED', 'IP_WHITELIST_UPDATED', // Added IP_WHITELIST_UPDATED
@@ -487,9 +486,10 @@ const handleTestNotification = async () => {
// Test unsaved setting
result = await store.testUnsavedSetting(formData.channel_type, testConfig);
}
testResult.value = { success: true, message: result.message || t('settings.notifications.form.testSuccess') };
} catch (error: any) {
console.error("Test notification error:", error);
// Translate the message received from the backend using t()
testResult.value = { success: true, message: t(result.message || 'settings.notifications.form.testSuccess') };
} catch (error: any) {
console.error("Test notification error:", error);
const message = error?.response?.data?.message || error.message || t('settings.notifications.form.testFailed');
testResult.value = { success: false, message: message };
// Optionally set testError if you want a separate display area for errors vs results
+17 -6
View File
@@ -502,8 +502,6 @@
"CONNECTION_UPDATED": "Connection Updated",
"CONNECTION_DELETED": "Connection Deleted",
"CONNECTION_TESTED": "Connection Tested",
"CONNECTIONS_IMPORTED": "Connections Imported",
"CONNECTIONS_EXPORTED": "Connections Exported",
"PROXY_CREATED": "Proxy Created",
"PROXY_UPDATED": "Proxy Updated",
"PROXY_DELETED": "Proxy Deleted",
@@ -644,6 +642,23 @@
}
}
},
"notificationController": {
"errorFetchSettings": "Failed to fetch notification settings",
"errorMissingFields": "Missing required notification setting fields (channel_type, name, config)",
"errorCreateSetting": "Failed to create notification setting",
"errorInvalidId": "Invalid notification setting ID",
"errorNoUpdateData": "No data provided for update",
"errorNotFound": "Notification setting with ID {id} not found",
"errorUpdateSetting": "Failed to update notification setting",
"errorDeleteNotFound": "Failed to delete notification setting with ID {id}, it might have already been deleted",
"errorDeleteSetting": "Failed to delete notification setting",
"testMessageSaved": "Test triggered for setting ID {id} ({name})",
"testEventTriggered": "Test notification event triggered. Please check the corresponding channel for reception.",
"errorTriggerTest": "Internal error occurred while triggering test notification",
"errorMissingTestInfo": "Missing required test information (channel_type, config)",
"errorInvalidChannelType": "Invalid channel type",
"testMessageUnsaved": "Test triggered for unsaved {channelType} configuration"
},
"common": {
"loading": "Loading...",
"cancel": "Cancel",
@@ -711,8 +726,6 @@
"CONNECTION_UPDATED": "Connection Updated",
"CONNECTION_DELETED": "Connection Deleted",
"CONNECTION_TESTED": "Connection Tested",
"CONNECTIONS_IMPORTED": "Connections Imported",
"CONNECTIONS_EXPORTED": "Connections Exported",
"PROXY_CREATED": "Proxy Created",
"PROXY_UPDATED": "Proxy Updated",
"PROXY_DELETED": "Proxy Deleted",
@@ -724,8 +737,6 @@
"NOTIFICATION_SETTING_CREATED": "Notification Setting Created",
"NOTIFICATION_SETTING_UPDATED": "Notification Setting Updated",
"NOTIFICATION_SETTING_DELETED": "Notification Setting Deleted",
"API_KEY_CREATED": "API Key Created",
"API_KEY_DELETED": "API Key Deleted",
"SFTP_ACTION": "SFTP Action",
"SSH_CONNECT_SUCCESS": "SSH Connection Successful",
"SSH_CONNECT_FAILURE": "SSH Connection Failed",
+17 -6
View File
@@ -502,8 +502,6 @@
"CONNECTION_UPDATED": "接続更新",
"CONNECTION_DELETED": "接続削除",
"CONNECTION_TESTED": "接続テスト",
"CONNECTIONS_IMPORTED": "接続インポート",
"CONNECTIONS_EXPORTED": "接続エクスポート",
"PROXY_CREATED": "プロキシ作成",
"PROXY_UPDATED": "プロキシ更新",
"PROXY_DELETED": "プロキシ削除",
@@ -644,6 +642,23 @@
}
}
},
"notificationController": {
"errorFetchSettings": "通知設定の取得に失敗しました",
"errorMissingFields": "必須の通知設定フィールドが不足しています (channel_type, name, config)",
"errorCreateSetting": "通知設定の作成に失敗しました",
"errorInvalidId": "無効な通知設定 ID",
"errorNoUpdateData": "更新するデータが提供されていません",
"errorNotFound": "ID {id} の通知設定が見つかりません",
"errorUpdateSetting": "通知設定の更新に失敗しました",
"errorDeleteNotFound": "ID {id} の通知設定の削除に失敗しました。すでに削除されている可能性があります",
"errorDeleteSetting": "通知設定の削除に失敗しました",
"testMessageSaved": "設定 ID {id} ({name}) のテストがトリガーされました",
"testEventTriggered": "テスト通知イベントがトリガーされました。対応するチャネルで受信を確認してください。",
"errorTriggerTest": "テスト通知のトリガー中に内部エラーが発生しました",
"errorMissingTestInfo": "必須のテスト情報が不足しています (channel_type, config)",
"errorInvalidChannelType": "無効なチャネルタイプ",
"testMessageUnsaved": "未保存の {channelType} 設定のテストがトリガーされました"
},
"common": {
"loading": "ロード中...",
"cancel": "キャンセル",
@@ -713,8 +728,6 @@
"CONNECTION_UPDATED": "接続更新",
"CONNECTION_DELETED": "接続削除",
"CONNECTION_TESTED": "接続テスト",
"CONNECTIONS_IMPORTED": "接続インポート",
"CONNECTIONS_EXPORTED": "接続エクスポート",
"PROXY_CREATED": "プロキシ作成",
"PROXY_UPDATED": "プロキシ更新",
"PROXY_DELETED": "プロキシ削除",
@@ -726,8 +739,6 @@
"NOTIFICATION_SETTING_CREATED": "通知設定作成",
"NOTIFICATION_SETTING_UPDATED": "通知設定更新",
"NOTIFICATION_SETTING_DELETED": "通知設定削除",
"API_KEY_CREATED": "APIキー作成",
"API_KEY_DELETED": "APIキー削除",
"SFTP_ACTION": "SFTP 操作",
"SSH_CONNECT_SUCCESS": "SSH 接続成功",
"SSH_CONNECT_FAILURE": "SSH 接続失敗",
+17 -6
View File
@@ -501,8 +501,6 @@
"CONNECTION_CREATED": "连接已创建",
"CONNECTION_UPDATED": "连接已更新",
"CONNECTION_DELETED": "连接已删除",
"CONNECTION_TESTED": "连接已测试",
"CONNECTIONS_IMPORTED": "连接已导入",
"CONNECTIONS_EXPORTED": "连接已导出",
"PROXY_CREATED": "代理已创建",
"PROXY_UPDATED": "代理已更新",
@@ -644,6 +642,23 @@
}
}
},
"notificationController": {
"errorFetchSettings": "获取通知设置失败",
"errorMissingFields": "缺少必要的通知设置字段 (channel_type, name, config)",
"errorCreateSetting": "创建通知设置失败",
"errorInvalidId": "无效的通知设置 ID",
"errorNoUpdateData": "没有提供要更新的数据",
"errorNotFound": "未找到 ID 为 {id} 的通知设置",
"errorUpdateSetting": "更新通知设置失败",
"errorDeleteNotFound": "删除 ID 为 {id} 的通知设置失败,可能已被删除",
"errorDeleteSetting": "删除通知设置失败",
"testMessageSaved": "为设置 ID {id} ({name}) 触发的测试",
"testEventTriggered": "测试通知事件已触发。请检查对应渠道的接收情况。",
"errorTriggerTest": "触发测试通知时发生内部错误",
"errorMissingTestInfo": "缺少必要的测试信息 (channel_type, config)",
"errorInvalidChannelType": "无效的渠道类型",
"testMessageUnsaved": "为未保存的 {channelType} 配置触发的测试"
},
"common": {
"loading": "加载中...",
"cancel": "取消",
@@ -713,8 +728,6 @@
"CONNECTION_UPDATED": "连接已更新",
"CONNECTION_DELETED": "连接已删除",
"CONNECTION_TESTED": "连接已测试",
"CONNECTIONS_IMPORTED": "连接已导入",
"CONNECTIONS_EXPORTED": "连接已导出",
"PROXY_CREATED": "代理已创建",
"PROXY_UPDATED": "代理已更新",
"PROXY_DELETED": "代理已删除",
@@ -726,8 +739,6 @@
"NOTIFICATION_SETTING_CREATED": "通知设置已创建",
"NOTIFICATION_SETTING_UPDATED": "通知设置已更新",
"NOTIFICATION_SETTING_DELETED": "通知设置已删除",
"API_KEY_CREATED": "API 密钥已创建",
"API_KEY_DELETED": "API 密钥已删除",
"SFTP_ACTION": "SFTP 操作",
"SSH_CONNECT_SUCCESS": "SSH 连接成功",
"SSH_CONNECT_FAILURE": "SSH 连接失败",
@@ -16,8 +16,6 @@ export type AuditLogActionType =
| 'CONNECTION_UPDATED'
| 'CONNECTION_DELETED'
| 'CONNECTION_TESTED'
| 'CONNECTIONS_IMPORTED'
| 'CONNECTIONS_EXPORTED'
// Proxies
| 'PROXY_CREATED'
| 'PROXY_UPDATED'
@@ -23,7 +23,6 @@ export type NotificationEvent =
| 'LOGIN_SUCCESS' | 'LOGIN_FAILURE' | 'LOGOUT' | 'PASSWORD_CHANGED'
| '2FA_ENABLED' | '2FA_DISABLED' | 'PASSKEY_REGISTERED' | 'PASSKEY_DELETED'
| 'CONNECTION_CREATED' | 'CONNECTION_UPDATED' | 'CONNECTION_DELETED' | 'CONNECTION_TESTED'
| 'CONNECTIONS_IMPORTED' | 'CONNECTIONS_EXPORTED'
| 'PROXY_CREATED' | 'PROXY_UPDATED' | 'PROXY_DELETED'
| 'TAG_CREATED' | 'TAG_UPDATED' | 'TAG_DELETED'
| 'SETTINGS_UPDATED' | 'IP_WHITELIST_UPDATED'
@@ -78,12 +77,10 @@ export type AuditLogActionType =
| 'LOGIN_SUCCESS' | 'LOGIN_FAILURE' | 'LOGOUT' | 'PASSWORD_CHANGED'
| '2FA_ENABLED' | '2FA_DISABLED' | 'PASSKEY_REGISTERED' | 'PASSKEY_DELETED'
| 'CONNECTION_CREATED' | 'CONNECTION_UPDATED' | 'CONNECTION_DELETED' | 'CONNECTION_TESTED'
| 'CONNECTIONS_IMPORTED' | 'CONNECTIONS_EXPORTED'
| 'PROXY_CREATED' | 'PROXY_UPDATED' | 'PROXY_DELETED'
| 'TAG_CREATED' | 'TAG_UPDATED' | 'TAG_DELETED'
| 'SETTINGS_UPDATED' | 'IP_WHITELIST_UPDATED'
| 'NOTIFICATION_SETTING_CREATED' | 'NOTIFICATION_SETTING_UPDATED' | 'NOTIFICATION_SETTING_DELETED'
// | 'API_KEY_CREATED' | 'API_KEY_DELETED' // Removed API Key types
| 'SFTP_ACTION'
// SSH Actions
| 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE'
@@ -120,12 +120,10 @@ const allActionTypes: AuditLogActionType[] = [
'LOGIN_SUCCESS', 'LOGIN_FAILURE', 'LOGOUT', 'PASSWORD_CHANGED',
'2FA_ENABLED', '2FA_DISABLED', 'PASSKEY_REGISTERED', 'PASSKEY_DELETED',
'CONNECTION_CREATED', 'CONNECTION_UPDATED', 'CONNECTION_DELETED', 'CONNECTION_TESTED',
'CONNECTIONS_IMPORTED', 'CONNECTIONS_EXPORTED',
'PROXY_CREATED', 'PROXY_UPDATED', 'PROXY_DELETED',
'TAG_CREATED', 'TAG_UPDATED', 'TAG_DELETED',
'SETTINGS_UPDATED', 'IP_WHITELIST_UPDATED',
'NOTIFICATION_SETTING_CREATED', 'NOTIFICATION_SETTING_UPDATED', 'NOTIFICATION_SETTING_DELETED',
// 'API_KEY_CREATED', 'API_KEY_DELETED', // Removed API Key types from dropdown
'SFTP_ACTION',
// SSH Actions
'SSH_CONNECT_SUCCESS', 'SSH_CONNECT_FAILURE', 'SSH_SHELL_FAILURE',