@oneuptime/common 9.5.3 → 9.5.4

package/Models/DatabaseModels/Alert.ts

@@ -1084,6 +1084,33 @@ export default class Alert extends BaseModel {
   })
   public alertNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Alert Number With Prefix",
+    description: "Alert number with prefix (e.g., 'ALT-42' or '#42')",
+    computed: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public alertNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],

package/Models/DatabaseModels/AlertEpisode.ts

@@ -260,6 +260,32 @@ export default class AlertEpisode extends BaseModel {
   })
   public episodeNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Episode Number With Prefix",
+    description: "Episode number with prefix (e.g., 'AE-42' or '#42')",
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public episodeNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/Incident.ts

@@ -1512,6 +1512,33 @@ export default class Incident extends BaseModel {
   })
   public incidentNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Incident Number With Prefix",
+    description: "Incident number with prefix (e.g., 'INC-42' or '#42')",
+    computed: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public incidentNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],

package/Models/DatabaseModels/IncidentEpisode.ts

@@ -259,6 +259,32 @@ export default class IncidentEpisode extends BaseModel {
   })
   public episodeNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisode,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Episode Number With Prefix",
+    description: "Episode number with prefix (e.g., 'IE-42' or '#42')",
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public episodeNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/Project.ts

@@ -718,6 +718,256 @@ export default class Project extends TenantModel {
   })
   public currentActiveMonitorsCount?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    isDefaultValueColumn: true,
+    required: true,
+    hideColumnInDocumentation: true,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    unique: false,
+    default: 0,
+  })
+  public incidentCounter?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    isDefaultValueColumn: true,
+    required: true,
+    hideColumnInDocumentation: true,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    unique: false,
+    default: 0,
+  })
+  public alertCounter?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    isDefaultValueColumn: true,
+    required: true,
+    hideColumnInDocumentation: true,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    unique: false,
+    default: 0,
+  })
+  public scheduledMaintenanceCounter?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    isDefaultValueColumn: true,
+    required: true,
+    hideColumnInDocumentation: true,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    unique: false,
+    default: 0,
+  })
+  public incidentEpisodeCounter?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    isDefaultValueColumn: true,
+    required: true,
+    hideColumnInDocumentation: true,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    unique: false,
+    default: 0,
+  })
+  public alertEpisodeCounter?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.User],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProject,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Incident Number Prefix",
+    description:
+      "Custom prefix for incident numbers (e.g., 'INC-'). If empty, '#' is used.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public incidentNumberPrefix?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.User],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProject,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Alert Number Prefix",
+    description:
+      "Custom prefix for alert numbers (e.g., 'ALT-'). If empty, '#' is used.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public alertNumberPrefix?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.User],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProject,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Scheduled Maintenance Number Prefix",
+    description:
+      "Custom prefix for scheduled maintenance numbers (e.g., 'SM-'). If empty, '#' is used.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public scheduledMaintenanceNumberPrefix?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.User],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProject,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Incident Episode Number Prefix",
+    description:
+      "Custom prefix for incident episode numbers (e.g., 'IE-'). If empty, '#' is used.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public incidentEpisodeNumberPrefix?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.User],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProject,
+      Permission.UnAuthorizedSsoUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProject,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Alert Episode Number Prefix",
+    description:
+      "Custom prefix for alert episode numbers (e.g., 'AE-'). If empty, '#' is used.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public alertEpisodeNumberPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/ScheduledMaintenance.ts

@@ -1073,6 +1073,33 @@ export default class ScheduledMaintenance extends BaseModel {
   })
   public scheduledMaintenanceNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectScheduledMaintenance,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Scheduled Maintenance Number With Prefix",
+    description:
+      "Scheduled maintenance number with prefix (e.g., 'SM-42' or '#42')",
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public scheduledMaintenanceNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],

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

