@oneuptime/common 7.0.3652 → 7.0.3668

package/Models/DatabaseModels/Alert.ts

@@ -1035,4 +1035,23 @@ export default class Alert extends BaseModel {
     nullable: true,
   })
   public alertNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannelName?: number = undefined;
 }

package/Models/DatabaseModels/Incident.ts

@@ -1120,4 +1120,23 @@ export default class Incident extends BaseModel {
     nullable: true,
   })
   public incidentNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannelName?: number = undefined;
 }

package/Models/DatabaseModels/ScheduledMaintenance.ts

@@ -979,4 +979,23 @@ export default class ScheduledMaintenance extends BaseModel {
     nullable: true,
   })
   public scheduledMaintenanceNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannelName?: number = undefined;
 }

package/Server/API/BaseAPI.ts

@@ -131,6 +131,30 @@ export default class BaseAPI<
       },
     );
 
+    router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/update-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.updateItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
+    router.get(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/update-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.updateItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     // Delete
     router.delete(
       `${new this.entityType().getCrudApiPath()?.toString()}/:id`,
@@ -144,6 +168,30 @@ export default class BaseAPI<
       },
     );
 
+    router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/delete-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.deleteItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
+    router.get(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/delete-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.deleteItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     this.router = router;
     this.service = service;
   }

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1739282331053 implements MigrationInterface {
+  public name = "MigrationName1739282331053";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ADD "postUpdatesToSlackChannelId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" ADD "postUpdatesToSlackChannelId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" ADD "postUpdatesToSlackChannelId" character varying(100)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" DROP COLUMN "postUpdatesToSlackChannelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" DROP COLUMN "postUpdatesToSlackChannelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" DROP COLUMN "postUpdatesToSlackChannelId"`,
+    );
+  }
+}

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1739374537088 implements MigrationInterface {
+  public name = "MigrationName1739374537088";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Incident" RENAME COLUMN "postUpdatesToSlackChannelId" TO "postUpdatesToWorkspaceChannelName"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" RENAME COLUMN "postUpdatesToSlackChannelId" TO "postUpdatesToWorkspaceChannelName"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" RENAME COLUMN "postUpdatesToSlackChannelId" TO "postUpdatesToWorkspaceChannelName"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" RENAME COLUMN "postUpdatesToWorkspaceChannelName" TO "postUpdatesToSlackChannelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" RENAME COLUMN "postUpdatesToWorkspaceChannelName" TO "postUpdatesToSlackChannelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" RENAME COLUMN "postUpdatesToWorkspaceChannelName" TO "postUpdatesToSlackChannelId"`,
+    );
+  }
+}

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

@@ -102,6 +102,8 @@ import { MigrationName1737997557974 } from "./1737997557974-MigrationName";
 import { MigrationName1739209832500 } from "./1739209832500-MigrationName";
 import { MigrationName1739210586538 } from "./1739210586538-MigrationName";
 import { MigrationName1739217257089 } from "./1739217257089-MigrationName";
+import { MigrationName1739282331053 } from "./1739282331053-MigrationName";
+import { MigrationName1739374537088 } from "./1739374537088-MigrationName";
 
 export default [
   InitialMigration,
@@ -208,4 +210,6 @@ export default [
   MigrationName1739209832500,
   MigrationName1739210586538,
   MigrationName1739217257089,
+  MigrationName1739282331053,
+  MigrationName1739374537088,
 ];

package/Server/Services/IncidentService.ts

@@ -54,6 +54,10 @@ import Label from "../../Models/DatabaseModels/Label";
 import LabelService from "./LabelService";
 import IncidentSeverity from "../../Models/DatabaseModels/IncidentSeverity";
 import IncidentSeverityService from "./IncidentSeverityService";
+import {
+  WorkspaceMessageBlock,
+  WorkspacePayloadMarkdown,
+} from "../../Types/Workspace/WorkspaceMessagePayload";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -1314,5 +1318,102 @@ ${incidentSeverity.name}
       logger.error(err);
     });
   }
+
+  public async getWorkspaceMessageBlocksForIncidentCreate(data: {
+    incidentId: ObjectID;
+  }): Promise<Array<WorkspaceMessageBlock>> {
+    const incident: Model | null = await this.findOneById({
+      id: data.incidentId,
+      select: {
+        projectId: true,
+        incidentNumber: true,
+        title: true,
+        description: true,
+        incidentSeverity: {
+          name: true,
+        },
+        rootCause: true,
+        remediationNotes: true,
+        currentIncidentState: {
+          name: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!incident) {
+      throw new BadDataException("Incident not found");
+    }
+
+    const blocks: Array<WorkspaceMessageBlock> = [];
+
+    if (incident.incidentNumber) {
+      const markdownBlock1: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Incident #${incident.incidentNumber} Created**`,
+      };
+      blocks.push(markdownBlock1);
+    }
+
+    if (incident.title) {
+      const markdownBlock2: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Incident Title**:
+${incident.title}`,
+      };
+      blocks.push(markdownBlock2);
+    }
+
+    if (incident.description) {
+      const markdownBlock3: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Description**:
+${incident.description}`,
+      };
+      blocks.push(markdownBlock3);
+    }
+
+    if (incident.incidentSeverity?.name) {
+      const markdownBlock4: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Severity**:
+${incident.incidentSeverity.name}`,
+      };
+      blocks.push(markdownBlock4);
+    }
+
+    if (incident.rootCause) {
+      const markdownBlock5: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Root Cause**:
+${incident.rootCause}`,
+      };
+      blocks.push(markdownBlock5);
+    }
+
+    if (incident.remediationNotes) {
+      const markdownBlock6: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Remediation Notes**:
+${incident.remediationNotes}`,
+      };
+      blocks.push(markdownBlock6);
+    }
+
+    if (incident.currentIncidentState?.name) {
+      const markdownBlock7: WorkspacePayloadMarkdown = {
+        _type: "WorkspacePayloadMarkdown",
+        text: `**Incident State**:
+${incident.currentIncidentState.name}`,
+      };
+      blocks.push(markdownBlock7);
+    }
+
+    // TODO: Add buttons to Post Private Note, Ack Incident, Resolve Incident. etc.
+
+    return blocks as Array<WorkspaceMessageBlock>;
+  }
 }
 export default new Service();

package/Server/Services/MonitorService.ts

@@ -52,6 +52,7 @@ import NotificationSettingEventType from "../../Types/NotificationSetting/Notifi
 import Query from "../Types/Database/Query";
 import DeleteBy from "../Types/Database/DeleteBy";
 import StatusPageResourceService from "./StatusPageResourceService";
+import Label from "../../Models/DatabaseModels/Label";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -643,6 +644,48 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  public async getLabelsForMonitors(data: {
+    monitorIds: Array<ObjectID>;
+  }): Promise<Array<Label>> {
+    if (data.monitorIds.length === 0) {
+      return [];
+    }
+
+    const monitors: Array<Model> = await this.findBy({
+      query: {
+        _id: QueryHelper.any(data.monitorIds),
+      },
+      select: {
+        _id: true,
+        name: true,
+        labels: true,
+      },
+      props: {
+        isRoot: true,
+      },
+      skip: 0,
+      limit: LIMIT_PER_PROJECT,
+    });
+
+    const labels: Array<Label> = [];
+
+    for (const monitor of monitors) {
+      if (monitor.labels) {
+        for (const label of monitor.labels) {
+          const isLabelAlreadyAdded: boolean = labels.some((l: Label) => {
+            return l.id!.toString() === label.id!.toString();
+          });
+
+          if (!isLabelAlreadyAdded) {
+            labels.push(label);
+          }
+        }
+      }
+    }
+
+    return labels;
+  }
+
   public async notifyOwnersWhenNoProbeIsEnabled(data: {
     monitorId: ObjectID;
     isNoProbesEnabled: boolean;

package/Server/Services/ProjectService.ts

@@ -465,7 +465,7 @@ export class ProjectService extends DatabaseService<Model> {
 `;
       }
 
