@oneuptime/common 7.0.3695 → 7.0.3699

package/Models/DatabaseModels/StatusPage.ts

@@ -2006,4 +2006,118 @@ export default class StatusPage extends BaseModel {
     type: ColumnType.VeryLongText,
   })
   public subscriberEmailNotificationFooterText?: string = 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: "Show Incidents on Status Page",
+    description: "Show Incidents on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showIncidentsOnStatusPage?: 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: "Show Announcements on Status Page",
+    description: "Show Announcements on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showAnnouncementsOnStatusPage?: 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: "Show Scheduled Maintenance Events on Status Page",
+    description: "Show Scheduled Maintenance Events on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showScheduledMaintenanceEventsOnStatusPage?: boolean = undefined;
 }

package/Server/API/StatusPageAPI.ts

@@ -335,6 +335,9 @@ export default class StatusPageAPI extends BaseAPI<
               type: true,
               name: true,
             },
+            showIncidentsOnStatusPage: true,
+            showAnnouncementsOnStatusPage: true,
+            showScheduledMaintenanceEventsOnStatusPage: true,
           };
 
           const hasEnabledSSO: PositiveNumber =
@@ -914,26 +917,28 @@ export default class StatusPageAPI extends BaseAPI<
                 return state.id!;
               });
 
-            activeIncidents = await IncidentService.findBy({
-              query: {
-                monitors: monitorsOnStatusPage as any,
-                currentIncidentStateId: QueryHelper.any(
-                  unresolvedIncidentStateIds,
-                ),
-                isVisibleOnStatusPage: true,
-                projectId: statusPage.projectId!,
-              },
-              select: select,
-              sort: {
-                createdAt: SortOrder.Ascending,
-              },
+            if (statusPage.showIncidentsOnStatusPage) {
+              activeIncidents = await IncidentService.findBy({
+                query: {
+                  monitors: monitorsOnStatusPage as any,
+                  currentIncidentStateId: QueryHelper.any(
+                    unresolvedIncidentStateIds,
+                  ),
+                  isVisibleOnStatusPage: true,
+                  projectId: statusPage.projectId!,
+                },
+                select: select,
+                sort: {
+                  createdAt: SortOrder.Ascending,
+                },
 
-              skip: 0,
-              limit: LIMIT_PER_PROJECT,
-              props: {
-                isRoot: true,
-              },
-            });
+                skip: 0,
+                limit: LIMIT_PER_PROJECT,
+                props: {
+                  isRoot: true,
+                },
+              });
+            }
           }
 
           const incidentsOnStatusPage: Array<ObjectID> = activeIncidents.map(
@@ -1003,8 +1008,10 @@ export default class StatusPageAPI extends BaseAPI<
 
           const today: Date = OneUptimeDate.getCurrentDate();
 
-          const activeAnnouncements: Array<StatusPageAnnouncement> =
-            await StatusPageAnnouncementService.findBy({
+          let activeAnnouncements: Array<StatusPageAnnouncement> = [];
+
+          if (statusPage.showAnnouncementsOnStatusPage) {
+            activeAnnouncements = await StatusPageAnnouncementService.findBy({
               query: {
                 statusPages: objectId as any,
                 showAnnouncementAt: QueryHelper.lessThan(today),
@@ -1025,6 +1032,7 @@ export default class StatusPageAPI extends BaseAPI<
                 isRoot: true,
               },
             });
+          }
 
           // check if status page has active scheduled events.
 
@@ -1057,47 +1065,56 @@ export default class StatusPageAPI extends BaseAPI<
             };
           }
 
-          const scheduledMaintenanceEvents: Array<ScheduledMaintenance> =
-            await ScheduledMaintenanceService.findBy({
-              query: {
-                currentScheduledMaintenanceState: {
-                  isOngoingState: true,
-                } as any,
-                statusPages: objectId as any,
-                projectId: statusPage.projectId!,
-                isVisibleOnStatusPage: true,
-              },
-              select: scheduledEventsSelect,
-              sort: {
-                startsAt: SortOrder.Ascending,
-              },
-              skip: 0,
-              limit: LIMIT_PER_PROJECT,
-              props: {
-                isRoot: true,
-              },
-            });
+          let scheduledMaintenanceEvents: Array<ScheduledMaintenance> = [];
 
-          const futureScheduledMaintenanceEvents: Array<ScheduledMaintenance> =
-            await ScheduledMaintenanceService.findBy({
-              query: {
-                currentScheduledMaintenanceState: {
-                  isScheduledState: true,
-                } as any,
-                statusPages: objectId as any,
-                projectId: statusPage.projectId!,
-                isVisibleOnStatusPage: true,
-              },
-              select: scheduledEventsSelect,
-              sort: {
-                startsAt: SortOrder.Ascending,
-              },
-              skip: 0,
-              limit: LIMIT_PER_PROJECT,
-              props: {
-                isRoot: true,
-              },
-            });
+          if (statusPage.showScheduledMaintenanceEventsOnStatusPage) {
+            scheduledMaintenanceEvents =
+              await ScheduledMaintenanceService.findBy({
+                query: {
+                  currentScheduledMaintenanceState: {
+                    isOngoingState: true,
+                  } as any,
+                  statusPages: objectId as any,
+                  projectId: statusPage.projectId!,
+                  isVisibleOnStatusPage: true,
+                },
+                select: scheduledEventsSelect,
+                sort: {
+                  startsAt: SortOrder.Ascending,
+                },
+                skip: 0,
+                limit: LIMIT_PER_PROJECT,
+                props: {
+                  isRoot: true,
+                },
+              });
+          }
+
+          let futureScheduledMaintenanceEvents: Array<ScheduledMaintenance> =
+            [];
+
+          if (statusPage.showScheduledMaintenanceEventsOnStatusPage) {
+            futureScheduledMaintenanceEvents =
+              await ScheduledMaintenanceService.findBy({
+                query: {
+                  currentScheduledMaintenanceState: {
+                    isScheduledState: true,
+                  } as any,
+                  statusPages: objectId as any,
+                  projectId: statusPage.projectId!,
+                  isVisibleOnStatusPage: true,
+                },
+                select: scheduledEventsSelect,
+                sort: {
+                  startsAt: SortOrder.Ascending,
+                },
+                skip: 0,
+                limit: LIMIT_PER_PROJECT,
+                props: {
+                  isRoot: true,
+                },
+              });
+          }
 
           futureScheduledMaintenanceEvents.forEach(
             (event: ScheduledMaintenance) => {
@@ -1509,6 +1526,7 @@ export default class StatusPageAPI extends BaseAPI<
         projectId: true,
         showScheduledEventHistoryInDays: true,
         showScheduledEventLabelsOnStatusPage: true,
+        showScheduledMaintenanceEventsOnStatusPage: true,
       },
       props: {
         isRoot: true,
@@ -1519,6 +1537,12 @@ export default class StatusPageAPI extends BaseAPI<
       throw new BadDataException("Status Page not found");
     }
 
+    if (!statusPage.showScheduledMaintenanceEventsOnStatusPage) {
+      throw new BadDataException(
+        "Scheduled Maintenance Events are not enabled on this status page",
+      );
+    }
+
     // get monitors on status page.
     const statusPageResources: Array<StatusPageResource> =
       await StatusPageService.getStatusPageResources({
@@ -1818,6 +1842,7 @@ export default class StatusPageAPI extends BaseAPI<
         _id: true,
         projectId: true,
         showAnnouncementHistoryInDays: true,
+        showAnnouncementsOnStatusPage: true,
       },
       props: {
         isRoot: true,
@@ -1828,6 +1853,12 @@ export default class StatusPageAPI extends BaseAPI<
       throw new BadDataException("Status Page not found");
     }
 
+    if (!statusPage.showAnnouncementsOnStatusPage) {
+      throw new BadDataException(
+        "Announcements are not enabled for this status page.",
+      );
+    }
+
     // check if status page has active announcement.
 
     const today: Date = OneUptimeDate.getCurrentDate();
@@ -2176,6 +2207,7 @@ export default class StatusPageAPI extends BaseAPI<
         projectId: true,
         showIncidentHistoryInDays: true,
         showIncidentLabelsOnStatusPage: true,
+        showIncidentsOnStatusPage: true,
       },
       props: {
         isRoot: true,
@@ -2186,6 +2218,12 @@ export default class StatusPageAPI extends BaseAPI<
       throw new BadDataException("Status Page not found");
     }
 
+    if (!statusPage.showIncidentsOnStatusPage) {
+      throw new BadDataException(
+        "Incidents are not enabled on this status page.",
+      );
+    }
+
     // get monitors on status page.
     const statusPageResources: Array<StatusPageResource> =
       await StatusPageService.getStatusPageResources({
@@ -2491,6 +2529,9 @@ export default class StatusPageAPI extends BaseAPI<
         defaultBarColor: true,
         showOverallUptimePercentOnStatusPage: true,
         overallUptimePercentPrecision: true,
+        showAnnouncementsOnStatusPage: true,
+        showIncidentsOnStatusPage: true,
+        showScheduledMaintenanceEventsOnStatusPage: true,
       },
       props: {
         isRoot: true,

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1740419151825 implements MigrationInterface {
+  public name = "MigrationName1740419151825";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showIncidentsOnStatusPage" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showAnnouncementsOnStatusPage" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showScheduledMaintenanceEventsOnStatusPage" boolean NOT NULL DEFAULT true`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "showScheduledMaintenanceEventsOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "showAnnouncementsOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "showIncidentsOnStatusPage"`,
+    );
+  }
+}

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

@@ -106,6 +106,7 @@ import { MigrationName1739282331053 } from "./1739282331053-MigrationName";
 import { MigrationName1739374537088 } from "./1739374537088-MigrationName";
 import { MigrationName1739569321582 } from "./1739569321582-MigrationName";
 import { MigrationName1740164199817 } from "./1740164199817-MigrationName";
+import { MigrationName1740419151825 } from "./1740419151825-MigrationName";
 
 export default [
   InitialMigration,
@@ -216,4 +217,5 @@ export default [
   MigrationName1739374537088,
   MigrationName1739569321582,
   MigrationName1740164199817,
+  MigrationName1740419151825,
 ];

package/Server/Types/Workflow/Components/Webhook.ts

@@ -1,4 +1,8 @@
-import { ExpressRequest, ExpressResponse } from "../../../Utils/Express";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../../../Utils/Express";
 import Response from "../../../Utils/Response";
 import { RunOptions, RunReturnType } from "../ComponentCode";
 import TriggerCode, { ExecuteWorkflowType, InitProps } from "../TriggerCode";
@@ -48,15 +52,23 @@ export default class WebhookTrigger extends TriggerCode {
   public override async init(props: InitProps): Promise<void> {
     props.router.get(
       `/trigger/:workflowId`,
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        await this.initTrigger(req, res, props);
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.initTrigger(req, res, props);
+        } catch (e) {
+          next(e);
+        }
       },
     );
 
     props.router.post(
       `/trigger/:workflowId`,
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        await this.initTrigger(req, res, props);
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.initTrigger(req, res, props);
+        } catch (e) {
+          next(e);
+        }
       },
     );
   }

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

