@oneuptime/common 7.0.3480 → 7.0.3517

package/Models/DatabaseModels/{AlertLog.ts → AlertFeed.ts}

@@ -18,8 +18,10 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import Color from "../../Types/Color";
 
-export enum AlertLogEvent {
+export enum AlertFeedEventType {
   PublicNote = "PublicNote",
   SubscriberEmailSent = "SubscriberEmailSent",
   OwnerEmailSent = "OwnerEmailSent",
@@ -37,13 +39,13 @@ export enum AlertLogEvent {
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateAlertLog,
+    Permission.CreateAlertFeed,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.ReadAlertLog,
+    Permission.ReadAlertFeed,
   ],
   delete: [],
   update: [],
@@ -54,31 +56,31 @@ export enum AlertLogEvent {
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/alert-log"))
+@CrudApiEndpoint(new Route("/alert-feed"))
 @Entity({
-  name: "AlertLog",
+  name: "AlertFeed",
 })
 @TableMetadata({
-  tableName: "AlertLog",
-  singularName: "Alert Log",
-  pluralName: "Alert Logs",
+  tableName: "AlertFeed",
+  singularName: "Alert Feed",
+  pluralName: "Alert Feeds",
   icon: IconProp.List,
   tableDescription:
     "Log of the entire alert state change. This is a log of all the alert state changes, public notes, more etc.",
 })
-export default class AlertLog extends BaseModel {
+export default class AlertFeed extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -108,13 +110,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -138,13 +140,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -174,13 +176,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -203,13 +205,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -240,13 +242,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -313,13 +315,13 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
@@ -334,32 +336,32 @@ export default class AlertLog extends BaseModel {
     nullable: false,
     unique: false,
   })
-  public logInMarkdown?: string = undefined;
+  public feedInfoInMarkdown?: string = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
   @TableColumn({
     type: TableColumnType.Markdown,
-    required: true,
+    required: false,
     title: "More Information (in Markdown)",
     description: "More information in Markdown",
   })
   @Column({
     type: ColumnType.Markdown,
-    nullable: false,
+    nullable: true,
     unique: false,
   })
   public moreInformationInMarkdown?: string = undefined;
@@ -369,26 +371,148 @@ export default class AlertLog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateAlertLog,
+      Permission.CreateAlertFeed,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadAlertLog,
+      Permission.ReadAlertFeed,
     ],
     update: [],
   })
   @TableColumn({
     type: TableColumnType.ShortText,
     required: true,
-    title: "Alert Log Event",
-    description: "Alert Log Event",
+    title: "Alert Feed Event",
+    description: "Alert Feed Event",
   })
   @Column({
     type: ColumnType.ShortText,
     nullable: false,
     unique: false,
   })
-  public alertLogEvent?: AlertLogEvent = undefined;
+  public alertFeedEventType?: AlertFeedEventType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for the alert log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
 }

package/Models/DatabaseModels/Incident.ts

@@ -853,7 +853,12 @@ export default class Incident extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
   })
   @TableColumn({
     type: TableColumnType.Markdown,