@oneuptime/common 7.0.3202 → 7.0.3206

package/Models/DatabaseModels/StatusPage.ts

@@ -1061,6 +1061,44 @@ export default class StatusPage extends BaseModel {
   })
   public allowSubscribersToChooseResources?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Allow Subscribers to subscribe to event types",
+    description:
+      "Can subscribers choose which event type like Announcements, Incidents, Scheduled Events to subscribe to?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Scale,
+    create: PlanType.Free,
+  })
+  public allowSubscribersToChooseEventTypes?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/StatusPageSubscriber.ts

@@ -32,6 +32,7 @@ import {
   ManyToMany,
   ManyToOne,
 } from "typeorm";
+import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
 
 @EnableDocumentation()
 @EnableWorkflow({
@@ -528,6 +529,40 @@ export default class StatusPageSubscriber extends BaseModel {
   })
   public isSubscribedToAllResources?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateStatusPageSubscriber,
+      Permission.Public,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadStatusPageSubscriber,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditStatusPageSubscriber,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Is Subscribed to All Event Types",
+    description:
+      "Is Subscriber Subscribed to All Event Types (like Incidents, Scheduled Events, Announcements) on this status page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+  })
+  public isSubscribedToAllEventTypes?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -575,4 +610,39 @@ export default class StatusPageSubscriber extends BaseModel {
     },
   })
   public statusPageResources?: Array<StatusPageResource> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateStatusPageSubscriber,
+      Permission.Public,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadStatusPageSubscriber,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditStatusPageSubscriber,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Subscribed to Event Types",
+    description:
+      "Which event types is the subscriber subscribed to (like Incidents, Scheduled Events, Announcements)",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+    default: [],
+  })
+  public statusPageEventTypes?: Array<StatusPageEventType> = undefined;
 }

package/Server/API/StatusPageAPI.ts

@@ -73,6 +73,7 @@ import StatusPageHistoryChartBarColorRule from "Common/Models/DatabaseModels/Sta
 import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource";
 import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
 import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscriber";
+import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
 
 export default class StatusPageAPI extends BaseAPI<
   StatusPage,
@@ -250,6 +251,7 @@ export default class StatusPageAPI extends BaseAPI<
             enableSmsSubscribers: true,
             isPublicStatusPage: true,
             allowSubscribersToChooseResources: true,
+            allowSubscribersToChooseEventTypes: true,
             requireSsoForLogin: true,
             coverImageFile: {
               file: true,
@@ -1750,6 +1752,7 @@ export default class StatusPageAPI extends BaseAPI<
         enableEmailSubscribers: true,
         enableSmsSubscribers: true,
         allowSubscribersToChooseResources: true,
+        allowSubscribersToChooseEventTypes: true,
       },
       props: {
         isRoot: true,
@@ -1838,6 +1841,15 @@ export default class StatusPageAPI extends BaseAPI<
       );
     }
 
+    if (
+      req.body.data["statusPageEventTypes"] &&
+      !statusPage.allowSubscribersToChooseEventTypes
+    ) {
+      throw new BadDataException(
+        "Subscribers are not allowed to choose event types for this status page.",
+      );
+    }
+
     statusPageSubscriber.statusPageId = objectId;
     statusPageSubscriber.sendYouHaveSubscribedMessage = true;
     statusPageSubscriber.projectId = statusPage.projectId!;
@@ -1845,6 +1857,10 @@ export default class StatusPageAPI extends BaseAPI<
       req.body.data["isSubscribedToAllResources"],
     );
 
+    statusPageSubscriber.isSubscribedToAllEventTypes = Boolean(
+      req.body.data["isSubscribedToAllEventTypes"],
+    );
+
     if (
       req.body.data["statusPageResources"] &&
       req.body.data["statusPageResources"].length > 0
@@ -1854,6 +1870,15 @@ export default class StatusPageAPI extends BaseAPI<
       ] as Array<StatusPageResource>;
     }
 
