@oneuptime/common 14.0.12 → 14.0.13

package/Models/DatabaseModels/TracePipeline.ts

@@ -13,6 +13,7 @@ import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import TenantColumn from "../../Types/Database/TenantColumn";
+import ListOrderColumn from "../../Types/Database/ListOrderColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -27,6 +28,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @TenantColumn("projectId")
+@ListOrderColumn({ column: "sortOrder", scopeColumns: ["projectId"] })
 @CrudApiEndpoint(new Route("/trace-pipeline"))
 @Entity({
   name: "TracePipeline",
@@ -310,12 +312,11 @@ export default class TracePipeline extends BaseModel {
   })
   @TableColumn({
     title: "Sort Order",
-    required: true,
+    required: false,
     type: TableColumnType.Number,
     canReadOnRelationQuery: true,
     description:
-      "Determines the execution order of this pipeline relative to others.",
-    defaultValue: 0,
+      "Where this pipeline runs among the project's trace pipelines, lowest number first. A new pipeline is added to the end of the list. Setting a number another one already has puts it in that place, and the ones in the way move one place along to make room. In the dashboard, drag the rows to reorder them.",
   })
   @Column({
     type: ColumnType.Number,

package/Models/DatabaseModels/TracePipelineProcessor.ts

@@ -14,6 +14,7 @@ import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import TenantColumn from "../../Types/Database/TenantColumn";
+import ListOrderColumn from "../../Types/Database/ListOrderColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -29,6 +30,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @TenantColumn("projectId")
+@ListOrderColumn({ column: "sortOrder", scopeColumns: ["tracePipelineId"] })
 @CrudApiEndpoint(new Route("/trace-pipeline-processor"))
 @Entity({
   name: "TracePipelineProcessor",
@@ -388,12 +390,11 @@ export default class TracePipelineProcessor extends BaseModel {
   })
   @TableColumn({
     title: "Sort Order",
-    required: true,
+    required: false,
     type: TableColumnType.Number,
     canReadOnRelationQuery: true,
     description:
-      "Determines the execution order of this processor within its pipeline.",
-    defaultValue: 0,
+      "Where this processor runs within its pipeline, lowest number first. A new processor is added to the end of the list. Setting a number another one already has puts it in that place, and the ones in the way move one place along to make room. In the dashboard, drag the rows to reorder them.",
   })
   @Column({
     type: ColumnType.Number,

package/Models/DatabaseModels/TraceRecordingRule.ts

@@ -234,13 +234,18 @@ export default class TraceRecordingRule extends BaseModel {
       Permission.EditProjectTraceRecordingRule,
     ],
   })
+  /*
+   * Not required: a create without one gets a name made from the rule's
+   * name (MetricRecordingRuleService.getOutputMetricNameForCreate). The
+   * column itself is never empty.
+   */
   @TableColumn({
-    required: true,
+    required: false,
     type: TableColumnType.ShortText,
     canReadOnRelationQuery: true,
     title: "Output Metric Name",
     description:
-      "Name of the new metric this rule writes (e.g. http.error_rate). Must be unique per project.",
+      "Name of the new metric this rule writes (e.g. http.error_rate). Leave it out and it is made from the rule's name - HTTP error rate becomes http_error_rate, with _2, _3 and so on added when another recording rule of the project already writes it. Keep it unique per project.",
   })
   @Column({
     nullable: false,

package/Models/DatabaseModels/TraceScrubRule.ts

@@ -13,6 +13,7 @@ import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import TenantColumn from "../../Types/Database/TenantColumn";
+import ListOrderColumn from "../../Types/Database/ListOrderColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -27,6 +28,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @TenantColumn("projectId")
+@ListOrderColumn({ column: "sortOrder", scopeColumns: ["projectId"] })
 @CrudApiEndpoint(new Route("/trace-scrub-rule"))
 @Entity({
   name: "TraceScrubRule",
@@ -427,8 +429,7 @@ export default class TraceScrubRule extends BaseModel {
     type: TableColumnType.Number,
     canReadOnRelationQuery: true,
     description:
-      "Determines the evaluation order of this rule relative to others.",
-    defaultValue: 0,
+      "Where this rule is applied among the project's span scrub rules, lowest number first. A new rule is added to the end of the list. Setting a number another one already has puts it in that place, and the ones in the way move one place along to make room. In the dashboard, drag the rows to reorder them.",
   })
   @Column({
     type: ColumnType.Number,

package/Models/DatabaseModels/UserNotificationEmailRollupItem.ts

@@ -2,6 +2,7 @@ import Project from "./Project";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
+import Color from "../../Types/Color";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";
@@ -41,7 +42,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
  *
  * WHAT IS DELIBERATELY NOT STORED: the envelope vars, the template type, and
  * any rendered body. A rollup line stores eventType, subject, an optional deep
- * link, and the severity and state names shown in alert/incident emails.
+ * link, and the severity and state names shown in alert/incident emails, with
+ * their colours.
  * Storing envelopes would multiply row size roughly fiftyfold, add a
  * stale-template bug class the moment a template changes under a queued row,
  * and buy nothing a reader of the rollup email ever sees.
@@ -332,6 +334,52 @@ export default class UserNotificationEmailRollupItem extends BaseModel {
   })
   public currentState?: string = undefined;
 
+  /*
+   * The colours of that severity and that state, snapshotted with their names
+   * for the same reason, so the rollup paints each one the way the email it
+   * stands in for would have. Always the #rrggbb EmailColorUtil wrote, never a
+   * colour as a project typed it. NULL for older queue items, for families
+   * with no severity or state, and for a colour that was not a usable hex or
+   * rgb() colour - all of which the rollup shows in its neutral chip.
+   */
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    title: "Severity Color",
+    description: "Color of the severity when this notification was queued",
+    example: "#ef4444",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: true,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public severityColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    title: "Current State Color",
+    description: "Color of the state when this notification was queued",
+    example: "#22c55e",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: true,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public currentStateColor?: Color = undefined;
+
   /*
    * The deep link back into the dashboard, lifted out of the envelope vars,
    * and also the key rows are folded on when the rollup is rendered - two

package/Server/API/BaseAnalyticsAPI.ts

@@ -332,6 +332,22 @@ export default class BaseAnalyticsAPI<
     );
   }
 
+  /*
+   * Whether a count request asked for the exact total (see CountBy.exact):
+   * the telemetry explorers' "712,345 spans", which must match the list and
+   * so must not come from a shortcut or a count cut short. Only the JSON
+   * boolean `true` asks — a stringly-typed "true" is not a request this API
+   * documents, and the default stays the cheap count every other caller
+   * already gets.
+   */
+  public static isExactCountRequested(body: unknown): boolean {
+    if (!body || typeof body !== "object") {
+      return false;
+    }
+
+    return (body as JSONObject)["exact"] === true;
+  }
+
   /*
    * Server-side clamp on the client-sent aggregate limit — nothing else
    * bounds it, so an arbitrary client could request limit=999999999
@@ -559,6 +575,7 @@ export default class BaseAnalyticsAPI<
     const count: PositiveNumber = await this.service.countBy({
       query,
       props: databaseProps,
+      exact: BaseAnalyticsAPI.isExactCountRequested(req.body),
     });
 
     return Response.sendJsonObjectResponse(req, res, {

package/Server/API/{IncidentFormAPI.ts → FormAPI.ts}

@@ -1,10 +1,10 @@
-import IncidentFormRateLimit, {
-  IncidentFormRateLimitBucket,
-} from "../Middleware/IncidentFormRateLimit";
+import FormRateLimit, {
+  FormRateLimitBucket,
+} from "../Middleware/FormRateLimit";
 import UserMiddleware from "../Middleware/UserAuthorization";
-import IncidentFormService, {
-  Service as IncidentFormServiceType,
-} from "../Services/IncidentFormService";
+import FormService, {
+  Service as FormServiceType,
+} from "../Services/FormService";
 import { resolveClientIp } from "../Utils/ClientIp";
 import {
   ExpressRequest,
@@ -14,33 +14,33 @@ import {
 import Response from "../Utils/Response";
 import SameOriginRequest from "../Utils/SameOriginRequest";
 import BaseAPI from "./BaseAPI";
-import IncidentForm from "../../Models/DatabaseModels/IncidentForm";
+import Form from "../../Models/DatabaseModels/Form";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ForbiddenException from "../../Types/Exception/ForbiddenException";
 import {
-  INCIDENT_FORM_PAGE_HEADER,
-  INCIDENT_FORM_PAGE_HEADER_VALUE,
-  PublicIncidentForm,
-  PublicIncidentFormSubmissionData,
-  PublicIncidentFormSubmissionRequest,
-  PublicIncidentFormSubmissionResult,
-} from "../../Types/Incident/IncidentFormPublic";
+  FORM_PAGE_HEADER,
+  FORM_PAGE_HEADER_VALUE,
+  PublicForm,
+  PublicFormSubmissionData,
+  PublicFormSubmissionRequest,
+  PublicFormSubmissionResult,
+} from "../../Types/Form/FormPublic";
 import { JSONObject } from "../../Types/JSON";
 
 /*
- * The incident form's CRUD routes (inherited from BaseAPI, all behind the
- * signed-in user middleware) plus the two routes the public form page calls,
- * for anyone holding a form's link:
+ * The form's CRUD routes (inherited from BaseAPI, all behind the signed-in
+ * user middleware) plus the two routes the public form page calls, for
+ * anyone holding a form's link:
  *
- *   GET  /incident-form/public/:shareKey          the form's questions
- *   POST /incident-form/public/:shareKey/submit   declare an incident
+ *   GET  /form/public/:shareKey          the form's questions
+ *   POST /form/public/:shareKey/submit   create from the answers
  *
- * Neither can be mistaken for a CRUD route: those are /incident-form,
- * /incident-form/get-list, /incident-form/count and /incident-form/:id with
- * or without /get-item, /update-item or /delete-item, and a share key is a
- * UUID, never "get-item". The CRUD routes are registered first (in BaseAPI's
- * constructor), so even a key spelled like one of their suffixes lands on a
- * CRUD route and its authentication, never the other way round.
+ * Neither can be mistaken for a CRUD route: those are /form, /form/get-list,
+ * /form/count and /form/:id with or without /get-item, /update-item or
+ * /delete-item, and a share key is a UUID, never "get-item". The CRUD routes
+ * are registered first (in BaseAPI's constructor), so even a key spelled
+ * like one of their suffixes lands on a CRUD route and its authentication,
+ * never the other way round.
  *
  * Each public route runs, in order:
  *
@@ -49,23 +49,23 @@ import { JSONObject } from "../../Types/JSON";
  *     anything. These routes are anonymous and trust where a request comes
  *     from - the form's IP allowlist, the per-address counters - so without
  *     this any website could have its visitors' browsers read a form or
- *     declare incidents from inside an allowed network, or use up those
- *     visitors' shared budgets. It can only go by the two headers in which
- *     a browser says where a request came from, and a browser does not
- *     always send them, so each route then asks for something only the
- *     form's page sends. The read route requires the page's own header
+ *     submit it from inside an allowed network, or use up those visitors'
+ *     shared budgets. It can only go by the two headers in which a browser
+ *     says where a request came from, and a browser does not always send
+ *     them, so each route then asks for something only the form's page
+ *     sends. The read route requires the page's own header
  *     (requireFormPageHeader, the same 403): over plain HTTP another site's
  *     <img> or link sends its GET with neither header, and it cannot add
- *     one. The submit route requires a JSON body (requireJsonBody, 400):
- *     the one kind another site cannot have a browser send without a
- *     preflight, which carries the Origin the first check reads.
+ *     one. The submit route requires a JSON body (requireJsonBody, 400): the
+ *     one kind another site cannot have a browser send without a preflight,
+ *     which carries the Origin the first check reads.
  *
- *  2. IncidentFormRateLimit's per-address counters, before anything else
- *     costs anything. Reading a form is load control and fails open;
- *     submitting one declares an incident, so its counters fail closed. (The
- *     form's own hourly ceiling is spent later, by IncidentFormService, only
- *     for a submission that passed every check; its 429 carries a
- *     Retry-After this route writes.)
+ *  2. FormRateLimit's per-address counters, before anything else costs
+ *     anything. Reading a form is load control and fails open; submitting
+ *     one creates an incident or an event, so its counters fail closed. (The
+ *     form's own hourly ceiling is spent later, by FormService, only for a
+ *     submission that passed every check; its 429 carries a Retry-After this
+ *     route writes.)
  *
  *  3. UserMiddleware.getPublicRouteUserMiddleware, the anonymous variant: an
  *     access-token cookie that no longer decodes makes the request anonymous
@@ -78,7 +78,7 @@ import { JSONObject } from "../../Types/JSON";
  *
  *  4. The handler, which checks the body's shape and hands everything else -
  *     the link, the form's switch, the plan, the IP allowlist, the captcha,
- *     the answers - to IncidentFormService, where it is unit-testable.
+ *     the answers - to FormService, where it is unit-testable.
  *
  * What the page must handle: 200, 400 (bad answers or captcha, with a
  * message to show), 403 (network not allowed), 404 (one message for every
@@ -92,7 +92,7 @@ import { JSONObject } from "../../Types/JSON";
  * inside its IP allowlist. It cannot submit: see SameOriginRequest.
  */
 
-export const INCIDENT_FORM_SUBMISSION_BODY_MESSAGE: string =
+export const FORM_SUBMISSION_BODY_MESSAGE: string =
   'The request must be a JSON object holding the form\'s answers in "data".';
 
 /*
@@ -100,10 +100,10 @@ export const INCIDENT_FORM_SUBMISSION_BODY_MESSAGE: string =
  * form and whether it exists: the refusal comes before the link is looked
  * at, so it tells that page nothing.
  */
-export const INCIDENT_FORM_FOREIGN_PAGE_MESSAGE: string =
+export const FORM_FOREIGN_PAGE_MESSAGE: string =
   "This form can only be used from its own page.";
 
-export const INCIDENT_FORM_CAPTCHA_TOKEN_MESSAGE: string =
+export const FORM_CAPTCHA_TOKEN_MESSAGE: string =
   "captchaToken must be a string.";
 
 /*
@@ -111,9 +111,9 @@ export const INCIDENT_FORM_CAPTCHA_TOKEN_MESSAGE: string =
  * small enough that a stranger cannot have the server forward megabytes of
  * "token" to hCaptcha on the form's behalf.
  */
-export const INCIDENT_FORM_CAPTCHA_TOKEN_MAX_LENGTH: number = 16384;
+export const FORM_CAPTCHA_TOKEN_MAX_LENGTH: number = 16384;
 
-export const INCIDENT_FORM_CAPTCHA_TOKEN_TOO_LONG_MESSAGE: string = `captchaToken cannot be more than ${INCIDENT_FORM_CAPTCHA_TOKEN_MAX_LENGTH} characters.`;
+export const FORM_CAPTCHA_TOKEN_TOO_LONG_MESSAGE: string = `captchaToken cannot be more than ${FORM_CAPTCHA_TOKEN_MAX_LENGTH} characters.`;
 
 type IsPlainObjectFunction = (
   value: unknown,
@@ -125,33 +125,28 @@ const isPlainObject: IsPlainObjectFunction = (
   return value !== null && typeof value === "object" && !Array.isArray(value);
 };
 
-export default class IncidentFormAPI extends BaseAPI<
-  IncidentForm,
-  IncidentFormServiceType
-> {
+export default class FormAPI extends BaseAPI<Form, FormServiceType> {
   public constructor() {
-    super(IncidentForm, IncidentFormService);
+    super(Form, FormService);
 
     const readRateLimit: (
       req: ExpressRequest,
       res: ExpressResponse,
       next: NextFunction,
-    ) => Promise<void> = IncidentFormRateLimit.getMiddleware(
-      IncidentFormRateLimitBucket.Read,
-    );
+    ) => Promise<void> = FormRateLimit.getMiddleware(FormRateLimitBucket.Read);
 
     const submitRateLimit: (
       req: ExpressRequest,
       res: ExpressResponse,
       next: NextFunction,
-    ) => Promise<void> = IncidentFormRateLimit.getMiddleware(
-      IncidentFormRateLimitBucket.Submit,
+    ) => Promise<void> = FormRateLimit.getMiddleware(
+      FormRateLimitBucket.Submit,
     );
 
     this.router.get(
       `${new this.entityType().getCrudApiPath()?.toString()}/public/:shareKey`,
-      IncidentFormAPI.refuseForeignPageRequests,
-      IncidentFormAPI.requireFormPageHeader,
+      FormAPI.refuseForeignPageRequests,
+      FormAPI.requireFormPageHeader,
       readRateLimit,
       UserMiddleware.getPublicRouteUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
@@ -162,11 +157,10 @@ export default class IncidentFormAPI extends BaseAPI<
            */
           Response.setNoCacheHeaders(res);
 
-          const form: PublicIncidentForm =
-            await IncidentFormService.getPublicForm({
-              shareKey: req.params["shareKey"],
-              clientIp: resolveClientIp(req),
-            });
+          const form: PublicForm = await FormService.getPublicForm({
+            shareKey: req.params["shareKey"],
+            clientIp: resolveClientIp(req),
+          });
 
           return Response.sendJsonObjectResponse(
             req,
@@ -183,16 +177,16 @@ export default class IncidentFormAPI extends BaseAPI<
       `${new this.entityType()
         .getCrudApiPath()
         ?.toString()}/public/:shareKey/submit`,
-      IncidentFormAPI.refuseForeignPageRequests,
-      IncidentFormAPI.requireJsonBody,
+      FormAPI.refuseForeignPageRequests,
+      FormAPI.requireJsonBody,
       submitRateLimit,
       UserMiddleware.getPublicRouteUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
           Response.setNoCacheHeaders(res);
 
-          const request: PublicIncidentFormSubmissionRequest =
-            IncidentFormAPI.readSubmissionRequest(req.body);
+          const request: PublicFormSubmissionRequest =
+            FormAPI.readSubmissionRequest(req.body);
 
           /*
            * The trusted end of X-Forwarded-For, for the form's IP allowlist
@@ -200,8 +194,8 @@ export default class IncidentFormAPI extends BaseAPI<
            */
           const clientIp: string | undefined = resolveClientIp(req);
 
-          const result: PublicIncidentFormSubmissionResult =
-            await IncidentFormService.submitPublicForm({
+          const result: PublicFormSubmissionResult =
+            await FormService.submitPublicForm({
               shareKey: req.params["shareKey"],
               request: request,
               clientIp: clientIp,
@@ -215,7 +209,7 @@ export default class IncidentFormAPI extends BaseAPI<
           );
         } catch (err) {
           // The form's own ceiling refused: say when to come back.
-          IncidentFormRateLimit.setRetryAfterFor(res, err);
+          FormRateLimit.setRetryAfterFor(res, err);
           next(err);
         }
       },
@@ -248,7 +242,7 @@ export default class IncidentFormAPI extends BaseAPI<
       return Response.sendErrorResponse(
         req,
         res,
-        new ForbiddenException(INCIDENT_FORM_FOREIGN_PAGE_MESSAGE),
+        new ForbiddenException(FORM_FOREIGN_PAGE_MESSAGE),
       );
     }
 
@@ -258,7 +252,7 @@ export default class IncidentFormAPI extends BaseAPI<
   /*
    * Second on the read route, still before the limiter: the request must
    * carry the header the form's page adds to every request it makes
-   * (INCIDENT_FORM_PAGE_HEADER). Over plain HTTP a browser sends another
+   * (FORM_PAGE_HEADER). Over plain HTTP a browser sends another
    * site's <img>, link or no-cors fetch with neither header the check above
    * reads, so without this such a page could have each of its visitors'
    * browsers send reads by the hundred - answered or not, every one counted
@@ -280,8 +274,8 @@ export default class IncidentFormAPI extends BaseAPI<
     if (
       !SameOriginRequest.hasPageScriptHeader({
         headers: req.headers,
-        name: INCIDENT_FORM_PAGE_HEADER,
-        value: INCIDENT_FORM_PAGE_HEADER_VALUE,
+        name: FORM_PAGE_HEADER,
+        value: FORM_PAGE_HEADER_VALUE,
       })
     ) {
       Response.setNoCacheHeaders(res);
@@ -289,7 +283,7 @@ export default class IncidentFormAPI extends BaseAPI<
       return Response.sendErrorResponse(
         req,
         res,
-        new ForbiddenException(INCIDENT_FORM_FOREIGN_PAGE_MESSAGE),
+        new ForbiddenException(FORM_FOREIGN_PAGE_MESSAGE),
       );
     }
 
@@ -316,7 +310,7 @@ export default class IncidentFormAPI extends BaseAPI<
       return Response.sendErrorResponse(
         req,
         res,
-        new BadDataException(INCIDENT_FORM_SUBMISSION_BODY_MESSAGE),
+        new BadDataException(FORM_SUBMISSION_BODY_MESSAGE),
       );
     }
 
@@ -327,7 +321,7 @@ export default class IncidentFormAPI extends BaseAPI<
    * The shape of the submit body, checked before anything reaches the
    * service: an object with the answers in `data` and, optionally, the
    * captcha token as text of a sane length. What the answers themselves
-   * hold is the service's to judge (validateIncidentFormSubmission); every
+   * hold is the service's to judge (validateFormSubmission); every
    * other key in the body is left behind here, so it cannot reach anything.
    *
    * The body's size is not checked here. The app's JSON parser has read it
@@ -341,9 +335,9 @@ export default class IncidentFormAPI extends BaseAPI<
    */
   public static readSubmissionRequest(
     body: unknown,
-  ): PublicIncidentFormSubmissionRequest {
+  ): PublicFormSubmissionRequest {
     if (!isPlainObject(body) || !isPlainObject(body["data"])) {
-      throw new BadDataException(INCIDENT_FORM_SUBMISSION_BODY_MESSAGE);
+      throw new BadDataException(FORM_SUBMISSION_BODY_MESSAGE);
     }
 
     const captchaToken: unknown = body["captchaToken"];
@@ -353,18 +347,18 @@ export default class IncidentFormAPI extends BaseAPI<
       captchaToken !== null &&
       typeof captchaToken !== "string"
     ) {
-      throw new BadDataException(INCIDENT_FORM_CAPTCHA_TOKEN_MESSAGE);
+      throw new BadDataException(FORM_CAPTCHA_TOKEN_MESSAGE);
     }
 
     if (
       typeof captchaToken === "string" &&
-      captchaToken.length > INCIDENT_FORM_CAPTCHA_TOKEN_MAX_LENGTH
+      captchaToken.length > FORM_CAPTCHA_TOKEN_MAX_LENGTH
     ) {
-      throw new BadDataException(INCIDENT_FORM_CAPTCHA_TOKEN_TOO_LONG_MESSAGE);
+      throw new BadDataException(FORM_CAPTCHA_TOKEN_TOO_LONG_MESSAGE);
     }
 
-    const request: PublicIncidentFormSubmissionRequest = {
-      data: body["data"] as unknown as PublicIncidentFormSubmissionData,
+    const request: PublicFormSubmissionRequest = {
+      data: body["data"] as unknown as PublicFormSubmissionData,
     };
 
     if (typeof captchaToken === "string") {

package/Server/Infrastructure/Postgres/SchemaMigrations/1797300000000-TurnOnLinkedAlertSwitchesByDefault.ts

@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Generated with npm run generate-postgres-migration, then renumbered after
+ * the last registered migration.
+ *
+ * The two linked alert switches on Project - acknowledge linked alerts when
+ * the incident is acknowledged, resolve them when it is resolved - are now on
+ * by default, so a new project's linked alerts follow their incident.
+ *
+ * Only the column default changes. Existing projects keep the value they
+ * have: a project that never touched the switches and one that turned them
+ * off on purpose both hold false, and nothing tells them apart, so switching
+ * either on would change how alerts are acknowledged and paged in a project
+ * that did not ask for it. SET DEFAULT is a catalog change; it rewrites no
+ * rows.
+ */
+export class TurnOnLinkedAlertSwitchesByDefault1797300000000
+  implements MigrationInterface
+{
+  public name: string = "TurnOnLinkedAlertSwitchesByDefault1797300000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "acknowledgeLinkedAlertsWhenIncidentAcknowledged" SET DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "resolveLinkedAlertsWhenIncidentResolved" SET DEFAULT true`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "resolveLinkedAlertsWhenIncidentResolved" SET DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "acknowledgeLinkedAlertsWhenIncidentAcknowledged" SET DEFAULT false`,
+    );
+  }
+}