diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx index e5654faeb..4624b2cba 100644 --- a/client/src/Components/Inputs/Search/index.jsx +++ b/client/src/Components/Inputs/Search/index.jsx @@ -1,7 +1,17 @@ import PropTypes from "prop-types"; -import { Box, ListItem, Autocomplete, TextField, Stack, Typography } from "@mui/material"; +import { + Box, + ListItem, + Autocomplete, + TextField, + Stack, + Typography, + Checkbox, +} from "@mui/material"; import { useTheme } from "@emotion/react"; import SearchIcon from "../../../assets/icons/search.svg?react"; +import React, { useEffect } from "react"; +import { useTranslation } from "react-i18next"; /** * Search component using Material UI's Autocomplete. @@ -60,24 +70,72 @@ const Search = ({ onBlur, }) => { const theme = useTheme(); + const { t } = useTranslation(); + const [selectAll, setSelectAll] = React.useState(false); + + const [open, setOpen] = React.useState(false); + const enhancedOptions = React.useMemo(() => { + return multiple && isAdorned + ? [ + { [filteredBy]: t("selectAll"), isSelectAll: true, _id: "select_all" }, + ...options, + ] + : options; + }, [multiple, isAdorned, options, filteredBy]); + const isOptionSelected = (option) => { + if (!multiple && !isAdorned) return false; + if (Array.isArray(value)) { + return value.some((item) => item._id === option._id); + } + return false; + }; + const handleSelectAll = (isSelectAll) => { + const newValue = isSelectAll ? [...options] : []; + handleChange(newValue); + setSelectAll(isSelectAll); + }; + useEffect(() => { + const allSelected = + Array.isArray(value) && Array.isArray(options) && value.length === options.length; + if (selectAll !== allSelected) setSelectAll(allSelected); + }, [value, options]); return ( setOpen(true)} + onClose={(event, reason) => { + if (reason === "blur" || reason === "escape") { + setOpen(false); + } + }} inputValue={inputValue} onInputChange={(_, newValue) => { handleInputChange(newValue); }} onChange={(_, newValue) => { - handleChange(newValue); + if (multiple && isAdorned) { + const hasSelectAllSelected = + Array.isArray(newValue) && newValue.some((item) => item.isSelectAll); + if (hasSelectAllSelected) { + handleSelectAll(!selectAll); + } else { + handleChange(newValue); + setSelectAll(Array.isArray(newValue) && newValue.length === options.length); + } + } else { + handleChange(newValue); + setOpen(false); + } }} fullWidth freeSolo disabled={disabled} disableClearable - options={options} + options={enhancedOptions} getOptionLabel={(option) => option[filteredBy]} isOptionEqualToValue={(option, value) => option._id === value._id} // Compare by unique identifier renderInput={(params) => ( @@ -120,6 +178,9 @@ const Search = ({ )} filterOptions={(options, { inputValue }) => { + if (inputValue.trim() === "" && multiple && isAdorned) { + return enhancedOptions; + } const filtered = options.filter((option) => option[filteredBy].toLowerCase().includes(inputValue.toLowerCase()) ); @@ -136,6 +197,7 @@ const Search = ({ const { key, ...optionProps } = props; const hasSecondaryLabel = secondaryLabel && option[secondaryLabel] !== undefined; const port = option["port"]; + const selected = isOptionSelected(option); return ( + {multiple && isAdorned && !option.noOptions && ( + + )} {option[filteredBy] + (hasSecondaryLabel ? ` (${option[secondaryLabel]}${port ? `: ${port}` : ""})` diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx index d569ec840..5ad665069 100644 --- a/client/src/Components/MonitorDetailsControlHeader/index.jsx +++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx @@ -68,6 +68,9 @@ const MonitorDetailsControlHeader = ({ onClick={() => { testAllNotifications({ monitorId: monitor?._id }); }} + sx={{ + whiteSpace: "nowrap", + }} > {t("sendTestNotifications")} diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx index fdfb955f4..65671a609 100644 --- a/client/src/Components/MonitorDetailsControlHeader/status.jsx +++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx @@ -8,6 +8,7 @@ import { formatDurationRounded } from "../../Utils/timeUtils"; import PropTypes from "prop-types"; import { useTheme } from "@emotion/react"; import { useMonitorUtils } from "../../Hooks/useMonitorUtils"; +import { formatMonitorUrl } from "../../Utils/utils"; /** * Status component displays the status information of a monitor. * It includes the monitor's name, URL, and check interval. @@ -33,9 +34,7 @@ const Status = ({ monitor }) => { gap={theme.spacing(4)} > - - {monitor?.url?.replace(/^https?:\/\//, "") || "..."} - + {formatMonitorUrl(monitor?.url)} Checking every {formatDurationRounded(monitor?.interval)}. diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooks.js index dac2be671..683b89b20 100644 --- a/client/src/Hooks/checkHooks.js +++ b/client/src/Hooks/checkHooks.js @@ -2,8 +2,57 @@ import { useState, useEffect } from "react"; import { networkService } from "../main"; import { createToast } from "../Utils/toastUtils"; -const useFetchChecks = ({ - teamId, +const useFetchChecksTeam = ({ + status, + sortOrder, + limit, + dateRange, + filter, + page, + rowsPerPage, + enabled = true, +}) => { + const [checks, setChecks] = useState(undefined); + const [checksCount, setChecksCount] = useState(undefined); + const [isLoading, setIsLoading] = useState(false); + const [networkError, setNetworkError] = useState(false); + + useEffect(() => { + const fetchChecks = async () => { + if (!enabled) { + return; + } + + const config = { + status, + sortOrder, + limit, + dateRange, + filter, + page, + rowsPerPage, + }; + + try { + setIsLoading(true); + const res = await networkService.getChecksByTeam(config); + setChecks(res.data.data.checks); + setChecksCount(res.data.data.checksCount); + } catch (error) { + setNetworkError(true); + createToast({ body: error.message }); + } finally { + setIsLoading(false); + } + }; + + fetchChecks(); + }, [status, sortOrder, limit, dateRange, filter, page, rowsPerPage, enabled]); + + return [checks, checksCount, isLoading, networkError]; +}; + +const useFetchChecksByMonitor = ({ monitorId, type, status, @@ -13,6 +62,7 @@ const useFetchChecks = ({ filter, page, rowsPerPage, + enabled = true, }) => { const [checks, setChecks] = useState(undefined); const [checksCount, setChecksCount] = useState(undefined); @@ -21,40 +71,25 @@ const useFetchChecks = ({ useEffect(() => { const fetchChecks = async () => { - if (!type && !teamId) { + if (!enabled || !type) { return; } - const method = monitorId - ? networkService.getChecksByMonitor - : networkService.getChecksByTeam; - - const config = monitorId - ? { - monitorId, - type, - status, - sortOrder, - limit, - dateRange, - filter, - page, - rowsPerPage, - } - : { - status, - teamId, - sortOrder, - limit, - dateRange, - filter, - page, - rowsPerPage, - }; + const config = { + monitorId, + type, + status, + sortOrder, + limit, + dateRange, + filter, + page, + rowsPerPage, + }; try { setIsLoading(true); - const res = await method(config); + const res = await networkService.getChecksByMonitor(config); setChecks(res.data.data.checks); setChecksCount(res.data.data.checksCount); } catch (error) { @@ -68,7 +103,6 @@ const useFetchChecks = ({ fetchChecks(); }, [ monitorId, - teamId, type, status, sortOrder, @@ -77,9 +111,10 @@ const useFetchChecks = ({ filter, page, rowsPerPage, + enabled, ]); return [checks, checksCount, isLoading, networkError]; }; -export { useFetchChecks }; +export { useFetchChecksByMonitor, useFetchChecksTeam }; diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx index cf6fbb49d..3b2e07238 100644 --- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx +++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx @@ -10,10 +10,11 @@ import NetworkError from "../../../../Components/GenericFallback/NetworkError"; //Utils import { formatDateWithTz } from "../../../../Utils/timeUtils"; import { useSelector } from "react-redux"; -import { useState, useEffect } from "react"; +import { useState } from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import { useFetchChecks } from "../../../../Hooks/checkHooks"; +import { useFetchChecksTeam } from "../../../../Hooks/checkHooks"; +import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooks"; const IncidentTable = ({ shouldRender, @@ -26,26 +27,41 @@ const IncidentTable = ({ const uiTimezone = useSelector((state) => state.ui.timezone); //Local state - const [teamId, setTeamId] = useState(undefined); - const [monitorId, setMonitorId] = useState(undefined); - const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); const selectedMonitorDetails = monitors?.[selectedMonitor]; const selectedMonitorType = selectedMonitorDetails?.type; - const [checks, checksCount, isLoading, networkError] = useFetchChecks({ - status: false, - monitorId, - teamId, - type: selectedMonitorType, - sortOrder: "desc", - limit: null, - dateRange, - filter: filter, - page: page, - rowsPerPage: rowsPerPage, - }); + const [checksMonitor, checksCountMonitor, isLoadingMonitor, networkErrorMonitor] = + useFetchChecksByMonitor({ + monitorId: selectedMonitor === "0" ? undefined : selectedMonitor, + type: selectedMonitorType, + status: false, + sortOrder: "desc", + limit: null, + dateRange, + filter: filter, + page: page, + rowsPerPage: rowsPerPage, + enabled: selectedMonitor !== "0", + }); + + const [checksTeam, checksCountTeam, isLoadingTeam, networkErrorTeam] = + useFetchChecksTeam({ + status: false, + sortOrder: "desc", + limit: null, + dateRange, + filter: filter, + page: page, + rowsPerPage: rowsPerPage, + enabled: selectedMonitor === "0", + }); + + const checks = selectedMonitor === "0" ? checksTeam : checksMonitor; + const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor; + const isLoading = isLoadingTeam || isLoadingMonitor; + const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor; const { t } = useTranslation(); @@ -58,16 +74,6 @@ const IncidentTable = ({ setRowsPerPage(event.target.value); }; - useEffect(() => { - if (selectedMonitor === "0") { - setTeamId("placeholder"); // TODO this isn't needed any longer, fix hook - setMonitorId(undefined); - } else { - setMonitorId(selectedMonitor); - setTeamId(undefined); - } - }, [selectedMonitor]); - const headers = [ { id: "monitorName", diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx index 79762e0c3..5f36ee7e5 100644 --- a/client/src/Pages/Uptime/Details/index.jsx +++ b/client/src/Pages/Uptime/Details/index.jsx @@ -18,7 +18,7 @@ import { useTheme } from "@emotion/react"; import { useIsAdmin } from "../../../Hooks/useIsAdmin"; import { useFetchUptimeMonitorById } from "../../../Hooks/monitorHooks"; import useCertificateFetch from "./Hooks/useCertificateFetch"; -import { useFetchChecks } from "../../../Hooks/checkHooks"; +import { useFetchChecksByMonitor } from "../../../Hooks/checkHooks"; import { useTranslation } from "react-i18next"; // Constants @@ -66,16 +66,17 @@ const UptimeDetails = () => { const monitorType = monitor?.type; - const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecks({ - monitorId, - type: monitorType, - sortOrder: "desc", - limit: null, - dateRange, - filter: null, - page, - rowsPerPage, - }); + const [checks, checksCount, checksAreLoading, checksNetworkError] = + useFetchChecksByMonitor({ + monitorId, + type: monitorType, + sortOrder: "desc", + limit: null, + dateRange, + filter: null, + page, + rowsPerPage, + }); // Handlers const triggerUpdate = () => { diff --git a/client/src/Utils/utils.js b/client/src/Utils/utils.js index 8bd9c9019..81ec44b06 100644 --- a/client/src/Utils/utils.js +++ b/client/src/Utils/utils.js @@ -5,3 +5,11 @@ export const safelyParseFloat = (value) => { } return parsedValue; }; + +export const formatMonitorUrl = (url, maxLength = 55) => { + if (!url) return ""; + const strippedUrl = url.replace(/^https?:\/\//, ""); + return strippedUrl.length > maxLength + ? `${strippedUrl.slice(0, maxLength)}…` + : strippedUrl; +}; diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 7d2cdbfa7..ff878c3da 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -744,5 +744,6 @@ "settingsEmailRejectUnauthorized": "Reject Unauthorized", "settingsEmailSecure": "Secure - Use SSL", "settingsEmailPool": "Pool - Enable connection pooling", - "sendTestNotifications": "Send test notifications" -} + "sendTestNotifications": "Send test notifications", + "selectAll": "Select all" +} \ No newline at end of file diff --git a/server/controllers/authController.js b/server/controllers/authController.js index b05a9635a..df4034aef 100755 --- a/server/controllers/authController.js +++ b/server/controllers/authController.js @@ -7,7 +7,6 @@ import { recoveryTokenValidation, newPasswordValidation, } from "../validation/joi.js"; -import logger from "../utils/logger.js"; import jwt from "jsonwebtoken"; import { getTokenFromHeaders } from "../utils/utils.js"; import crypto from "crypto"; @@ -15,12 +14,13 @@ import { handleValidationError, handleError } from "./controllerUtils.js"; const SERVICE_NAME = "authController"; class AuthController { - constructor(db, settingsService, emailService, jobQueue, stringService) { + constructor({ db, settingsService, emailService, jobQueue, stringService, logger }) { this.db = db; this.settingsService = settingsService; this.emailService = emailService; this.jobQueue = jobQueue; this.stringService = stringService; + this.logger = logger; } /** @@ -96,21 +96,28 @@ class AuthController { const token = this.issueToken(userForToken, appSettings); - this.emailService - .buildAndSendEmail( - "welcomeEmailTemplate", - { name: newUser.firstName }, - newUser.email, - "Welcome to Uptime Monitor" - ) - .catch((error) => { - logger.error({ - message: error.message, - service: SERVICE_NAME, - method: "registerUser", - stack: error.stack, - }); + try { + const html = await this.emailService.buildEmail("welcomeEmailTemplate", { + name: newUser.firstName, }); + this.emailService + .sendEmail(newUser.email, "Welcome to Uptime Monitor", html) + .catch((error) => { + this.logger.warn({ + message: error.message, + service: SERVICE_NAME, + method: "registerUser", + stack: error.stack, + }); + }); + } catch (error) { + logger.warn({ + message: error.message, + service: SERVICE_NAME, + method: "registerUser", + stack: error.stack, + }); + } res.success({ msg: this.stringService.authCreateUser, @@ -300,15 +307,16 @@ class AuthController { const name = user.firstName; const { clientHost } = this.settingsService.getSettings(); const url = `${clientHost}/set-new-password/${recoveryToken.token}`; - const msgId = await this.emailService.buildAndSendEmail( - "passwordResetTemplate", - { - name, - email, - url, - }, + + const html = await this.emailService.buildEmail("passwordResetTemplate", { + name, email, - "Checkmate Password Reset" + url, + }); + const msgId = await this.emailService.sendEmail( + email, + "Checkmate Password Reset", + html ); return res.success({ diff --git a/server/controllers/inviteController.js b/server/controllers/inviteController.js index bce40dfa1..3b2212769 100755 --- a/server/controllers/inviteController.js +++ b/server/controllers/inviteController.js @@ -71,24 +71,25 @@ class InviteController { const inviteToken = await this.db.requestInviteToken({ ...req.body }); const { clientHost } = this.settingsService.getSettings(); - this.emailService - .buildAndSendEmail( - "employeeActivationTemplate", - { - name: firstname, - link: `${clientHost}/register/${inviteToken.token}`, - }, - req.body.email, - "Welcome to Uptime Monitor" - ) - .catch((error) => { - logger.error({ - message: error.message, - service: SERVICE_NAME, - method: "issueInvitation", - stack: error.stack, - }); + + try { + const html = await this.emailService.buildEmail("employeeActivationTemplate", { + name: firstname, + link: `${clientHost}/register/${inviteToken.token}`, }); + await this.emailService.sendEmail( + req.body.email, + "Welcome to Uptime Monitor", + html + ); + } catch (error) { + logger.warn({ + message: error.message, + service: SERVICE_NAME, + method: "sendInviteEmail", + stack: error.stack, + }); + } return res.success({ msg: this.stringService.inviteIssued, diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js index 6c6136fb5..e1d087c74 100755 --- a/server/controllers/monitorController.js +++ b/server/controllers/monitorController.js @@ -580,12 +580,8 @@ class MonitorController { const subject = this.stringService.testEmailSubject; const context = { testName: "Monitoring System" }; - const messageId = await this.emailService.buildAndSendEmail( - "testEmailTemplate", - context, - to, - subject - ); + const html = await this.emailService.buildEmail("testEmailTemplate", context); + const messageId = await this.emailService.sendEmail(to, subject, html); if (!messageId) { return res.error({ diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js index b9faa1c32..ef1d689d6 100755 --- a/server/controllers/settingsController.js +++ b/server/controllers/settingsController.js @@ -90,26 +90,21 @@ class SettingsController { const subject = this.stringService.testEmailSubject; const context = { testName: "Monitoring System" }; - const messageId = await this.emailService.buildAndSendEmail( - "testEmailTemplate", - context, - to, - subject, - { - systemEmailHost, - systemEmailPort, - systemEmailUser, - systemEmailAddress, - systemEmailPassword, - systemEmailConnectionHost, - systemEmailSecure, - systemEmailPool, - systemEmailIgnoreTLS, - systemEmailRequireTLS, - systemEmailRejectUnauthorized, - systemEmailTLSServername, - } - ); + const html = await this.emailService.buildEmail("testEmailTemplate", context); + const messageId = await this.emailService.sendEmail(to, subject, html, { + systemEmailHost, + systemEmailPort, + systemEmailUser, + systemEmailAddress, + systemEmailPassword, + systemEmailConnectionHost, + systemEmailSecure, + systemEmailPool, + systemEmailIgnoreTLS, + systemEmailRequireTLS, + systemEmailRejectUnauthorized, + systemEmailTLSServername, + }); if (!messageId) { return res.error({ @@ -122,7 +117,7 @@ class SettingsController { data: { messageId }, }); } catch (error) { - next(handleValidationError(error, SERVICE_NAME)); + next(handleError(error, SERVICE_NAME)); return; } }; diff --git a/server/index.js b/server/index.js index b520e6171..0753af995 100755 --- a/server/index.js +++ b/server/index.js @@ -239,13 +239,14 @@ const startApp = async () => { process.on("SIGTERM", shutdown); //Create controllers - const authController = new AuthController( - ServiceRegistry.get(MongoDB.SERVICE_NAME), - ServiceRegistry.get(SettingsService.SERVICE_NAME), - ServiceRegistry.get(EmailService.SERVICE_NAME), - ServiceRegistry.get(JobQueue.SERVICE_NAME), - ServiceRegistry.get(StringService.SERVICE_NAME) - ); + const authController = new AuthController({ + db: ServiceRegistry.get(MongoDB.SERVICE_NAME), + settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME), + emailService: ServiceRegistry.get(EmailService.SERVICE_NAME), + jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME), + stringService: ServiceRegistry.get(StringService.SERVICE_NAME), + logger: logger, + }); const monitorController = new MonitorController( ServiceRegistry.get(MongoDB.SERVICE_NAME), diff --git a/server/service/emailService.js b/server/service/emailService.js index 09123ef93..89bd4d50f 100755 --- a/server/service/emailService.js +++ b/server/service/emailService.js @@ -80,24 +80,28 @@ class EmailService { */ }; - /** - * Asynchronously builds and sends an email using a specified template and context. - * - * @param {string} template - The name of the template to use for the email body. - * @param {Object} context - The data context to render the template with. - * @param {string} to - The recipient's email address. - * @param {string} subject - The subject of the email. - * @returns {Promise} A promise that resolves to the messageId of the sent email. - */ - buildAndSendEmail = async (template, context, to, subject, transportConfig) => { - // TODO - Consider an update transporter method so this only needs to be recreated when smtp settings change + buildEmail = async (template, context) => { + try { + const mjml = this.templateLookup[template](context); + const html = await this.mjml2html(mjml); + return html.html; + } catch (error) { + this.logger.error({ + message: error.message, + service: SERVICE_NAME, + method: "buildEmail", + stack: error.stack, + }); + } + }; + + sendEmail = async (to, subject, html, transportConfig) => { let config; if (typeof transportConfig !== "undefined") { config = transportConfig; } else { config = await this.settingsService.getDBSettings(); } - const { systemEmailHost, systemEmailPort, @@ -131,45 +135,24 @@ class EmailService { servername: systemEmailTLSServername, }, }; - this.transporter = this.nodemailer.createTransport(emailConfig); - const buildHtml = async (template, context) => { - try { - const mjml = this.templateLookup[template](context); - const html = await this.mjml2html(mjml); - return html.html; - } catch (error) { - this.logger.error({ - message: error.message, - service: SERVICE_NAME, - method: "buildAndSendEmail", - stack: error.stack, - }); - } - }; - - const sendEmail = async (to, subject, html) => { - try { - const info = await this.transporter.sendMail({ - to: to, - from: systemEmailAddress, - subject: subject, - html: html, - }); - return info; - } catch (error) { - this.logger.error({ - message: error.message, - service: SERVICE_NAME, - method: "sendEmail", - stack: error.stack, - }); - } - }; - const html = await buildHtml(template, context); - const info = await sendEmail(to, subject, html); - return info?.messageId; + try { + const info = await this.transporter.sendMail({ + to: to, + from: systemEmailAddress, + subject: subject, + html: html, + }); + return info?.messageId; + } catch (error) { + this.logger.error({ + message: error.message, + service: SERVICE_NAME, + method: "sendEmail", + stack: error.stack, + }); + } }; } diff --git a/server/service/notificationService.js b/server/service/notificationService.js index 77bd31aee..dcd629d53 100755 --- a/server/service/notificationService.js +++ b/server/service/notificationService.js @@ -218,7 +218,16 @@ class NotificationService { const template = "hardwareIncidentTemplate"; const context = { monitor: monitor.name, url: monitor.url, alerts }; const subject = `Monitor ${monitor.name} infrastructure alerts`; - this.emailService.buildAndSendEmail(template, context, address, subject); + const html = await this.emailService.buildEmail(template, context); + this.emailService.sendEmail(address, subject, html).catch((error) => { + this.logger.warn({ + message: error.message, + service: this.SERVICE_NAME, + method: "sendHardwareEmail", + stack: error.stack, + }); + }); + return true; } @@ -231,17 +240,22 @@ class NotificationService { const subject = this.stringService.testEmailSubject; const context = { testName: "Monitoring System" }; - const messageId = await this.emailService.buildAndSendEmail( - "testEmailTemplate", - context, - to, - subject - ); + try { + const html = await this.emailService.buildEmail("testEmailTemplate", context); + const messageId = await this.emailService.sendEmail(to, subject, html); - if (messageId) { - return true; + if (messageId) { + return true; + } + } catch (error) { + this.logger.warn({ + message: error.message, + service: this.SERVICE_NAME, + method: "sendTestEmail", + stack: error.stack, + }); + return false; } - return false; }; /** @@ -259,7 +273,17 @@ class NotificationService { const template = prevStatus === false ? "serverIsUpTemplate" : "serverIsDownTemplate"; const context = { monitor: monitor.name, url: monitor.url }; const subject = `Monitor ${monitor.name} is ${status === true ? "up" : "down"}`; - this.emailService.buildAndSendEmail(template, context, address, subject); + + const html = await this.emailService.buildEmail(template, context); + this.emailService.sendEmail(address, subject, html).catch((error) => { + this.logger.warn({ + message: error.message, + service: this.SERVICE_NAME, + method: "sendEmail", + stack: error.stack, + }); + }); + return true; }