@oneuptime/common 12.0.34 → 13.0.0

package/build/dist/Server/Services/UserNotificationRuleService.js

@@ -648,6 +648,16 @@ export class Service extends DatabaseService {
                     rootCause: true,
                     incidentNumber: true,
                     incidentNumberWithPrefix: true,
+                    /*
+                     * AcknowledgeIncident.hbs asks for a Resources Affected row and
+                     * the generator had nothing to build it from, so the row was
+                     * silently dropped — the same `{{#if}}` swallow that hid the
+                     * alert's Root Cause.
+                     */
+                    monitors: {
+                        _id: true,
+                        name: true,
+                    },
                 },
             });
         }
@@ -675,6 +685,20 @@ export class Service extends DatabaseService {
                     },
                     alertNumber: true,
                     alertNumberWithPrefix: true,
+                    /*
+                     * AcknowledgeAlert.hbs has always asked for a Root Cause row, but
+                     * this select never loaded the column and the template's
+                     * `{{#if text}}` guard silently dropped the row — so the one
+                     * person being woken up for the alert was the only one who could
+                     * not see why it fired. The other three on-call templates already
+                     * select it.
+                     */
+                    rootCause: true,
+                    // Same story for the template's Resources Affected row.
+                    monitor: {
+                        _id: true,
+                        name: true,
+                    },
                 },
             });
         }
