@oneuptime/common 14.0.12 → 14.0.13

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

@@ -13,6 +13,7 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import QueryHelper from "../Types/Database/QueryHelper";
 import SubscriberTemplateIncidentRecordAccess from "../Utils/StatusPage/SubscriberTemplateIncidentRecordAccess";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import { normalizeCustomFieldTemplateVariableName } from "../../Types/CustomField/CustomFieldVariableKey";
 import StatusPageSubscriberNotificationTemplateStatusPageService from "./StatusPageSubscriberNotificationTemplateStatusPageService";
 import SubscriberNotificationTemplateVariables from "../../Types/StatusPage/SubscriberNotificationTemplateVariables";
 import SubscriberNotificationTemplateCompiler from "../../Types/StatusPage/SubscriberNotificationTemplateCompiler";
@@ -22,9 +23,10 @@ export class Service extends DatabaseService {
     }
     /*
      * A template's body and subject may place values from the team's incident
-     * records - {{incidentLabels}} and {{customFields.<key>}} - only when
-     * whoever writes them may read those records: the status page roles that
-     * may write templates may not (SubscriberTemplateIncidentRecordAccess).
+     * records - {{incidentLabels}} and {{incident.customFields.<key>}} (or the
+     * older {{customFields.<key>}}) - only when whoever writes them may read
+     * those records: the status page roles that may write templates may not
+     * (SubscriberTemplateIncidentRecordAccess).
      */
     async onBeforeCreate(createBy) {
         SubscriberTemplateIncidentRecordAccess.assertCanPlace({
@@ -40,7 +42,10 @@ export class Service extends DatabaseService {
      * On an update, only what the write adds is checked: a placeholder the
      * template already holds was allowed when it was written, so someone
      * without incident access can still fix a typo, rename the template or
-     * move a placeholder from the subject to the body - but not add one.
+     * move a placeholder from the subject to the body - but not add one. A
+     * custom field the template holds as {{customFields.<key>}} may be
+     * rewritten as {{incident.customFields.<key>}}, its documented name: both
+     * read the same field, so nothing new is placed.
      *
      * Pointing a template somewhere else counts as placing everything it
      * holds: changing its channel or event type makes an admin's template
@@ -131,8 +136,12 @@ export class Service extends DatabaseService {
                 }
                 continue;
             }
+            // The same field written the other way is not an addition.
+            const heldFields = new Set(held.map((name) => {
+                return normalizeCustomFieldTemplateVariableName(name);
+            }));
             for (const name of written) {
-                if (!held.includes(name)) {
+                if (!heldFields.has(normalizeCustomFieldTemplateVariableName(name))) {
                     added.add(name);
                 }
             }

package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateService.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatusPageSubscriberNotificationTemplateService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageSubscriberNotificationTemplateService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StatusPageSubscriberNotificationTemplateService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageSubscriberNotificationTemplateService.ts"],"names":[],"mappings":"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"}

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

@@ -18,12 +18,13 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
  * Linking a custom subscriber notification template to a status page sends
  * that page's subscribers whatever the template places. A template may place
  * values from the team's incident records ({{incidentLabels}},
- * {{customFields.<key>}}), which only someone who may read them may put in a
- * template (SubscriberTemplateIncidentRecordAccess) - and the status page
- * roles that may link templates may also add a Slack, Teams or webhook
- * subscriber of their own to a page. So linking such a template, or moving a
- * link to another template or page, is checked as placing everything the
- * template holds. Root and master admin writes are not checked.
+ * {{incident.customFields.<key>}}), which only someone who may read them may
+ * put in a template (SubscriberTemplateIncidentRecordAccess) - and the
+ * status page roles that may link templates may also add a Slack, Teams or
+ * webhook subscriber of their own to a page. So linking such a template, or
+ * moving a link to another template or page, is checked as placing
+ * everything the template holds. Root and master admin writes are not
+ * checked.
  */
 export class Service extends DatabaseService {
     constructor() {

package/build/dist/Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatusPageSubscriberNotificationTemplateStatusPageService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StatusPageSubscriberNotificationTemplateStatusPageService.js","sourceRoot":"","sources":["../../../../Server/Services/StatusPageSubscriberNotificationTemplateStatusPageService.ts"],"names":[],"mappings":"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"}

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

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/TraceRecordingRule";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import { Service as MetricRecordingRuleService } from "./MetricRecordingRuleService";
+import MetricRecordingRuleServiceInstance, { Service as MetricRecordingRuleService, } from "./MetricRecordingRuleService";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -18,13 +18,22 @@ export class Service extends DatabaseService {
     /*
      * A trace recording rule writes a metric too, and straight into the metric
      * store: it may not claim a reserved session replay name any more than a
-     * metric recording rule may (MetricRecordingRuleService).
+     * metric recording rule may (MetricRecordingRuleService). Its output
+     * metric name is made from its name when the create leaves it out, kept
+     * clear of every metric and trace recording rule of the project.
      */
     async onBeforeCreate(createBy) {
+        createBy.data.outputMetricName =
+            await MetricRecordingRuleServiceInstance.getOutputMetricNameForCreate({
+                outputMetricName: createBy.data.outputMetricName,
+                ruleName: createBy.data.name,
+                projectId: createBy.data.projectId || createBy.props.tenantId,
+            });
         MetricRecordingRuleService.assertOutputMetricNameAllowed(createBy.data.outputMetricName);
         return { createBy, carryForward: null };
     }
     async onBeforeUpdate(updateBy) {
+        MetricRecordingRuleService.assertOutputMetricNameNotCleared(updateBy.data);
         // Only an update that sets the name can make it reserved.
         MetricRecordingRuleService.assertOutputMetricNameAllowed(updateBy.data["outputMetricName"]);
         return { updateBy, carryForward: null };

package/build/dist/Server/Services/TraceRecordingRuleService.js.map

@@ -1 +1 @@
-{"version":3,"file":"TraceRecordingRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/TraceRecordingRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,gDAAgD,CAAC;AAInE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAErF,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED;;;;OAIG;IAEsB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,0BAA0B,CAAC,6BAA6B,CACtD,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAC/B,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,0DAA0D;QAC1D,0BAA0B,CAAC,6BAA6B,CACrD,QAAQ,CAAC,IAA2C,CAAC,kBAAkB,CAAC,CAC1E,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;CACF;AArB0B;IADxB,WAAW,EAAE;;;;6CASb;AAGwB;IADxB,WAAW,EAAE;;;;6CAUb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"TraceRecordingRuleService.js","sourceRoot":"","sources":["../../../../Server/Services/TraceRecordingRuleService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,gDAAgD,CAAC;AAInE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,kCAAkC,EAAE,EACzC,OAAO,IAAI,0BAA0B,GACtC,MAAM,8BAA8B,CAAC;AAEtC,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IAEsB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,QAAQ,CAAC,IAAI,CAAC,gBAAgB;YAC5B,MAAM,kCAAkC,CAAC,4BAA4B,CAAC;gBACpE,gBAAgB,EAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB;gBAChD,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI;gBAC5B,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ;aAC9D,CAAC,CAAC;QAEL,0BAA0B,CAAC,6BAA6B,CACtD,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAC/B,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,0BAA0B,CAAC,gCAAgC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE3E,0DAA0D;QAC1D,0BAA0B,CAAC,6BAA6B,CACrD,QAAQ,CAAC,IAA2C,CAAC,kBAAkB,CAAC,CAC1E,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;CACF;AA9B0B;IADxB,WAAW,EAAE;;;;6CAgBb;AAGwB;IADxB,WAAW,EAAE;;;;6CAYb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

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

@@ -11,6 +11,7 @@ import DatabaseConfig from "../DatabaseConfig";
 import DatabaseRequestType from "../Types/BaseDatabase/DatabaseRequestType";
 import TenantPermission from "../Types/Database/Permissions/TenantPermission";
 import Markdown, { MarkdownContentType } from "../Types/Markdown";
+import EmailColorUtil from "../../Utils/Email/EmailColorUtil";
 import { escapeMarkdownValue } from "../../Utils/Markdown/MarkdownEscape";
 import CallService from "./CallService";
 import DatabaseService from "./DatabaseService";
@@ -644,9 +645,11 @@ export class Service extends DatabaseService {
                     },
                     currentIncidentState: {
                         name: true,
+                        color: true,
                     },
                     incidentSeverity: {
                         name: true,
+                        color: true,
                     },
                     rootCause: true,
                     incidentNumber: true,
@@ -677,9 +680,11 @@ export class Service extends DatabaseService {
                     },
                     currentAlertState: {
                         name: true,
+                        color: true,
                     },
                     alertSeverity: {
                         name: true,
+                        color: true,
                     },
                     alertNumber: true,
                     alertNumberWithPrefix: true,
@@ -720,9 +725,11 @@ export class Service extends DatabaseService {
                     },
                     currentAlertState: {
                         name: true,
+                        color: true,
                     },
                     alertSeverity: {
                         name: true,
+                        color: true,
                     },
                     episodeNumber: true,
                     episodeNumberWithPrefix: true,
@@ -749,9 +756,11 @@ export class Service extends DatabaseService {
                     },
                     currentIncidentState: {
                         name: true,
+                        color: true,
                     },
                     incidentSeverity: {
                         name: true,
+                        color: true,
                     },
                     episodeNumber: true,
                     episodeNumberWithPrefix: true,
@@ -3201,17 +3210,12 @@ export class Service extends DatabaseService {
         };
     }
     async generateEmailTemplateForAlertCreated(to, alert, userOnCallLogTimelineId) {
+        var _a, _b;
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
         const alertNumber = alert.alertNumberWithPrefix ||
             (alert.alertNumber ? `#${alert.alertNumber}` : "");
-        const vars = {
-            alertTitle: alert.title,
-            alertNumber: alertNumber,
-            projectName: alert.project.name,
-            currentState: alert.currentAlertState.name,
-            alertDescription: await Markdown.convertToHTML(alert.description || "", MarkdownContentType.Email),
-            alertSeverity: alert.alertSeverity.name,
+        const vars = Object.assign(Object.assign(Object.assign(Object.assign({ alertTitle: alert.title, alertNumber: alertNumber, projectName: alert.project.name, currentState: alert.currentAlertState.name }, EmailColorUtil.getTemplateVariables("currentState", (_a = alert.currentAlertState) === null || _a === void 0 ? void 0 : _a.color)), { alertDescription: await Markdown.convertToHTML(alert.description || "", MarkdownContentType.Email), alertSeverity: alert.alertSeverity.name }), EmailColorUtil.getTemplateVariables("alertSeverity", (_b = alert.alertSeverity) === null || _b === void 0 ? void 0 : _b.color)), { 
             /*
              * Every resource the alert's Affected Resources card lists. An SLO
              * burn-rate alert has no monitor, and this used to read "No resources
@@ -3225,13 +3229,9 @@ export class Service extends DatabaseService {
                 }),
                 seriesSummary: SeriesLabelDisplay.buildInlineSummary(alert.seriesLabels),
                 fallback: "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())
+            }), 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)
-                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString(),
-        };
+                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString() });
         const emailMessage = {
             toEmail: to,
             templateType: EmailTemplateType.AcknowledgeAlert,
@@ -3242,17 +3242,12 @@ export class Service extends DatabaseService {
         return emailMessage;
     }
     async generateEmailTemplateForIncidentCreated(to, incident, userOnCallLogTimelineId) {
+        var _a, _b;
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
         const incidentNumber = incident.incidentNumberWithPrefix ||
             (incident.incidentNumber ? `#${incident.incidentNumber}` : "");
-        const vars = {
-            incidentTitle: incident.title,
-            incidentNumber: incidentNumber,
-            projectName: incident.project.name,
-            currentState: incident.currentIncidentState.name,
-            incidentDescription: await Markdown.convertToHTML(incident.description || "", MarkdownContentType.Email),
-            incidentSeverity: incident.incidentSeverity.name,
+        const vars = Object.assign(Object.assign(Object.assign(Object.assign({ incidentTitle: incident.title, incidentNumber: incidentNumber, projectName: incident.project.name, currentState: incident.currentIncidentState.name }, EmailColorUtil.getTemplateVariables("currentState", (_a = incident.currentIncidentState) === null || _a === void 0 ? void 0 : _a.color)), { incidentDescription: await Markdown.convertToHTML(incident.description || "", MarkdownContentType.Email), incidentSeverity: incident.incidentSeverity.name }), EmailColorUtil.getTemplateVariables("incidentSeverity", (_b = incident.incidentSeverity) === null || _b === void 0 ? void 0 : _b.color)), { 
             // Every resource the incident's Affected Resources card lists.
             resourcesAffected: LinkedAffectedResources.getText({
                 resources: await LinkedAffectedResources.readForIncident({
@@ -3261,13 +3256,9 @@ export class Service extends DatabaseService {
                     incidentId: incident.id,
                 }),
                 fallback: "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())
+            }), 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)
-                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString(),
-        };
+                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString() });
         const emailMessage = {
             toEmail: to,
             templateType: EmailTemplateType.AcknowledgeIncident,
@@ -3278,7 +3269,7 @@ export class Service extends DatabaseService {
         return emailMessage;
     }
     async generateEmailTemplateForAlertEpisodeCreated(to, alertEpisode, userOnCallLogTimelineId) {
-        var _a;
+        var _a, _b, _c;
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
         // Fetch alerts that are members of this episode
@@ -3376,23 +3367,10 @@ export class Service extends DatabaseService {
         }
         const episodeNumber = alertEpisode.episodeNumberWithPrefix ||
             (alertEpisode.episodeNumber ? `#${alertEpisode.episodeNumber}` : "");
-        const vars = {
-            alertEpisodeTitle: alertEpisode.title,
-            episodeNumber: episodeNumber,
-            projectName: alertEpisode.project.name,
-            currentState: alertEpisode.currentAlertState.name,
-            alertEpisodeDescription: await Markdown.convertToHTML(alertEpisode.description || "", MarkdownContentType.Email),
-            alertEpisodeSeverity: alertEpisode.alertSeverity.name,
-            resourcesAffected: resourcesAffected,
-            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(),
-            acknowledgeAlertEpisodeLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
+        const vars = Object.assign(Object.assign(Object.assign(Object.assign({ alertEpisodeTitle: alertEpisode.title, episodeNumber: episodeNumber, projectName: alertEpisode.project.name, currentState: alertEpisode.currentAlertState.name }, EmailColorUtil.getTemplateVariables("currentState", (_b = alertEpisode.currentAlertState) === null || _b === void 0 ? void 0 : _b.color)), { alertEpisodeDescription: await Markdown.convertToHTML(alertEpisode.description || "", MarkdownContentType.Email), alertEpisodeSeverity: alertEpisode.alertSeverity.name }), EmailColorUtil.getTemplateVariables("alertEpisodeSeverity", (_c = alertEpisode.alertSeverity) === null || _c === void 0 ? void 0 : _c.color)), { resourcesAffected: resourcesAffected, 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(), acknowledgeAlertEpisodeLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
                 .addRoute(new UserOnCallLogTimeline().crudApiPath)
-                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString(),
-        };
+                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString() });
         const emailMessage = {
             toEmail: to,
             templateType: EmailTemplateType.AcknowledgeAlertEpisode,
@@ -3403,6 +3381,7 @@ export class Service extends DatabaseService {
         return emailMessage;
     }
     async generateEmailTemplateForIncidentEpisodeCreated(to, incidentEpisode, userOnCallLogTimelineId) {
+        var _a, _b;
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
         // Fetch incidents that are members of this episode
@@ -3509,23 +3488,10 @@ export class Service extends DatabaseService {
             (incidentEpisode.episodeNumber
                 ? `#${incidentEpisode.episodeNumber}`
                 : "");
-        const vars = {
-            incidentEpisodeTitle: incidentEpisode.title,
-            episodeNumber: episodeNumber,
-            projectName: incidentEpisode.project.name,
-            currentState: incidentEpisode.currentIncidentState.name,
-            incidentEpisodeDescription: await Markdown.convertToHTML(incidentEpisode.description || "", MarkdownContentType.Email),
-            incidentEpisodeSeverity: incidentEpisode.incidentSeverity.name,
-            resourcesAffected: resourcesAffected,
-            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(),
-            acknowledgeIncidentEpisodeLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
+        const vars = Object.assign(Object.assign(Object.assign(Object.assign({ incidentEpisodeTitle: incidentEpisode.title, episodeNumber: episodeNumber, projectName: incidentEpisode.project.name, currentState: incidentEpisode.currentIncidentState.name }, EmailColorUtil.getTemplateVariables("currentState", (_a = incidentEpisode.currentIncidentState) === null || _a === void 0 ? void 0 : _a.color)), { incidentEpisodeDescription: await Markdown.convertToHTML(incidentEpisode.description || "", MarkdownContentType.Email), incidentEpisodeSeverity: incidentEpisode.incidentSeverity.name }), EmailColorUtil.getTemplateVariables("incidentEpisodeSeverity", (_b = incidentEpisode.incidentSeverity) === null || _b === void 0 ? void 0 : _b.color)), { resourcesAffected: resourcesAffected, 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(), acknowledgeIncidentEpisodeLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
                 .addRoute(new UserOnCallLogTimeline().crudApiPath)
-                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString(),
-        };
+                .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString())).toString() });
         const emailMessage = {
             toEmail: to,
             templateType: EmailTemplateType.AcknowledgeIncidentEpisode,