@@ -0,0 +1,57 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770237245070 implements MigrationInterface {
+  public name = "MigrationName1770237245070";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Add counter columns with default 0
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "scheduledMaintenanceCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentEpisodeCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertEpisodeCounter" integer NOT NULL DEFAULT '0'`,
+    );
+
+    // Backfill from MAX of each entity table (including soft-deleted rows)
+    await queryRunner.query(
+      `UPDATE "Project" SET "incidentCounter" = COALESCE((SELECT MAX("incidentNumber") FROM "Incident" WHERE "Incident"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "alertCounter" = COALESCE((SELECT MAX("alertNumber") FROM "Alert" WHERE "Alert"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "scheduledMaintenanceCounter" = COALESCE((SELECT MAX("scheduledMaintenanceNumber") FROM "ScheduledMaintenance" WHERE "ScheduledMaintenance"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "incidentEpisodeCounter" = COALESCE((SELECT MAX("episodeNumber") FROM "IncidentEpisode" WHERE "IncidentEpisode"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "alertEpisodeCounter" = COALESCE((SELECT MAX("episodeNumber") FROM "AlertEpisode" WHERE "AlertEpisode"."projectId" = "Project"."_id"), 0)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertEpisodeCounter"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentEpisodeCounter"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "scheduledMaintenanceCounter"`,
+    );
+    await queryRunner.query(`ALTER TABLE "Project" DROP COLUMN "alertCounter"`);
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentCounter"`,
+    );
+  }
+}

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

@@ -0,0 +1,83 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770407024682 implements MigrationInterface {
+  public name = "MigrationName1770407024682";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "scheduledMaintenanceNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentEpisodeNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertEpisodeNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "episodeNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ADD "incidentNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisode" ADD "episodeNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" ADD "alertNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" ADD "scheduledMaintenanceNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" DROP COLUMN "scheduledMaintenanceNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" DROP COLUMN "alertNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisode" DROP COLUMN "episodeNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" DROP COLUMN "incidentNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "episodeNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertEpisodeNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentEpisodeNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "scheduledMaintenanceNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentNumberPrefix"`,
+    );
+  }
+}

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

@@ -251,6 +251,8 @@ import { MigrationName1769802715014 } from "./1769802715014-MigrationName";
 import { MigrationName1770054293299 } from "./1770054293299-MigrationName";
 import { MigrationName1770232207959 } from "./1770232207959-MigrationName";
 import { MigrationName1770237245069 } from "./1770237245069-MigrationName";
+import { MigrationName1770237245070 } from "./1770237245070-MigrationName";
+import { MigrationName1770407024682 } from "./1770407024682-MigrationName";
 
 export default [
   InitialMigration,
@@ -506,4 +508,6 @@ export default [
   MigrationName1770054293299,
   MigrationName1770232207959,
   MigrationName1770237245069,
+  MigrationName1770237245070,
+  MigrationName1770407024682,
 ];

package/Server/Services/AlertEpisodeMemberService.ts

@@ -120,6 +120,7 @@ export class Service extends DatabaseService<Model> {
       id: createdItem.alertId,
       select: {
         alertNumber: true,
+        alertNumberWithPrefix: true,
         title: true,
       },
       props: {
@@ -132,6 +133,7 @@ export class Service extends DatabaseService<Model> {
       id: createdItem.alertEpisodeId,
       select: {
         episodeNumber: true,
+        episodeNumberWithPrefix: true,
         title: true,
       },
       props: {
@@ -145,7 +147,7 @@ export class Service extends DatabaseService<Model> {
       projectId: createdItem.projectId,
       alertEpisodeFeedEventType: AlertEpisodeFeedEventType.AlertAdded,
       displayColor: Yellow500,
-      feedInfoInMarkdown: `**Alert #${alert?.alertNumber || "N/A"}** added to episode: ${alert?.title || "No title"}`,
+      feedInfoInMarkdown: `**Alert ${alert?.alertNumberWithPrefix || "#" + (alert?.alertNumber || "N/A")}** added to episode: ${alert?.title || "No title"}`,
       userId: createdItem.addedByUserId || undefined,
     });
 
@@ -155,7 +157,7 @@ export class Service extends DatabaseService<Model> {
       projectId: createdItem.projectId,
       alertFeedEventType: AlertFeedEventType.AddedToEpisode,
       displayColor: Yellow500,
-      feedInfoInMarkdown: `Added to **Episode #${episode?.episodeNumber || "N/A"}**: ${episode?.title || "No title"}`,
+      feedInfoInMarkdown: `Added to **Episode ${episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || "N/A")}**: ${episode?.title || "No title"}`,
       userId: createdItem.addedByUserId || undefined,
     });
 
@@ -228,6 +230,7 @@ export class Service extends DatabaseService<Model> {
                 id: member.alertEpisodeId,
                 select: {
                   episodeNumber: true,
+                  episodeNumberWithPrefix: true,
                   title: true,
                 },
                 props: {
@@ -250,7 +253,7 @@ export class Service extends DatabaseService<Model> {
               projectId: member.projectId,
               alertFeedEventType: AlertFeedEventType.RemovedFromEpisode,
               displayColor: Green500,
-              feedInfoInMarkdown: `Removed from **Episode #${episode?.episodeNumber || "N/A"}**: ${episode?.title || "No title"}`,
+              feedInfoInMarkdown: `Removed from **Episode ${episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || "N/A")}**: ${episode?.title || "No title"}`,
             });
           }
         }