@@ -3171,6 +3195,7 @@ export class Service extends DatabaseService {
         };
     }
     async generateEmailTemplateForAlertCreated(to, alert, userOnCallLogTimelineId) {
+        var _a;
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
         const alertNumber = alert.alertNumberWithPrefix ||
@@ -3182,6 +3207,8 @@ export class Service extends DatabaseService {
             currentState: alert.currentAlertState.name,
             alertDescription: await Markdown.convertToHTML(alert.description || "", MarkdownContentType.Email),
             alertSeverity: alert.alertSeverity.name,
+            resourcesAffected: ((_a = alert.monitor) === null || _a === void 0 ? void 0 : _a.name) || "No resources identified",
+            rootCause: await Markdown.convertToHTML(alert.rootCause || "No root cause identified for this alert", MarkdownContentType.Email),
             alertViewLink: (await AlertService.getAlertLinkInDashboard(alert.projectId, alert.id)).toString(),
             acknowledgeAlertLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
                 .addRoute(new UserOnCallLogTimeline().crudApiPath)
@@ -3207,7 +3234,15 @@ export class Service extends DatabaseService {
             currentState: incident.currentIncidentState.name,
             incidentDescription: await Markdown.convertToHTML(incident.description || "", MarkdownContentType.Email),
             incidentSeverity: incident.incidentSeverity.name,
-            rootCause: incident.rootCause || "No root cause identified for this incident",
+            resourcesAffected: (incident.monitors || [])
+                .map((monitor) => {
+                return monitor.name || "";
+            })
+                .filter((name) => {
+                return name.length > 0;
+            })
+                .join(", ") || "No resources identified",
+            rootCause: await Markdown.convertToHTML(incident.rootCause || "No root cause identified for this incident", MarkdownContentType.Email),
             incidentViewLink: (await IncidentService.getIncidentLinkInDashboard(incident.projectId, incident.id)).toString(),
             acknowledgeIncidentLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
                 .addRoute(new UserOnCallLogTimeline().crudApiPath)
@@ -3285,23 +3320,23 @@ export class Service extends DatabaseService {
         if (alerts.length > 0) {
             const alertRows = [];
             for (const alert of alerts) {
-                const alertTitle = alert.title || "Untitled Alert";
+                const alertTitle = Markdown.escapeHtml(alert.title || "Untitled Alert");
                 const alertNumber = alert.alertNumberWithPrefix ||
                     (alert.alertNumber ? `#${alert.alertNumber}` : "");
                 const alertLink = (await AlertService.getAlertLinkInDashboard(alertEpisode.projectId, alert.id)).toString();
-                const monitorName = ((_b = alert.monitor) === null || _b === void 0 ? void 0 : _b.name) || "";
+                const monitorName = Markdown.escapeHtml(((_b = alert.monitor) === null || _b === void 0 ? void 0 : _b.name) || "");
                 alertRows.push(`
             <tr>
-              <td style="padding: 12px 16px; border-bottom: 1px solid #e2e8f0;">
-                <table cellpadding="0" cellspacing="0" width="100%">
+              <td style="padding: 16px 20px; border-bottom: 1px solid #e2e8f0; overflow-wrap: anywhere; word-break: break-word;">
+                <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="width: 100%; table-layout: fixed;">
                   <tr>
                     <td style="vertical-align: middle;">
-                      <span style="display: inline-block; background-color: #dbeafe; color: #1e40af; font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: 4px; margin-right: 8px;">${alertNumber}</span>
-                      <a href="${alertLink}" style="color: #2563eb; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 14px; font-weight: 500; text-decoration: none;">${alertTitle}</a>
-                      ${monitorName ? `<span style="display: block; color: #64748b; font-size: 12px; margin-top: 4px;">Monitor: ${monitorName}</span>` : ""}
+                      <span style="display: inline-block; background-color: #f1f5f9; color: #111111; font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: 4px; margin-right: 8px;">${alertNumber}</span>
+                      <a href="${alertLink}" style="color: #111111; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 15px; line-height: 24px; font-weight: 600; text-decoration: underline; text-underline-offset: 3px;">${alertTitle}</a>
+                      ${monitorName ? `<span style="display: block; color: #64748b; font-size: 13px; line-height: 20px; margin-top: 6px;">Monitor: ${monitorName}</span>` : ""}
                     </td>
-                    <td style="text-align: right; vertical-align: middle;">
-                      <a href="${alertLink}" style="color: #2563eb; font-size: 12px; text-decoration: none;">View →</a>
+                    <td width="52" style="text-align: right; vertical-align: middle; padding-left: 8px;">
+                      <a href="${alertLink}" style="color: #111111; font-size: 13px; line-height: 20px; text-decoration: underline;">View →</a>
                     </td>
                   </tr>
                 </table>
@@ -3311,7 +3346,7 @@ export class Service extends DatabaseService {
             }
             if (alertRows.length > 0) {
                 alertsListHtml = `
-          <table cellpadding="0" cellspacing="0" width="100%" style="background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%); border-radius: 8px; border: 1px solid #e2e8f0; margin: 8px 0 16px 0;">
+          <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="width: 100%; table-layout: fixed; background-color: #f8fafc; border-radius: 12px; border: 1px solid #e2e8f0; margin: 8px 0 16px 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;">
             <tbody>
               ${alertRows.join("")}
             </tbody>
@@ -3329,8 +3364,8 @@ export class Service extends DatabaseService {
             alertEpisodeDescription: await Markdown.convertToHTML(alertEpisode.description || "", MarkdownContentType.Email),
             alertEpisodeSeverity: alertEpisode.alertSeverity.name,
             resourcesAffected: resourcesAffected,
-            rootCause: alertEpisode.rootCause ||
-                "No root cause identified for this alert episode",
+            rootCause: await Markdown.convertToHTML(alertEpisode.rootCause ||
+                "No root cause identified for this alert episode", MarkdownContentType.Email),
             alertsList: alertsListHtml,
             alertsCount: alerts.length.toString(),
             alertEpisodeViewLink: (await AlertEpisodeService.getEpisodeLinkInDashboard(alertEpisode.projectId, alertEpisode.id)).toString(),
@@ -3415,30 +3450,30 @@ export class Service extends DatabaseService {
         if (incidents.length > 0) {
             const incidentRows = [];
             for (const incident of incidents) {
-                const incidentTitle = incident.title || "Untitled Incident";
+                const incidentTitle = Markdown.escapeHtml(incident.title || "Untitled Incident");
                 const incidentNumber = incident.incidentNumberWithPrefix ||
                     (incident.incidentNumber ? `#${incident.incidentNumber}` : "");
                 const incidentLink = (await IncidentService.getIncidentLinkInDashboard(incidentEpisode.projectId, incident.id)).toString();
-                const monitorName = (incident.monitors || [])
+                const monitorName = Markdown.escapeHtml((incident.monitors || [])
                     .map((monitor) => {
                     return monitor.name || "";
                 })
                     .filter((name) => {
                     return name.length > 0;
                 })
-                    .join(", ") || "";
+                    .join(", ") || "");
                 incidentRows.push(`
             <tr>
-              <td style="padding: 12px 16px; border-bottom: 1px solid #e2e8f0;">
-                <table cellpadding="0" cellspacing="0" width="100%">
+              <td style="padding: 16px 20px; border-bottom: 1px solid #e2e8f0; overflow-wrap: anywhere; word-break: break-word;">
+                <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="width: 100%; table-layout: fixed;">
                   <tr>
                     <td style="vertical-align: middle;">
                       <span style="display: inline-block; background-color: #fee2e2; color: #991b1b; font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: 4px; margin-right: 8px;">${incidentNumber}</span>
-                      <a href="${incidentLink}" style="color: #2563eb; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 14px; font-weight: 500; text-decoration: none;">${incidentTitle}</a>
-                      ${monitorName ? `<span style="display: block; color: #64748b; font-size: 12px; margin-top: 4px;">Monitor: ${monitorName}</span>` : ""}
+                      <a href="${incidentLink}" style="color: #111111; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 15px; line-height: 24px; font-weight: 600; text-decoration: underline; text-underline-offset: 3px;">${incidentTitle}</a>
+                      ${monitorName ? `<span style="display: block; color: #64748b; font-size: 13px; line-height: 20px; margin-top: 6px;">Monitor: ${monitorName}</span>` : ""}
                     </td>
-                    <td style="text-align: right; vertical-align: middle;">
-                      <a href="${incidentLink}" style="color: #2563eb; font-size: 12px; text-decoration: none;">View →</a>
+                    <td width="52" style="text-align: right; vertical-align: middle; padding-left: 8px;">
+                      <a href="${incidentLink}" style="color: #111111; font-size: 13px; line-height: 20px; text-decoration: underline;">View →</a>
                     </td>
                   </tr>
                 </table>
@@ -3448,7 +3483,7 @@ export class Service extends DatabaseService {
             }
             if (incidentRows.length > 0) {
                 incidentsListHtml = `
-          <table cellpadding="0" cellspacing="0" width="100%" style="background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%); border-radius: 8px; border: 1px solid #e2e8f0; margin: 8px 0 16px 0;">
+          <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="width: 100%; table-layout: fixed; background-color: #f8fafc; border-radius: 12px; border: 1px solid #e2e8f0; margin: 8px 0 16px 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;">
             <tbody>
               ${incidentRows.join("")}
             </tbody>
@@ -3468,8 +3503,8 @@ export class Service extends DatabaseService {
             incidentEpisodeDescription: await Markdown.convertToHTML(incidentEpisode.description || "", MarkdownContentType.Email),
             incidentEpisodeSeverity: incidentEpisode.incidentSeverity.name,
             resourcesAffected: resourcesAffected,
-            rootCause: incidentEpisode.rootCause ||
-                "No root cause identified for this incident episode",
+            rootCause: await Markdown.convertToHTML(incidentEpisode.rootCause ||
+                "No root cause identified for this incident episode", MarkdownContentType.Email),
             incidentsList: incidentsListHtml,
             incidentsCount: incidents.length.toString(),
             incidentEpisodeViewLink: (await IncidentEpisodeService.getEpisodeLinkInDashboard(incidentEpisode.projectId, incidentEpisode.id)).toString(),