From 8ef45a7fb9b9aef61f92522e5a6799f3e8969ab4 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 16 May 2025 18:24:34 -0400 Subject: [PATCH 01/37] 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 02/37] 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 03/37] 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 04/37] 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 08e1e22dad4707386b0f5524d0dee5a3dd8163e9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 12:26:25 -0700 Subject: [PATCH 05/37] change failed job log level to error --- server/service/JobQueue/JobQueueHelper.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/server/service/JobQueue/JobQueueHelper.js b/server/service/JobQueue/JobQueueHelper.js index 99a6430e6..de1e00fb8 100644 --- a/server/service/JobQueue/JobQueueHelper.js +++ b/server/service/JobQueue/JobQueueHelper.js @@ -143,10 +143,11 @@ class JobQueueHelper { }); worker.on("failed", (job, error, prev) => { - this.logger.warn({ - message: `Worker ${queueName} is failed with msg: ${error}`, - service: SERVICE_NAME, - method: "createWorker:failed", + this.logger.error({ + message: `Worker ${queueName} is failed with msg: ${error.message}`, + service: error?.service ?? SERVICE_NAME, + method: error?.method ?? "createWorker:failed", + stack: error?.stack, }); }); @@ -293,13 +294,7 @@ class JobQueueHelper { await job.updateProgress(100); return true; } catch (error) { - this.logger.error({ - message: error.message, - service: error.service ?? SERVICE_NAME, - method: error.method ?? "createJobHandler", - details: `Error processing job ${job.id}: ${error.message}`, - stack: error.stack, - }); + await job.updateProgress(100); throw error; } }; From 20911697cc9a4567c43b640985150db1a5cf8c11 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 12:28:18 -0700 Subject: [PATCH 06/37] remove double logging --- server/service/statusService.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/server/service/statusService.js b/server/service/statusService.js index 79db6c96e..a53552717 100755 --- a/server/service/statusService.js +++ b/server/service/statusService.js @@ -121,10 +121,10 @@ class StatusService { try { const { monitorId, status, code } = networkResponse; const monitor = await this.db.getMonitorById(monitorId); - + // Update running stats this.updateRunningStats({ monitor, networkResponse }); - + // No change in monitor status, return early if (monitor.status === status) return { @@ -134,7 +134,7 @@ class StatusService { code, timestamp: new Date().getTime(), }; - + // Monitor status changed, save prev status and update monitor this.logger.info({ service: this.SERVICE_NAME, @@ -144,11 +144,11 @@ class StatusService { prevStatus: monitor.status, newStatus: status, }); - + const prevStatus = monitor.status; monitor.status = status; await monitor.save(); - + return { monitor, statusChanged: true, @@ -157,12 +157,8 @@ class StatusService { timestamp: new Date().getTime(), }; } catch (error) { - this.logger.error({ - service: this.SERVICE_NAME, - message: error.message, - method: "updateStatus", - stack: error.stack, - }); + error.service = this.SERVICE_NAME; + error.method = "updateStatus"; throw error; } }; From 4d5c9424645e5cf9601332bb2f3c461a0d9db5bc Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 12:29:54 -0700 Subject: [PATCH 07/37] remove extra logging --- server/service/networkService.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/service/networkService.js b/server/service/networkService.js index e94ec5367..a023ffadd 100755 --- a/server/service/networkService.js +++ b/server/service/networkService.js @@ -437,12 +437,6 @@ class NetworkService { throw new Error(response.data.message); } } catch (error) { - this.logger.error({ - message: "Error in requestDistributedHttp", - service: this.SERVICE_NAME, - method: "requestDistributedHttp", - stack: error.stack, - }); error.service = this.SERVICE_NAME; error.method = "requestDistributedHttp"; throw error; From 72cd3b592ec74448a3eec71b4169ca14ddb7f7fe Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:00:11 -0700 Subject: [PATCH 08/37] add a docker config for a monolithic app --- docker/dist-mono/build_images.sh | 29 +++++++++++++++++++++++ docker/dist-mono/docker-compose.yaml | 35 ++++++++++++++++++++++++++++ docker/dist-mono/mongoDB.Dockerfile | 3 +++ docker/dist-mono/redis.Dockerfile | 2 ++ docker/dist-mono/server.Dockerfile | 25 ++++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100755 docker/dist-mono/build_images.sh create mode 100755 docker/dist-mono/docker-compose.yaml create mode 100755 docker/dist-mono/mongoDB.Dockerfile create mode 100755 docker/dist-mono/redis.Dockerfile create mode 100644 docker/dist-mono/server.Dockerfile diff --git a/docker/dist-mono/build_images.sh b/docker/dist-mono/build_images.sh new file mode 100755 index 000000000..b56b9052c --- /dev/null +++ b/docker/dist-mono/build_images.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Change directory to root Server directory for correct Docker Context +cd "$(dirname "$0")" +cd ../.. + +# Define service names and their corresponding Dockerfiles in parallel arrays +services=("mono_mongo" "mono_redis" "mono_server") +dockerfiles=( + "./docker/dist-mono/mongoDB.Dockerfile" + "./docker/dist-mono/redis.Dockerfile" + "./docker/dist-mono/server.Dockerfile" +) + +# Loop through each service and build the corresponding image +for i in "${!services[@]}"; do + service="${services[$i]}" + dockerfile="${dockerfiles[$i]}" + + docker build -f "$dockerfile" -t "$service" . + + # Check if the build succeeded + if [ $? -ne 0 ]; then + echo "Error building $service image. Exiting..." + exit 1 + fi +done + +echo "All images built successfully" \ No newline at end of file diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml new file mode 100755 index 000000000..204881d4a --- /dev/null +++ b/docker/dist-mono/docker-compose.yaml @@ -0,0 +1,35 @@ +services: + server: + image: mono_server:latest + restart: always + ports: + - "52345:52345" + env_file: + - server.env + depends_on: + - redis + - mongodb + redis: + image: mono_redis:latest + restart: always + volumes: + - ./redis/data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 30s + timeout: 10s + retries: 5 + start_period: 5s + mongodb: + image: mono_mongo:latest + restart: always + command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"] + volumes: + - ./mongo/data:/data/db + healthcheck: + test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet + interval: 5s + timeout: 30s + start_period: 0s + start_interval: 1s + retries: 30 diff --git a/docker/dist-mono/mongoDB.Dockerfile b/docker/dist-mono/mongoDB.Dockerfile new file mode 100755 index 000000000..969a320c2 --- /dev/null +++ b/docker/dist-mono/mongoDB.Dockerfile @@ -0,0 +1,3 @@ +FROM mongo +EXPOSE 27017 +CMD ["mongod"] diff --git a/docker/dist-mono/redis.Dockerfile b/docker/dist-mono/redis.Dockerfile new file mode 100755 index 000000000..af68ec61e --- /dev/null +++ b/docker/dist-mono/redis.Dockerfile @@ -0,0 +1,2 @@ +FROM redis +EXPOSE 6379 \ No newline at end of file diff --git a/docker/dist-mono/server.Dockerfile b/docker/dist-mono/server.Dockerfile new file mode 100644 index 000000000..f28c834ea --- /dev/null +++ b/docker/dist-mono/server.Dockerfile @@ -0,0 +1,25 @@ +FROM node:20-alpine AS frontend-build + +WORKDIR /app/client + +COPY client/package*.json ./ +RUN npm install + +COPY client ./ +RUN npm run build + +FROM node:20-alpine AS app + +WORKDIR /app/server + +COPY server ./ + +COPY --from=frontend-build /app/client/dist ./public + +RUN npm install + +RUN chmod +x ./scripts/inject-vars.sh + +EXPOSE 52345 + +CMD ./scripts/inject-vars.sh && node ./index.js From c13a3e93b2e8c09ead2597cb6a1a4b089b7c4b27 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:00:57 -0700 Subject: [PATCH 09/37] update gitignore --- docker/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/.gitignore b/docker/.gitignore index 1e35b3731..81ba730c9 100755 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -8,5 +8,6 @@ dist/redis/data/* prod/mongo/data/* prod/redis/data/* dist/docker-compose-test.yaml +/dist-mono/mongo/data/* +/dist-mono/redis/data/* *.env -prod/certbot/* \ No newline at end of file From 870e84b539d072c2c317585ab2826850143fb958 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:04:58 -0700 Subject: [PATCH 10/37] add env vars --- docker/dist-mono/docker-compose.yaml | 5 +++-- server/index.js | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml index 204881d4a..ae4ac7569 100755 --- a/docker/dist-mono/docker-compose.yaml +++ b/docker/dist-mono/docker-compose.yaml @@ -4,8 +4,9 @@ services: restart: always ports: - "52345:52345" - env_file: - - server.env + environment: + - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1 + - UPTIME_APP_CLIENT_HOST=http://localhost depends_on: - redis - mongodb diff --git a/server/index.js b/server/index.js index 85ad2a31d..b101c7bff 100755 --- a/server/index.js +++ b/server/index.js @@ -99,6 +99,8 @@ const openApiSpec = JSON.parse( fs.readFileSync(path.join(__dirname, "openapi.json"), "utf8") ); +const frontendPath = path.join(__dirname, "public"); + let server; const shutdown = async () => { @@ -308,6 +310,7 @@ const startApp = async () => { const notificationRoutes = new NotificationRoutes(notificationController); const diagnosticRoutes = new DiagnosticRoutes(diagnosticController); // Middleware + app.use(express.static(frontendPath)); app.use(responseHandler); app.use( cors({ @@ -353,6 +356,10 @@ const startApp = async () => { status: "OK", }); }); + // FE routes + app.get("*", (req, res) => { + res.sendFile(path.join(frontendPath, "index.html")); + }); app.use(handleErrors); }; From d6681885e7319ed3ce184fb35d68ed30bc6cee03 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:10:45 -0700 Subject: [PATCH 11/37] update workflows --- .github/workflows/distribution-deploy.yml | 3 -- .../workflows/distribution-mono-deploy.yml | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/distribution-mono-deploy.yml diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml index 69f3afd73..d4bcfc8b7 100644 --- a/.github/workflows/distribution-deploy.yml +++ b/.github/workflows/distribution-deploy.yml @@ -11,9 +11,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/distribution-mono-deploy.yml b/.github/workflows/distribution-mono-deploy.yml new file mode 100644 index 000000000..547cf2efe --- /dev/null +++ b/.github/workflows/distribution-mono-deploy.yml @@ -0,0 +1,30 @@ +name: Distribution deploy + +on: + push: + branches: ["master"] + workflow_dispatch: +jobs: + docker-build-and-push-server: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Server Docker image + run: | + docker build \ + -t ghcr.io/bluewave-labs/checkmate:backend-dist-mono \ + -f ./docker/dist-mono/server.Dockerfile \ + --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ + . + + - name: Push Server Docker image + run: docker push ghcr.io/bluewave-labs/checkmate:backend-dist-mono From b6699c8aef9396dba4b0ffa708dd0a049d587ad3 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:11:02 -0700 Subject: [PATCH 12/37] user ghcr images --- docker/dist-mono/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml index ae4ac7569..35c642132 100755 --- a/docker/dist-mono/docker-compose.yaml +++ b/docker/dist-mono/docker-compose.yaml @@ -1,6 +1,6 @@ services: server: - image: mono_server:latest + image: ghcr.io/bluewave-labs/checkmate:backend-dist-mono restart: always ports: - "52345:52345" @@ -11,7 +11,7 @@ services: - redis - mongodb redis: - image: mono_redis:latest + image: ghcr.io/bluewave-labs/checkmate:redis-dist restart: always volumes: - ./redis/data:/data @@ -22,7 +22,7 @@ services: retries: 5 start_period: 5s mongodb: - image: mono_mongo:latest + image: ghcr.io/bluewave-labs/checkmate:mongo-dist restart: always command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"] volumes: From d9d25bb108f4a2ff2ca3980a423c2859b63f15c6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:13:29 -0700 Subject: [PATCH 13/37] fix aciton name --- .github/workflows/distribution-mono-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distribution-mono-deploy.yml b/.github/workflows/distribution-mono-deploy.yml index 547cf2efe..7dafbfc21 100644 --- a/.github/workflows/distribution-mono-deploy.yml +++ b/.github/workflows/distribution-mono-deploy.yml @@ -1,4 +1,4 @@ -name: Distribution deploy +name: Distribution deploy - Monolithic on: push: From ff819b3f9fcdbcfbfe3176ce03aea63e7ecac0a2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:16:55 -0700 Subject: [PATCH 14/37] Add missing script --- server/scripts/inject-vars.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 server/scripts/inject-vars.sh diff --git a/server/scripts/inject-vars.sh b/server/scripts/inject-vars.sh new file mode 100755 index 000000000..34365b0d3 --- /dev/null +++ b/server/scripts/inject-vars.sh @@ -0,0 +1,7 @@ +for i in $(env | grep UPTIME_APP_) +do + key=$(echo $i | cut -d '=' -f 1) + value=$(echo $i | cut -d '=' -f 2-) + echo $key=$value + find ./public/assets -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|${key}|${value}|g" '{}' + +done \ No newline at end of file From 016cd6fef093662933701fb84f2514ac1bce11e5 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 15:17:05 -0700 Subject: [PATCH 15/37] update gitignore --- server/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/server/.gitignore b/server/.gitignore index bab6fb27c..4103f8fe6 100755 --- a/server/.gitignore +++ b/server/.gitignore @@ -2,6 +2,7 @@ node_modules .env *.log *.sh +!scripts/inject-vars.sh .nyc_output coverage .clinic From d5d3e14d96e1db70cb3ca25a5210d23c636d0304 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 19 May 2025 19:47:11 -0400 Subject: [PATCH 16/37] 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 }); } } From fefe124b87e83718105a9507b189751d55299567 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 19 May 2025 17:00:28 -0700 Subject: [PATCH 17/37] update config --- docker/dist-mono/docker-compose.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml index 35c642132..9b3364975 100755 --- a/docker/dist-mono/docker-compose.yaml +++ b/docker/dist-mono/docker-compose.yaml @@ -7,6 +7,10 @@ services: environment: - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1 - UPTIME_APP_CLIENT_HOST=http://localhost + - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0 + - REDIS_URL=redis://redis:6379 + - CLIENT_HOST=http://localhost + - JWT_SECRET=my_secret depends_on: - redis - mongodb From dab2bb466fda3b82520354523d7750ef56f445c7 Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Tue, 20 May 2025 21:36:31 +0530 Subject: [PATCH 18/37] Added pause button in configuration page. --- client/src/Pages/Uptime/Configure/index.jsx | 36 ++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx index d52780eea..3586e61b4 100644 --- a/client/src/Pages/Uptime/Configure/index.jsx +++ b/client/src/Pages/Uptime/Configure/index.jsx @@ -34,6 +34,9 @@ import SkeletonLayout from "./skeleton"; import "./index.css"; import Dialog from "../../../Components/Dialog"; import NotificationIntegrationModal from "../../../Components/NotificationIntegrationModal/Components/NotificationIntegrationModal"; +import { usePauseMonitor } from "../../../Hooks/useMonitorControls"; +import PauseOutlinedIcon from "@mui/icons-material/PauseOutlined"; +import PlayArrowOutlinedIcon from "@mui/icons-material/PlayArrowOutlined"; /** * Parses a URL string and returns a URL object. @@ -83,13 +86,22 @@ const Configure = () => { include: "ok", }; + const [trigger, setTrigger] = useState(false); + const triggerUpdate = () => { + setTrigger(!trigger); + }; + const [pauseMonitor, isPausing, error] = usePauseMonitor({ + monitorId: monitor?._id, + triggerUpdate, + }); + useEffect(() => { const fetchMonitor = async () => { try { const action = await dispatch(getUptimeMonitorById({ monitorId })); - if (getUptimeMonitorById.fulfilled.match(action)) { const monitor = action.payload.data; + console.log("Monitor fetched: ", monitor); setMonitor(monitor); } else if (getUptimeMonitorById.rejected.match(action)) { throw new Error(action.error.message); @@ -100,7 +112,7 @@ const Configure = () => { } }; fetchMonitor(); - }, [monitorId, navigate]); + }, [monitorId, navigate, trigger]); const handleChange = (event, name) => { let { checked, value, id } = event.target; @@ -257,7 +269,7 @@ const Configure = () => { gap={theme.spacing(2)} > { }} > - + { + From d28e2bf5fbd868e3c63ade1907dbb3b874a89a9d Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 23 May 2025 22:45:32 -0400 Subject: [PATCH 34/37] Add ping monitoring to status pages (#2299) --- client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx index a665aa9eb..e3c4ae2fc 100644 --- a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx +++ b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx @@ -15,7 +15,7 @@ const useMonitorsFetch = () => { const response = await networkService.getMonitorsByTeamId({ teamId: user.teamId, limit: null, // donot return any checks for the monitors - types: ["http"], // status page is available only for the uptime type + types: ["http", "ping"], // status page is available for uptime and ping monitors }); setMonitors(response.data.data.monitors); } catch (error) { From 118ad6736909c7b791c0fa030a603b70a4305b81 Mon Sep 17 00:00:00 2001 From: sonvir249 Date: Sun, 25 May 2025 15:54:31 +0530 Subject: [PATCH 35/37] Show port monitors with port numbers. --- client/src/Components/Inputs/Search/index.jsx | 5 ++++- client/src/Pages/Maintenance/CreateMaintenance/index.jsx | 2 +- server/db/mongo/modules/monitorModuleQueries.js | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx index a3b75161c..2e81dcb2f 100644 --- a/client/src/Components/Inputs/Search/index.jsx +++ b/client/src/Components/Inputs/Search/index.jsx @@ -155,6 +155,7 @@ const Search = ({ renderOption={(props, option) => { const { key, ...optionProps } = props; const hasSecondaryLabel = secondaryLabel && option[secondaryLabel] !== undefined; + const port = option["port"]; return ( {option[filteredBy] + - (hasSecondaryLabel ? ` (${option[secondaryLabel]})` : "")} + (hasSecondaryLabel + ? ` (${option[secondaryLabel]}${port ? `, ${port}` : ""})` + : "")} ); }} diff --git a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx index 714d57f13..f3754c6b0 100644 --- a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -137,7 +137,7 @@ const CreateMaintenance = () => { const response = await networkService.getMonitorsByTeamId({ teamId: user.teamId, limit: null, - types: ["http", "ping", "pagespeed"], + types: ["http", "ping", "pagespeed", "port"], }); const monitors = response.data.data.monitors; setMonitors(monitors); diff --git a/server/db/mongo/modules/monitorModuleQueries.js b/server/db/mongo/modules/monitorModuleQueries.js index 0ffaaf6f1..4af3f8985 100755 --- a/server/db/mongo/modules/monitorModuleQueries.js +++ b/server/db/mongo/modules/monitorModuleQueries.js @@ -490,6 +490,7 @@ const buildMonitorsByTeamIdPipeline = ({ matchStage, field, order }) => { _id: 1, name: 1, type: 1, + port: 1, }, }, ]; From e7ed85405b69caab2c4270fa756938117a14a0ea Mon Sep 17 00:00:00 2001 From: Asim Ahmed Siddiqui Date: Mon, 26 May 2025 00:19:49 +0530 Subject: [PATCH 36/37] Changes: Made showURL boolean and removed console log --- client/src/Features/UI/uiSlice.js | 8 ++++---- client/src/Pages/Settings/SettingsURL.jsx | 12 ++++++------ client/src/Pages/Settings/index.jsx | 11 +++++------ .../Status/Components/MonitorsList/index.jsx | 3 +-- client/src/Validation/validation.js | 2 +- client/src/locales/gb.json | 2 ++ client/src/locales/ru.json | 2 ++ client/src/locales/tr.json | 2 ++ server/validation/joi.js | 2 +- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/client/src/Features/UI/uiSlice.js b/client/src/Features/UI/uiSlice.js index 00d94d735..bd6e92804 100644 --- a/client/src/Features/UI/uiSlice.js +++ b/client/src/Features/UI/uiSlice.js @@ -20,7 +20,7 @@ const initialState = { collapsed: false, }, mode: initialMode, - statusURL: "disabled", + showURL: false, greeting: { index: 0, lastUpdate: null }, timezone: "America/Toronto", distributedUptimeEnabled: false, @@ -47,8 +47,8 @@ const uiSlice = createSlice({ setMode: (state, action) => { state.mode = action.payload; }, - setStatusURL: (state, action) => { - state.statusURL = action.payload; + setShowURL: (state, action) => { + state.showURL = action.payload; }, setGreeting(state, action) { state.greeting.index = action.payload.index; @@ -71,7 +71,7 @@ export const { setRowsPerPage, toggleSidebar, setMode, - setStatusURL, + setShowURL, setGreeting, setTimezone, setDistributedUptimeEnabled, diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx index ddcc271b4..64804c903 100644 --- a/client/src/Pages/Settings/SettingsURL.jsx +++ b/client/src/Pages/Settings/SettingsURL.jsx @@ -9,7 +9,7 @@ import { useTheme } from "@emotion/react"; import { PropTypes } from "prop-types"; import { useTranslation } from "react-i18next"; -const SettingsURL = ({ HEADING_SX, handleChange, statusURL }) => { +const SettingsURL = ({ HEADING_SX, handleChange, showURL }) => { const { t } = useTranslation(); const theme = useTheme(); return ( @@ -20,13 +20,13 @@ const SettingsURL = ({ HEADING_SX, handleChange, statusURL }) => { @@ -37,7 +37,7 @@ const SettingsURL = ({ HEADING_SX, handleChange, statusURL }) => { SettingsURL.propTypes = { HEADING_SX: PropTypes.object, handleChange: PropTypes.func, - statusURL: PropTypes.string, + showURL: PropTypes.bool, }; export default SettingsURL; diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx index b4d890984..b61fa0294 100644 --- a/client/src/Pages/Settings/index.jsx +++ b/client/src/Pages/Settings/index.jsx @@ -16,7 +16,7 @@ import { useState } from "react"; import { useTheme } from "@emotion/react"; import { useTranslation } from "react-i18next"; import { useSelector, useDispatch } from "react-redux"; -import { setTimezone, setMode, setLanguage, setStatusURL } from "../../Features/UI/uiSlice"; +import { setTimezone, setMode, setLanguage, setShowURL } from "../../Features/UI/uiSlice"; import SettingsStats from "./SettingsStats"; import { deleteMonitorChecksByTeamId, @@ -32,7 +32,7 @@ const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }]; const Settings = () => { // Redux state - const { mode, language, timezone, statusURL } = useSelector((state) => state.ui); + const { mode, language, timezone, showURL } = useSelector((state) => state.ui); const { user } = useSelector((state) => state.auth); // Local state @@ -68,7 +68,6 @@ const Settings = () => { const { error } = settingsValidation.validate(newSettingsData.settings, { abortEarly: false, }); - console.log(error) if (!error || error.details.length === 0) { setErrors({}); } else { @@ -87,8 +86,8 @@ const Settings = () => { dispatch(setMode(value)); } - if (name === "statusURL") { - dispatch(setStatusURL(value)); + if (name === "showURL") { + dispatch(setShowURL(value)); } if (name === "language") { @@ -173,7 +172,7 @@ const Settings = () => { state.ui); - const showURL = statusURL === "enabled"; + const { showURL } = useSelector((state) => state.ui); return ( <> diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index bbf1227ec..76d904865 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -277,7 +277,7 @@ const settingsValidation = joi.object({ }), pagespeedApiKey: joi.string().allow("").optional(), language: joi.string().required(), - statusURL: joi.string().required(), + showURL: joi.bool().required(), systemEmailHost: joi.string().allow(""), systemEmailPort: joi.number().allow(null, ""), systemEmailAddress: joi.string().allow(""), diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json index 716f45ca3..c430371e2 100644 --- a/client/src/locales/gb.json +++ b/client/src/locales/gb.json @@ -78,6 +78,8 @@ "settingsURLTitle": "Monitor IP/URL on Status Page", "settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.", "settingsURLSelectTitle": "Display IP/URL on status page", + "settingsURLEnabled": "Enabled", + "settingURLDisabled": "Disabled", "settingsDistributedUptime": "Distributed uptime", "settingsDistributedUptimeDescription": "Enable/disable distributed uptime monitoring.", "settingsEnabled": "Enabled", diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json index 2240cf314..9bdf32495 100644 --- a/client/src/locales/ru.json +++ b/client/src/locales/ru.json @@ -92,6 +92,8 @@ "settingsURLTitle": "Отображать IP/URL на странице статуса", "settingsURLDescription": "Отображать IP-адрес или URL-адрес монитора на общедоступной странице статуса. Если отключено, будет отображаться только имя монитора для защиты конфиденциальной информации.", "settingsURLSelectTitle": "Показать IP/URL на странице статуса", + "settingsURLEnabled": "Включено", + "settingURLDisabled": "Отключено", "settingsDistributedUptime": "Distributed uptime", "settingsDistributedUptimeDescription": "Включить/выключить distributed uptime monitoring.", "settingsEnabled": "Включено", diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json index 69db239dd..214e7703c 100644 --- a/client/src/locales/tr.json +++ b/client/src/locales/tr.json @@ -76,6 +76,8 @@ "settingsURLTitle": "Durum Sayfasında IP/URL'yi Göster", "settingsURLDescription": "Monitörün IP adresini veya URL'sini genel Durum sayfasında göster. Devre dışı bırakıldığında, hassas bilgileri korumak için yalnızca monitör adı gösterilecektir.", "settingsURLSelectTitle": "Durum sayfasında IP/URL'yi göster", + "settingsURLEnabled": "Etkin", + "settingURLDisabled": "Devre Dışı", "settingsDistributedUptime": "Dağıtılmış çalışma süresi", "settingsDistributedUptimeDescription": "Dağıtılmış çalışma süresi izlemeyi etkinleştirin/devre dışı bırakın.", "settingsEnabled": "Etkin", diff --git a/server/validation/joi.js b/server/validation/joi.js index 8db68b6d6..596da3fd4 100755 --- a/server/validation/joi.js +++ b/server/validation/joi.js @@ -427,7 +427,7 @@ const updateAppSettingsBodyValidation = joi.object({ checkTTL: joi.number().allow(""), pagespeedApiKey: joi.string().allow(""), language: joi.string().allow(""), - statusURL: joi.string().required(), + showURL: joi.bool().required(), systemEmailHost: joi.string().allow(""), systemEmailPort: joi.number().allow(""), systemEmailAddress: joi.string().allow(""), From 8ec6c2325043c1abb4bcfc8551ba9f6854d3cb8f Mon Sep 17 00:00:00 2001 From: sonvir249 Date: Mon, 26 May 2025 21:13:05 +0530 Subject: [PATCH 37/37] Join port number with colon(:) --- client/src/Components/Inputs/Search/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx index 2e81dcb2f..86ce57779 100644 --- a/client/src/Components/Inputs/Search/index.jsx +++ b/client/src/Components/Inputs/Search/index.jsx @@ -171,7 +171,7 @@ const Search = ({ > {option[filteredBy] + (hasSecondaryLabel - ? ` (${option[secondaryLabel]}${port ? `, ${port}` : ""})` + ? ` (${option[secondaryLabel]}${port ? `: ${port}` : ""})` : "")} );