@oneuptime/common 10.5.2 → 10.5.3

package/Models/DatabaseModels/StatusPageGroup.ts

@@ -25,6 +25,7 @@ import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
+import StatusPageGroupViewMode from "../../Types/StatusPage/StatusPageGroupViewMode";
 
 @EnableDocumentation()
 @TableBillingAccessControl({
@@ -695,4 +696,215 @@ export default class StatusPageGroup extends BaseModel {
     nullable: true,
   })
   public uptimePercentPrecision?: UptimePrecision = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageGroup,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageGroup,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageGroup,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "View Mode",
+    required: false,
+    description:
+      "Layout of this group on the status page. 'List' renders resources stacked vertically (default). 'Grid' renders resources as a matrix using row and column axes.",
+    defaultValue: StatusPageGroupViewMode.List,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: true,
+    default: StatusPageGroupViewMode.List,
+  })
+  public viewMode?: StatusPageGroupViewMode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageGroup,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageGroup,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageGroup,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Row Axis Label",
+    required: false,
+    description:
+      "Label shown above the row axis when the group is rendered as a grid (e.g. 'Service', 'Tenant'). Free-form so you can use any dimension you like.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public rowAxisLabel?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageGroup,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageGroup,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageGroup,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Column Axis Label",
+    required: false,
+    description:
+      "Label shown above the column axis when the group is rendered as a grid (e.g. 'Region', 'Environment'). Free-form so you can use any dimension you like.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public columnAxisLabel?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageGroup,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageGroup,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageGroup,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Row Axis Values",
+    description:
+      "Comma-separated list of row labels for the grid (e.g. 'Auth, API, Database'). Determines row order in the grid layout.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public rowAxisValues?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageGroup,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageGroup,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageGroup,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Column Axis Values",
+    description:
+      "Comma-separated list of column labels for the grid (e.g. 'US-East, EU-West, Asia'). Determines column order in the grid layout.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public columnAxisValues?: string = undefined;
 }

package/Models/DatabaseModels/StatusPageResource.ts

@@ -926,6 +926,92 @@ export default class StatusPageResource extends BaseModel {
   })
   public order?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageResource,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageResource,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageResource,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Row Axis Value",
+    description:
+      "Row this resource belongs to when its status page group is rendered as a grid. Should match one of the row axis values defined on the group.",
+    example: "API",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public rowAxisValue?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.CreateStatusPageResource,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.StatusPageViewer,
+      Permission.ReadStatusPageResource,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageAdmin,
+      Permission.StatusPageMember,
+      Permission.EditStatusPageResource,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: false,
+    title: "Column Axis Value",
+    description:
+      "Column this resource belongs to when its status page group is rendered as a grid. Should match one of the column axis values defined on the group.",
+    example: "US-East",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public columnAxisValue?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],

package/Server/API/StatusPageAPI.ts

@@ -3070,11 +3070,16 @@ export default class StatusPageAPI extends BaseAPI<
           statusPageGroupId: true,
           statusPageGroup: {
             name: true,
+            viewMode: true,
+            rowAxisLabel: true,
+            columnAxisLabel: true,
           },
           monitorId: true,
           displayTooltip: true,
           displayDescription: true,
           displayName: true,