-      SlackUtil.sendMessageToChannel({
+      SlackUtil.sendMessageToChannelViaIncomingWebhook({
         url: URL.fromString(NotificationSlackWebhookOnSubscriptionUpdate),
         text: slackMessage,
       }).catch((error: Exception) => {
@@ -668,7 +668,7 @@ export class ProjectService extends DatabaseService<Model> {
 `;
         }
 
-        SlackUtil.sendMessageToChannel({
+        SlackUtil.sendMessageToChannelViaIncomingWebhook({
           url: URL.fromString(NotificationSlackWebhookOnCreateProject),
           text: slackMessage,
         }).catch((error: Exception) => {
@@ -1178,7 +1178,7 @@ export class ProjectService extends DatabaseService<Model> {
 `;
         }
 
-        SlackUtil.sendMessageToChannel({
+        SlackUtil.sendMessageToChannelViaIncomingWebhook({
           url: URL.fromString(NotificationSlackWebhookOnDeleteProject),
           text: slackMessage,
         }).catch((err: Error) => {

package/Server/Services/TeamMemberService.ts

@@ -90,6 +90,7 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
         isNewUser = true;
         user = await UserService.createByEmail({
           email,
+          name: undefined, // name is not required for now.
           props: {
             isRoot: true,
           },

package/Server/Services/UserService.ts

@@ -32,6 +32,7 @@ import SlackUtil from "../Utils/Slack/Slack";
 import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 import UserTwoFactorAuthService from "./UserTwoFactorAuthService";
 import BadDataException from "../../Types/Exception/BadDataException";
+import Name from "../../Types/Name";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -43,7 +44,7 @@ export class Service extends DatabaseService<Model> {
     createdItem: Model,
   ): Promise<Model> {
     if (NotificationSlackWebhookOnCreateUser) {
-      SlackUtil.sendMessageToChannel({
+      SlackUtil.sendMessageToChannelViaIncomingWebhook({
         url: URL.fromString(NotificationSlackWebhookOnCreateUser),
         text: `*New OneUptime User:* 
   *Email:* ${createdItem.email?.toString() || "N/A"}
@@ -292,6 +293,7 @@ export class Service extends DatabaseService<Model> {
 
   public async createByEmail(data: {
     email: Email;
+    name: Name | undefined;
     isEmailVerified?: boolean;
     generateRandomPassword?: boolean;
     props: DatabaseCommonInteractionProps;
@@ -300,6 +302,9 @@ export class Service extends DatabaseService<Model> {
 
     const user: Model = new Model();
     user.email = email;
+    if (data.name) {
+      user.name = data.name;
+    }
     user.isEmailVerified = data.isEmailVerified || false;
 
     if (data.generateRandomPassword) {