@oneuptime/common 10.5.3 → 10.5.6

package/Server/Services/IncidentEpisodeMemberService.ts

@@ -4,6 +4,7 @@ import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import PositiveNumber from "../../Types/PositiveNumber";
 import Model from "../../Models/DatabaseModels/IncidentEpisodeMember";
 import Incident from "../../Models/DatabaseModels/Incident";
 import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
@@ -64,6 +65,28 @@ export class Service extends DatabaseService<Model> {
       createBy.data.addedAt = OneUptimeDate.getCurrentDate();
     }
 
+    /*
+     * If this is the very first incident in the episode (the founder), the
+     * "episode created" notification already covers it. Mark the member as
+     * "already notified" so the IncidentAdded-to-episode cron skips it. This
+     * avoids double-notifying owners when an episode is born with its first
+     * incident.
+     */
+    if (createBy.data.isOwnerNotifiedOfIncidentAdded === undefined) {
+      const existingMemberCount: PositiveNumber = await this.countBy({
+        query: {
+          incidentEpisodeId: createBy.data.incidentEpisodeId,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (existingMemberCount.toNumber() === 0) {
+        createBy.data.isOwnerNotifiedOfIncidentAdded = true;
+      }
+    }
+
     return { createBy, carryForward: null };
   }
 

package/Server/Services/IncidentGroupingEngineService.ts

@@ -17,6 +17,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import OneUptimeDate from "../../Types/Date";
 import QueryHelper from "../Types/Database/QueryHelper";
 import IncidentGroupingRuleService from "./IncidentGroupingRuleService";
+import IncidentService from "./IncidentService";
 import IncidentEpisodeService from "./IncidentEpisodeService";
 import IncidentEpisodeMemberService from "./IncidentEpisodeMemberService";
 import IncidentEpisodeOwnerUserService from "./IncidentEpisodeOwnerUserService";
@@ -93,6 +94,8 @@ class IncidentGroupingEngineServiceClass {
             groupByMonitor: true,
             groupBySeverity: true,
             groupByIncidentTitle: true,
+            groupByIncidentLabels: true,
+            groupByMonitorLabels: true,
             // Time settings
             enableTimeWindow: true,
             timeWindowMinutes: true,
@@ -613,10 +616,100 @@ class IncidentGroupingEngineServiceClass {
       parts.push(`title:${normalizedTitle}`);
     }
 
+    // Group by incident labels (exact set match) - only if explicitly enabled
+    if (rule.groupByIncidentLabels && incident.id) {
+      const incidentLabels: Array<Label> =
+        await this.getIncidentLabels(incident);
+      const sortedLabelIds: Array<string> = incidentLabels
+        .map((l: Label) => {
+          return l.id?.toString() || "";
+        })
+        .filter((id: string) => {
+          return id.length > 0;
+        })
+        .sort();
+      parts.push(`incidentLabels:${sortedLabelIds.join(",")}`);
+    }
+
+    /*
+     * Group by monitor labels (exact set match) - only if explicitly enabled
+     * Incidents can be associated with multiple monitors; we union and dedupe labels across all of them.
+     */
+    if (
+      rule.groupByMonitorLabels &&
+      incident.monitors &&
+      incident.monitors.length > 0
+    ) {
+      const monitorLabelIdSet: Set<string> = new Set<string>();
+      for (const incidentMonitor of incident.monitors) {
+        if (!incidentMonitor || !incidentMonitor.id) {
+          continue;
+        }
+        const monitorLabels: Array<Label> = await this.getMonitorLabels(
+          incidentMonitor.id,
+        );
+        for (const label of monitorLabels) {
+          const labelIdStr: string = label.id?.toString() || "";
+          if (labelIdStr.length > 0) {
+            monitorLabelIdSet.add(labelIdStr);
+          }
+        }
+      }
+      const sortedLabelIds: Array<string> =
+        Array.from(monitorLabelIdSet).sort();
+      parts.push(`monitorLabels:${sortedLabelIds.join(",")}`);
+    }
+
     // If no group by options are enabled, all matching incidents go into a single episode
     return parts.join("|") || "default";
   }
 
+  @CaptureSpan()
+  private async getIncidentLabels(incident: Incident): Promise<Array<Label>> {
+    // If labels are already loaded on the incident, use them
+    if (incident.labels && Array.isArray(incident.labels)) {
+      return incident.labels;
+    }
+
+    if (!incident.id) {
+      return [];
+    }
+
+    // Re-load incident with labels
+    const reloadedIncident: Incident | null = await IncidentService.findOneById(
+      {
+        id: incident.id,
+        select: {
+          labels: {
+            _id: true,
+          },
+        },
+        props: {
+          isRoot: true,
+        },
+      },
+    );
+
+    return reloadedIncident?.labels || [];
+  }
+
+  @CaptureSpan()
+  private async getMonitorLabels(monitorId: ObjectID): Promise<Array<Label>> {
+    const monitor: Monitor | null = await MonitorService.findOneById({
+      id: monitorId,
+      select: {
+        labels: {
+          _id: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    return monitor?.labels || [];
+  }
+
   @CaptureSpan()
   private async findMatchingActiveEpisode(
     projectId: ObjectID,
@@ -887,6 +980,12 @@ class IncidentGroupingEngineServiceClass {
         if (rule.groupByIncidentTitle) {
           groupByParts.push("Incident Title");
         }
+        if (rule.groupByIncidentLabels) {
+          groupByParts.push("Incident Labels");
+        }
+        if (rule.groupByMonitorLabels) {
+          groupByParts.push("Monitor Labels");
+        }
 
         const groupByDescription: string =
           groupByParts.length > 0

package/Server/Services/MailService.ts

@@ -45,12 +45,24 @@ export class MailService extends BaseService {
 
     if (options && options.mailServer) {
       body["SMTP_ID"] = options.mailServer.id?.toString();
+      // host/port/secure are optional on EmailServer because HTTP-API
+      // transports (e.g. Microsoft Graph) don't use them. Only serialize the
+      // SMTP-only fields when they're actually present.
+      body["SMTP_TRANSPORT_TYPE"] =
+        options.mailServer.transportType || undefined;
       body["SMTP_USERNAME"] = options.mailServer.username || undefined;
       body["SMTP_EMAIL"] = options.mailServer.fromEmail.toString();
       body["SMTP_FROM_NAME"] = options.mailServer.fromName;
-      body["SMTP_IS_SECURE"] = options.mailServer.secure;
-      body["SMTP_PORT"] = options.mailServer.port.toNumber();
-      body["SMTP_HOST"] = options.mailServer.host.toString();
+      body["SMTP_IS_SECURE"] =
+        options.mailServer.secure === undefined
+          ? undefined
+          : options.mailServer.secure;
+      body["SMTP_PORT"] = options.mailServer.port
+        ? options.mailServer.port.toNumber()
+        : undefined;
+      body["SMTP_HOST"] = options.mailServer.host
+        ? options.mailServer.host.toString()
+        : undefined;
       body["SMTP_PASSWORD"] = options.mailServer.password || undefined;
       body["SMTP_AUTH_TYPE"] = options.mailServer.authType || undefined;
       body["SMTP_CLIENT_ID"] = options.mailServer.clientId || undefined;

package/Server/Services/ProjectSmtpConfigService.ts

@@ -1,5 +1,6 @@
 import DatabaseService from "./DatabaseService";
 import EmailServer from "../../Types/Email/EmailServer";
+import MailTransportType from "../../Types/Email/MailTransportType";
 import SMTPAuthenticationType from "../../Types/Email/SMTPAuthenticationType";
 import BadDataException from "../../Types/Exception/BadDataException";
 import URL from "../../Types/API/URL";
@@ -21,17 +22,28 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Project SMTP config id is not set");
     }
 
-    if (!projectSmtpConfig.hostname) {
-      throw new BadDataException("Project SMTP config host is not set");
-    }
-
-    if (!projectSmtpConfig.port) {
-      throw new BadDataException("Project SMTP config port is not set");
-    }
+    const transportType: MailTransportType =
+      projectSmtpConfig.transportType || MailTransportType.SMTP;
 
-    // Get auth type, default to UsernamePassword for backward compatibility
+    /*
+     * Get auth type, default to UsernamePassword for backward compatibility.
+     * Microsoft Graph always uses OAuth (Client Credentials) regardless of what
+     * the user picked — but we still let the existing OAuth validation apply.
+     */
     const authType: SMTPAuthenticationType =
-      projectSmtpConfig.authType || SMTPAuthenticationType.UsernamePassword;
+      transportType === MailTransportType.MicrosoftGraph
+        ? SMTPAuthenticationType.OAuth
+        : projectSmtpConfig.authType || SMTPAuthenticationType.UsernamePassword;
+
+    if (transportType === MailTransportType.SMTP) {
+      if (!projectSmtpConfig.hostname) {
+        throw new BadDataException("Project SMTP config host is not set");
+      }
+
+      if (!projectSmtpConfig.port) {
+        throw new BadDataException("Project SMTP config port is not set");
+      }
+    }
 
     // Validate based on auth type
     if (authType === SMTPAuthenticationType.UsernamePassword) {
@@ -43,7 +55,14 @@ export class Service extends DatabaseService<Model> {
         throw new BadDataException("Project SMTP config password is not set");
       }
     } else if (authType === SMTPAuthenticationType.OAuth) {
-      if (!projectSmtpConfig.username) {
+      /*
+       * For Microsoft Graph, username is optional — we fall back to fromEmail
+       * as the sender mailbox. For SMTP+XOAUTH2, username is required.
+       */
+      if (
+        transportType === MailTransportType.SMTP &&
+        !projectSmtpConfig.username
+      ) {
         throw new BadDataException(
           "Project SMTP config username (email address) is not set for OAuth",
         );
@@ -85,6 +104,7 @@ export class Service extends DatabaseService<Model> {
 
     return {
       id: projectSmtpConfig.id!,
+      transportType: transportType,
       host: projectSmtpConfig.hostname,
       port: projectSmtpConfig.port,
       username: projectSmtpConfig.username,

package/Server/Services/StatusPagePrivateUserService.ts

@@ -92,6 +92,7 @@ export class Service extends DatabaseService<Model> {
         projectId: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,

package/Server/Services/StatusPageSubscriberService.ts

@@ -684,6 +684,7 @@ Stay informed about service availability! 🚀`;
         name: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,
@@ -915,6 +916,7 @@ Stay informed about service availability! 🚀`;
         name: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,
@@ -1347,6 +1349,7 @@ Stay informed about service availability! 🚀`;
         allowSubscribersToChooseEventTypes: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,

package/Server/Services/UserNotificationSettingService.ts

@@ -706,6 +706,12 @@ export class Service extends DatabaseService<UserNotificationSetting> {
       projectId,
       NotificationSettingEventType.SEND_ALERT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION,
     );
+
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_ALERT_ADDED_TO_EPISODE_OWNER_NOTIFICATION,
+    );
   }
 
   private async addIncidentEpisodeNotificationSettings(
@@ -723,6 +729,12 @@ export class Service extends DatabaseService<UserNotificationSetting> {
       projectId,
       NotificationSettingEventType.SEND_INCIDENT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION,
     );
+
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_INCIDENT_ADDED_TO_EPISODE_OWNER_NOTIFICATION,
+    );
   }
 
   private async addNotificationSettingIfNotExists(

package/Server/Utils/WhatsAppTemplateUtil.ts

@@ -94,6 +94,8 @@ const templateIdByEventType: Record<
     WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification,
   [NotificationSettingEventType.SEND_ALERT_EPISODE_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification,
+  [NotificationSettingEventType.SEND_ALERT_ADDED_TO_EPISODE_OWNER_NOTIFICATION]:
+    WhatsAppTemplateIds.AlertAddedToEpisodeOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_CREATED_OWNER_NOTIFICATION]:
     WhatsAppTemplateIds.IncidentEpisodeCreatedOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_NOTE_POSTED_OWNER_NOTIFICATION]:
@@ -102,6 +104,8 @@ const templateIdByEventType: Record<
     WhatsAppTemplateIds.IncidentEpisodeStateChangedOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.IncidentEpisodeOwnerAddedNotification,
+  [NotificationSettingEventType.SEND_INCIDENT_ADDED_TO_EPISODE_OWNER_NOTIFICATION]:
+    WhatsAppTemplateIds.IncidentAddedToEpisodeOwnerNotification,
   [NotificationSettingEventType.SEND_MONITOR_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.MonitorOwnerAddedNotification,
   [NotificationSettingEventType.SEND_MONITOR_CREATED_OWNER_NOTIFICATION]:

package/Tests/Server/Services/AlertGroupingEngineService.test.ts

@@ -232,6 +232,34 @@ describe("AlertGroupingEngineService Models", () => {
       );
       expect(groupingKey).toContain(`title:${mockAlert.title}`);
     });
+
+    test("should produce identical label key regardless of label order (exact set match)", () => {
+      // Simulates buildGroupingKey's label-sorting logic.
+      const labelIdsA: string[] = ["lbl-c", "lbl-a", "lbl-b"];
+      const labelIdsB: string[] = ["lbl-b", "lbl-c", "lbl-a"];
+
+      const keyA: string = `alertLabels:${[...labelIdsA].sort().join(",")}`;
+      const keyB: string = `alertLabels:${[...labelIdsB].sort().join(",")}`;
+
+      expect(keyA).toBe(keyB);
+      expect(keyA).toBe("alertLabels:lbl-a,lbl-b,lbl-c");
+    });
+
+    test("should produce different label keys for different label sets (exact set match)", () => {
+      // Alerts with [A,B] and [A,C] must NOT group together under exact set match.
+      const keyAB: string = `alertLabels:${["lbl-a", "lbl-b"].sort().join(",")}`;
+      const keyAC: string = `alertLabels:${["lbl-a", "lbl-c"].sort().join(",")}`;
+
+      expect(keyAB).not.toBe(keyAC);
+    });
+
+    test("should emit empty label key when alert has no labels", () => {
+      // Alerts with no labels should produce the same (empty) label key.
+      const labelIds: string[] = [];
+      const key: string = `alertLabels:${[...labelIds].sort().join(",")}`;
+
+      expect(key).toBe("alertLabels:");
+    });
   });
 
   describe("Time Window Configuration", () => {

package/Tests/Server/Services/AlertGroupingRuleService.test.ts

@@ -143,14 +143,28 @@ describe("AlertGroupingRule Model", () => {
       expect(rule.groupByAlertTitle).toBe(true);
     });
 
+    test("should set and get groupByAlertLabels correctly", () => {
+      rule.groupByAlertLabels = true;
+      expect(rule.groupByAlertLabels).toBe(true);
+    });
+
+    test("should set and get groupByMonitorLabels correctly", () => {
+      rule.groupByMonitorLabels = true;
+      expect(rule.groupByMonitorLabels).toBe(true);
+    });
+
     test("should handle all groupBy options as false", () => {
       rule.groupByMonitor = false;
       rule.groupBySeverity = false;
       rule.groupByAlertTitle = false;
+      rule.groupByAlertLabels = false;
+      rule.groupByMonitorLabels = false;
 
       expect(rule.groupByMonitor).toBe(false);
       expect(rule.groupBySeverity).toBe(false);
       expect(rule.groupByAlertTitle).toBe(false);
+      expect(rule.groupByAlertLabels).toBe(false);
+      expect(rule.groupByMonitorLabels).toBe(false);
     });
 
     test("should handle combination of groupBy options", () => {

package/Types/Email/EmailServer.ts

@@ -3,20 +3,38 @@ import URL from "../API/URL";
 import Email from "../Email";
 import ObjectID from "../ObjectID";
 import Port from "../Port";
+import MailTransportType from "./MailTransportType";
 import OAuthProviderType from "./OAuthProviderType";
 import SMTPAuthenticationType from "./SMTPAuthenticationType";
 
 export default interface EmailServer {
   id?: ObjectID | undefined; // If this is custom SMTP, this is the ID of the SMTP config. Otherwise, it's undefined
-  host: Hostname;
-  port: Port;
+
+  /*
+   * Transport selection.
+   * Defaults to SMTP when undefined for backwards compatibility with existing
+   * EmailServer constructions.
+   */
+  transportType?: MailTransportType | undefined;
+
+  /*
+   * SMTP transport fields. Required when transportType === SMTP (or undefined).
+   * Not used for HTTP-API transports like MicrosoftGraph.
+   */
+  host?: Hostname | undefined;
+  port?: Port | undefined;
+  secure?: boolean | undefined;
+
   username: string | undefined;
   password: string | undefined;
-  secure: boolean;
   fromEmail: Email;
   fromName: string;
 
-  // OAuth 2.0 fields for any OAuth-enabled SMTP server
+  /*
+   * OAuth 2.0 fields. Used by:
+   * - SMTP transport when authType === OAuth (XOAUTH2)
+   * - HTTP-API transports (always — they always authenticate via OAuth2)
+   */
   authType?: SMTPAuthenticationType | undefined;
   clientId?: string | undefined; // OAuth Application Client ID
   clientSecret?: string | undefined; // OAuth Application Client Secret

package/Types/Email/EmailTemplateType.ts

@@ -47,11 +47,13 @@ enum EmailTemplateType {
   AlertEpisodeOwnerStateChanged = "AlertEpisodeOwnerStateChanged.hbs",
   AlertEpisodeOwnerNotePosted = "AlertEpisodeOwnerNotePosted.hbs",
   AlertEpisodeOwnerResourceCreated = "AlertEpisodeOwnerResourceCreated.hbs",
+  AlertEpisodeOwnerAlertAdded = "AlertEpisodeOwnerAlertAdded.hbs",
 
   IncidentEpisodeOwnerAdded = "IncidentEpisodeOwnerAdded.hbs",
   IncidentEpisodeOwnerStateChanged = "IncidentEpisodeOwnerStateChanged.hbs",
   IncidentEpisodeOwnerNotePosted = "IncidentEpisodeOwnerNotePosted.hbs",
   IncidentEpisodeOwnerResourceCreated = "IncidentEpisodeOwnerResourceCreated.hbs",
+  IncidentEpisodeOwnerIncidentAdded = "IncidentEpisodeOwnerIncidentAdded.hbs",
 
   SubscriberEpisodeCreated = "SubscriberEpisodeCreated.hbs",
   SubscriberEpisodeStateChanged = "SubscriberEpisodeStateChanged.hbs",

package/Types/Email/MailTransportType.ts

@@ -0,0 +1,18 @@
+/**
+ * Transport type for delivering email.
+ *
+ * - SMTP: traditional SMTP server (with optional XOAUTH2 / username+password / no auth)
+ * - MicrosoftGraph: Microsoft 365 mailbox via Microsoft Graph API
+ *   (POST /v1.0/users/{sender}/sendMail). Required when the tenant has SMTP AUTH
+ *   disabled — the Azure AD app only needs Mail.Send (application) permission.
+ *
+ * Adding a new HTTP-API provider (Gmail, SES, etc.) means adding a new enum value
+ * and a matching MailProvider implementation. See
+ * App/FeatureSet/Notification/Services/MailProviders.
+ */
+enum MailTransportType {
+  SMTP = "SMTP",
+  MicrosoftGraph = "Microsoft Graph",
+}
+
+export default MailTransportType;

package/Types/NotificationSetting/NotificationSettingEventType.ts

@@ -19,6 +19,7 @@ enum NotificationSettingEventType {
   SEND_ALERT_EPISODE_NOTE_POSTED_OWNER_NOTIFICATION = "Send alert episode note posted notification when I am the owner of the alert episode",
   SEND_ALERT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION = "Send alert episode state changed notification when I am the owner of the alert episode",
   SEND_ALERT_EPISODE_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the alert episode",
+  SEND_ALERT_ADDED_TO_EPISODE_OWNER_NOTIFICATION = "Send notification when a new alert is added to an alert episode I own",
 
   // Incident Episodes
 
@@ -26,6 +27,7 @@ enum NotificationSettingEventType {
   SEND_INCIDENT_EPISODE_NOTE_POSTED_OWNER_NOTIFICATION = "Send incident episode note posted notification when I am the owner of the incident episode",
   SEND_INCIDENT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION = "Send incident episode state changed notification when I am the owner of the incident episode",
   SEND_INCIDENT_EPISODE_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the incident episode",
+  SEND_INCIDENT_ADDED_TO_EPISODE_OWNER_NOTIFICATION = "Send notification when a new incident is added to an incident episode I own",
 
   // Monitors
   SEND_MONITOR_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the monitor",

package/Types/WhatsApp/WhatsAppTemplates.ts

@@ -18,10 +18,12 @@ type TemplateIdsMap = {
   readonly AlertEpisodeNotePostedOwnerNotification: "oneuptime_alert_episode_note_posted_owner_notification";
   readonly AlertEpisodeStateChangedOwnerNotification: "oneuptime_alert_episode_state_changed_owner_notification";
   readonly AlertEpisodeOwnerAddedNotification: "oneuptime_alert_episode_owner_added_notification";
+  readonly AlertAddedToEpisodeOwnerNotification: "oneuptime_alert_added_to_episode_owner_notification";
   readonly IncidentEpisodeCreatedOwnerNotification: "oneuptime_incident_episode_created_owner_notification";
   readonly IncidentEpisodeNotePostedOwnerNotification: "oneuptime_incident_episode_note_posted_owner_notification";
   readonly IncidentEpisodeStateChangedOwnerNotification: "oneuptime_incident_episode_state_changed_owner_notification";
   readonly IncidentEpisodeOwnerAddedNotification: "oneuptime_incident_episode_owner_added_notification";
+  readonly IncidentAddedToEpisodeOwnerNotification: "oneuptime_incident_added_to_episode_owner_notification";
   readonly MonitorOwnerAddedNotification: "oneuptime_monitor_owner_added_notification";
   readonly MonitorCreatedOwnerNotification: "oneuptime_monitor_created_owner_notification";
   readonly MonitorStatusChangedOwnerNotification: "oneuptime_monitor_status_changed_owner_notification";
@@ -75,6 +77,8 @@ const templateIds: TemplateIdsMap = {
     "oneuptime_alert_episode_state_changed_owner_notification",
   AlertEpisodeOwnerAddedNotification:
     "oneuptime_alert_episode_owner_added_notification",
+  AlertAddedToEpisodeOwnerNotification:
+    "oneuptime_alert_added_to_episode_owner_notification",
   IncidentEpisodeCreatedOwnerNotification:
     "oneuptime_incident_episode_created_owner_notification",
   IncidentEpisodeNotePostedOwnerNotification:
@@ -83,6 +87,8 @@ const templateIds: TemplateIdsMap = {
     "oneuptime_incident_episode_state_changed_owner_notification",
   IncidentEpisodeOwnerAddedNotification:
     "oneuptime_incident_episode_owner_added_notification",
+  IncidentAddedToEpisodeOwnerNotification:
+    "oneuptime_incident_added_to_episode_owner_notification",
   MonitorOwnerAddedNotification: "oneuptime_monitor_owner_added_notification",
   MonitorCreatedOwnerNotification:
     "oneuptime_monitor_created_owner_notification",
@@ -156,10 +162,12 @@ export const WhatsAppTemplateMessages: WhatsAppTemplateMessagesDefinition = {
   [WhatsAppTemplateIds.AlertEpisodeNotePostedOwnerNotification]: `A new note was posted on alert episode #{{episode_number}} ({{episode_title}}). Review the alert episode using {{episode_link}} on the OneUptime dashboard for updates.`,
   [WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification]: `Alert Episode #{{episode_number}} ({{episode_title}}) state changed to {{episode_state}}. Track the alert episode status using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification]: `You have been added as an owner of alert episode #{{episode_number}} ({{episode_title}}). Manage the alert episode using {{episode_link}} on the OneUptime dashboard.`,
+  [WhatsAppTemplateIds.AlertAddedToEpisodeOwnerNotification]: `{{alert_count}} new alert(s) were added to alert episode #{{episode_number}} ({{episode_title}}). Review the alert episode using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.IncidentEpisodeCreatedOwnerNotification]: `Incident Episode #{{episode_number}} ({{episode_title}}) has been created for project {{project_name}}. View incident episode details using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.IncidentEpisodeNotePostedOwnerNotification]: `A new note was posted on incident episode #{{episode_number}} ({{episode_title}}). Review the incident episode using {{episode_link}} on the OneUptime dashboard for updates.`,
   [WhatsAppTemplateIds.IncidentEpisodeStateChangedOwnerNotification]: `Incident Episode #{{episode_number}} ({{episode_title}}) state changed to {{episode_state}}. Track the incident episode status using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.IncidentEpisodeOwnerAddedNotification]: `You have been added as an owner of incident episode #{{episode_number}} ({{episode_title}}). Manage the incident episode using {{episode_link}} on the OneUptime dashboard.`,
+  [WhatsAppTemplateIds.IncidentAddedToEpisodeOwnerNotification]: `{{incident_count}} new incident(s) were added to incident episode #{{episode_number}} ({{episode_title}}). Review the incident episode using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.MonitorOwnerAddedNotification]: `You have been added as an owner of monitor {{monitor_name}}. Manage the monitor using {{monitor_link}} on the OneUptime dashboard to keep things running.`,
   [WhatsAppTemplateIds.MonitorCreatedOwnerNotification]: `Monitor {{monitor_name}} has been created. Check monitor {{monitor_link}} on the OneUptime dashboard `,
   [WhatsAppTemplateIds.MonitorStatusChangedOwnerNotification]: `Monitor {{monitor_name}} status changed to {{monitor_status}}. Check the monitor status using {{monitor_link}} on the OneUptime dashboard to stay informed.`,
@@ -203,10 +211,12 @@ export const WhatsAppTemplateLanguage: Record<WhatsAppTemplateId, string> = {
   [WhatsAppTemplateIds.AlertEpisodeNotePostedOwnerNotification]: "en",
   [WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification]: "en",
   [WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification]: "en",
+  [WhatsAppTemplateIds.AlertAddedToEpisodeOwnerNotification]: "en",
   [WhatsAppTemplateIds.IncidentEpisodeCreatedOwnerNotification]: "en",
   [WhatsAppTemplateIds.IncidentEpisodeNotePostedOwnerNotification]: "en",
   [WhatsAppTemplateIds.IncidentEpisodeStateChangedOwnerNotification]: "en",
   [WhatsAppTemplateIds.IncidentEpisodeOwnerAddedNotification]: "en",
+  [WhatsAppTemplateIds.IncidentAddedToEpisodeOwnerNotification]: "en",
   [WhatsAppTemplateIds.MonitorOwnerAddedNotification]: "en",
   [WhatsAppTemplateIds.MonitorCreatedOwnerNotification]: "en",
   [WhatsAppTemplateIds.MonitorStatusChangedOwnerNotification]: "en",

package/UI/Components/Accordion/Accordion.tsx

@@ -75,7 +75,9 @@ const Accordion: FunctionComponent<ComponentProps> = (
     <div className={className}>
       <div>
         <div
-          className={`flex justify-between items-start gap-3 cursor-pointer group/accordion-header rounded-lg -mx-2 px-2 py-2 transition-colors ${
+          className={`flex justify-between ${
+            props.description ? "items-start" : "items-center"
+          } gap-3 cursor-pointer group/accordion-header rounded-lg -mx-2 px-2 py-2 transition-colors ${
             isOpen ? "" : "hover:bg-gray-50/80"
           }`}
           role="button"
@@ -87,10 +89,16 @@ const Accordion: FunctionComponent<ComponentProps> = (
           }}
           onKeyDown={handleKeyDown}
         >
-          <div className="flex items-start min-w-0 flex-1">
+          <div
+            className={`flex ${
+              props.description ? "items-start" : "items-center"
+            } min-w-0 flex-1`}
+          >
             {props.title && (
               <div
-                className={`flex-shrink-0 mt-0.5 flex items-center justify-center w-6 h-6 rounded-md transition-all duration-200 ${
+                className={`flex-shrink-0 ${
+                  props.description ? "mt-0.5" : ""
+                } flex items-center justify-center w-6 h-6 rounded-md transition-all duration-200 ${
                   isOpen
                     ? "bg-gray-900/5 text-gray-700"
                     : "text-gray-400 group-hover/accordion-header:bg-gray-900/5 group-hover/accordion-header:text-gray-700"
@@ -126,7 +134,7 @@ const Accordion: FunctionComponent<ComponentProps> = (
             )}
           </div>
           {!isOpen && props.rightElement && (
-            <div className="flex-shrink-0 mt-0.5">{props.rightElement}</div>
+            <div className="flex-shrink-0">{props.rightElement}</div>
           )}
         </div>
         {isOpen && (

package/build/dist/Models/DatabaseModels/AlertEpisodeMember.js

@@ -54,6 +54,7 @@ let AlertEpisodeMember = class AlertEpisodeMember extends BaseModel {
         this.matchedRuleId = undefined;
         this.createdByUser = undefined;
         this.createdByUserId = undefined;
+        this.isOwnerNotifiedOfAlertAdded = undefined;
         this.deletedByUser = undefined;
         this.deletedByUserId = undefined;
     }
@@ -588,6 +589,35 @@ __decorate([
     }),
     __metadata("design:type", ObjectID)
 ], AlertEpisodeMember.prototype, "createdByUserId", void 0);
+__decorate([
+    ColumnAccessControl({
+        create: [],
+        read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.AlertAdmin,
+            Permission.AlertMember,
+            Permission.AlertViewer,
+            Permission.ReadAlertEpisodeMember,
+        ],
+        update: [],
+    }),
+    TableColumn({
+        isDefaultValueColumn: true,
+        required: true,
+        type: TableColumnType.Boolean,
+        title: "Is Owner Notified of Alert Added to Episode",
+        description: "Has the owner been notified that this alert was added to the episode?",
+    }),
+    Column({
+        type: ColumnType.Boolean,
+        nullable: false,
+        default: false,
+    }),
+    __metadata("design:type", Boolean)
+], AlertEpisodeMember.prototype, "isOwnerNotifiedOfAlertAdded", void 0);
 __decorate([
     ColumnAccessControl({
         create: [],