@@ -99,6 +99,9 @@ let StatusPage = class StatusPage extends BaseModel {
         this.showOverallUptimePercentOnStatusPage = undefined;
         this.overallUptimePercentPrecision = undefined;
         this.subscriberEmailNotificationFooterText = undefined;
+        this.showIncidentsOnStatusPage = undefined;
+        this.showAnnouncementsOnStatusPage = undefined;
+        this.showScheduledMaintenanceEventsOnStatusPage = undefined;
     }
 };
 __decorate([
@@ -2023,6 +2026,123 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], StatusPage.prototype, "subscriberEmailNotificationFooterText", 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: "Show Incidents on Status Page",
+        description: "Show Incidents on Status Page?",
+    }),
+    Column({
+        type: ColumnType.Boolean,
+        default: true,
+        nullable: false,
+    }),
+    ColumnBillingAccessControl({
+        read: PlanType.Free,
+        update: PlanType.Growth,
+        create: PlanType.Free,
+    }),
+    __metadata("design:type", Boolean)
+], StatusPage.prototype, "showIncidentsOnStatusPage", 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: "Show Announcements on Status Page",
+        description: "Show Announcements on Status Page?",
+    }),
+    Column({
+        type: ColumnType.Boolean,
+        default: true,
+        nullable: false,
+    }),
+    ColumnBillingAccessControl({
+        read: PlanType.Free,
+        update: PlanType.Growth,
+        create: PlanType.Free,
+    }),
+    __metadata("design:type", Boolean)
+], StatusPage.prototype, "showAnnouncementsOnStatusPage", 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: "Show Scheduled Maintenance Events on Status Page",
+        description: "Show Scheduled Maintenance Events on Status Page?",
+    }),
+    Column({
+        type: ColumnType.Boolean,
+        default: true,
+        nullable: false,
+    }),
+    ColumnBillingAccessControl({
+        read: PlanType.Free,
+        update: PlanType.Growth,
+        create: PlanType.Free,
+    }),
+    __metadata("design:type", Boolean)
+], StatusPage.prototype, "showScheduledMaintenanceEventsOnStatusPage", void 0);
 StatusPage = __decorate([
     EnableDocumentation(),
     AccessControlColumn("labels"),