+          rowAxisValue: true,
+          columnAxisValue: true,
           monitorGroupId: true,
           monitor: {
             _id: true,
@@ -4837,6 +4842,11 @@ export default class StatusPageAPI extends BaseAPI<
         showCurrentStatus: true,
         showUptimePercent: true,
         uptimePercentPrecision: true,
+        viewMode: true,
+        rowAxisLabel: true,
+        columnAxisLabel: true,
+        rowAxisValues: true,
+        columnAxisValues: true,
       },
       sort: {
         order: SortOrder.Ascending,
@@ -4858,6 +4868,9 @@ export default class StatusPageAPI extends BaseAPI<
           statusPageGroupId: true,
           statusPageGroup: {
             name: true,
+            viewMode: true,
+            rowAxisLabel: true,
+            columnAxisLabel: true,
           },
           monitorId: true,
           displayTooltip: true,
@@ -4873,6 +4886,8 @@ export default class StatusPageAPI extends BaseAPI<
           monitorGroupId: true,
           showUptimePercent: true,
           uptimePercentPrecision: true,
+          rowAxisValue: true,
+          columnAxisValue: true,
         },
         sort: {
           order: SortOrder.Ascending,

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

@@ -1,20 +1,68 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
 export class MigrationName1779879993421 implements MigrationInterface {
-    public name = 'MigrationName1779879993421'
+  public name = "MigrationName1779879993421";
 
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`DROP INDEX "public"."IDX_telemetry_exception_project_service_fingerprint"`);
-        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":[]}}'`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_1f55d43a0b73e883bb226158c7" ON "TelemetryException" ("projectId", "serviceId", "fingerprint") `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`DROP INDEX "public"."IDX_1f55d43a0b73e883bb226158c7"`);
-        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(`CREATE UNIQUE INDEX "IDX_telemetry_exception_project_service_fingerprint" ON "TelemetryException" ("projectId", "serviceId", "fingerprint") `);
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS "public"."IDX_telemetry_exception_project_service_fingerprint"`,
+    );
+    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":[]}}'`,
+    );
+    /*
+     * Remove pre-existing duplicates so the unique index below can be created.
+     * Done as: one cheap GROUP BY to find duplicate keys, then a small DELETE
+     * per key — keeps every individual statement well under the 30s
+     * statement/query timeout that applies to the migration connection.
+     */
+    const duplicateKeys: Array<{
+      projectId: string;
+      serviceId: string;
+      fingerprint: string;
+    }> = await queryRunner.query(
+      `SELECT "projectId", "serviceId", "fingerprint"
+       FROM "TelemetryException"
+       GROUP BY "projectId", "serviceId", "fingerprint"
+       HAVING COUNT(*) > 1`,
+    );
+    for (const key of duplicateKeys) {
+      await queryRunner.query(
+        `DELETE FROM "TelemetryException"
+         WHERE "projectId" = $1
+           AND "serviceId" = $2
+           AND "fingerprint" = $3
+           AND "_id" <> (
+             SELECT "_id" FROM "TelemetryException"
+             WHERE "projectId" = $1
+               AND "serviceId" = $2
+               AND "fingerprint" = $3
+             ORDER BY "lastSeenAt" DESC NULLS LAST, "_id" DESC
+             LIMIT 1
+           )`,
+        [key.projectId, key.serviceId, key.fingerprint],
+      );
     }
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX IF NOT EXISTS "IDX_1f55d43a0b73e883bb226158c7" ON "TelemetryException" ("projectId", "serviceId", "fingerprint") `,
+    );
+  }
 
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS "public"."IDX_1f55d43a0b73e883bb226158c7"`,
+    );
+    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(
+      `CREATE UNIQUE INDEX IF NOT EXISTS "IDX_telemetry_exception_project_service_fingerprint" ON "TelemetryException" ("projectId", "serviceId", "fingerprint") `,
+    );
+  }
 }

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

@@ -0,0 +1,65 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1779882573463 implements MigrationInterface {
+  public name = "MigrationName1779882573463";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" ADD "viewMode" character varying DEFAULT 'List'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" ADD "rowAxisLabel" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" ADD "columnAxisLabel" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" ADD "rowAxisValues" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" ADD "columnAxisValues" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageResource" ADD "rowAxisValue" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageResource" ADD "columnAxisValue" 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 "StatusPageResource" DROP COLUMN "columnAxisValue"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageResource" DROP COLUMN "rowAxisValue"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" DROP COLUMN "columnAxisValues"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" DROP COLUMN "rowAxisValues"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" DROP COLUMN "columnAxisLabel"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" DROP COLUMN "rowAxisLabel"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageGroup" DROP COLUMN "viewMode"`,
+    );
+  }
+}

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

@@ -355,7 +355,8 @@ import { MigrationName1779790539196 } from "./1779790539196-MigrationName";
 import { ExpandOwnerRuleInheritFlags1779823516881 } from "./1779823516881-ExpandOwnerRuleInheritFlags";
 import { RenameStatusPageZhToZhCN1779827700000 } from "./1779827700000-RenameStatusPageZhToZhCN";
 import { MigrationName1779879993421 } from "./1779879993421-MigrationName";
-import { DedupeTelemetryExceptionsAndAddUniqueIndex1779900000000 } from "./1779900000000-DedupeTelemetryExceptionsAndAddUniqueIndex";
+import { MigrationName1779882573463 } from "./1779882573463-MigrationName";
+
 export default [
   InitialMigration,
   MigrationName1717678334852,
@@ -713,6 +714,6 @@ export default [
   MigrationName1779790539196,
   ExpandOwnerRuleInheritFlags1779823516881,
   RenameStatusPageZhToZhCN1779827700000,
-  DedupeTelemetryExceptionsAndAddUniqueIndex1779900000000,
-  MigrationName1779879993421
+  MigrationName1779879993421,
+  MigrationName1779882573463,
 ];

package/Server/Services/StatusPageService.ts

@@ -1247,11 +1247,16 @@ export class Service extends DatabaseService<StatusPage> {
           statusPageGroupId: true,
           statusPageGroup: {
             name: true,
+            viewMode: true,
+            rowAxisLabel: true,
+            columnAxisLabel: true,
           },
           monitorId: true,
           displayTooltip: true,
           displayDescription: true,
           displayName: true,
+          rowAxisValue: true,
+          columnAxisValue: true,
           monitor: {
             _id: true,
             currentMonitorStatusId: true,