From 8ef45a7fb9b9aef61f92522e5a6799f3e8969ab4 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 16 May 2025 18:24:34 -0400 Subject: [PATCH 1/5] feat: Update email testing to use form values without saving - Update sendTestEmail method to use new /api/v1/settings/test-email endpoint - Send current form values directly to test endpoint without saving to DB - Format request body according to backend requirements --- client/src/Utils/NetworkService.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js index 4adf8ff8b..1a9732354 100644 --- a/client/src/Utils/NetworkService.js +++ b/client/src/Utils/NetworkService.js @@ -1154,10 +1154,27 @@ class NetworkService { } // ************************************ - // Send tes t email + // Send test email // ************************************ async sendTestEmail(config) { - const { to } = config; + // Extract recipient and email configuration + const { to, emailConfig } = config; + + // If emailConfig is provided, use the new endpoint with direct parameters + if (emailConfig) { + return this.axiosInstance.post(`/api/v1/settings/test-email`, { + to, + systemEmailHost: emailConfig.systemEmailHost, + systemEmailPort: emailConfig.systemEmailPort, + systemEmailAddress: emailConfig.systemEmailAddress, + systemEmailPassword: emailConfig.systemEmailPassword, + // Only include these if they are present + ...(emailConfig.systemEmailConnectionHost && { systemEmailConnectionHost: emailConfig.systemEmailConnectionHost }), + ...(emailConfig.systemEmailUser && { systemEmailUser: emailConfig.systemEmailUser }) + }); + } + + // Fallback to original behavior for backward compatibility return this.axiosInstance.post(`/monitors/test-email`, { to }); } } From 083c395f10eb0d3a79ec791bb62d76914b606f33 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 16 May 2025 19:29:44 -0400 Subject: [PATCH 2/5] feat: Update email testing to use form values without saving - Modify test email button to collect current form values - Add validation for required fields before testing - Pass configuration directly to test endpoint - Improve user experience by allowing testing before saving --- client/src/Pages/Settings/SettingsEmail.jsx | 29 ++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx index 38cc592da..09a6aeaae 100644 --- a/client/src/Pages/Settings/SettingsEmail.jsx +++ b/client/src/Pages/Settings/SettingsEmail.jsx @@ -11,6 +11,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments"; import { useSendTestEmail } from "../../Hooks/useSendTestEmail"; +import { createToast } from "../../Utils/toastUtils"; const SettingsEmail = ({ isAdmin, @@ -29,7 +30,7 @@ const SettingsEmail = ({ const [hasBeenReset, setHasBeenReset] = useState(false); // Network - const [isSending, error, sendTestEmail] = useSendTestEmail(); + const [isSending, , sendTestEmail] = useSendTestEmail(); // Using empty placeholder for unused error variable // Handlers const handlePasswordChange = (e) => { @@ -136,9 +137,31 @@ const SettingsEmail = ({ variant="contained" color="accent" loading={isSending} - onClick={sendTestEmail} + onClick={() => { + // Collect current form values + const emailConfig = { + systemEmailHost: settingsData?.settings?.systemEmailHost, + systemEmailPort: settingsData?.settings?.systemEmailPort, + systemEmailUser: settingsData?.settings?.systemEmailUser, + systemEmailAddress: settingsData?.settings?.systemEmailAddress, + systemEmailPassword: password || settingsData?.settings?.systemEmailPassword, + systemEmailConnectionHost: settingsData?.settings?.systemEmailConnectionHost + }; + + // Basic validation + if (!emailConfig.systemEmailHost || !emailConfig.systemEmailPort) { + createToast({ + body: t("settingsEmailRequiredFields", "Email host and port are required"), + variant: "error" + }); + return; + } + + // Send test email with current form values + sendTestEmail(emailConfig); + }} > - Send test e-mail + {t("settingsTestEmail", "Send test e-mail")} From dbcdb24da659feebe8fedfcf49b1734159a5329e Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 16 May 2025 19:45:24 -0400 Subject: [PATCH 3/5] feat: Enhance useSendTestEmail hook to support testing without saving - Add support for optional email configuration parameter - Implement improved error handling with detailed messages - Add internationalization support for all user feedback - Return appropriate error information for better UX - Maintain backward compatibility with existing code --- client/src/Hooks/useSendTestEmail.js | 25 +++++++++++++++++++++---- client/src/locales/gb.json | 24 ++++++++++++++---------- client/src/locales/ru.json | 15 +++++++++++++++ client/src/locales/tr.json | 6 ++++++ 4 files changed, 56 insertions(+), 14 deletions(-) diff --git a/client/src/Hooks/useSendTestEmail.js b/client/src/Hooks/useSendTestEmail.js index fef45c3ea..55d5da4c3 100644 --- a/client/src/Hooks/useSendTestEmail.js +++ b/client/src/Hooks/useSendTestEmail.js @@ -2,27 +2,44 @@ import { useState } from "react"; import { networkService } from "../main"; import { useSelector } from "react-redux"; import { createToast } from "../Utils/toastUtils"; +import { useTranslation } from "react-i18next"; const useSendTestEmail = () => { const [isSending, setIsSending] = useState(false); const [error, setError] = useState(null); const user = useSelector((state) => state.auth.user); + const { t } = useTranslation(); - const sendTestEmail = async () => { + /** + * Send a test email with optional email configuration + * @param {Object} emailConfig - Optional email configuration parameters + */ + const sendTestEmail = async (emailConfig = null) => { try { setIsSending(true); setError(null); - const response = await networkService.sendTestEmail({ to: user.email }); + // Send the test email with or without configuration + const response = await networkService.sendTestEmail({ + to: user.email, + emailConfig + }); + if (typeof response?.data?.data?.messageId !== "undefined") { createToast({ - body: "Test email sent successfully", + body: t("settingsTestEmailSuccess", "Test email sent successfully"), }); } else { - throw new Error("Failed to send test email"); + throw new Error(response?.data?.error || t("settingsTestEmailFailed", "Failed to send test email")); } } catch (error) { setError(error); + createToast({ + body: t("settingsTestEmailFailedWithReason", "Failed to send test email: {{reason}}", { + reason: error.message || t("settingsTestEmailUnknownError", "Unknown error") + }), + variant: "error" + }); } finally { setIsSending(false); } diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json index e15968a80..9fb5ac2bb 100644 --- a/client/src/locales/gb.json +++ b/client/src/locales/gb.json @@ -112,15 +112,21 @@ "settingsFailedToAddDemoMonitors": "Failed to add demo monitors", "settingsMonitorsDeleted": "Successfully deleted all monitors", "settingsFailedToDeleteMonitors": "Failed to delete all monitors", - "settingsEmail": "Email settings", - "settingsEmailDescription": "Configure email settings", - "settingsEmailHost": "Email host - Hostname or IP address of the SMTP server", - "settingsEmailPort": "Email port - Port to connect to", - "settingsEmailAddress": "Email address - Used for authentication", - "settingsEmailPassword": "Email password - Password for authentication", - "settingsEmailUser": "Email user - Username for authentication, overrides email address if specified", + "settingsEmail": "Email", + "settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.", + "settingsEmailHost": "Email host", + "settingsEmailPort": "Email port", + "settingsEmailUser": "Email user", + "settingsEmailAddress": "Email address", + "settingsEmailPassword": "Email password", + "settingsEmailConnectionHost": "Email connection host", + "settingsTestEmail": "Send test e-mail", + "settingsTestEmailSuccess": "Test email sent successfully", + "settingsTestEmailFailed": "Failed to send test email", + "settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}", + "settingsTestEmailUnknownError": "Unknown error", + "settingsEmailRequiredFields": "Email host and port are required", "settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.", - "settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting", "backendUnreachable": "Server Connection Error", "backendUnreachableMessage": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.", "backendUnreachableError": "Cannot connect to the server. Please try again later.", @@ -522,8 +528,6 @@ "logOut": "Log out" }, "navControls": "Controls", - "statusBreadCrumbsStatusPages": "Status Pages", - "statusBreadCrumbsDetails": "Details", "incidentsPageTitle": "Incidents", "passwordPanel": { "passwordChangedSuccess": "Your password was changed successfully.", diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json index df1e5a5a7..cff51d4de 100644 --- a/client/src/locales/ru.json +++ b/client/src/locales/ru.json @@ -115,6 +115,21 @@ "settingsRemoveAllMonitorsDialogConfirm": "Да, удалить все мониторы", "settingsWallet": "Кошелёк", "settingsWalletDescription": "Подключите свой кошелек здесь. Это необходимо для того, чтобы монитор Distributed Uptime мог подключиться к нескольким узлам по всему миру.", + "settingsEmail": "Настройки электронной почты", + "settingsEmailDescription": "Настройте параметры электронной почты", + "settingsEmailHost": "Хост электронной почты - имя хоста или IP-адрес SMTP-сервера", + "settingsEmailPort": "Порт электронной почты - порт для подключения", + "settingsEmailAddress": "Адрес электронной почты - используется для аутентификации", + "settingsEmailPassword": "Пароль электронной почты - пароль для аутентификации", + "settingsEmailUser": "Пользователь электронной почты - имя пользователя для аутентификации, переопределяет адрес электронной почты, если указан", + "settingsEmailFieldResetLabel": "Пароль установлен. Нажмите «Сбросить», чтобы изменить его.", + "settingsEmailConnectionHost": "Хост подключения электронной почты - имя хоста, используемое в приветствии HELO/EHLO", + "settingsTestEmail": "Отправить тестовое письмо", + "settingsTestEmailSuccess": "Тестовое письмо успешно отправлено", + "settingsTestEmailFailed": "Не удалось отправить тестовое письмо", + "settingsTestEmailFailedWithReason": "Не удалось отправить тестовое письмо: {{reason}}", + "settingsTestEmailUnknownError": "Неизвестная ошибка", + "settingsEmailRequiredFields": "Требуются хост и порт электронной почты", "settingsAbout": "О", "settingsDevelopedBy": "Developed by Bluewave Labs.", "settingsSave": "Сохранить", diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json index 5aee7cf51..3aacbdf4c 100644 --- a/client/src/locales/tr.json +++ b/client/src/locales/tr.json @@ -99,6 +99,12 @@ "settingsRemoveAllMonitorsDialogConfirm": "Evet, tüm monitörleri kaldır", "settingsWallet": "Cüzdan", "settingsWalletDescription": "Cüzdanınızı buradan bağlayın. Bu, Dağıtılmış Çalışma Süresi monitörünün küresel olarak birden çok düğüme bağlanması için gereklidir.", + "settingsTestEmail": "Test e-postası gönder", + "settingsTestEmailSuccess": "Test e-postası başarıyla gönderildi", + "settingsTestEmailFailed": "Test e-postası gönderilemedi", + "settingsTestEmailFailedWithReason": "Test e-postası gönderilemedi: {{reason}}", + "settingsTestEmailUnknownError": "Bilinmeyen hata", + "settingsEmailRequiredFields": "E-posta sunucusu ve port gereklidir", "settingsAbout": "Hakkında", "settingsDevelopedBy": "Bluewave Labs tarafından geliştirilmiştir.", "settingsSave": "Kaydet", From aaba9e8d424a709411a1f9d15f76025972264373 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 16 May 2025 19:59:19 -0400 Subject: [PATCH 4/5] Translation Fix --- client/src/locales/gb.json | 12 ++++++------ client/src/locales/tr.json | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json index 9fb5ac2bb..0b2131910 100644 --- a/client/src/locales/gb.json +++ b/client/src/locales/gb.json @@ -114,12 +114,12 @@ "settingsFailedToDeleteMonitors": "Failed to delete all monitors", "settingsEmail": "Email", "settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.", - "settingsEmailHost": "Email host", - "settingsEmailPort": "Email port", - "settingsEmailUser": "Email user", - "settingsEmailAddress": "Email address", - "settingsEmailPassword": "Email password", - "settingsEmailConnectionHost": "Email connection host", + "settingsEmailHost": "Email host - Hostname or IP address of the SMTP server", + "settingsEmailPort": "Email port - Port to connect to", + "settingsEmailUser": "Email user - Username for authentication, overrides email address if specified", + "settingsEmailAddress": "Email address - Used for authentication", + "settingsEmailPassword": "Email password - Password for authentication", + "settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting", "settingsTestEmail": "Send test e-mail", "settingsTestEmailSuccess": "Test email sent successfully", "settingsTestEmailFailed": "Failed to send test email", diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json index 3aacbdf4c..051ab4150 100644 --- a/client/src/locales/tr.json +++ b/client/src/locales/tr.json @@ -104,6 +104,14 @@ "settingsTestEmailFailed": "Test e-postası gönderilemedi", "settingsTestEmailFailedWithReason": "Test e-postası gönderilemedi: {{reason}}", "settingsTestEmailUnknownError": "Bilinmeyen hata", + "settingsEmail": "E-posta", + "settingsEmailDescription": "Sisteminiz için e-posta ayarlarını yapılandırın. Bu, bildirim ve uyarıları göndermek için kullanılır.", + "settingsEmailHost": "E-posta sunucusu - SMTP sunucusunun ana bilgisayar adı veya IP adresi", + "settingsEmailPort": "E-posta portu - Bağlanılacak port", + "settingsEmailUser": "E-posta kullanıcısı - Kimlik doğrulama için kullanıcı adı, belirtilirse e-posta adresini geçersiz kılar", + "settingsEmailAddress": "E-posta adresi - Kimlik doğrulama için kullanılır", + "settingsEmailPassword": "E-posta şifresi - Kimlik doğrulama için şifre", + "settingsEmailConnectionHost": "E-posta bağlantı sunucusu - HELO/EHLO selamlamasında kullanılacak ana bilgisayar adı", "settingsEmailRequiredFields": "E-posta sunucusu ve port gereklidir", "settingsAbout": "Hakkında", "settingsDevelopedBy": "Bluewave Labs tarafından geliştirilmiştir.", From d5d3e14d96e1db70cb3ca25a5210d23c636d0304 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 19 May 2025 19:47:11 -0400 Subject: [PATCH 5/5] Change API and Refactoring a handler function --- client/src/Pages/Settings/SettingsEmail.jsx | 51 +++++++++++---------- client/src/Utils/NetworkService.js | 4 +- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx index 09a6aeaae..5fe2ffdd1 100644 --- a/client/src/Pages/Settings/SettingsEmail.jsx +++ b/client/src/Pages/Settings/SettingsEmail.jsx @@ -41,6 +41,33 @@ const SettingsEmail = ({ }); }; + /** + * Handle sending test email with current form values + */ + const handleSendTestEmail = () => { + // Collect current form values + const emailConfig = { + systemEmailHost: settingsData?.settings?.systemEmailHost, + systemEmailPort: settingsData?.settings?.systemEmailPort, + systemEmailUser: settingsData?.settings?.systemEmailUser, + systemEmailAddress: settingsData?.settings?.systemEmailAddress, + systemEmailPassword: password || settingsData?.settings?.systemEmailPassword, + systemEmailConnectionHost: settingsData?.settings?.systemEmailConnectionHost + }; + + // Basic validation + if (!emailConfig.systemEmailHost || !emailConfig.systemEmailPort) { + createToast({ + body: t("settingsEmailRequiredFields", "Email host and port are required"), + variant: "error" + }); + return; + } + + // Send test email with current form values + sendTestEmail(emailConfig); + }; + if (!isAdmin) { return null; } @@ -137,29 +164,7 @@ const SettingsEmail = ({ variant="contained" color="accent" loading={isSending} - onClick={() => { - // Collect current form values - const emailConfig = { - systemEmailHost: settingsData?.settings?.systemEmailHost, - systemEmailPort: settingsData?.settings?.systemEmailPort, - systemEmailUser: settingsData?.settings?.systemEmailUser, - systemEmailAddress: settingsData?.settings?.systemEmailAddress, - systemEmailPassword: password || settingsData?.settings?.systemEmailPassword, - systemEmailConnectionHost: settingsData?.settings?.systemEmailConnectionHost - }; - - // Basic validation - if (!emailConfig.systemEmailHost || !emailConfig.systemEmailPort) { - createToast({ - body: t("settingsEmailRequiredFields", "Email host and port are required"), - variant: "error" - }); - return; - } - - // Send test email with current form values - sendTestEmail(emailConfig); - }} + onClick={handleSendTestEmail} > {t("settingsTestEmail", "Send test e-mail")} diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js index 1a9732354..8af1cecec 100644 --- a/client/src/Utils/NetworkService.js +++ b/client/src/Utils/NetworkService.js @@ -1162,7 +1162,7 @@ class NetworkService { // If emailConfig is provided, use the new endpoint with direct parameters if (emailConfig) { - return this.axiosInstance.post(`/api/v1/settings/test-email`, { + return this.axiosInstance.post(`/settings/test-email`, { to, systemEmailHost: emailConfig.systemEmailHost, systemEmailPort: emailConfig.systemEmailPort, @@ -1175,7 +1175,7 @@ class NetworkService { } // Fallback to original behavior for backward compatibility - return this.axiosInstance.post(`/monitors/test-email`, { to }); + return this.axiosInstance.post(`/settings/test-email`, { to }); } }