+    if (
+      req.body.data["statusPageEventTypes"] &&
+      req.body.data["statusPageEventTypes"].length > 0
+    ) {
+      statusPageSubscriber.statusPageEventTypes = req.body.data[
+        "statusPageEventTypes"
+      ] as Array<StatusPageEventType>;
+    }
+
     if (isUpdate) {
       // check isUnsubscribed is set to false.
 

package/Server/Infrastructure/Postgres/SchemaMigrations/1730117995642-MigrationName.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1730117995642 implements MigrationInterface {
+  public name = "MigrationName1730117995642";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "allowSubscribersToChooseEventTypes" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageSubscriber" ADD "isSubscribedToAllEventTypes" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageSubscriber" ADD "statusPageEventTypes" jsonb DEFAULT '[]'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageSubscriber" DROP COLUMN "statusPageEventTypes"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageSubscriber" DROP COLUMN "isSubscribedToAllEventTypes"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "allowSubscribersToChooseEventTypes"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -75,6 +75,7 @@ import { MigrationName1727894983857 } from "./1727894983857-MigrationName";
 import { MigrationName1727906598804 } from "./1727906598804-MigrationName";
 import { MigrationName1728472625805 } from "./1728472625805-MigrationName";
 import { MigrationName1729682875503 } from "./1729682875503-MigrationName";
+import { MigrationName1730117995642 } from "./1730117995642-MigrationName";
 
 export default [
   InitialMigration,
@@ -154,4 +155,5 @@ export default [
   MigrationName1727906598804,
   MigrationName1728472625805,
   MigrationName1729682875503,
+  MigrationName1730117995642,
 ];

package/Server/Services/ScheduledMaintenanceService.ts

@@ -46,6 +46,7 @@ import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscri
 import Hostname from "../../Types/API/Hostname";
 import Protocol from "../../Types/API/Protocol";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -165,6 +166,7 @@ export class Service extends DatabaseService<Model> {
               subscriber: subscriber,
               statusPageResources: statusPageToResources[statuspage._id!] || [],
               statusPage: statuspage,
+              eventType: StatusPageEventType.ScheduledEvent,
             });
 
           if (!shouldNotifySubscriber) {

package/Server/Services/StatusPageService.ts

@@ -699,12 +699,7 @@ export class Service extends DatabaseService<StatusPage> {
           continue;
         }
 
-        const shouldNotifySubscriber: boolean =
-          StatusPageSubscriberService.shouldSendNotification({
-            subscriber: subscriber,
-            statusPageResources: [],
-            statusPage: statuspage,
-          });
+        const shouldNotifySubscriber: boolean = !subscriber.isUnsubscribed;
 
         if (!shouldNotifySubscriber) {
           continue;

package/Server/Services/StatusPageSubscriberService.ts

@@ -28,6 +28,7 @@ import StatusPage from "Common/Models/DatabaseModels/StatusPage";
 import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource";
 import Model from "Common/Models/DatabaseModels/StatusPageSubscriber";
 import PositiveNumber from "../../Types/PositiveNumber";
+import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -153,17 +154,6 @@ export class Service extends DatabaseService<Model> {
       },
     );
 
-    if (statuspage && !statuspage.allowSubscribersToChooseResources) {
-      data.data.isSubscribedToAllResources = true;
-    } else if (
-      !data.data.statusPageResources ||
-      data.data.statusPageResources.length === 0
-    ) {
-      if (!data.data.isSubscribedToAllResources) {
-        throw new BadDataException("Select resources to subscribe to.");
-      }
-    }
-
     if (!statuspage || !statuspage.projectId) {
       throw new BadDataException("Status Page not found");
     }
@@ -305,6 +295,8 @@ export class Service extends DatabaseService<Model> {
         subscriberWebhook: true,
         isSubscribedToAllResources: true,
         statusPageResources: true,
+        isSubscribedToAllEventTypes: true,
+        statusPageEventTypes: true,
       },
       skip: 0,
       limit: LIMIT_MAX,
@@ -325,33 +317,67 @@ export class Service extends DatabaseService<Model> {
     subscriber: Model;
     statusPageResources: Array<StatusPageResource>;
     statusPage: StatusPage;
+    eventType: StatusPageEventType;
   }): boolean {
+    let shouldSendNotification: boolean = true; // default to true.
+
     if (data.subscriber.isUnsubscribed) {
-      return false;
+      shouldSendNotification = false;
+      return shouldSendNotification;
     }
 
-    if (!data.statusPage.allowSubscribersToChooseResources) {
-      return true;
-    }
+    if (
+      data.statusPage.allowSubscribersToChooseResources &&
+      !data.subscriber.isSubscribedToAllResources &&
+      data.eventType !== StatusPageEventType.Announcement // announcements dont have resources
+    ) {
+      const subscriberResourceIds: Array<string> =
+        data.subscriber.statusPageResources?.map(
+          (resource: StatusPageResource) => {
+            return resource.id?.toString() as string;
+          },
+        ) || [];
+
+      let shouldSendNotificationForResource: boolean = false;
+
+      if (subscriberResourceIds.length === 0) {
+        shouldSendNotificationForResource = false;
+      } else {
+        for (const resource of data.statusPageResources) {
+          if (
+            subscriberResourceIds.includes(resource.id?.toString() as string)
+          ) {
+            shouldSendNotificationForResource = true;
+          }
+        }
+      }
 
-    if (data.subscriber.isSubscribedToAllResources) {
-      return true;
+      if (!shouldSendNotificationForResource) {
+        shouldSendNotification = false;
+      }
     }
 
-    const subscriberResourceIds: Array<string> =
-      data.subscriber.statusPageResources?.map(
-        (resource: StatusPageResource) => {
-          return resource.id?.toString() as string;
-        },
-      ) || [];
+    // now do for event types
+
+    if (
+      data.statusPage.allowSubscribersToChooseEventTypes &&
+      !data.subscriber.isSubscribedToAllEventTypes
+    ) {
+      const subscriberEventTypes: Array<StatusPageEventType> =
+        data.subscriber.statusPageEventTypes || [];
+
+      let shouldSendNotificationForEventType: boolean = false;
+
+      if (subscriberEventTypes.includes(data.eventType)) {
+        shouldSendNotificationForEventType = true;
+      }
 
-    for (const resource of data.statusPageResources) {
-      if (subscriberResourceIds.includes(resource.id?.toString() as string)) {
-        return true;
+      if (!shouldSendNotificationForEventType) {
+        shouldSendNotification = false;
       }
     }
 
-    return false;
+    return shouldSendNotification;
   }
 
   public async getStatusPagesToSendNotification(
@@ -375,6 +401,7 @@ export class Service extends DatabaseService<Model> {
         isPublicStatusPage: true,
         logoFileId: true,
         allowSubscribersToChooseResources: true,
+        allowSubscribersToChooseEventTypes: true,
         smtpConfig: {
           _id: true,
           hostname: true,

package/Server/Utils/Monitor/MonitorResource.ts

@@ -653,6 +653,27 @@ export default class MonitorResourceUtil {
       }
     }
 
+    if (
+      (data.dataToProcess as ProbeMonitorResponse).customCodeMonitorResponse
+        ?.executionTimeInMS
+    ) {
+      const monitorMetricsByMinute: MonitorMetricsByMinute =
+        new MonitorMetricsByMinute();
+      monitorMetricsByMinute.monitorId = data.monitorId;
+      monitorMetricsByMinute.projectId = data.projectId;
+      monitorMetricsByMinute.metricType = CheckOn.ExecutionTime;
+      monitorMetricsByMinute.metricValue = (
+        data.dataToProcess as ProbeMonitorResponse
+      ).customCodeMonitorResponse?.executionTimeInMS;
+      monitorMetricsByMinute.miscData = {
+        probeId: (
+          data.dataToProcess as ProbeMonitorResponse
+        ).probeId.toString(),
+      };
+
+      itemsToSave.push(monitorMetricsByMinute);
+    }
+
     if ((data.dataToProcess as ProbeMonitorResponse).responseTimeInMs) {
       const monitorMetricsByMinute: MonitorMetricsByMinute =
         new MonitorMetricsByMinute();

package/Types/Monitor/CriteriaFilter.ts

@@ -166,6 +166,8 @@ export class CriteriaFilterUtil {
         CheckOn.CPUUsagePercent,
         CheckOn.MemoryUsagePercent,
       ];
+    } else if (monitorType === MonitorType.CustomJavaScriptCode) {
+      return [CheckOn.ExecutionTime];
     }
     return [];
   }

package/Types/StatusPage/StatusPageEventType.ts

@@ -0,0 +1,7 @@
+enum StatusPageEventType {
+  Incident = "Incident",
+  Announcement = "Announcement",
+  ScheduledEvent = "Scheduled Event",
+}
+
+export default StatusPageEventType;

package/UI/Utils/StatusPage.ts

@@ -9,8 +9,15 @@ import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import ObjectID from "Common/Types/ObjectID";
 import StatusPageGroup from "Common/Models/DatabaseModels/StatusPageGroup";
 import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource";
+import DropdownUtil from "./Dropdown";
+import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
+import { DropdownOption } from "../Components/Dropdown/Dropdown";
 
 export default class StatusPageUtil {
+  public static getDropdownPropsBasedOnEventTypes(): Array<DropdownOption> {
+    return DropdownUtil.getDropdownOptionsFromEnum(StatusPageEventType);
+  }
+
   public static async getCategoryCheckboxPropsBasedOnResources(
     statusPageId: ObjectID,
     overrideRequestUrl?: URL,

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

@@ -72,6 +72,7 @@ let StatusPage = class StatusPage extends BaseModel {
         this.enableSubscribers = undefined;
         this.enableEmailSubscribers = undefined;
         this.allowSubscribersToChooseResources = undefined;
+        this.allowSubscribersToChooseEventTypes = undefined;
         this.enableSmsSubscribers = undefined;
         this.copyrightText = undefined;
         this.customFields = undefined;
@@ -1069,6 +1070,44 @@ __decorate([
     }),
     __metadata("design:type", Boolean)
 ], StatusPage.prototype, "allowSubscribersToChooseResources", void 0);
+__decorate([
+    ColumnAccessControl({
+        create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectStatusPage,
+        ],
+        read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadProjectStatusPage,
+        ],
+        update: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.EditProjectStatusPage,
+        ],
+    }),
+    TableColumn({
+        isDefaultValueColumn: true,
+        type: TableColumnType.Boolean,
+        title: "Allow Subscribers to subscribe to event types",
+        description: "Can subscribers choose which event type like Announcements, Incidents, Scheduled Events to subscribe to?",
+    }),
+    Column({
+        type: ColumnType.Boolean,
+        default: false,
+    }),
+    ColumnBillingAccessControl({
+        read: PlanType.Free,
+        update: PlanType.Scale,
+        create: PlanType.Free,
+    }),
+    __metadata("design:type", Boolean)
+], StatusPage.prototype, "allowSubscribersToChooseEventTypes", void 0);
 __decorate([
     ColumnAccessControl({
         create: [