@opencrvs/toolkit 1.8.0-rc.fb96ec1 → 1.8.0-rc.fbababd

package/dist/events/index.js

@@ -32,7 +32,6 @@ var events_exports = {};
 __export(events_exports, {
   ACTION_ALLOWED_CONFIGURABLE_SCOPES: () => ACTION_ALLOWED_CONFIGURABLE_SCOPES,
   ACTION_ALLOWED_SCOPES: () => ACTION_ALLOWED_SCOPES,
-  AVAILABLE_ACTIONS_BY_EVENT_STATUS: () => AVAILABLE_ACTIONS_BY_EVENT_STATUS,
   Action: () => Action,
   ActionBase: () => ActionBase,
   ActionConditional: () => ActionConditional,
@@ -69,7 +68,7 @@ __export(events_exports, {
   Conditional: () => Conditional,
   ConditionalType: () => ConditionalType,
   ConfirmableActions: () => ConfirmableActions,
-  ContainsFlags: () => ContainsFlags,
+  CustomFlags: () => CustomFlags,
   DEFAULT_DATE_OF_EVENT_PROPERTY: () => DEFAULT_DATE_OF_EVENT_PROPERTY,
   DataEntry: () => DataEntry,
   DataFieldValue: () => DataFieldValue,
@@ -104,7 +103,6 @@ __export(events_exports, {
   EventState: () => EventState,
   EventStatus: () => EventStatus,
   Exact: () => Exact,
-  ExactDate: () => ExactDate,
   ExactStatus: () => ExactStatus,
   FieldConditional: () => FieldConditional,
   FieldConfig: () => FieldConfig,
@@ -124,7 +122,6 @@ __export(events_exports, {
   GenericAddressValue: () => GenericAddressValue,
   GeographicalArea: () => GeographicalArea,
   ImageMimeType: () => ImageMimeType,
-  InherentFlags: () => InherentFlags,
   LanguageConfig: () => LanguageConfig,
   LegalStatuses: () => LegalStatuses,
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
@@ -132,6 +129,7 @@ __export(events_exports, {
   NameFieldUpdateValue: () => NameFieldUpdateValue,
   NameFieldValue: () => NameFieldValue,
   NonEmptyTextValue: () => NonEmptyTextValue,
+  Not: () => Not,
   NotifyActionInput: () => NotifyActionInput,
   NumberFieldValue: () => NumberFieldValue,
   PageConfig: () => PageConfig,
@@ -141,7 +139,6 @@ __export(events_exports, {
   QueryInput: () => QueryInput,
   QueryType: () => QueryType,
   Range: () => Range,
-  RangeDate: () => RangeDate,
   ReadActionInput: () => ReadActionInput,
   RegisterAction: () => RegisterAction,
   RegisterActionInput: () => RegisterActionInput,
@@ -158,10 +155,8 @@ __export(events_exports, {
   SelectOption: () => SelectOption,
   ShowConditional: () => ShowConditional,
   SignatureFieldValue: () => SignatureFieldValue,
-  StatusChangingActions: () => StatusChangingActions,
   SummaryConfig: () => SummaryConfig,
   TENNIS_CLUB_MEMBERSHIP: () => TENNIS_CLUB_MEMBERSHIP,
-  TestUserRole: () => TestUserRole,
   TextValue: () => TextValue,
   TranslationConfig: () => TranslationConfig,
   UnassignActionInput: () => UnassignActionInput,
@@ -169,10 +164,8 @@ __export(events_exports, {
   UrbanAddressValue: () => UrbanAddressValue,
   User: () => User,
   ValidateActionInput: () => ValidateActionInput,
-  ValidationConfig: () => ValidationConfig,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
-  WRITE_ACTION_SCOPES: () => WRITE_ACTION_SCOPES,
   Within: () => Within,
   WorkqueueActionsWithDefault: () => WorkqueueActionsWithDefault,
   WorkqueueColumn: () => WorkqueueColumn,
@@ -181,7 +174,6 @@ __export(events_exports, {
   WorkqueueColumnValue: () => WorkqueueColumnValue,
   WorkqueueConfig: () => WorkqueueConfig,
   WorkqueueConfigInput: () => WorkqueueConfigInput,
-  WorkqueueConfigWithoutQuery: () => WorkqueueConfigWithoutQuery,
   WorkqueueCountInput: () => WorkqueueCountInput,
   WorkqueueCountOutput: () => WorkqueueCountOutput,
   ZodDate: () => ZodDate,
@@ -217,6 +209,7 @@ __export(events_exports, {
   eventQueryDataGenerator: () => eventQueryDataGenerator,
   field: () => field,
   fieldTypes: () => fieldTypes,
+  filterUnallowedActions: () => filterUnallowedActions,
   findActiveDrafts: () => findActiveDrafts,
   findAllFields: () => findAllFields,
   findLastAssignmentAction: () => findLastAssignmentAction,
@@ -228,10 +221,8 @@ __export(events_exports, {
   generateEventDraftDocument: () => generateEventDraftDocument,
   generateRandomName: () => generateRandomName,
   generateRandomSignature: () => generateRandomSignature,
-  generateRegistrationNumber: () => generateRegistrationNumber,
   generateTransactionId: () => generateTransactionId,
   generateTranslationConfig: () => generateTranslationConfig,
-  generateUuid: () => generateUuid,
   generateWorkqueues: () => generateWorkqueues,
   getAcceptedActions: () => getAcceptedActions,
   getActionAnnotation: () => getActionAnnotation,
@@ -372,12 +363,6 @@ var FieldConditional = import_zod.z.discriminatedUnion("type", [
   ref: "FieldConditional"
 });
 
-// ../commons/src/events/PageConfig.ts
-var import_zod6 = require("zod");
-
-// ../commons/src/events/FieldConfig.ts
-var import_zod5 = require("zod");
-
 // ../commons/src/events/TranslationConfig.ts
 var import_zod2 = require("zod");
 var import_zod_openapi2 = require("zod-openapi");
@@ -395,6 +380,105 @@ var TranslationConfig = import_zod2.z.object({
   ref: "TranslationConfig"
 });
 
+// ../commons/src/events/ActionType.ts
+var import_zod3 = require("zod");
+var ActionType = {
+  // Pre-declaration actions
+  DELETE: "DELETE",
+  CREATE: "CREATE",
+  NOTIFY: "NOTIFY",
+  // Declaration actions
+  DECLARE: "DECLARE",
+  VALIDATE: "VALIDATE",
+  REGISTER: "REGISTER",
+  // Declaration system actions. Non-configurable.
+  DETECT_DUPLICATE: "DETECT_DUPLICATE",
+  REJECT: "REJECT",
+  // REJECT_DECLARATION
+  MARKED_AS_DUPLICATE: "MARKED_AS_DUPLICATE",
+  // MARK_AS_DUPLICATE
+  ARCHIVE: "ARCHIVE",
+  // Record actions
+  PRINT_CERTIFICATE: "PRINT_CERTIFICATE",
+  REQUEST_CORRECTION: "REQUEST_CORRECTION",
+  REJECT_CORRECTION: "REJECT_CORRECTION",
+  APPROVE_CORRECTION: "APPROVE_CORRECTION",
+  // General actions
+  READ: "READ",
+  ASSIGN: "ASSIGN",
+  UNASSIGN: "UNASSIGN"
+};
+var ConfirmableActions = [
+  ActionType.NOTIFY,
+  ActionType.DECLARE,
+  ActionType.VALIDATE,
+  ActionType.REGISTER,
+  ActionType.REJECT,
+  ActionType.ARCHIVE,
+  ActionType.PRINT_CERTIFICATE
+];
+var ActionTypes = import_zod3.z.enum([
+  "DELETE",
+  "CREATE",
+  "NOTIFY",
+  "DECLARE",
+  "VALIDATE",
+  "REGISTER",
+  "DETECT_DUPLICATE",
+  "REJECT",
+  "MARKED_AS_DUPLICATE",
+  "ARCHIVE",
+  "PRINT_CERTIFICATE",
+  "REQUEST_CORRECTION",
+  "REJECT_CORRECTION",
+  "APPROVE_CORRECTION",
+  "READ",
+  "ASSIGN",
+  "UNASSIGN"
+]);
+var declarationActionValues = [
+  ActionTypes.enum.DECLARE,
+  ActionTypes.enum.VALIDATE,
+  ActionTypes.enum.REGISTER
+];
+var DeclarationActions = ActionTypes.extract(declarationActionValues);
+var declarationUpdateActionValues = [
+  ...declarationActionValues,
+  ActionTypes.enum.REQUEST_CORRECTION
+];
+var DeclarationUpdateActions = ActionTypes.extract(
+  declarationUpdateActionValues
+);
+var annotationActions = ActionTypes.exclude(declarationActionValues);
+var writeActions = ActionTypes.exclude([
+  ActionType.CREATE,
+  ActionType.READ,
+  ActionType.ASSIGN,
+  ActionType.UNASSIGN
+]);
+var workqueueActions = ActionTypes.exclude([
+  ActionType.CREATE,
+  ActionType.NOTIFY,
+  ActionType.DETECT_DUPLICATE,
+  ActionType.REJECT,
+  ActionType.MARKED_AS_DUPLICATE,
+  ActionType.ARCHIVE,
+  ActionType.REQUEST_CORRECTION,
+  ActionType.REJECT_CORRECTION,
+  ActionType.APPROVE_CORRECTION
+]);
+var META_ACTIONS = [
+  ActionType.ASSIGN,
+  ActionType.UNASSIGN,
+  ActionType.READ
+];
+function isMetaAction(actionType) {
+  return META_ACTIONS.includes(actionType);
+}
+
+// ../commons/src/events/FieldConfig.ts
+var import_zod6 = require("zod");
+
 // ../commons/src/events/FieldType.ts
 var FieldType = {
   NAME: "NAME",
@@ -433,10 +517,10 @@ var compositeFieldTypes = [
 ];
 
 // ../commons/src/events/FieldValue.ts
-var import_zod4 = require("zod");
+var import_zod5 = require("zod");
 
 // ../commons/src/events/CompositeFieldValue.ts
-var import_zod3 = require("zod");
+var import_zod4 = require("zod");
 var GeographicalArea = {
   URBAN: "URBAN",
   RURAL: "RURAL"
@@ -445,98 +529,98 @@ var AddressType = {
   DOMESTIC: "DOMESTIC",
   INTERNATIONAL: "INTERNATIONAL"
 };
-var FileFieldValue = import_zod3.z.object({
-  filename: import_zod3.z.string(),
-  originalFilename: import_zod3.z.string(),
-  type: import_zod3.z.string()
+var FileFieldValue = import_zod4.z.object({
+  filename: import_zod4.z.string(),
+  originalFilename: import_zod4.z.string(),
+  type: import_zod4.z.string()
 });
-var AdminStructure = import_zod3.z.object({
-  country: import_zod3.z.string(),
-  addressType: import_zod3.z.literal(AddressType.DOMESTIC),
-  province: import_zod3.z.string(),
-  district: import_zod3.z.string()
+var AdminStructure = import_zod4.z.object({
+  country: import_zod4.z.string(),
+  addressType: import_zod4.z.literal(AddressType.DOMESTIC),
+  province: import_zod4.z.string(),
+  district: import_zod4.z.string()
 });
 var UrbanAddressValue = AdminStructure.extend({
-  urbanOrRural: import_zod3.z.literal(GeographicalArea.URBAN),
-  town: import_zod3.z.string().optional(),
-  residentialArea: import_zod3.z.string().optional(),
-  street: import_zod3.z.string().optional(),
-  number: import_zod3.z.string().optional(),
-  zipCode: import_zod3.z.string().optional()
+  urbanOrRural: import_zod4.z.literal(GeographicalArea.URBAN),
+  town: import_zod4.z.string().optional(),
+  residentialArea: import_zod4.z.string().optional(),
+  street: import_zod4.z.string().optional(),
+  number: import_zod4.z.string().optional(),
+  zipCode: import_zod4.z.string().optional()
 });
 var RuralAddressValue = AdminStructure.extend({
-  urbanOrRural: import_zod3.z.literal(GeographicalArea.RURAL),
-  village: import_zod3.z.string().optional()
+  urbanOrRural: import_zod4.z.literal(GeographicalArea.RURAL),
+  village: import_zod4.z.string().optional()
 });
 var UrbanAddressUpdateValue = AdminStructure.extend({
-  urbanOrRural: import_zod3.z.literal(GeographicalArea.URBAN),
-  town: import_zod3.z.string().nullish(),
-  residentialArea: import_zod3.z.string().nullish(),
-  street: import_zod3.z.string().nullish(),
-  number: import_zod3.z.string().nullish(),
-  zipCode: import_zod3.z.string().nullish()
+  urbanOrRural: import_zod4.z.literal(GeographicalArea.URBAN),
+  town: import_zod4.z.string().nullish(),
+  residentialArea: import_zod4.z.string().nullish(),
+  street: import_zod4.z.string().nullish(),
+  number: import_zod4.z.string().nullish(),
+  zipCode: import_zod4.z.string().nullish()
 });
-var NameFieldValue = import_zod3.z.object({
-  firstname: import_zod3.z.string(),
-  surname: import_zod3.z.string(),
-  middlename: import_zod3.z.string().optional()
+var NameFieldValue = import_zod4.z.object({
+  firstname: import_zod4.z.string(),
+  surname: import_zod4.z.string(),
+  middlename: import_zod4.z.string().optional()
 });
-var NameFieldUpdateValue = import_zod3.z.object({
-  firstname: import_zod3.z.string(),
-  surname: import_zod3.z.string(),
-  middlename: import_zod3.z.string().nullish()
-}).or(import_zod3.z.null()).or(import_zod3.z.undefined());
+var NameFieldUpdateValue = import_zod4.z.object({
+  firstname: import_zod4.z.string(),
+  surname: import_zod4.z.string(),
+  middlename: import_zod4.z.string().nullish()
+}).or(import_zod4.z.null()).or(import_zod4.z.undefined());
 var RuralAddressUpdateValue = AdminStructure.extend({
-  urbanOrRural: import_zod3.z.literal(GeographicalArea.RURAL),
-  village: import_zod3.z.string().nullish()
+  urbanOrRural: import_zod4.z.literal(GeographicalArea.RURAL),
+  village: import_zod4.z.string().nullish()
 });
-var GenericAddressValue = import_zod3.z.object({
-  country: import_zod3.z.string(),
-  addressType: import_zod3.z.literal(AddressType.INTERNATIONAL),
-  state: import_zod3.z.string(),
-  district2: import_zod3.z.string(),
-  cityOrTown: import_zod3.z.string().optional(),
-  addressLine1: import_zod3.z.string().optional(),
-  addressLine2: import_zod3.z.string().optional(),
-  addressLine3: import_zod3.z.string().optional(),
-  postcodeOrZip: import_zod3.z.string().optional()
+var GenericAddressValue = import_zod4.z.object({
+  country: import_zod4.z.string(),
+  addressType: import_zod4.z.literal(AddressType.INTERNATIONAL),
+  state: import_zod4.z.string(),
+  district2: import_zod4.z.string(),
+  cityOrTown: import_zod4.z.string().optional(),
+  addressLine1: import_zod4.z.string().optional(),
+  addressLine2: import_zod4.z.string().optional(),
+  addressLine3: import_zod4.z.string().optional(),
+  postcodeOrZip: import_zod4.z.string().optional()
 });
-var AddressFieldValue = import_zod3.z.discriminatedUnion("urbanOrRural", [UrbanAddressValue, RuralAddressValue]).or(GenericAddressValue);
-var GenericAddressUpdateValue = import_zod3.z.object({
-  country: import_zod3.z.string(),
-  addressType: import_zod3.z.literal(AddressType.INTERNATIONAL),
-  state: import_zod3.z.string(),
-  district2: import_zod3.z.string(),
-  cityOrTown: import_zod3.z.string().nullish(),
-  addressLine1: import_zod3.z.string().nullish(),
-  addressLine2: import_zod3.z.string().nullish(),
-  addressLine3: import_zod3.z.string().nullish(),
-  postcodeOrZip: import_zod3.z.string().nullish()
+var AddressFieldValue = import_zod4.z.discriminatedUnion("urbanOrRural", [UrbanAddressValue, RuralAddressValue]).or(GenericAddressValue);
+var GenericAddressUpdateValue = import_zod4.z.object({
+  country: import_zod4.z.string(),
+  addressType: import_zod4.z.literal(AddressType.INTERNATIONAL),
+  state: import_zod4.z.string(),
+  district2: import_zod4.z.string(),
+  cityOrTown: import_zod4.z.string().nullish(),
+  addressLine1: import_zod4.z.string().nullish(),
+  addressLine2: import_zod4.z.string().nullish(),
+  addressLine3: import_zod4.z.string().nullish(),
+  postcodeOrZip: import_zod4.z.string().nullish()
 });
-var AddressFieldUpdateValue = import_zod3.z.discriminatedUnion("urbanOrRural", [
+var AddressFieldUpdateValue = import_zod4.z.discriminatedUnion("urbanOrRural", [
   UrbanAddressUpdateValue,
   RuralAddressUpdateValue
 ]).or(GenericAddressUpdateValue);
-var FileFieldValueWithOption = import_zod3.z.object({
-  filename: import_zod3.z.string(),
-  originalFilename: import_zod3.z.string(),
-  type: import_zod3.z.string(),
-  option: import_zod3.z.string()
+var FileFieldValueWithOption = import_zod4.z.object({
+  filename: import_zod4.z.string(),
+  originalFilename: import_zod4.z.string(),
+  type: import_zod4.z.string(),
+  option: import_zod4.z.string()
 });
-var FileFieldWithOptionValue = import_zod3.z.array(FileFieldValueWithOption);
+var FileFieldWithOptionValue = import_zod4.z.array(FileFieldValueWithOption);
 
 // ../commons/src/events/FieldValue.ts
-var TextValue = import_zod4.z.string();
+var TextValue = import_zod5.z.string();
 var NonEmptyTextValue = TextValue.min(1);
-var DateValue = import_zod4.z.string().date().describe("Date in the format YYYY-MM-DD");
-var DatetimeValue = import_zod4.z.string().datetime();
-var DateRangeFieldValue = DateValue.or(import_zod4.z.tuple([DateValue, DateValue]));
-var EmailValue = import_zod4.z.string().email();
-var CheckboxFieldValue = import_zod4.z.boolean();
-var NumberFieldValue = import_zod4.z.number();
-var DataFieldValue = import_zod4.z.undefined();
-var SignatureFieldValue = import_zod4.z.string();
-var FieldValue = import_zod4.z.union([
+var DateValue = import_zod5.z.string().date().describe("Date in the format YYYY-MM-DD");
+var DatetimeValue = import_zod5.z.string().datetime();
+var DateRangeFieldValue = DateValue.or(import_zod5.z.tuple([DateValue, DateValue]));
+var EmailValue = import_zod5.z.string().email();
+var CheckboxFieldValue = import_zod5.z.boolean();
+var NumberFieldValue = import_zod5.z.number();
+var DataFieldValue = import_zod5.z.undefined();
+var SignatureFieldValue = import_zod5.z.string();
+var FieldValue = import_zod5.z.union([
   TextValue,
   DateValue,
   DateRangeFieldValue,
@@ -551,7 +635,7 @@ var FieldValue = import_zod4.z.union([
   NameFieldValue,
   NameFieldUpdateValue
 ]);
-var FieldUpdateValue = import_zod4.z.union([
+var FieldUpdateValue = import_zod5.z.union([
   TextValue,
   DateValue,
   DateRangeFieldValue,
@@ -568,62 +652,63 @@ var FieldUpdateValue = import_zod4.z.union([
 
 // ../commons/src/events/FieldConfig.ts
 var import_zod_openapi3 = require("zod-openapi");
-(0, import_zod_openapi3.extendZodWithOpenApi)(import_zod5.z);
-var FieldId = import_zod5.z.string().describe("Unique identifier for the field");
-var FieldReference = import_zod5.z.object({
+(0, import_zod_openapi3.extendZodWithOpenApi)(import_zod6.z);
+var FieldId = import_zod6.z.string().describe("Unique identifier for the field");
+var FieldReference = import_zod6.z.object({
   $$field: FieldId
 }).describe("Reference to a field by its ID");
 var ParentReference = FieldReference.optional();
-var ValidationConfig = import_zod5.z.object({
-  validator: Conditional,
-  message: TranslationConfig
-});
-var BaseField = import_zod5.z.object({
+var BaseField = import_zod6.z.object({
   id: FieldId,
   parent: ParentReference,
-  conditionals: import_zod5.z.array(FieldConditional).default([]).optional(),
-  required: import_zod5.z.boolean().default(false).optional(),
+  conditionals: import_zod6.z.array(FieldConditional).default([]).optional(),
+  required: import_zod6.z.boolean().default(false).optional(),
   placeholder: TranslationConfig.optional(),
-  validation: import_zod5.z.array(ValidationConfig).default([]).optional(),
+  validation: import_zod6.z.array(
+    import_zod6.z.object({
+      validator: Conditional,
+      message: TranslationConfig
+    })
+  ).default([]).optional(),
   label: TranslationConfig,
   helperText: TranslationConfig.optional(),
-  hideLabel: import_zod5.z.boolean().default(false).optional()
+  hideLabel: import_zod6.z.boolean().default(false).optional()
 });
 var Divider = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.DIVIDER)
+  type: import_zod6.z.literal(FieldType.DIVIDER)
 });
 var TextField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.TEXT),
+  type: import_zod6.z.literal(FieldType.TEXT),
   defaultValue: NonEmptyTextValue.optional(),
-  configuration: import_zod5.z.object({
-    maxLength: import_zod5.z.number().optional().describe("Maximum length of the text"),
-    type: import_zod5.z.enum(["text", "password"]).optional(),
+  configuration: import_zod6.z.object({
+    maxLength: import_zod6.z.number().optional().describe("Maximum length of the text"),
+    type: import_zod6.z.enum(["text", "password"]).optional(),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).default({ type: "text" }).optional()
 }).describe("Text input");
 var NumberField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.NUMBER),
+  type: import_zod6.z.literal(FieldType.NUMBER),
   defaultValue: NumberFieldValue.optional(),
-  configuration: import_zod5.z.object({
-    min: import_zod5.z.number().optional().describe("Minimum value"),
-    max: import_zod5.z.number().optional().describe("Maximum value"),
+  configuration: import_zod6.z.object({
+    min: import_zod6.z.number().optional().describe("Minimum value"),
+    max: import_zod6.z.number().optional().describe("Maximum value"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).optional()
 }).describe("Number input");
 var TextAreaField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.TEXTAREA),
+  type: import_zod6.z.literal(FieldType.TEXTAREA),
   defaultValue: NonEmptyTextValue.optional(),
-  configuration: import_zod5.z.object({
-    maxLength: import_zod5.z.number().optional().describe("Maximum length of the text"),
-    rows: import_zod5.z.number().optional().describe("Number of visible text lines"),
-    cols: import_zod5.z.number().optional().describe("Number of visible columns"),
+  configuration: import_zod6.z.object({
+    maxLength: import_zod6.z.number().optional().describe("Maximum length of the text"),
+    rows: import_zod6.z.number().optional().describe("Number of visible text lines"),
+    cols: import_zod6.z.number().optional().describe("Number of visible columns"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).default({ rows: 4 }).optional()
 }).describe("Multiline text input");
-var ImageMimeType = import_zod5.z.enum([
+var ImageMimeType = import_zod6.z.enum([
   "image/png",
   "image/jpg",
   "image/jpeg",
@@ -632,38 +717,38 @@ var ImageMimeType = import_zod5.z.enum([
 var MimeType = ImageMimeType;
 var DEFAULT_MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024;
 var SignatureField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.SIGNATURE),
+  type: import_zod6.z.literal(FieldType.SIGNATURE),
   signaturePromptLabel: TranslationConfig.describe(
     "Title of the signature modal"
   ),
   defaultValue: SignatureFieldValue.optional(),
-  configuration: import_zod5.z.object({
-    maxFileSize: import_zod5.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
+  configuration: import_zod6.z.object({
+    maxFileSize: import_zod6.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
   }).default({
     maxFileSize: DEFAULT_MAX_FILE_SIZE_BYTES
   })
 }).describe("Signature input field");
 var EmailField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.EMAIL),
-  configuration: import_zod5.z.object({
-    maxLength: import_zod5.z.number().optional().describe("Maximum length of the text")
+  type: import_zod6.z.literal(FieldType.EMAIL),
+  configuration: import_zod6.z.object({
+    maxLength: import_zod6.z.number().optional().describe("Maximum length of the text")
   }).default({ maxLength: 10 }).optional(),
   defaultValue: NonEmptyTextValue.optional()
 });
 var DateField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.DATE),
+  type: import_zod6.z.literal(FieldType.DATE),
   defaultValue: DateValue.optional(),
-  configuration: import_zod5.z.object({
+  configuration: import_zod6.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
     ).optional()
   }).optional()
 }).describe("A single date input (dd-mm-YYYY)");
 var DateRangeField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.DATE_RANGE),
+  type: import_zod6.z.literal(FieldType.DATE_RANGE),
   defaultValue: DateRangeFieldValue.optional(),
-  configuration: import_zod5.z.object({
+  configuration: import_zod6.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
     ).optional()
@@ -671,7 +756,7 @@ var DateRangeField = BaseField.extend({
 }).describe(
   "A date range input ({ rangeStart: dd-mm-YYYY, rangeEnd: dd-mm-YYYY })"
 );
-var HtmlFontVariant = import_zod5.z.enum([
+var HtmlFontVariant = import_zod6.z.enum([
   "reg12",
   "reg14",
   "reg16",
@@ -681,27 +766,31 @@ var HtmlFontVariant = import_zod5.z.enum([
   "h2",
   "h1"
 ]);
+var ParagraphConfiguration = import_zod6.z.object({
+  styles: import_zod6.z.object({
+    fontVariant: HtmlFontVariant.optional().describe(
+      "Font variant to use for the paragraph text"
+    ),
+    hint: import_zod6.z.boolean().optional().describe("When true, paragraph is styled as a hint with grey color")
+  }).optional()
+}).default({});
 var Paragraph = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.PARAGRAPH),
+  type: import_zod6.z.literal(FieldType.PARAGRAPH),
   defaultValue: NonEmptyTextValue.optional(),
-  configuration: import_zod5.z.object({
-    styles: import_zod5.z.object({
-      fontVariant: HtmlFontVariant.optional()
-    }).optional()
-  }).default({})
+  configuration: ParagraphConfiguration
 }).describe("A read-only HTML <p> paragraph");
 var PageHeader = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.PAGE_HEADER),
+  type: import_zod6.z.literal(FieldType.PAGE_HEADER),
   defaultValue: NonEmptyTextValue.optional()
 }).describe("A read-only header component for form pages");
 var File = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.FILE),
+  type: import_zod6.z.literal(FieldType.FILE),
   defaultValue: FileFieldValue.optional(),
-  configuration: import_zod5.z.object({
-    maxFileSize: import_zod5.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
+  configuration: import_zod6.z.object({
+    maxFileSize: import_zod6.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
-    style: import_zod5.z.object({
-      width: import_zod5.z.enum(["full", "auto"]).optional().describe(
+    style: import_zod6.z.object({
+      width: import_zod6.z.enum(["full", "auto"]).optional().describe(
         "Whether the file upload button should take the full width of the container or not"
       )
     }).optional(),
@@ -710,123 +799,123 @@ var File = BaseField.extend({
     maxFileSize: DEFAULT_MAX_FILE_SIZE_BYTES
   })
 }).describe("File upload");
-var SelectOption = import_zod5.z.object({
-  value: import_zod5.z.string().describe("The value of the option"),
+var SelectOption = import_zod6.z.object({
+  value: import_zod6.z.string().describe("The value of the option"),
   label: TranslationConfig.describe("The label of the option")
 });
 var RadioGroup = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.RADIO_GROUP),
+  type: import_zod6.z.literal(FieldType.RADIO_GROUP),
   defaultValue: TextValue.optional(),
-  options: import_zod5.z.array(SelectOption).describe("A list of options"),
-  configuration: import_zod5.z.object({
-    styles: import_zod5.z.object({
-      size: import_zod5.z.enum(["NORMAL", "LARGE"]).optional()
+  options: import_zod6.z.array(SelectOption).describe("A list of options"),
+  configuration: import_zod6.z.object({
+    styles: import_zod6.z.object({
+      size: import_zod6.z.enum(["NORMAL", "LARGE"]).optional()
     }).optional()
   }).optional()
 }).describe("Grouped radio options");
 var BulletList = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.BULLET_LIST),
+  type: import_zod6.z.literal(FieldType.BULLET_LIST),
   defaultValue: TextValue.optional(),
-  items: import_zod5.z.array(TranslationConfig).describe("A list of items"),
-  configuration: import_zod5.z.object({
-    styles: import_zod5.z.object({
+  items: import_zod6.z.array(TranslationConfig).describe("A list of items"),
+  configuration: import_zod6.z.object({
+    styles: import_zod6.z.object({
       fontVariant: HtmlFontVariant.optional()
     }).optional()
   }).default({})
 }).describe("A list of bullet points");
 var Select = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.SELECT),
+  type: import_zod6.z.literal(FieldType.SELECT),
   defaultValue: TextValue.optional(),
-  options: import_zod5.z.array(SelectOption).describe("A list of options")
+  options: import_zod6.z.array(SelectOption).describe("A list of options")
 }).describe("Select input");
 var NameField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.NAME),
-  defaultValue: import_zod5.z.object({
+  type: import_zod6.z.literal(FieldType.NAME),
+  defaultValue: import_zod6.z.object({
     firstname: NonEmptyTextValue,
     surname: NonEmptyTextValue
   }).optional(),
-  configuration: import_zod5.z.object({
-    maxLength: import_zod5.z.number().optional().describe("Maximum length of the text"),
+  configuration: import_zod6.z.object({
+    maxLength: import_zod6.z.number().optional().describe("Maximum length of the text"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).optional()
 }).describe("Name input field");
 var PhoneField = BaseField.extend({
   defaultValue: NonEmptyTextValue.optional(),
-  type: import_zod5.z.literal(FieldType.PHONE)
+  type: import_zod6.z.literal(FieldType.PHONE)
 }).describe("Phone input field");
 var IdField = BaseField.extend({
   defaultValue: NonEmptyTextValue.optional(),
-  type: import_zod5.z.literal(FieldType.ID)
+  type: import_zod6.z.literal(FieldType.ID)
 }).describe("ID input field");
 var Checkbox = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.CHECKBOX),
+  type: import_zod6.z.literal(FieldType.CHECKBOX),
   defaultValue: CheckboxFieldValue.optional()
 }).describe("Boolean checkbox field");
 var Country = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.COUNTRY),
+  type: import_zod6.z.literal(FieldType.COUNTRY),
   defaultValue: NonEmptyTextValue.optional()
 }).describe("Country select field");
-var AdministrativeAreas = import_zod5.z.enum([
+var AdministrativeAreas = import_zod6.z.enum([
   "ADMIN_STRUCTURE",
   "HEALTH_FACILITY",
   "CRVS_OFFICE"
 ]);
-var AdministrativeAreaConfiguration = import_zod5.z.object({
-  partOf: import_zod5.z.object({
-    $declaration: import_zod5.z.string()
+var AdministrativeAreaConfiguration = import_zod6.z.object({
+  partOf: import_zod6.z.object({
+    $declaration: import_zod6.z.string()
   }).optional().describe("Parent location"),
   type: AdministrativeAreas
 }).describe("Administrative area options");
 var AdministrativeArea = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.ADMINISTRATIVE_AREA),
+  type: import_zod6.z.literal(FieldType.ADMINISTRATIVE_AREA),
   defaultValue: NonEmptyTextValue.optional(),
   configuration: AdministrativeAreaConfiguration
 }).describe("Administrative area input field e.g. facility, office");
 var Location = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.LOCATION),
+  type: import_zod6.z.literal(FieldType.LOCATION),
   defaultValue: NonEmptyTextValue.optional()
 }).describe("Input field for a location");
 var FileUploadWithOptions = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.FILE_WITH_OPTIONS),
-  options: import_zod5.z.array(SelectOption).describe("A list of options"),
+  type: import_zod6.z.literal(FieldType.FILE_WITH_OPTIONS),
+  options: import_zod6.z.array(SelectOption).describe("A list of options"),
   defaultValue: FileFieldWithOptionValue.optional(),
-  configuration: import_zod5.z.object({
-    maxFileSize: import_zod5.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
+  configuration: import_zod6.z.object({
+    maxFileSize: import_zod6.z.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
   }).default({
     maxFileSize: DEFAULT_MAX_FILE_SIZE_BYTES
   })
 });
 var Facility = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.FACILITY),
+  type: import_zod6.z.literal(FieldType.FACILITY),
   defaultValue: NonEmptyTextValue.optional()
 }).describe("Input field for a facility");
 var Office = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.OFFICE),
+  type: import_zod6.z.literal(FieldType.OFFICE),
   defaultValue: NonEmptyTextValue.optional()
 }).describe("Input field for an office");
 var Address = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.ADDRESS),
+  type: import_zod6.z.literal(FieldType.ADDRESS),
   defaultValue: AddressFieldValue.optional()
 }).describe("Address input field \u2013 a combination of location and text fields");
-var DataEntry = import_zod5.z.union([
-  import_zod5.z.object({
+var DataEntry = import_zod6.z.union([
+  import_zod6.z.object({
     label: TranslationConfig,
-    value: TranslationConfig.or(import_zod5.z.string())
+    value: TranslationConfig.or(import_zod6.z.string())
   }),
-  import_zod5.z.object({
-    fieldId: import_zod5.z.string()
+  import_zod6.z.object({
+    fieldId: import_zod6.z.string()
   })
 ]);
 var DataField = BaseField.extend({
-  type: import_zod5.z.literal(FieldType.DATA),
-  configuration: import_zod5.z.object({
+  type: import_zod6.z.literal(FieldType.DATA),
+  configuration: import_zod6.z.object({
     subtitle: TranslationConfig.optional(),
-    data: import_zod5.z.array(DataEntry)
+    data: import_zod6.z.array(DataEntry)
   })
 }).describe("Data field for displaying read-only data");
-var FieldConfig = import_zod5.z.discriminatedUnion("type", [
+var FieldConfig = import_zod6.z.discriminatedUnion("type", [
   Address,
   TextField,
   NumberField,
@@ -858,14 +947,18 @@ var FieldConfig = import_zod5.z.discriminatedUnion("type", [
   ref: "FieldConfig"
 });
 
+// ../commons/src/events/FormConfig.ts
+var import_zod8 = require("zod");
+
 // ../commons/src/events/PageConfig.ts
+var import_zod7 = require("zod");
 var import_zod_openapi4 = require("zod-openapi");
-(0, import_zod_openapi4.extendZodWithOpenApi)(import_zod6.z);
-var PageTypes = import_zod6.z.enum(["FORM", "VERIFICATION"]);
-var PageConfigBase = import_zod6.z.object({
-  id: import_zod6.z.string().describe("Unique identifier for the page"),
+(0, import_zod_openapi4.extendZodWithOpenApi)(import_zod7.z);
+var PageTypes = import_zod7.z.enum(["FORM", "VERIFICATION"]);
+var PageConfigBase = import_zod7.z.object({
+  id: import_zod7.z.string().describe("Unique identifier for the page"),
   title: TranslationConfig.describe("Header title of the page"),
-  fields: import_zod6.z.array(FieldConfig).describe("Fields to be rendered on the page"),
+  fields: import_zod7.z.array(FieldConfig).describe("Fields to be rendered on the page"),
   conditional: Conditional.optional().describe(
     "Page will be shown if condition is met. If conditional is not defined, the page will be always shown."
   )
@@ -874,13 +967,13 @@ var PageConfigBase = import_zod6.z.object({
   ref: "FormPageConfig"
 });
 var FormPageConfig = PageConfigBase.extend({
-  type: import_zod6.z.literal(PageTypes.enum.FORM).default(PageTypes.enum.FORM)
+  type: import_zod7.z.literal(PageTypes.enum.FORM).default(PageTypes.enum.FORM)
 });
-var VerificationActionConfig = import_zod6.z.object({
-  verify: import_zod6.z.object({ label: TranslationConfig }),
-  cancel: import_zod6.z.object({
+var VerificationActionConfig = import_zod7.z.object({
+  verify: import_zod7.z.object({ label: TranslationConfig }),
+  cancel: import_zod7.z.object({
     label: TranslationConfig,
-    confirmation: import_zod6.z.object({
+    confirmation: import_zod7.z.object({
       title: TranslationConfig,
       body: TranslationConfig
     })
@@ -890,122 +983,15 @@ var VerificationActionConfig = import_zod6.z.object({
   ref: "VerificationActionConfig"
 });
 var VerificationPageConfig = FormPageConfig.extend({
-  type: import_zod6.z.literal(PageTypes.enum.VERIFICATION),
+  type: import_zod7.z.literal(PageTypes.enum.VERIFICATION),
   actions: VerificationActionConfig
 });
-var PageConfig = import_zod6.z.discriminatedUnion("type", [
+var PageConfig = import_zod7.z.discriminatedUnion("type", [
   FormPageConfig,
   VerificationPageConfig
 ]);
 
-// ../commons/src/events/ActionType.ts
-var import_zod7 = require("zod");
-var ActionType = {
-  // Pre-declaration actions
-  DELETE: "DELETE",
-  CREATE: "CREATE",
-  NOTIFY: "NOTIFY",
-  // Declaration actions
-  DECLARE: "DECLARE",
-  VALIDATE: "VALIDATE",
-  REGISTER: "REGISTER",
-  // Declaration system actions. Non-configurable.
-  DETECT_DUPLICATE: "DETECT_DUPLICATE",
-  REJECT: "REJECT",
-  // REJECT_DECLARATION
-  MARKED_AS_DUPLICATE: "MARKED_AS_DUPLICATE",
-  // MARK_AS_DUPLICATE
-  ARCHIVE: "ARCHIVE",
-  // Record actions
-  PRINT_CERTIFICATE: "PRINT_CERTIFICATE",
-  REQUEST_CORRECTION: "REQUEST_CORRECTION",
-  REJECT_CORRECTION: "REJECT_CORRECTION",
-  APPROVE_CORRECTION: "APPROVE_CORRECTION",
-  // General actions
-  READ: "READ",
-  ASSIGN: "ASSIGN",
-  UNASSIGN: "UNASSIGN"
-};
-var ConfirmableActions = [
-  ActionType.NOTIFY,
-  ActionType.DECLARE,
-  ActionType.VALIDATE,
-  ActionType.REGISTER,
-  ActionType.REJECT,
-  ActionType.ARCHIVE,
-  ActionType.PRINT_CERTIFICATE
-];
-var ActionTypes = import_zod7.z.enum([
-  "DELETE",
-  "CREATE",
-  "NOTIFY",
-  "DECLARE",
-  "VALIDATE",
-  "REGISTER",
-  "DETECT_DUPLICATE",
-  "REJECT",
-  "MARKED_AS_DUPLICATE",
-  "ARCHIVE",
-  "PRINT_CERTIFICATE",
-  "REQUEST_CORRECTION",
-  "REJECT_CORRECTION",
-  "APPROVE_CORRECTION",
-  "READ",
-  "ASSIGN",
-  "UNASSIGN"
-]);
-var declarationActionValues = [
-  ActionTypes.enum.DECLARE,
-  ActionTypes.enum.VALIDATE,
-  ActionTypes.enum.REGISTER
-];
-var DeclarationActions = ActionTypes.extract(declarationActionValues);
-var declarationUpdateActionValues = [
-  ...declarationActionValues,
-  ActionTypes.enum.REQUEST_CORRECTION
-];
-var DeclarationUpdateActions = ActionTypes.extract(
-  declarationUpdateActionValues
-);
-var annotationActions = ActionTypes.exclude(declarationActionValues);
-var writeActions = ActionTypes.exclude([
-  ActionType.CREATE,
-  ActionType.READ,
-  ActionType.ASSIGN,
-  ActionType.UNASSIGN
-]);
-var StatusChangingActions = ActionTypes.extract([
-  ActionType.CREATE,
-  ActionType.NOTIFY,
-  ActionType.DECLARE,
-  ActionType.VALIDATE,
-  ActionType.REGISTER,
-  ActionType.REJECT,
-  ActionType.ARCHIVE,
-  ActionType.PRINT_CERTIFICATE
-]);
-var workqueueActions = ActionTypes.exclude([
-  ActionType.CREATE,
-  ActionType.NOTIFY,
-  ActionType.DETECT_DUPLICATE,
-  ActionType.REJECT,
-  ActionType.MARKED_AS_DUPLICATE,
-  ActionType.ARCHIVE,
-  ActionType.REQUEST_CORRECTION,
-  ActionType.REJECT_CORRECTION,
-  ActionType.APPROVE_CORRECTION
-]);
-var META_ACTIONS = [
-  ActionType.ASSIGN,
-  ActionType.UNASSIGN,
-  ActionType.READ
-];
-function isMetaAction(actionType) {
-  return META_ACTIONS.includes(actionType);
-}
-
 // ../commons/src/events/FormConfig.ts
-var import_zod8 = require("zod");
 var DeclarationFormConfig = import_zod8.z.object({
   label: TranslationConfig.describe("Human readable description of the form"),
   pages: import_zod8.z.array(FormPageConfig)
@@ -1087,8 +1073,7 @@ var PrintCertificateActionConfig = ActionConfigBase.merge(
 var RequestCorrectionConfig = ActionConfigBase.merge(
   import_zod9.z.object({
     type: import_zod9.z.literal(ActionType.REQUEST_CORRECTION),
-    onboardingForm: import_zod9.z.array(PageConfig),
-    additionalDetailsForm: import_zod9.z.array(PageConfig)
+    correctionForm: ActionFormConfig
   })
 );
 var RejectCorrectionConfig = ActionConfigBase.merge(
@@ -1164,7 +1149,7 @@ var LanguageConfig = import_zod11.z.object({
 });
 
 // ../commons/src/events/EventConfig.ts
-var import_zod20 = require("zod");
+var import_zod18 = require("zod");
 
 // ../commons/src/events/DeduplicationConfig.ts
 var import_zod12 = require("zod");
@@ -1301,600 +1286,164 @@ var BaseField3 = import_zod14.z.object({
        However, in advanced search we often want to make all Informant fields searchable,
        regardless of their original visibility logic. To do this, we explicitly set their
        'conditionals' to an empty array ('[]') in the search config. This ensures they
-       are always rendered in the advanced search form.
-      `
-  ),
-  validations: import_zod14.z.array(ValidationConfig).default([]).optional().describe(
-    `In advanced search, we sometimes need to override the default field validations.`
-  )
-});
-var SearchQueryParams = import_zod14.z.object({
-  eventType: import_zod14.z.string().optional().describe(
-    "Defines type of event so that when redirecting to Advanced Search page, appropriate tab can be selected"
-  )
-}).catchall(FieldValue);
-var FieldConfigSchema = BaseField3.extend({
-  fieldId: import_zod14.z.string(),
-  fieldType: import_zod14.z.literal("field")
-});
-var EventFieldId = import_zod14.z.enum([
-  "trackingId",
-  "status",
-  "legalStatus.REGISTERED.createdAt",
-  "legalStatus.REGISTERED.createdAtLocation",
-  "updatedAt"
-]);
-var EventFieldConfigSchema = BaseField3.extend({
-  fieldId: EventFieldId,
-  fieldType: import_zod14.z.literal("event")
-});
-var SearchField = import_zod14.z.discriminatedUnion("fieldType", [
-  FieldConfigSchema,
-  EventFieldConfigSchema
-]);
-var AdvancedSearchConfig = import_zod14.z.object({
-  title: TranslationConfig.describe("Advanced search tab title"),
-  fields: import_zod14.z.array(SearchField).describe("Advanced search fields.")
-});
-
-// ../commons/src/events/utils.ts
-var import_lodash = require("lodash");
-
-// ../commons/src/events/ActionDocument.ts
-var import_zod18 = require("zod");
-var import_zod_openapi7 = require("zod-openapi");
-
-// ../commons/src/uuid.ts
-var import_uuid = require("uuid");
-var import_zod15 = require("zod");
-var UUID = import_zod15.z.string().uuid().brand("UUID");
-function getUUID() {
-  return (0, import_uuid.v4)();
-}
-
-// ../commons/src/events/CreatedAtLocation.ts
-var CreatedAtLocation = UUID.nullish();
-
-// ../commons/src/authentication.ts
-var import_jwt_decode = __toESM(require("jwt-decode"));
-var import_zod17 = require("zod");
-
-// ../commons/src/scopes.ts
-var import_zod16 = require("zod");
-var SCOPES = {
-  // TODO v1.8 legacy scopes
-  NATLSYSADMIN: "natlsysadmin",
-  BYPASSRATELIMIT: "bypassratelimit",
-  DECLARE: "declare",
-  REGISTER: "register",
-  VALIDATE: "validate",
-  DEMO: "demo",
-  CERTIFY: "certify",
-  PERFORMANCE: "performance",
-  SYSADMIN: "sysadmin",
-  TEAMS: "teams",
-  CONFIG: "config",
-  // systems / integrations
-  WEBHOOK: "webhook",
-  NATIONALID: "nationalId",
-  NOTIFICATION_API: "notification-api",
-  RECORDSEARCH: "recordsearch",
-  /**
-   * @TODO This is a temporary scope to be used for V2 Events custom events declaration
-   */
-  RECORD_DECLARE: "record.declare-birth",
-  // declare
-  RECORD_IMPORT: "record.import",
-  // declare
-  RECORD_DECLARE_BIRTH: "record.declare-birth",
-  RECORD_DECLARE_BIRTH_MY_JURISDICTION: "record.declare-birth:my-jurisdiction",
-  RECORD_DECLARE_DEATH: "record.declare-death",
-  RECORD_DECLARE_DEATH_MY_JURISDICTION: "record.declare-death:my-jurisdiction",
-  RECORD_DECLARE_MARRIAGE: "record.declare-marriage",
-  RECORD_DECLARE_MARRIAGE_MY_JURISDICTION: "record.declare-marriage:my-jurisdiction",
-  RECORD_SUBMIT_INCOMPLETE: "record.declaration-submit-incomplete",
-  RECORD_SUBMIT_FOR_REVIEW: "record.declaration-submit-for-review",
-  RECORD_UNASSIGN_OTHERS: "record.unassign-others",
-  // validate
-  RECORD_SUBMIT_FOR_APPROVAL: "record.declaration-submit-for-approval",
-  RECORD_SUBMIT_FOR_UPDATES: "record.declaration-submit-for-updates",
-  RECORD_DECLARATION_EDIT: "record.declaration-edit",
-  RECORD_REVIEW_DUPLICATES: "record.review-duplicates",
-  RECORD_DECLARATION_ARCHIVE: "record.declaration-archive",
-  RECORD_DECLARATION_REINSTATE: "record.declaration-reinstate",
-  // register
-  RECORD_REGISTER: "record.register",
-  // certify
-  RECORD_EXPORT_RECORDS: "record.export-records",
-  RECORD_DECLARATION_PRINT: "record.declaration-print",
-  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS: "record.declaration-print-supporting-documents",
-  RECORD_REGISTRATION_PRINT: "record.registration-print",
-  // v1.8
-  /**
-   * This scope is used to **print and **issue certified copies of a record
-   * after it has been registered. Previously Registrars had this permission.
-   */
-  RECORD_PRINT_ISSUE_CERTIFIED_COPIES: "record.registration-print&issue-certified-copies",
-  RECORD_PRINT_CERTIFIED_COPIES: "record.registration-print-certified-copies",
-  // v1.8
-  RECORD_BULK_PRINT_CERTIFIED_COPIES: "record.registration-bulk-print-certified-copies",
-  // v1.8
-  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES: "record.registration-verify-certified-copies",
-  // v1.8
-  // correct
-  RECORD_REGISTRATION_REQUEST_CORRECTION: "record.registration-request-correction",
-  RECORD_REGISTRATION_CORRECT: "record.registration-correct",
-  RECORD_REGISTRATION_REQUEST_REVOCATION: "record.registration-request-revocation",
-  // v1.8
-  RECORD_REGISTRATION_REVOKE: "record.registration-revoke",
-  // v1.8
-  RECORD_REGISTRATION_REQUEST_REINSTATEMENT: "record.registration-request-reinstatement",
-  // v1.8
-  RECORD_REGISTRATION_REINSTATE: "record.registration-reinstate",
-  // v1.8
-  RECORD_CONFIRM_REGISTRATION: "record.confirm-registration",
-  RECORD_REJECT_REGISTRATION: "record.reject-registration",
-  // search
-  SEARCH_BIRTH_MY_JURISDICTION: "search.birth:my-jurisdiction",
-  SEARCH_BIRTH: "search.birth",
-  SEARCH_DEATH_MY_JURISDICTION: "search.death:my-jurisdiction",
-  SEARCH_DEATH: "search.death",
-  SEARCH_MARRIAGE_MY_JURISDICTION: "search.marriage:my-jurisdiction",
-  SEARCH_MARRIAGE: "search.marriage",
-  // audit v1.8
-  RECORD_READ: "record.read",
-  RECORD_READ_AUDIT: "record.read-audit",
-  RECORD_READ_COMMENTS: "record.read-comments",
-  RECORD_CREATE_COMMENTS: "record.create-comments",
-  // profile
-  PROFILE_UPDATE: "profile.update",
-  //v1.8
-  PROFILE_ELECTRONIC_SIGNATURE: "profile.electronic-signature",
-  // performance
-  PERFORMANCE_READ: "performance.read",
-  PERFORMANCE_READ_DASHBOARDS: "performance.read-dashboards",
-  PERFORMANCE_EXPORT_VITAL_STATISTICS: "performance.vital-statistics-export",
-  // organisation
-  ORGANISATION_READ_LOCATIONS: "organisation.read-locations:all",
-  ORGANISATION_READ_LOCATIONS_MY_OFFICE: "organisation.read-locations:my-office",
-  ORGANISATION_READ_LOCATIONS_MY_JURISDICTION: "organisation.read-locations:my-jurisdiction",
-  // user
-  USER_READ: "user.read:all",
-  USER_READ_MY_OFFICE: "user.read:my-office",
-  USER_READ_MY_JURISDICTION: "user.read:my-jurisdiction",
-  USER_READ_ONLY_MY_AUDIT: "user.read:only-my-audit",
-  //v1.8
-  USER_CREATE: "user.create:all",
-  USER_CREATE_MY_JURISDICTION: "user.create:my-jurisdiction",
-  USER_UPDATE: "user.update:all",
-  USER_UPDATE_MY_JURISDICTION: "user.update:my-jurisdiction",
-  // config
-  CONFIG_UPDATE_ALL: "config.update:all",
-  // data seeding
-  USER_DATA_SEEDING: "user.data-seeding"
-};
-var LegacyScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.NATLSYSADMIN),
-  import_zod16.z.literal(SCOPES.BYPASSRATELIMIT),
-  import_zod16.z.literal(SCOPES.DECLARE),
-  import_zod16.z.literal(SCOPES.REGISTER),
-  import_zod16.z.literal(SCOPES.VALIDATE),
-  import_zod16.z.literal(SCOPES.DEMO),
-  import_zod16.z.literal(SCOPES.CERTIFY),
-  import_zod16.z.literal(SCOPES.PERFORMANCE),
-  import_zod16.z.literal(SCOPES.SYSADMIN),
-  import_zod16.z.literal(SCOPES.TEAMS),
-  import_zod16.z.literal(SCOPES.CONFIG)
-]);
-var IntegrationScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.WEBHOOK),
-  import_zod16.z.literal(SCOPES.NATIONALID),
-  import_zod16.z.literal(SCOPES.NOTIFICATION_API),
-  import_zod16.z.literal(SCOPES.RECORDSEARCH)
-]);
-var DeclareScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE),
-  import_zod16.z.literal(SCOPES.RECORD_IMPORT),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_BIRTH),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_DEATH),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.RECORD_SUBMIT_INCOMPLETE),
-  import_zod16.z.literal(SCOPES.RECORD_SUBMIT_FOR_REVIEW)
-]);
-var UnassignScope = import_zod16.z.literal(SCOPES.RECORD_UNASSIGN_OTHERS);
-var ValidateScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.RECORD_SUBMIT_FOR_APPROVAL),
-  import_zod16.z.literal(SCOPES.RECORD_SUBMIT_FOR_UPDATES),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARATION_EDIT),
-  import_zod16.z.literal(SCOPES.RECORD_REVIEW_DUPLICATES),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARATION_ARCHIVE),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARATION_REINSTATE)
-]);
-var RegisterScope = import_zod16.z.literal(SCOPES.RECORD_REGISTER);
-var CertifyScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.RECORD_EXPORT_RECORDS),
-  import_zod16.z.literal(SCOPES.RECORD_DECLARATION_PRINT),
-  import_zod16.z.literal(SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_PRINT),
-  import_zod16.z.literal(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES),
-  import_zod16.z.literal(SCOPES.RECORD_PRINT_CERTIFIED_COPIES),
-  import_zod16.z.literal(SCOPES.RECORD_BULK_PRINT_CERTIFIED_COPIES),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES)
-]);
-var CorrectionScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_CORRECT),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REVOCATION),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_REVOKE),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REINSTATEMENT),
-  import_zod16.z.literal(SCOPES.RECORD_REGISTRATION_REINSTATE),
-  import_zod16.z.literal(SCOPES.RECORD_CONFIRM_REGISTRATION),
-  import_zod16.z.literal(SCOPES.RECORD_REJECT_REGISTRATION)
-]);
-var SearchScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.SEARCH_BIRTH_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.SEARCH_BIRTH),
-  import_zod16.z.literal(SCOPES.SEARCH_DEATH_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.SEARCH_DEATH),
-  import_zod16.z.literal(SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.SEARCH_MARRIAGE)
-]);
-var AuditScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.RECORD_READ),
-  import_zod16.z.literal(SCOPES.RECORD_READ_AUDIT),
-  import_zod16.z.literal(SCOPES.RECORD_READ_COMMENTS),
-  import_zod16.z.literal(SCOPES.RECORD_CREATE_COMMENTS)
-]);
-var ProfileScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.PROFILE_UPDATE),
-  import_zod16.z.literal(SCOPES.PROFILE_ELECTRONIC_SIGNATURE)
-]);
-var PerformanceScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.PERFORMANCE_READ),
-  import_zod16.z.literal(SCOPES.PERFORMANCE_READ_DASHBOARDS),
-  import_zod16.z.literal(SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS)
-]);
-var OrganisationScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS),
-  import_zod16.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE),
-  import_zod16.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION)
-]);
-var UserScopes = import_zod16.z.union([
-  import_zod16.z.literal(SCOPES.USER_READ),
-  import_zod16.z.literal(SCOPES.USER_READ_MY_OFFICE),
-  import_zod16.z.literal(SCOPES.USER_READ_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.USER_READ_ONLY_MY_AUDIT),
-  import_zod16.z.literal(SCOPES.USER_CREATE),
-  import_zod16.z.literal(SCOPES.USER_CREATE_MY_JURISDICTION),
-  import_zod16.z.literal(SCOPES.USER_UPDATE),
-  import_zod16.z.literal(SCOPES.USER_UPDATE_MY_JURISDICTION)
-]);
-var ConfigScope = import_zod16.z.literal(SCOPES.CONFIG_UPDATE_ALL);
-var DataSeedingScope = import_zod16.z.literal(SCOPES.USER_DATA_SEEDING);
-var LiteralScopes = import_zod16.z.union([
-  LegacyScopes,
-  IntegrationScopes,
-  UnassignScope,
-  DeclareScopes,
-  ValidateScopes,
-  RegisterScope,
-  CertifyScopes,
-  CorrectionScopes,
-  SearchScopes,
-  AuditScopes,
-  ProfileScopes,
-  PerformanceScopes,
-  OrganisationScopes,
-  UserScopes,
-  ConfigScope,
-  DataSeedingScope
-]);
-var rawConfigurableScopeRegex = /^([a-zA-Z\.]+)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
-var rawConfigurableScope = import_zod16.z.string().regex(rawConfigurableScopeRegex);
-var CreateUserScope = import_zod16.z.object({
-  type: import_zod16.z.literal("user.create"),
-  options: import_zod16.z.object({
-    role: import_zod16.z.array(import_zod16.z.string())
-  })
-});
-var EditUserScope = import_zod16.z.object({
-  type: import_zod16.z.literal("user.edit"),
-  options: import_zod16.z.object({
-    role: import_zod16.z.array(import_zod16.z.string())
-  })
-});
-var WorkqueueScope = import_zod16.z.object({
-  type: import_zod16.z.literal("workqueue"),
-  options: import_zod16.z.object({
-    id: import_zod16.z.array(import_zod16.z.string())
-  })
+       are always rendered in the advanced search form.
+      `
+  )
 });
-var NotifyRecordScope = import_zod16.z.object({
-  type: import_zod16.z.literal("record.notify"),
-  options: import_zod16.z.object({
-    event: import_zod16.z.array(import_zod16.z.string())
-  })
+var SearchQueryParams = import_zod14.z.object({
+  eventType: import_zod14.z.string().optional().describe(
+    "Defines type of event so that when redirecting to Advanced Search page, appropriate tab can be selected"
+  )
+}).catchall(FieldValue);
+var FieldConfigSchema = BaseField3.extend({
+  fieldId: import_zod14.z.string(),
+  fieldType: import_zod14.z.literal("field")
 });
-var ConfigurableScopes = import_zod16.z.discriminatedUnion("type", [
-  CreateUserScope,
-  EditUserScope,
-  WorkqueueScope,
-  NotifyRecordScope
+var EventFieldId = import_zod14.z.enum([
+  "trackingId",
+  "status",
+  "legalStatus.REGISTERED.createdAt",
+  "legalStatus.REGISTERED.createdAtLocation",
+  "updatedAt"
 ]);
-var scopes = Object.values(SCOPES);
-var ActionScopes = import_zod16.z.union([
-  DeclareScopes,
-  ValidateScopes,
-  RegisterScope,
-  CertifyScopes,
-  CorrectionScopes
+var EventFieldConfigSchema = BaseField3.extend({
+  fieldId: EventFieldId,
+  fieldType: import_zod14.z.literal("event")
+});
+var SearchField = import_zod14.z.discriminatedUnion("fieldType", [
+  FieldConfigSchema,
+  EventFieldConfigSchema
 ]);
+var AdvancedSearchConfig = import_zod14.z.object({
+  title: TranslationConfig.describe("Advanced search tab title"),
+  fields: import_zod14.z.array(SearchField).describe("Advanced search fields.")
+});
 
-// ../commons/src/authentication.ts
-var DEFAULT_ROLES_DEFINITION = [
-  {
-    id: "FIELD_AGENT",
-    label: {
-      defaultMessage: "Field Agent",
-      description: "Name for user role Field Agent",
-      id: "userRole.fieldAgent"
-    },
-    scopes: [
-      // new scopes
-      SCOPES.RECORD_DECLARE_BIRTH,
-      SCOPES.RECORD_DECLARE_DEATH,
-      SCOPES.RECORD_DECLARE_MARRIAGE,
-      SCOPES.RECORD_SUBMIT_INCOMPLETE,
-      SCOPES.RECORD_SUBMIT_FOR_REVIEW,
-      SCOPES.SEARCH_BIRTH,
-      SCOPES.SEARCH_DEATH,
-      SCOPES.SEARCH_MARRIAGE
-    ]
-  },
-  {
-    id: "REGISTRATION_AGENT",
-    label: {
-      defaultMessage: "Registration Agent",
-      description: "Name for user role Registration Agent",
-      id: "userRole.registrationAgent"
-    },
-    scopes: [
-      SCOPES.PERFORMANCE,
-      SCOPES.CERTIFY,
-      SCOPES.RECORD_DECLARE_BIRTH,
-      SCOPES.RECORD_DECLARE_DEATH,
-      SCOPES.RECORD_DECLARE_MARRIAGE,
-      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
-      SCOPES.RECORD_SUBMIT_FOR_UPDATES,
-      SCOPES.RECORD_DECLARATION_ARCHIVE,
-      SCOPES.RECORD_DECLARATION_REINSTATE,
-      SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION,
-      SCOPES.RECORD_REGISTRATION_PRINT,
-      SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
-      SCOPES.RECORD_EXPORT_RECORDS,
-      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
-      SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES,
-      SCOPES.RECORD_CREATE_COMMENTS,
-      SCOPES.PERFORMANCE_READ,
-      SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
-      SCOPES.SEARCH_BIRTH,
-      SCOPES.SEARCH_DEATH,
-      SCOPES.SEARCH_MARRIAGE
-    ]
-  },
-  {
-    id: "LOCAL_REGISTRAR",
-    label: {
-      defaultMessage: "Local Registrar",
-      description: "Name for user role Local Registrar",
-      id: "userRole.localRegistrar"
-    },
-    scopes: [
-      SCOPES.PERFORMANCE,
-      SCOPES.CERTIFY,
-      SCOPES.RECORD_DECLARE_BIRTH,
-      SCOPES.RECORD_DECLARE_DEATH,
-      SCOPES.RECORD_DECLARE_MARRIAGE,
-      SCOPES.RECORD_SUBMIT_FOR_UPDATES,
-      SCOPES.RECORD_REVIEW_DUPLICATES,
-      SCOPES.RECORD_DECLARATION_ARCHIVE,
-      SCOPES.RECORD_DECLARATION_REINSTATE,
-      SCOPES.RECORD_REGISTER,
-      SCOPES.RECORD_REGISTRATION_CORRECT,
-      SCOPES.RECORD_REGISTRATION_PRINT,
-      SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
-      SCOPES.RECORD_EXPORT_RECORDS,
-      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
-      SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES,
-      SCOPES.RECORD_CREATE_COMMENTS,
-      SCOPES.PERFORMANCE_READ,
-      SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.PROFILE_ELECTRONIC_SIGNATURE,
-      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
-      SCOPES.SEARCH_BIRTH,
-      SCOPES.SEARCH_DEATH,
-      SCOPES.SEARCH_MARRIAGE
-    ]
-  },
-  {
-    id: "LOCAL_SYSTEM_ADMIN",
-    label: {
-      defaultMessage: "Local System Admin",
-      description: "Name for user role Local System Admin",
-      id: "userRole.localSystemAdmin"
-    },
-    scopes: [
-      SCOPES.SYSADMIN,
-      SCOPES.USER_READ_MY_OFFICE,
-      SCOPES.USER_CREATE_MY_JURISDICTION,
-      SCOPES.USER_UPDATE_MY_JURISDICTION,
-      SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.PERFORMANCE_READ,
-      SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS
-      // 'organisation.read-users' ?
-    ]
-  },
-  {
-    id: "NATIONAL_SYSTEM_ADMIN",
-    label: {
-      defaultMessage: "National System Admin",
-      description: "Name for user role National System Admin",
-      id: "userRole.nationalSystemAdmin"
-    },
-    scopes: [
-      SCOPES.SYSADMIN,
-      SCOPES.NATLSYSADMIN,
-      SCOPES.USER_CREATE,
-      SCOPES.USER_READ,
-      SCOPES.USER_UPDATE,
-      SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.PERFORMANCE_READ,
-      SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS
-      // 'organisation.read-users' ?
-    ]
-  },
-  {
-    id: "PERFORMANCE_MANAGER",
-    label: {
-      defaultMessage: "Performance Manager",
-      description: "Name for user role Performance Manager",
-      id: "userRole.performanceManager"
-    },
-    scopes: [
-      SCOPES.PERFORMANCE,
-      SCOPES.PERFORMANCE_READ,
-      SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS
-    ]
-  }
-];
-var TokenUserType = import_zod17.z.enum(["user", "system"]);
-var TokenWithBearer = import_zod17.z.string().regex(/^Bearer\s/);
+// ../commons/src/events/utils.ts
+var import_lodash = require("lodash");
+
+// ../commons/src/events/ActionDocument.ts
+var import_zod16 = require("zod");
+var import_zod_openapi7 = require("zod-openapi");
+
+// ../commons/src/events/CreatedAtLocation.ts
+var import_zod15 = require("zod");
+var CreatedAtLocation = import_zod15.z.string().nullish();
 
 // ../commons/src/events/ActionDocument.ts
-(0, import_zod_openapi7.extendZodWithOpenApi)(import_zod18.z);
-var ActionUpdate = import_zod18.z.record(import_zod18.z.string(), FieldUpdateValue);
-var EventState = import_zod18.z.record(import_zod18.z.string(), FieldValue);
+(0, import_zod_openapi7.extendZodWithOpenApi)(import_zod16.z);
+var ActionUpdate = import_zod16.z.record(import_zod16.z.string(), FieldUpdateValue);
+var EventState = import_zod16.z.record(import_zod16.z.string(), FieldValue);
 var ActionStatus = {
   Requested: "Requested",
   Accepted: "Accepted",
   Rejected: "Rejected"
 };
-var ActionBase = import_zod18.z.object({
-  id: UUID,
-  transactionId: import_zod18.z.string(),
-  createdByUserType: TokenUserType,
-  createdAt: import_zod18.z.string().datetime(),
-  createdBy: import_zod18.z.string(),
-  createdByRole: import_zod18.z.string(),
-  createdBySignature: import_zod18.z.string().nullish().describe("Reference to signature of the user who created the action"),
+var ActionBase = import_zod16.z.object({
+  id: import_zod16.z.string(),
+  transactionId: import_zod16.z.string(),
+  createdAt: import_zod16.z.string().datetime(),
+  createdBy: import_zod16.z.string(),
+  createdByRole: import_zod16.z.string(),
+  createdBySignature: import_zod16.z.string().nullish().describe("Reference to signature of the user who created the action"),
   createdAtLocation: CreatedAtLocation,
   declaration: ActionUpdate,
-  annotation: ActionUpdate.optional().nullable(),
-  status: import_zod18.z.enum([
+  annotation: ActionUpdate.optional(),
+  status: import_zod16.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
     ActionStatus.Rejected
   ]),
   // If the action is an asynchronous confirmation for another action, we will save the original action id here.
-  originalActionId: UUID.optional().nullable().describe(
-    "Reference to the original action that was asynchronously rejected or accepted by 3rd party integration."
-  )
+  originalActionId: import_zod16.z.string().optional()
 });
 var AssignedAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.ASSIGN),
-    assignedTo: import_zod18.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.ASSIGN),
+    assignedTo: import_zod16.z.string()
   })
 );
 var UnassignedAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.UNASSIGN)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.UNASSIGN),
+    assignedTo: import_zod16.z.literal(null)
   })
 );
 var RegisterAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.REGISTER),
-    registrationNumber: import_zod18.z.string().optional()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REGISTER),
+    registrationNumber: import_zod16.z.string().optional()
   })
 );
 var DeclareAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.DECLARE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.DECLARE)
   })
 );
 var ValidateAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.VALIDATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.VALIDATE)
   })
 );
-var RejectionReason = import_zod18.z.object({
-  message: import_zod18.z.string().min(1, { message: "Message cannot be empty" }).describe("Message describing reason for rejection or archiving"),
-  isDuplicate: import_zod18.z.boolean().optional().describe("If a declaration is duplicated")
+var RejectionReason = import_zod16.z.object({
+  message: import_zod16.z.string().min(1, { message: "Message cannot be empty" }).describe("Message describing reason for rejection or archiving"),
+  isDuplicate: import_zod16.z.boolean().optional().describe("If a declaration is duplicated")
 });
 var RejectAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.REJECT),
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REJECT),
     reason: RejectionReason
   })
 );
 var MarkAsDuplicateAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.MARKED_AS_DUPLICATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.MARKED_AS_DUPLICATE)
   })
 );
 var ArchiveAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.ARCHIVE),
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.ARCHIVE),
     reason: RejectionReason
   })
 );
 var CreatedAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.CREATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.CREATE)
   })
 );
 var NotifiedAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.NOTIFY)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.NOTIFY)
   })
 );
 var PrintCertificateAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.PRINT_CERTIFICATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.PRINT_CERTIFICATE)
   })
 );
 var RequestedCorrectionAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.REQUEST_CORRECTION)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REQUEST_CORRECTION)
   })
 );
 var ApprovedCorrectionAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.APPROVE_CORRECTION),
-    requestId: import_zod18.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.APPROVE_CORRECTION),
+    requestId: import_zod16.z.string()
   })
 );
 var RejectedCorrectionAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.REJECT_CORRECTION),
-    requestId: import_zod18.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REJECT_CORRECTION),
+    requestId: import_zod16.z.string()
   })
 );
 var ReadAction = ActionBase.merge(
-  import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.READ)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.READ)
   })
 );
-var ActionDocument = import_zod18.z.discriminatedUnion("type", [
+var ActionDocument = import_zod16.z.discriminatedUnion("type", [
   CreatedAction.openapi({ ref: "CreatedAction" }),
   ValidateAction.openapi({ ref: "ValidateAction" }),
   RejectAction.openapi({ ref: "RejectAction" }),
@@ -1917,20 +1466,20 @@ var AsyncRejectActionDocument = ActionBase.omit({
   declaration: true,
   annotation: true
 }).merge(
-  import_zod18.z.object({
-    type: import_zod18.z.enum(ConfirmableActions),
-    status: import_zod18.z.literal(ActionStatus.Rejected)
+  import_zod16.z.object({
+    type: import_zod16.z.enum(ConfirmableActions),
+    status: import_zod16.z.literal(ActionStatus.Rejected)
   })
 );
-var Action = import_zod18.z.union([ActionDocument, AsyncRejectActionDocument]);
-var ResolvedUser = import_zod18.z.object({
-  id: import_zod18.z.string(),
-  role: import_zod18.z.string(),
-  name: import_zod18.z.array(
-    import_zod18.z.object({
-      use: import_zod18.z.string(),
-      given: import_zod18.z.array(import_zod18.z.string()),
-      family: import_zod18.z.string()
+var Action = import_zod16.z.union([ActionDocument, AsyncRejectActionDocument]);
+var ResolvedUser = import_zod16.z.object({
+  id: import_zod16.z.string(),
+  role: import_zod16.z.string(),
+  name: import_zod16.z.array(
+    import_zod16.z.object({
+      use: import_zod16.z.string(),
+      given: import_zod16.z.array(import_zod16.z.string()),
+      family: import_zod16.z.string()
     })
   )
 });
@@ -1941,7 +1490,7 @@ var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
 // ../commons/src/events/FieldTypeMapping.ts
-var import_zod19 = require("zod");
+var import_zod17 = require("zod");
 function mapFieldTypeToZod(type, required) {
   let schema;
   switch (type) {
@@ -2001,7 +1550,7 @@ function createValidationSchema(config) {
   for (const field2 of config) {
     shape[field2.id] = mapFieldTypeToZod(field2.type, field2.required);
   }
-  return import_zod19.z.object(shape);
+  return import_zod17.z.object(shape);
 }
 function mapFieldTypeToEmptyValue(field2) {
   switch (field2.type) {
@@ -2141,29 +1690,6 @@ var ajv = new import_ajv.default({
   allowUnionTypes: true
 });
 (0, import_ajv_formats.default)(ajv);
-ajv.addKeyword({
-  keyword: "daysFromNow",
-  type: "string",
-  schemaType: "object",
-  $data: true,
-  errors: true,
-  validate(schema, data, _, dataContext) {
-    if (!(dataContext && dataContext.rootData && typeof dataContext.rootData === "object" && "$now" in dataContext.rootData && typeof dataContext.rootData.$now === "string")) {
-      throw new Error("Validation context must contain $now");
-    }
-    const { days, clause } = schema;
-    if (typeof data !== "string") {
-      return false;
-    }
-    const date = new Date(data);
-    if (isNaN(date.getTime())) {
-      return false;
-    }
-    const now = new Date(dataContext.rootData.$now);
-    const offsetDate = new Date(now.getTime() + days * 24 * 60 * 60 * 1e3);
-    return clause === "after" ? (0, import_date_fns.isAfter)(date, offsetDate) : (0, import_date_fns.isBefore)(date, offsetDate);
-  }
-});
 function validate(schema, data) {
   return ajv.validate(schema, data);
 }
@@ -2377,6 +1903,12 @@ function getValidatorsForField(fieldId, validations) {
   }).filter((x) => x !== null);
 }
 
+// ../commons/src/uuid.ts
+var import_uuid = require("uuid");
+function getUUID() {
+  return (0, import_uuid.v4)();
+}
+
 // ../commons/src/utils.ts
 function getOrThrow(x, message) {
   if (x === void 0 || x === null) {
@@ -2384,9 +1916,6 @@ function getOrThrow(x, message) {
   }
   return x;
 }
-function joinValues(values, separator = " ") {
-  return values.filter((value) => !!value).join(separator).trim();
-}
 
 // ../commons/src/events/utils.ts
 function isDeclarationActionConfig(action) {
@@ -2403,10 +1932,7 @@ function getDeclaration(configuration) {
 }
 var getActionAnnotationFields = (actionConfig) => {
   if (actionConfig.type === ActionType.REQUEST_CORRECTION) {
-    return [
-      ...actionConfig.onboardingForm.flatMap(({ fields }) => fields),
-      ...actionConfig.additionalDetailsForm.flatMap(({ fields }) => fields)
-    ];
+    return actionConfig.correctionForm.pages.flatMap(({ fields }) => fields);
   }
   if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
     return actionConfig.printForm.pages.flatMap(({ fields }) => fields);
@@ -2429,7 +1955,7 @@ function getDeclarationFieldById(config, fieldId) {
 var findRecordActionPages = (config, actionType) => {
   const action = config.actions.find((a) => a.type === actionType);
   if (action?.type === ActionType.REQUEST_CORRECTION) {
-    return [...action.onboardingForm, ...action.additionalDetailsForm];
+    return action.correctionForm.pages;
   }
   if (action?.type === ActionType.PRINT_CERTIFICATE) {
     return action.printForm.pages;
@@ -2486,9 +2012,8 @@ function createEmptyDraft(eventId, draftId, actionType) {
       declaration: {},
       annotation: {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      createdByUserType: TokenUserType.Enum.user,
       createdBy: "@todo",
-      createdAtLocation: "00000000-0000-0000-0000-000000000000",
+      createdAtLocation: "@todo",
       status: ActionStatus.Accepted,
       transactionId: "@todo",
       createdByRole: "@todo"
@@ -2503,13 +2028,10 @@ function getVisibleVerificationPageIds(pages, annotation) {
 }
 function getActionVerificationPageIds(actionConfig, annotation) {
   if (actionConfig.type === ActionType.REQUEST_CORRECTION) {
-    return [
-      ...getVisibleVerificationPageIds(actionConfig.onboardingForm, annotation),
-      ...getVisibleVerificationPageIds(
-        actionConfig.additionalDetailsForm,
-        annotation
-      )
-    ];
+    return getVisibleVerificationPageIds(
+      actionConfig.correctionForm.pages,
+      annotation
+    );
   }
   if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
     return getVisibleVerificationPageIds(
@@ -2591,9 +2113,9 @@ function getEventConfigById(eventConfigs, id) {
 
 // ../commons/src/events/EventConfig.ts
 var import_zod_openapi8 = require("zod-openapi");
-(0, import_zod_openapi8.extendZodWithOpenApi)(import_zod20.z);
-var EventConfig = import_zod20.z.object({
-  id: import_zod20.z.string().describe(
+(0, import_zod_openapi8.extendZodWithOpenApi)(import_zod18.z);
+var EventConfig = import_zod18.z.object({
+  id: import_zod18.z.string().describe(
     'A machine-readable identifier for the event, e.g. "birth" or "death"'
   ),
   dateOfEvent: FieldReference.optional(),
@@ -2603,10 +2125,10 @@ var EventConfig = import_zod20.z.object({
   ),
   summary: SummaryConfig,
   label: TranslationConfig,
-  actions: import_zod20.z.array(ActionConfig),
+  actions: import_zod18.z.array(ActionConfig),
   declaration: DeclarationFormConfig,
-  deduplication: import_zod20.z.array(DeduplicationConfig).optional().default([]),
-  advancedSearch: import_zod20.z.array(AdvancedSearchConfig).optional().default([])
+  deduplication: import_zod18.z.array(DeduplicationConfig).optional().default([]),
+  advancedSearch: import_zod18.z.array(AdvancedSearchConfig).optional().default([])
 }).superRefine((event2, ctx) => {
   const allFields = findAllFields(event2);
   const fieldIds = allFields.map((field2) => field2.id);
@@ -2668,12 +2190,12 @@ var definePage = (page) => PageConfig.parse(page);
 var defineFormPage = (formPage) => FormPageConfig.parse(formPage);
 
 // ../commons/src/events/WorkqueueConfig.ts
-var import_zod27 = require("zod");
+var import_zod25 = require("zod");
 
 // ../commons/src/events/serializers/user/serializer.ts
-var import_zod21 = require("zod");
-var SerializedUserField = import_zod21.z.object({
-  $userField: import_zod21.z.enum([
+var import_zod19 = require("zod");
+var SerializedUserField = import_zod19.z.object({
+  $userField: import_zod19.z.enum([
     "id",
     "name",
     "role",
@@ -2781,6 +2303,9 @@ function createEventConditionals() {
     })
   };
 }
+function getDateFromNow(days) {
+  return new Date(Date.now() - days * 24 * 60 * 60 * 1e3).toISOString().split("T")[0];
+}
 function getDateRangeToFieldReference(fieldId, comparedFieldId, clause) {
   return {
     type: "object",
@@ -2799,20 +2324,6 @@ function isFieldReference(value) {
   return typeof value === "object" && value !== null && "$$field" in value;
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (days, clause) => ({
-    type: "object",
-    properties: {
-      [fieldId]: {
-        type: "string",
-        format: "date",
-        daysFromNow: {
-          days,
-          clause
-        }
-      }
-    },
-    required: [fieldId]
-  });
   const getDateRange = (date, clause) => ({
     type: "object",
     properties: {
@@ -2831,8 +2342,12 @@ function createFieldConditionals(fieldId) {
     $$field: fieldId,
     isAfter: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(getDayRange(-days, "after")),
-        inFuture: () => defineFormConditional(getDayRange(days, "after"))
+        inPast: () => defineFormConditional(
+          getDateRange(getDateFromNow(days), "formatMinimum")
+        ),
+        inFuture: () => defineFormConditional(
+          getDateRange(getDateFromNow(-days), "formatMinimum")
+        )
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -2847,12 +2362,16 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMinimum"));
       },
-      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMinimum"))
+      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMinimum"))
     }),
     isBefore: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(getDayRange(days, "before")),
-        inFuture: () => defineFormConditional(getDayRange(-days, "before"))
+        inPast: () => defineFormConditional(
+          getDateRange(getDateFromNow(days), "formatMaximum")
+        ),
+        inFuture: () => defineFormConditional(
+          getDateRange(getDateFromNow(-days), "formatMaximum")
+        )
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -2867,7 +2386,7 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMaximum"));
       },
-      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMaximum"))
+      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMaximum"))
     }),
     isEqualTo: (value) => {
       if (isFieldReference(value)) {
@@ -3079,11 +2598,11 @@ var event = Object.assign(eventFn, {
 });
 
 // ../commons/src/events/WorkqueueColumnConfig.ts
-var import_zod23 = require("zod");
+var import_zod21 = require("zod");
 
 // ../commons/src/events/EventMetadata.ts
-var import_zod22 = require("zod");
-var EventStatus = import_zod22.z.enum([
+var import_zod20 = require("zod");
+var EventStatus = import_zod20.z.enum([
   "CREATED",
   "NOTIFIED",
   "DECLARED",
@@ -3093,69 +2612,60 @@ var EventStatus = import_zod22.z.enum([
   "REJECTED",
   "ARCHIVED"
 ]);
-var InherentFlags = {
-  PRINTED: "printed",
-  INCOMPLETE: "incomplete",
-  REJECTED: "rejected",
-  CORRECTION_REQUESTED: "correction-requested"
+var CustomFlags = {
+  CERTIFICATE_PRINTED: "certificate-printed"
 };
-var Flag = import_zod22.z.string().regex(
+var Flag = import_zod20.z.string().regex(
   new RegExp(
     `^(${Object.values(ActionType).join("|").toLowerCase()}):(${Object.values(
       ActionStatus
     ).join("|").toLowerCase()})$`
   ),
   "Flag must be in the format ActionType:ActionStatus (lowerCase)"
-).or(import_zod22.z.nativeEnum(InherentFlags));
-var ZodDate = import_zod22.z.string().date();
-var ActionCreationMetadata = import_zod22.z.object({
-  createdAt: import_zod22.z.string().datetime().describe("The timestamp when the action request was created."),
-  createdBy: import_zod22.z.string().describe("ID of the user who created the action request."),
+).or(import_zod20.z.nativeEnum(CustomFlags));
+var ZodDate = import_zod20.z.string().date();
+var ActionCreationMetadata = import_zod20.z.object({
+  createdAt: import_zod20.z.string().datetime().describe("The timestamp when the action request was created."),
+  createdBy: import_zod20.z.string().describe("ID of the user who created the action request."),
   createdAtLocation: CreatedAtLocation.describe(
     "Location of the user who created the action request."
   ),
-  createdByUserType: import_zod22.z.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
-  acceptedAt: import_zod22.z.string().datetime().describe("Timestamp when the action request was accepted."),
-  createdByRole: import_zod22.z.string().describe("Role of the user at the time of action request creation."),
-  createdBySignature: import_zod22.z.string().nullish().describe("Signature of the user who created the action request.")
+  acceptedAt: import_zod20.z.string().datetime().describe("Timestamp when the action request was accepted."),
+  createdByRole: import_zod20.z.string().describe("Role of the user at the time of action request creation."),
+  createdBySignature: import_zod20.z.string().nullish().describe("Signature of the user who created the action request.")
 });
 var RegistrationCreationMetadata = ActionCreationMetadata.extend({
-  registrationNumber: import_zod22.z.string().describe(
+  registrationNumber: import_zod20.z.string().describe(
     "Registration number of the event. Always present for accepted registrations."
   )
 });
-var LegalStatuses = import_zod22.z.object({
+var LegalStatuses = import_zod20.z.object({
   [EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
   [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
 });
-var EventMetadata = import_zod22.z.object({
-  id: UUID,
-  type: import_zod22.z.string().describe("The type of event, such as birth, death, or marriage."),
+var EventMetadata = import_zod20.z.object({
+  id: import_zod20.z.string(),
+  type: import_zod20.z.string().describe("The type of event, such as birth, death, or marriage."),
   status: EventStatus,
   legalStatuses: LegalStatuses.describe(
     "Metadata related to the legal registration of the event, such as who registered it and when."
   ),
-  createdAt: import_zod22.z.string().datetime().describe("The timestamp when the event was first created and saved."),
+  createdAt: import_zod20.z.string().datetime().describe("The timestamp when the event was first created and saved."),
   dateOfEvent: ZodDate.nullish(),
-  createdBy: import_zod22.z.string().describe("ID of the user who created the event."),
-  createdByUserType: import_zod22.z.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
-  updatedByUserRole: import_zod22.z.string().describe("Role of the user who last changed the status."),
+  createdBy: import_zod20.z.string().describe("ID of the user who created the event."),
+  updatedByUserRole: import_zod20.z.string().describe("Role of the user who last updated the declaration."),
   createdAtLocation: CreatedAtLocation.describe(
     "Location of the user who created the event."
   ),
-  createdBySignature: import_zod22.z.string().nullish().describe("Signature of the user who created the event."),
-  updatedAtLocation: UUID.nullish().describe(
-    "Location of the user who last changed the status."
-  ),
-  updatedAt: import_zod22.z.string().datetime().describe(
-    "Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
-  ),
-  assignedTo: import_zod22.z.string().nullish().describe("ID of the user currently assigned to the event."),
-  updatedBy: import_zod22.z.string().nullish().describe("ID of the user who last changed the status."),
-  trackingId: import_zod22.z.string().describe(
+  createdBySignature: import_zod20.z.string().nullish().describe("Signature of the user who created the event."),
+  updatedAtLocation: import_zod20.z.string().nullish().describe("Location of the user who last updated the declaration."),
+  updatedAt: import_zod20.z.string().datetime().describe("Timestamp of the most recent declaration update."),
+  assignedTo: import_zod20.z.string().nullish().describe("ID of the user currently assigned to the event."),
+  updatedBy: import_zod20.z.string().nullish().describe("ID of the user who last updated the declaration."),
+  trackingId: import_zod20.z.string().describe(
     "System-generated tracking ID used by informants or registrars to look up the event."
   ),
-  flags: import_zod22.z.array(Flag)
+  flags: import_zod20.z.array(Flag)
 });
 var EventMetadataKeysArray = [
   "id",
@@ -3164,7 +2674,6 @@ var EventMetadataKeysArray = [
   "createdAt",
   "dateOfEvent",
   "createdBy",
-  "createdByUserType",
   "updatedByUserRole",
   "createdAtLocation",
   "updatedAtLocation",
@@ -3175,7 +2684,7 @@ var EventMetadataKeysArray = [
   "legalStatuses",
   "flags"
 ];
-var EventMetadataKeys = import_zod22.z.enum(EventMetadataKeysArray);
+var EventMetadataKeys = import_zod20.z.enum(EventMetadataKeysArray);
 var eventMetadataLabelMap = {
   "event.assignedTo": {
     id: "event.assignedTo.label",
@@ -3187,11 +2696,6 @@ var eventMetadataLabelMap = {
     defaultMessage: "Created",
     description: "Created At"
   },
-  "event.createdByUserType": {
-    id: "event.createdByUserType.label",
-    defaultMessage: "createdByUserType",
-    description: "createdByUserType:user or system"
-  },
   "event.dateOfEvent": {
     id: "event.dateOfEvent.label",
     defaultMessage: "Date of Event",
@@ -3257,14 +2761,13 @@ var eventMetadataLabelMap = {
 // ../commons/src/events/WorkqueueColumnConfig.ts
 var WorkqueueColumnKeysArray = [
   ...EventMetadataKeysArray,
-  "title",
-  "outbox"
+  "title"
 ];
-var WorkqueueColumnKeys = import_zod23.z.enum(WorkqueueColumnKeysArray);
-var WorkqueueColumnValue = import_zod23.z.object({
+var WorkqueueColumnKeys = import_zod21.z.enum(WorkqueueColumnKeysArray);
+var WorkqueueColumnValue = import_zod21.z.object({
   $event: WorkqueueColumnKeys
 });
-var WorkqueueColumn = import_zod23.z.object({
+var WorkqueueColumn = import_zod21.z.object({
   label: TranslationConfig,
   value: WorkqueueColumnValue
 });
@@ -3275,115 +2778,97 @@ function defineWorkqueuesColumns(workqueueColumns) {
 }
 
 // ../commons/src/events/CountryConfigQueryInput.ts
-var import_zod25 = require("zod");
+var import_zod23 = require("zod");
 
 // ../commons/src/events/EventIndex.ts
-var import_zod24 = require("zod");
+var import_zod22 = require("zod");
 var import_zod_openapi9 = require("zod-openapi");
-(0, import_zod_openapi9.extendZodWithOpenApi)(import_zod24.z);
+(0, import_zod_openapi9.extendZodWithOpenApi)(import_zod22.z);
 var EventIndex = EventMetadata.extend({
   declaration: EventState
 }).openapi({
   ref: "EventIndex"
 });
-var EventSearchIndex = import_zod24.z.record(import_zod24.z.string(), import_zod24.z.any()).and(
-  import_zod24.z.object({
-    type: import_zod24.z.string()
+var EventSearchIndex = import_zod22.z.record(import_zod22.z.string(), import_zod22.z.any()).and(
+  import_zod22.z.object({
+    type: import_zod22.z.string()
     // Ensures "type" (event-id) exists and is a string
   })
 ).openapi({
   ref: "EventSearchIndex"
 });
-var Fuzzy = import_zod24.z.object({ type: import_zod24.z.literal("fuzzy"), term: import_zod24.z.string() }).openapi({
+var Fuzzy = import_zod22.z.object({ type: import_zod22.z.literal("fuzzy"), term: import_zod22.z.string() }).openapi({
   ref: "Fuzzy"
 });
-var Exact = import_zod24.z.object({ type: import_zod24.z.literal("exact"), term: import_zod24.z.string() }).openapi({
+var Exact = import_zod22.z.object({ type: import_zod22.z.literal("exact"), term: import_zod22.z.string() }).openapi({
   ref: "Exact"
 });
-var ExactStatus = import_zod24.z.object({
-  type: import_zod24.z.literal("exact"),
-  term: EventStatus
+var AnyOf = import_zod22.z.object({
+  type: import_zod22.z.literal("anyOf"),
+  terms: import_zod22.z.array(import_zod22.z.string())
 }).openapi({
-  ref: "ExactStatus"
+  ref: "AnyOf"
 });
-var AnyOf = import_zod24.z.object({
-  type: import_zod24.z.literal("anyOf"),
-  terms: import_zod24.z.array(import_zod24.z.string())
+var ExactStatus = import_zod22.z.object({
+  type: import_zod22.z.literal("exact"),
+  term: EventStatus
 }).openapi({
-  ref: "AnyOf"
+  ref: "ExactStatus"
 });
-var AnyOfStatus = import_zod24.z.object({
-  type: import_zod24.z.literal("anyOf"),
-  terms: import_zod24.z.array(EventStatus)
+var AnyOfStatus = import_zod22.z.object({
+  type: import_zod22.z.literal("anyOf"),
+  terms: import_zod22.z.array(EventStatus)
 }).openapi({
   ref: "AnyOfStatus"
 });
-var Range = import_zod24.z.object({
-  type: import_zod24.z.literal("range"),
-  gte: import_zod24.z.string(),
-  lte: import_zod24.z.string()
+var Range = import_zod22.z.object({
+  type: import_zod22.z.literal("range"),
+  gte: import_zod22.z.string(),
+  lte: import_zod22.z.string()
 }).openapi({
   ref: "Range"
 });
-var ContainsFlags = import_zod24.z.object({
-  anyOf: import_zod24.z.array(Flag).optional(),
-  noneOf: import_zod24.z.array(Flag).optional()
-}).openapi({
-  ref: "ContainsFlags"
+var Not = import_zod22.z.object({ type: import_zod22.z.literal("not"), term: import_zod22.z.string() }).openapi({
+  ref: "Not"
 });
-var Within = import_zod24.z.object({ type: import_zod24.z.literal("within"), location: import_zod24.z.string() }).openapi({
+var Within = import_zod22.z.object({ type: import_zod22.z.literal("within"), location: import_zod22.z.string() }).openapi({
   ref: "Within"
 });
-var RangeDate = Range.extend({
-  gte: import_zod24.z.string().date().or(import_zod24.z.string().datetime()),
-  lte: import_zod24.z.string().date().or(import_zod24.z.string().datetime())
-}).openapi({
-  ref: "RangeDate"
-});
-var ExactDate = Exact.extend({
-  term: import_zod24.z.string().date().or(import_zod24.z.string().datetime())
-}).openapi({
-  ref: "ExactDate"
-});
-var DateCondition = import_zod24.z.union([ExactDate, RangeDate]).openapi({
+var DateCondition = import_zod22.z.union([Exact, Range]).openapi({
   ref: "DateCondition"
 });
-var QueryInput = import_zod24.z.lazy(
-  () => import_zod24.z.union([
-    import_zod24.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf]),
-    import_zod24.z.record(import_zod24.z.string(), QueryInput)
+var QueryInput = import_zod22.z.lazy(
+  () => import_zod22.z.union([
+    import_zod22.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf, Not]),
+    import_zod22.z.record(import_zod22.z.string(), QueryInput)
   ])
 ).openapi({
   ref: "QueryInput"
 });
-var QueryExpression = import_zod24.z.object({
-  id: import_zod24.z.optional(import_zod24.z.string()),
-  eventType: import_zod24.z.string(),
-  status: import_zod24.z.optional(import_zod24.z.union([AnyOfStatus, ExactStatus])),
-  createdAt: import_zod24.z.optional(DateCondition),
-  updatedAt: import_zod24.z.optional(DateCondition),
-  "legalStatus.REGISTERED.createdAt": import_zod24.z.optional(DateCondition),
-  "legalStatus.REGISTERED.createdAtLocation": import_zod24.z.optional(
-    import_zod24.z.union([Within, Exact])
+var QueryExpression = import_zod22.z.object({
+  eventType: import_zod22.z.string(),
+  status: import_zod22.z.optional(import_zod22.z.union([AnyOfStatus, ExactStatus])),
+  createdAt: import_zod22.z.optional(DateCondition),
+  updatedAt: import_zod22.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAt": import_zod22.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAtLocation": import_zod22.z.optional(
+    import_zod22.z.union([Within, Exact])
   ),
-  "legalStatus.REGISTERED.registrationNumber": import_zod24.z.optional(Exact),
-  createdAtLocation: import_zod24.z.optional(import_zod24.z.union([Within, Exact])),
-  updatedAtLocation: import_zod24.z.optional(import_zod24.z.union([Within, Exact])),
-  assignedTo: import_zod24.z.optional(Exact),
-  createdByUserType: TokenUserType,
-  createdBy: import_zod24.z.optional(Exact),
-  updatedBy: import_zod24.z.optional(Exact),
-  trackingId: import_zod24.z.optional(Exact),
-  flags: import_zod24.z.optional(ContainsFlags),
+  "legalStatus.REGISTERED.registrationNumber": import_zod22.z.optional(Exact),
+  createdAtLocation: import_zod22.z.optional(import_zod22.z.union([Within, Exact])),
+  updatedAtLocation: import_zod22.z.optional(import_zod22.z.union([Within, Exact])),
+  assignedTo: import_zod22.z.optional(Exact),
+  createdBy: import_zod22.z.optional(Exact),
+  updatedBy: import_zod22.z.optional(Exact),
+  trackingId: import_zod22.z.optional(Exact),
+  flags: import_zod22.z.optional(import_zod22.z.array(import_zod22.z.union([AnyOf, Not]))),
   data: QueryInput
-}).partial().refine((obj) => Object.values(obj).some((val) => val !== void 0), {
-  message: "At least one query field must be specified."
-}).openapi({
+}).partial().openapi({
   ref: "QueryExpression"
 });
-var QueryType = import_zod24.z.object({
-  type: import_zod24.z.literal("and").or(import_zod24.z.literal("or")).openapi({ default: "and" }),
-  clauses: import_zod24.z.preprocess(
+var QueryType = import_zod22.z.object({
+  type: import_zod22.z.literal("and").or(import_zod22.z.literal("or")).openapi({ default: "and" }),
+  clauses: import_zod22.z.preprocess(
     (val) => {
       if (typeof val === "string") {
         return [JSON.parse(val)];
@@ -3393,7 +2878,7 @@ var QueryType = import_zod24.z.object({
       }
       return val;
     },
-    import_zod24.z.array(QueryExpression).nonempty("At least one clause is required.").openapi({
+    import_zod22.z.array(QueryExpression).nonempty("At least one clause is required.").openapi({
       default: [
         {
           eventType: TENNIS_CLUB_MEMBERSHIP,
@@ -3416,56 +2901,50 @@ var QueryType = import_zod24.z.object({
 });
 
 // ../commons/src/events/CountryConfigQueryInput.ts
-var SerializableExact = import_zod25.z.object({
-  type: import_zod25.z.literal("exact"),
-  term: import_zod25.z.union([import_zod25.z.string(), SerializedUserField])
+var SerializableExact = import_zod23.z.object({
+  type: import_zod23.z.literal("exact"),
+  term: import_zod23.z.union([import_zod23.z.string(), SerializedUserField])
 });
-var SerializableWithin = import_zod25.z.object({
-  type: import_zod25.z.literal("within"),
-  location: import_zod25.z.union([import_zod25.z.string(), SerializedUserField])
+var SerializableWithin = import_zod23.z.object({
+  type: import_zod23.z.literal("within"),
+  location: import_zod23.z.union([import_zod23.z.string(), SerializedUserField])
 });
-var SerializedQueryExpression = import_zod25.z.object({
-  eventType: import_zod25.z.string(),
-  status: import_zod25.z.optional(import_zod25.z.union([AnyOfStatus, ExactStatus])),
-  createdAt: import_zod25.z.optional(DateCondition),
-  updatedAt: import_zod25.z.optional(DateCondition),
-  "legalStatus.REGISTERED.createdAt": import_zod25.z.optional(DateCondition),
-  "legalStatus.REGISTERED.createdAtLocation": import_zod25.z.optional(
-    import_zod25.z.union([Within, Exact])
-  ),
-  "legalStatus.REGISTERED.registrationNumber": import_zod25.z.optional(Exact),
-  createdAtLocation: import_zod25.z.optional(
-    import_zod25.z.union([SerializableWithin, SerializableExact])
+var SerializedQueryExpression = import_zod23.z.object({
+  eventType: import_zod23.z.string(),
+  status: import_zod23.z.optional(import_zod23.z.union([AnyOfStatus, ExactStatus])),
+  createdAt: import_zod23.z.optional(DateCondition),
+  updatedAt: import_zod23.z.optional(DateCondition),
+  createdAtLocation: import_zod23.z.optional(
+    import_zod23.z.union([SerializableWithin, SerializableExact])
   ),
-  updatedAtLocation: import_zod25.z.optional(
-    import_zod25.z.union([SerializableWithin, SerializableExact])
+  updatedAtLocation: import_zod23.z.optional(
+    import_zod23.z.union([SerializableWithin, SerializableExact])
   ),
-  assignedTo: import_zod25.z.optional(SerializableExact),
-  createdBy: import_zod25.z.optional(SerializableExact),
-  createdByUserType: TokenUserType,
-  updatedBy: import_zod25.z.optional(SerializableExact),
-  trackingId: import_zod25.z.optional(Exact),
-  flags: import_zod25.z.optional(ContainsFlags),
+  assignedTo: import_zod23.z.optional(SerializableExact),
+  createdBy: import_zod23.z.optional(SerializableExact),
+  updatedBy: import_zod23.z.optional(SerializableExact),
+  trackingId: import_zod23.z.optional(Exact),
+  flags: import_zod23.z.optional(import_zod23.z.array(import_zod23.z.union([AnyOf, Not]))),
   data: QueryInput
 }).partial();
-var Or2 = import_zod25.z.object({
-  type: import_zod25.z.literal("or"),
-  clauses: import_zod25.z.array(SerializedQueryExpression)
+var Or2 = import_zod23.z.object({
+  type: import_zod23.z.literal("or"),
+  clauses: import_zod23.z.array(SerializedQueryExpression)
 });
-var And2 = import_zod25.z.object({
-  type: import_zod25.z.literal("and"),
-  clauses: import_zod25.z.array(SerializedQueryExpression)
+var And2 = import_zod23.z.object({
+  type: import_zod23.z.literal("and"),
+  clauses: import_zod23.z.array(SerializedQueryExpression)
 });
-var CountryConfigQueryType = import_zod25.z.discriminatedUnion("type", [And2, Or2]);
-var CountryConfigQueryInputType = import_zod25.z.union([
+var CountryConfigQueryType = import_zod23.z.discriminatedUnion("type", [And2, Or2]);
+var CountryConfigQueryInputType = import_zod23.z.union([
   SerializedQueryExpression,
   And2,
   Or2
 ]);
 
 // ../commons/src/icons.ts
-var import_zod26 = require("zod");
-var AvailableIcons = import_zod26.z.enum([
+var import_zod24 = require("zod");
+var AvailableIcons = import_zod24.z.enum([
   "Archived",
   "Assigned",
   "Certified",
@@ -3503,6 +2982,7 @@ var AvailableIcons = import_zod26.z.enum([
   "Copy",
   "Database",
   "DotsThreeVertical",
+  "DownloadSimple",
   "ArrowCounterClockwise",
   "MagnifyingGlassMinus",
   "MagnifyingGlassPlus",
@@ -3586,42 +3066,38 @@ var mandatoryColumns = defineWorkqueuesColumns([
     value: event.field("updatedAt")
   }
 ]);
-var WorkqueueActionsWithDefault = import_zod27.z.enum([
+var WorkqueueActionsWithDefault = import_zod25.z.enum([
   ...workqueueActions.options,
   "DEFAULT"
 ]);
-var WorkqueueConfig = import_zod27.z.object({
-  slug: import_zod27.z.string().describe("Determines the url of the workqueue."),
+var WorkqueueConfig = import_zod25.z.object({
+  slug: import_zod25.z.string().describe("Determines the url of the workqueue."),
   name: TranslationConfig.describe(
     "Title of the workflow (both in navigation and on the page)"
   ),
   query: CountryConfigQueryType,
-  actions: import_zod27.z.array(
-    import_zod27.z.object({
+  actions: import_zod25.z.array(
+    import_zod25.z.object({
       type: WorkqueueActionsWithDefault,
-      conditionals: import_zod27.z.array(Conditional).optional()
+      conditionals: import_zod25.z.array(Conditional).optional()
     })
   ),
-  columns: import_zod27.z.array(WorkqueueColumn).default(mandatoryColumns),
+  columns: import_zod25.z.array(WorkqueueColumn).default(mandatoryColumns),
   icon: AvailableIcons
 }).describe("Configuration for workqueue.");
-var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
-  query: true,
-  columns: true
-});
-var WorkqueueConfigInput = import_zod27.z.object({
-  slug: import_zod27.z.string().describe("Determines the url of the workqueue."),
+var WorkqueueConfigInput = import_zod25.z.object({
+  slug: import_zod25.z.string().describe("Determines the url of the workqueue."),
   name: TranslationConfig.describe(
     "Title of the workflow (both in navigation and on the page)"
   ),
   query: CountryConfigQueryInputType,
-  actions: import_zod27.z.array(
-    import_zod27.z.object({
+  actions: import_zod25.z.array(
+    import_zod25.z.object({
       type: WorkqueueActionsWithDefault,
-      conditionals: import_zod27.z.array(Conditional).optional()
+      conditionals: import_zod25.z.array(Conditional).optional()
     })
   ),
-  columns: import_zod27.z.array(WorkqueueColumn).default(mandatoryColumns),
+  columns: import_zod25.z.array(WorkqueueColumn).default(mandatoryColumns),
   icon: AvailableIcons
 });
 function defineWorkqueue(workqueueInput) {
@@ -3632,10 +3108,10 @@ function defineWorkqueue(workqueueInput) {
 function defineWorkqueues(workqueues) {
   return workqueues.map((workqueue) => defineWorkqueue(workqueue));
 }
-var WorkqueueCountInput = import_zod27.z.array(
-  import_zod27.z.object({ slug: import_zod27.z.string(), query: QueryType })
+var WorkqueueCountInput = import_zod25.z.array(
+  import_zod25.z.object({ slug: import_zod25.z.string(), query: QueryType })
 );
-var WorkqueueCountOutput = import_zod27.z.record(import_zod27.z.string(), import_zod27.z.number());
+var WorkqueueCountOutput = import_zod25.z.record(import_zod25.z.string(), import_zod25.z.number());
 
 // ../commons/src/events/workqueueDefaultColumns.ts
 var defaultWorkqueueColumns = [
@@ -3658,115 +3134,115 @@ var defaultWorkqueueColumns = [
 ];
 
 // ../commons/src/events/Draft.ts
-var import_zod29 = require("zod");
+var import_zod27 = require("zod");
 
 // ../commons/src/events/ActionInput.ts
-var import_zod28 = require("zod");
+var import_zod26 = require("zod");
 var import_zod_openapi10 = require("zod-openapi");
-(0, import_zod_openapi10.extendZodWithOpenApi)(import_zod28.z);
-var BaseActionInput = import_zod28.z.object({
-  eventId: UUID,
-  transactionId: import_zod28.z.string(),
+var import_uuid3 = require("uuid");
+(0, import_zod_openapi10.extendZodWithOpenApi)(import_zod26.z);
+var BaseActionInput = import_zod26.z.object({
+  eventId: import_zod26.z.string(),
+  transactionId: import_zod26.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  originalActionId: UUID.optional(),
-  // should not be part of base action.
-  keepAssignment: import_zod28.z.boolean().optional()
+  originalActionId: import_zod26.z.string().optional(),
+  keepAssignment: import_zod26.z.boolean().optional()
 });
 var CreateActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.CREATE).default(ActionType.CREATE),
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.CREATE).default(ActionType.CREATE),
     createdAtLocation: CreatedAtLocation
   })
 );
 var RegisterActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.REGISTER).default(ActionType.REGISTER),
-    registrationNumber: import_zod28.z.string().optional()
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REGISTER).default(ActionType.REGISTER),
+    registrationNumber: import_zod26.z.string().optional()
   })
-).strict();
+);
 var ValidateActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.VALIDATE).default(ActionType.VALIDATE),
-    duplicates: import_zod28.z.array(import_zod28.z.string())
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.VALIDATE).default(ActionType.VALIDATE),
+    duplicates: import_zod26.z.array(import_zod26.z.string())
   })
 );
 var NotifyActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
   })
 ).openapi({
   default: {
     eventId: "<event-id-here>",
-    transactionId: getUUID(),
+    transactionId: (0, import_uuid3.v4)(),
     declaration: {},
     annotation: {},
     type: ActionType.NOTIFY
   }
 });
 var DeclareActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.DECLARE).default(ActionType.DECLARE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.DECLARE).default(ActionType.DECLARE)
   })
 );
 var PrintCertificateActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
   })
 );
 var RejectDeclarationActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.REJECT).default(ActionType.REJECT),
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REJECT).default(ActionType.REJECT),
     reason: RejectionReason
   })
 );
 var MarkedAsDuplicateActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.MARKED_AS_DUPLICATE).default(ActionType.MARKED_AS_DUPLICATE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.MARKED_AS_DUPLICATE).default(ActionType.MARKED_AS_DUPLICATE)
   })
 );
 var ArchiveActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.ARCHIVE).default(ActionType.ARCHIVE),
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.ARCHIVE).default(ActionType.ARCHIVE),
     reason: RejectionReason
   })
 );
 var AssignActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.ASSIGN).default(ActionType.ASSIGN),
-    assignedTo: import_zod28.z.string()
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.ASSIGN).default(ActionType.ASSIGN),
+    assignedTo: import_zod26.z.string()
   })
 );
 var UnassignActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.UNASSIGN).default(ActionType.UNASSIGN),
-    assignedTo: import_zod28.z.literal(null).default(null)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.UNASSIGN).default(ActionType.UNASSIGN),
+    assignedTo: import_zod26.z.literal(null).default(null)
   })
 );
 var RequestCorrectionActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.REQUEST_CORRECTION).default(ActionType.REQUEST_CORRECTION)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REQUEST_CORRECTION).default(ActionType.REQUEST_CORRECTION)
   })
 );
 var RejectCorrectionActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    requestId: import_zod28.z.string(),
-    type: import_zod28.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
+  import_zod26.z.object({
+    requestId: import_zod26.z.string(),
+    type: import_zod26.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
   })
 );
 var ApproveCorrectionActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    requestId: import_zod28.z.string(),
-    type: import_zod28.z.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
+  import_zod26.z.object({
+    requestId: import_zod26.z.string(),
+    type: import_zod26.z.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
   })
 );
 var ReadActionInput = BaseActionInput.merge(
-  import_zod28.z.object({
-    type: import_zod28.z.literal(ActionType.READ).default(ActionType.READ)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.READ).default(ActionType.READ)
   })
 );
-var DeleteActionInput = import_zod28.z.object({ eventId: UUID });
-var ActionInput = import_zod28.z.discriminatedUnion("type", [
+var DeleteActionInput = import_zod26.z.object({ eventId: import_zod26.z.string() });
+var ActionInput = import_zod26.z.discriminatedUnion("type", [
   CreateActionInput.openapi({ ref: "CreateActionInput" }),
   ValidateActionInput.openapi({ ref: "ValidateActionInput" }),
   RegisterActionInput.openapi({ ref: "RegisterActionInput" }),
@@ -3795,18 +3271,18 @@ var ActionInput = import_zod28.z.discriminatedUnion("type", [
 });
 
 // ../commons/src/events/Draft.ts
-var Draft = import_zod29.z.object({
-  id: UUID,
-  eventId: UUID,
-  transactionId: import_zod29.z.string(),
-  createdAt: import_zod29.z.string().datetime(),
+var Draft = import_zod27.z.object({
+  id: import_zod27.z.string(),
+  eventId: import_zod27.z.string(),
+  transactionId: import_zod27.z.string(),
+  createdAt: import_zod27.z.string().datetime(),
   action: ActionBase.extend({
     type: ActionTypes
   }).omit({ id: true })
 });
 var DraftInput = BaseActionInput.extend({
   type: ActionTypes,
-  status: import_zod29.z.enum([
+  status: import_zod27.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
     ActionStatus.Rejected
@@ -3814,24 +3290,24 @@ var DraftInput = BaseActionInput.extend({
 });
 
 // ../commons/src/events/EventInput.ts
-var import_zod30 = require("zod");
-var import_uuid8 = require("uuid");
-var EventInput = import_zod30.z.object({
-  transactionId: import_zod30.z.string(),
-  type: import_zod30.z.string()
-}).openapi({ default: { transactionId: (0, import_uuid8.v4)(), type: "v2.birth" } });
+var import_zod28 = require("zod");
+var import_uuid4 = require("uuid");
+var EventInput = import_zod28.z.object({
+  transactionId: import_zod28.z.string(),
+  type: import_zod28.z.string()
+}).openapi({ default: { transactionId: (0, import_uuid4.v4)(), type: "v2.birth" } });
 
 // ../commons/src/events/EventDocument.ts
-var import_zod31 = require("zod");
+var import_zod29 = require("zod");
 var import_zod_openapi11 = require("zod-openapi");
-(0, import_zod_openapi11.extendZodWithOpenApi)(import_zod31.z);
-var EventDocument = import_zod31.z.object({
-  id: UUID,
-  type: import_zod31.z.string(),
-  createdAt: import_zod31.z.string().datetime(),
-  updatedAt: import_zod31.z.string().datetime(),
-  actions: import_zod31.z.array(Action),
-  trackingId: import_zod31.z.string()
+(0, import_zod_openapi11.extendZodWithOpenApi)(import_zod29.z);
+var EventDocument = import_zod29.z.object({
+  id: import_zod29.z.string(),
+  type: import_zod29.z.string(),
+  createdAt: import_zod29.z.string().datetime(),
+  updatedAt: import_zod29.z.string().datetime(),
+  actions: import_zod29.z.array(Action),
+  trackingId: import_zod29.z.string()
 }).openapi({ ref: "EventDocument" });
 
 // ../commons/src/events/state/utils.ts
@@ -3865,7 +3341,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     // When 3rd party API returns 200 OK, we assume that the request was accepted, and persist single 'accepted' action.
     createdAt: requestAction?.createdAt ?? acceptAction.createdAt,
     createdBy: requestAction?.createdBy ?? acceptAction.createdBy,
-    createdByUserType: requestAction?.createdByUserType ?? acceptAction.createdByUserType,
     createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
     acceptedAt: acceptAction.createdAt,
     createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
@@ -3873,18 +3348,17 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     registrationNumber
   };
 }
-function getActionUpdateMetadata(actions) {
+function getDeclarationActionUpdateMetadata(actions) {
   const createAction = getOrThrow(
     actions.find((action) => action.type === ActionType.CREATE),
     `Event has no ${ActionType.CREATE} action`
   );
-  return StatusChangingActions.options.reduce(
+  return [ActionType.DECLARE, ActionType.VALIDATE, ActionType.REGISTER].reduce(
     (metadata, actionType) => {
       const { accept, request } = getActionRequests(actionType, actions);
       return {
         createdAt: request?.createdAt ?? accept?.createdAt ?? metadata.createdAt,
         createdBy: request?.createdBy ?? accept?.createdBy ?? metadata.createdBy,
-        createdByUserType: request?.createdByUserType ?? accept?.createdByUserType ?? metadata.createdByUserType,
         createdAtLocation: request?.createdAtLocation ?? accept?.createdAtLocation ?? metadata.createdAtLocation,
         createdByRole: request?.createdByRole ?? accept?.createdByRole ?? metadata.createdByRole
       };
@@ -3892,7 +3366,6 @@ function getActionUpdateMetadata(actions) {
     {
       createdAt: createAction.createdAt,
       createdBy: createAction.createdBy,
-      createdByUserType: createAction.createdByUserType,
       createdAtLocation: createAction.createdAtLocation,
       createdByRole: createAction.createdByRole
     }
@@ -3911,69 +3384,15 @@ function getLegalStatuses(actions) {
   };
 }
 
-// ../commons/src/events/state/flags.ts
-function isCertificatePrinted(actions) {
-  return actions.reduce((prev, { type }) => {
-    if (type === ActionType.PRINT_CERTIFICATE) {
-      return true;
-    }
-    if (type === ActionType.APPROVE_CORRECTION) {
-      return false;
-    }
-    return prev;
-  }, false);
-}
-function isCorrectionRequested(actions) {
-  return actions.reduce((prev, { type }) => {
-    if (type === ActionType.REQUEST_CORRECTION) {
-      return true;
-    }
-    if (type === ActionType.APPROVE_CORRECTION) {
-      return false;
-    }
-    if (type === ActionType.REJECT_CORRECTION) {
-      return false;
-    }
-    return prev;
-  }, false);
-}
-function isDeclarationIncomplete(actions) {
-  return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
-}
-function isRejected(actions) {
-  return getStatusFromActions(actions) === EventStatus.enum.REJECTED;
-}
-function getFlagsFromActions(actions) {
-  const sortedActions = actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
-  const actionStatus = sortedActions.reduce(
-    (actionStatuses, { type, status }) => ({
-      ...actionStatuses,
-      [type]: status
-    }),
-    {}
-  );
-  const flags = Object.entries(actionStatus).filter(([, status]) => status !== ActionStatus.Accepted).map(([type, status]) => {
-    const flag = joinValues([type, status], ":").toLowerCase();
-    return flag;
-  });
-  if (isCertificatePrinted(sortedActions)) {
-    flags.push(InherentFlags.PRINTED);
-  }
-  if (isCorrectionRequested(sortedActions)) {
-    flags.push(InherentFlags.CORRECTION_REQUESTED);
-  }
-  if (isDeclarationIncomplete(sortedActions)) {
-    flags.push(InherentFlags.INCOMPLETE);
-  }
-  if (isRejected(sortedActions)) {
-    flags.push(InherentFlags.REJECTED);
-  }
-  return flags;
-}
-
 // ../commons/src/events/state/index.ts
 function getStatusFromActions(actions) {
-  return actions.filter(({ status }) => status === ActionStatus.Accepted).reduce((status, action) => {
+  const hasRejectedAction = actions.some(
+    (a) => a.status === ActionStatus.Rejected
+  );
+  if (hasRejectedAction) {
+    return EventStatus.enum.REJECTED;
+  }
+  return actions.reduce((status, action) => {
     switch (action.type) {
       case ActionType.CREATE:
         return EventStatus.enum.CREATED;
@@ -4003,6 +3422,38 @@ function getStatusFromActions(actions) {
     }
   }, EventStatus.enum.CREATED);
 }
+function getFlagsFromActions(actions) {
+  const sortedactions = actions.sort(
+    (a, b) => a.createdAt.localeCompare(b.createdAt)
+  );
+  const actionStatus = sortedactions.reduce(
+    (actionStatuses, { type, status }) => ({
+      ...actionStatuses,
+      [type]: status
+    }),
+    {}
+  );
+  const flags = Object.entries(actionStatus).filter(([, status]) => status !== ActionStatus.Accepted).map(([type, status]) => {
+    const flag = `${type.toLowerCase()}:${status.toLowerCase()}`;
+    return flag;
+  });
+  const isCertificatePrinted = sortedactions.reduce(
+    (prev, { type }) => {
+      if (type === ActionType.PRINT_CERTIFICATE) {
+        return true;
+      }
+      if (type === ActionType.APPROVE_CORRECTION) {
+        return false;
+      }
+      return prev;
+    },
+    false
+  );
+  if (isCertificatePrinted) {
+    flags.push(CustomFlags.CERTIFICATE_PRINTED);
+  }
+  return flags;
+}
 function getAssignedUserFromActions(actions) {
   return actions.reduce((user2, action) => {
     if (action.type === ActionType.ASSIGN) {
@@ -4076,11 +3527,10 @@ function getCurrentEventState(event2, config) {
   if (!creationAction) {
     throw new Error(`Event ${event2.id} has no creation action`);
   }
-  const acceptedActions = getAcceptedActions(event2).sort(
-    (a, b) => a.createdAt.localeCompare(b.createdAt)
+  const acceptedActions = getAcceptedActions(event2);
+  const declarationUpdateMetadata = getDeclarationActionUpdateMetadata(
+    event2.actions
   );
-  const requestActionMetadata = getActionUpdateMetadata(event2.actions);
-  const acceptedActionMetadata = getActionUpdateMetadata(acceptedActions);
   const declaration = aggregateActionDeclarations(acceptedActions);
   let dateOfEvent;
   if (config.dateOfEvent) {
@@ -4100,17 +3550,16 @@ function getCurrentEventState(event2, config) {
     legalStatuses: getLegalStatuses(event2.actions),
     createdAt: creationAction.createdAt,
     createdBy: creationAction.createdBy,
-    createdByUserType: creationAction.createdByUserType,
     createdAtLocation: creationAction.createdAtLocation,
     createdBySignature: creationAction.createdBySignature,
-    updatedAt: acceptedActionMetadata.createdAt,
+    updatedAt: declarationUpdateMetadata.createdAt,
     assignedTo: getAssignedUserFromActions(acceptedActions),
     assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
-    updatedBy: requestActionMetadata.createdBy,
-    updatedAtLocation: requestActionMetadata.createdAtLocation,
+    updatedBy: declarationUpdateMetadata.createdBy,
+    updatedAtLocation: declarationUpdateMetadata.createdAtLocation,
     declaration,
     trackingId: event2.trackingId,
-    updatedByUserRole: requestActionMetadata.createdByRole,
+    updatedByUserRole: declarationUpdateMetadata.createdByRole,
     dateOfEvent,
     flags: getFlagsFromActions(event2.actions)
   });
@@ -4193,18 +3642,18 @@ function generateTransactionId() {
 }
 
 // ../commons/src/events/User.ts
-var import_zod32 = require("zod");
-var User = import_zod32.z.object({
-  id: import_zod32.z.string(),
-  name: import_zod32.z.array(
-    import_zod32.z.object({
-      use: import_zod32.z.string(),
-      given: import_zod32.z.array(import_zod32.z.string()),
-      family: import_zod32.z.string()
+var import_zod30 = require("zod");
+var User = import_zod30.z.object({
+  id: import_zod30.z.string(),
+  name: import_zod30.z.array(
+    import_zod30.z.object({
+      use: import_zod30.z.string(),
+      given: import_zod30.z.array(import_zod30.z.string()),
+      family: import_zod30.z.string()
     })
   ),
-  role: import_zod32.z.string(),
-  signatureFilename: import_zod32.z.string().optional()
+  role: import_zod30.z.string(),
+  signatureFilename: import_zod30.z.string().optional()
 });
 
 // ../commons/src/events/test.utils.ts
@@ -4889,7 +4338,7 @@ var PRINT_CERTIFICATE_FORM = defineActionForm({
 var TENNIS_CLUB_DECLARATION_REVIEW = {
   title: {
     id: "v2.event.tennis-club-membership.action.declare.form.review.title",
-    defaultMessage: "{applicant.name.firstname, select, __EMPTY__ {Member declaration} other {{applicant.name.surname, select, __EMPTY__ {Member declaration for {applicant.name.firstname}} other {Member declaration for {applicant.name.firstname} {applicant.name.surname}}}}}",
+    defaultMessage: "{applicant.name.firstname, select, __EMPTY__ {Member declaration} other {{applicant.name.surname, select, __EMPTY__ {Member declaration} other {Member declaration for {applicant.name.firstname} {applicant.name.surname}}}}}",
     description: "Title of the review page"
   },
   fields: [
@@ -5312,197 +4761,202 @@ var tennisClubMembershipEvent = defineConfig({
         description: "This is shown as the action name anywhere the user can trigger the action from",
         id: "event.tennis-club-membership.action.correction.request.label"
       },
-      onboardingForm: [
-        {
-          id: "correction-requester",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.corrector",
-            defaultMessage: "Correction requester",
-            description: "This is the title of the section"
-          },
-          fields: [
-            {
-              id: "correction.requester.relationshop.intro",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.requester.relationshop.intro.label",
-                defaultMessage: "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.",
-                description: "The title for the corrector form"
-              }
+      correctionForm: {
+        label: {
+          id: "v2.event.tennis-club-membership.action.request-correction.label",
+          defaultMessage: "Request correction",
+          description: "This is shown as the action name anywhere the user can trigger the action from"
+        },
+        pages: [
+          {
+            id: "correction-requester",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.tennis-club-membership.action.requestCorrection.form.section.corrector",
+              defaultMessage: "Correction requester",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.requester.relationship",
-              type: "RADIO_GROUP",
-              label: {
-                id: "v2.correction.corrector.title",
-                defaultMessage: "Who is requesting a change to this record?",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.requester.relationshop.intro",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.requester.relationshop.intro.label",
+                  defaultMessage: "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.",
+                  description: "The title for the corrector form"
+                }
               },
-              defaultValue: "",
-              options: [
-                {
-                  value: "INFORMANT",
-                  label: {
-                    id: "v2.correction.corrector.informant",
-                    defaultMessage: "Informant",
-                    description: "Label for informant option in certificate correction form"
-                  }
-                },
-                {
-                  value: "ANOTHER_AGENT",
-                  label: {
-                    id: "v2.correction.corrector.anotherAgent",
-                    defaultMessage: "Another registration agent or field agent",
-                    description: "Label for another registration or field agent option in certificate correction form"
-                  }
+              {
+                id: "correction.requester.relationship",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "v2.correction.corrector.title",
+                  defaultMessage: "Who is requesting a change to this record?",
+                  description: "The title for the corrector form"
                 },
-                {
-                  value: "REGISTRAR",
-                  label: {
-                    id: "v2.correction.corrector.me",
-                    defaultMessage: "Me (Registrar)",
-                    description: "Label for registrar option in certificate correction form"
-                  }
-                },
-                {
-                  value: "OTHER",
-                  label: {
-                    id: "v2.correction.corrector.others",
-                    defaultMessage: "Someone else",
-                    description: "Label for someone else option in certificate correction form"
+                defaultValue: "",
+                options: [
+                  {
+                    value: "INFORMANT",
+                    label: {
+                      id: "v2.correction.corrector.informant",
+                      defaultMessage: "Informant",
+                      description: "Label for informant option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "ANOTHER_AGENT",
+                    label: {
+                      id: "v2.correction.corrector.anotherAgent",
+                      defaultMessage: "Another registration agent or field agent",
+                      description: "Label for another registration or field agent option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "REGISTRAR",
+                    label: {
+                      id: "v2.correction.corrector.me",
+                      defaultMessage: "Me (Registrar)",
+                      description: "Label for registrar option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "OTHER",
+                    label: {
+                      id: "v2.correction.corrector.others",
+                      defaultMessage: "Someone else",
+                      description: "Label for someone else option in certificate correction form"
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: "identity-check",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
-            defaultMessage: "Verify their identity",
-            description: "This is the title of the section"
-          },
-          fields: [
-            {
-              id: "correction.identity-check.instructions",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.corrector.identity.instruction",
-                defaultMessage: "Please verify the identity of the person making this request",
-                description: "The title for the corrector form"
+                ]
               }
-            },
-            {
-              id: "correction.identity-check.verified",
-              type: "RADIO_GROUP",
-              label: {
-                id: "correction.corrector.identity.verified.label",
-                defaultMessage: "Identity verified",
-                description: "The title for the corrector form"
-              },
-              defaultValue: "",
-              required: true,
-              options: [
-                {
-                  value: "VERIFIED",
-                  label: {
-                    id: "correction.corrector.identity.verified",
-                    defaultMessage: "I have verified their identity",
-                    description: "Label for verified option in corrector identity check page"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      additionalDetailsForm: [
-        {
-          id: "correction-request.supporting-documents",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
-            defaultMessage: "Upload supporting documents",
-            description: "This is the title of the section"
+            ]
           },
-          fields: [
-            {
-              id: "correction.supportingDocs.introduction",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.corrector.paragraph.title",
-                defaultMessage: "For all record corrections at a minimum an affidavit must be provided. For material errors and omissions eg. in paternity cases, a court order must also be provided.",
-                description: "The title for the corrector form"
-              }
+          {
+            id: "identity-check",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
+              defaultMessage: "Verify their identity",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.supportingDocs",
-              type: FieldType.FILE,
-              label: {
-                id: "correction.corrector.title",
-                defaultMessage: "Upload supporting documents",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.identity-check.instructions",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.corrector.identity.instruction",
+                  defaultMessage: "Please verify the identity of the person making this request",
+                  description: "The title for the corrector form"
+                }
+              },
+              {
+                id: "correction.identity-check.verified",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "correction.corrector.identity.verified.label",
+                  defaultMessage: "Identity verified",
+                  description: "The title for the corrector form"
+                },
+                defaultValue: "",
+                required: true,
+                options: [
+                  {
+                    value: "VERIFIED",
+                    label: {
+                      id: "correction.corrector.identity.verified",
+                      defaultMessage: "I have verified their identity",
+                      description: "Label for verified option in corrector identity check page"
+                    }
+                  }
+                ]
               }
+            ]
+          },
+          {
+            id: "correction-request.supporting-documents",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
+              defaultMessage: "Upload supporting documents",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.request.supportingDocuments",
-              type: "RADIO_GROUP",
-              label: {
-                id: "correction.corrector.title",
-                defaultMessage: "Who is requesting a change to this record?",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.supportingDocs.introduction",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.corrector.paragraph.title",
+                  defaultMessage: "For all record corrections at a minimum an affidavit must be provided. For material errors and omissions eg. in paternity cases, a court order must also be provided.",
+                  description: "The title for the corrector form"
+                }
               },
-              defaultValue: "",
-              configuration: {
-                styles: {
-                  size: "NORMAL"
+              {
+                id: "correction.supportingDocs",
+                type: FieldType.FILE,
+                label: {
+                  id: "correction.corrector.title",
+                  defaultMessage: "Upload supporting documents",
+                  description: "The title for the corrector form"
                 }
               },
-              options: [
-                {
-                  value: "ATTEST",
-                  label: {
-                    id: "correction.supportingDocuments.attest.label",
-                    defaultMessage: "I attest to seeing supporting documentation and have a copy filed at my office",
-                    description: ""
+              {
+                id: "correction.request.supportingDocuments",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "correction.corrector.title",
+                  defaultMessage: "Who is requesting a change to this record?",
+                  description: "The title for the corrector form"
+                },
+                defaultValue: "",
+                configuration: {
+                  styles: {
+                    size: "NORMAL"
                   }
                 },
-                {
-                  value: "NOT_NEEDED",
-                  label: {
-                    id: "correction.supportingDocuments.notNeeded.label",
-                    defaultMessage: "No supporting documents required",
-                    description: ""
+                options: [
+                  {
+                    value: "ATTEST",
+                    label: {
+                      id: "correction.supportingDocuments.attest.label",
+                      defaultMessage: "I attest to seeing supporting documentation and have a copy filed at my office",
+                      description: ""
+                    }
+                  },
+                  {
+                    value: "NOT_NEEDED",
+                    label: {
+                      id: "correction.supportingDocuments.notNeeded.label",
+                      defaultMessage: "No supporting documents required",
+                      description: ""
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: "correction-request.additional-details",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.corrector",
-            defaultMessage: "Reason for correction",
-            description: "This is the title of the section"
+                ]
+              }
+            ]
           },
-          fields: [
-            {
-              id: "correction.request.reason",
-              type: FieldType.TEXT,
-              label: {
-                id: "correction.reason.title",
-                defaultMessage: "Reason for correction?",
-                description: "The title for the corrector form"
+          {
+            id: "correction-request.additional-details",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.tennis-club-membership.action.requestCorrection.form.section.corrector",
+              defaultMessage: "Reason for correction",
+              description: "This is the title of the section"
+            },
+            fields: [
+              {
+                id: "correction.request.reason",
+                type: FieldType.TEXT,
+                label: {
+                  id: "correction.reason.title",
+                  defaultMessage: "Reason for correction?",
+                  description: "The title for the corrector form"
+                }
               }
-            }
-          ]
-        }
-      ]
+            ]
+          }
+        ]
+      }
     },
     {
       type: ActionType.APPROVE_CORRECTION,
@@ -5705,197 +5159,202 @@ var footballClubMembershipEvent = defineConfig({
         description: "This is shown as the action name anywhere the user can trigger the action from",
         id: "event.football-club-membership.action.correction.request.label"
       },
-      onboardingForm: [
-        {
-          id: "correction-requester",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
-            defaultMessage: "Correction requester",
-            description: "This is the title of the section"
-          },
-          fields: [
-            {
-              id: "correction.requester.relationshop.intro",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.requester.relationshop.intro.label",
-                defaultMessage: "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.",
-                description: "The title for the corrector form"
-              }
+      correctionForm: {
+        label: {
+          id: "event.football-club-membership.action.correction.request.label",
+          defaultMessage: "Request correction",
+          description: "This is shown as the action name anywhere the user can trigger the action from"
+        },
+        pages: [
+          {
+            id: "correction-requester",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
+              defaultMessage: "Correction requester",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.requester.relationship",
-              type: "RADIO_GROUP",
-              label: {
-                id: "v2.correction.corrector.title",
-                defaultMessage: "Who is requesting a change to this record?",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.requester.relationshop.intro",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.requester.relationshop.intro.label",
+                  defaultMessage: "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.",
+                  description: "The title for the corrector form"
+                }
               },
-              defaultValue: "",
-              options: [
-                {
-                  value: "INFORMANT",
-                  label: {
-                    id: "v2.correction.corrector.informant",
-                    defaultMessage: "Informant",
-                    description: "Label for informant option in certificate correction form"
-                  }
+              {
+                id: "correction.requester.relationship",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "v2.correction.corrector.title",
+                  defaultMessage: "Who is requesting a change to this record?",
+                  description: "The title for the corrector form"
                 },
-                {
-                  value: "ANOTHER_AGENT",
-                  label: {
-                    id: "v2.correction.corrector.anotherAgent",
-                    defaultMessage: "Another registration agent or field agent",
-                    description: "Label for another registration or field agent option in certificate correction form"
-                  }
-                },
-                {
-                  value: "REGISTRAR",
-                  label: {
-                    id: "v2.correction.corrector.me",
-                    defaultMessage: "Me (Registrar)",
-                    description: "Label for registrar option in certificate correction form"
-                  }
-                },
-                {
-                  value: "OTHER",
-                  label: {
-                    id: "v2.correction.corrector.others",
-                    defaultMessage: "Someone else",
-                    description: "Label for someone else option in certificate correction form"
+                defaultValue: "",
+                options: [
+                  {
+                    value: "INFORMANT",
+                    label: {
+                      id: "v2.correction.corrector.informant",
+                      defaultMessage: "Informant",
+                      description: "Label for informant option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "ANOTHER_AGENT",
+                    label: {
+                      id: "v2.correction.corrector.anotherAgent",
+                      defaultMessage: "Another registration agent or field agent",
+                      description: "Label for another registration or field agent option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "REGISTRAR",
+                    label: {
+                      id: "v2.correction.corrector.me",
+                      defaultMessage: "Me (Registrar)",
+                      description: "Label for registrar option in certificate correction form"
+                    }
+                  },
+                  {
+                    value: "OTHER",
+                    label: {
+                      id: "v2.correction.corrector.others",
+                      defaultMessage: "Someone else",
+                      description: "Label for someone else option in certificate correction form"
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: "identity-check",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.football-club-membership.action.requestCorrection.form.section.verify",
-            defaultMessage: "Verify their identity",
-            description: "This is the title of the section"
-          },
-          fields: [
-            {
-              id: "correction.identity-check.instructions",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.corrector.identity.instruction",
-                defaultMessage: "Please verify the identity of the person making this request",
-                description: "The title for the corrector form"
+                ]
               }
+            ]
+          },
+          {
+            id: "identity-check",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.football-club-membership.action.requestCorrection.form.section.verify",
+              defaultMessage: "Verify their identity",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.identity-check.verified",
-              type: "RADIO_GROUP",
-              label: {
-                id: "correction.corrector.identity.verified.label",
-                defaultMessage: "Identity verified",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.identity-check.instructions",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.corrector.identity.instruction",
+                  defaultMessage: "Please verify the identity of the person making this request",
+                  description: "The title for the corrector form"
+                }
               },
-              defaultValue: "",
-              required: true,
-              options: [
-                {
-                  value: "VERIFIED",
-                  label: {
-                    id: "correction.corrector.identity.verified",
-                    defaultMessage: "I have verified their identity",
-                    description: "Label for verified option in corrector identity check page"
+              {
+                id: "correction.identity-check.verified",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "correction.corrector.identity.verified.label",
+                  defaultMessage: "Identity verified",
+                  description: "The title for the corrector form"
+                },
+                defaultValue: "",
+                required: true,
+                options: [
+                  {
+                    value: "VERIFIED",
+                    label: {
+                      id: "correction.corrector.identity.verified",
+                      defaultMessage: "I have verified their identity",
+                      description: "Label for verified option in corrector identity check page"
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      additionalDetailsForm: [
-        {
-          id: "correction-request.supporting-documents",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.football-club-membership.action.requestCorrection.form.section.verify",
-            defaultMessage: "Upload supporting documents",
-            description: "This is the title of the section"
-          },
-          fields: [
-            {
-              id: "correction.supportingDocs.introduction",
-              type: "PAGE_HEADER",
-              label: {
-                id: "correction.corrector.paragraph.title",
-                defaultMessage: "For all record corrections at a minimum an affidavit must be provided. For material errors and omissions eg. in paternity cases, a court order must also be provided.",
-                description: "The title for the corrector form"
-              }
-            },
-            {
-              id: "correction.supportingDocs",
-              type: FieldType.FILE,
-              label: {
-                id: "correction.corrector.title",
-                defaultMessage: "Upload supporting documents",
-                description: "The title for the corrector form"
+                ]
               }
+            ]
+          },
+          {
+            id: "correction-request.supporting-documents",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.football-club-membership.action.requestCorrection.form.section.verify",
+              defaultMessage: "Upload supporting documents",
+              description: "This is the title of the section"
             },
-            {
-              id: "correction.request.supportingDocuments",
-              type: "RADIO_GROUP",
-              label: {
-                id: "correction.corrector.title",
-                defaultMessage: "Who is requesting a change to this record?",
-                description: "The title for the corrector form"
+            fields: [
+              {
+                id: "correction.supportingDocs.introduction",
+                type: "PAGE_HEADER",
+                label: {
+                  id: "correction.corrector.paragraph.title",
+                  defaultMessage: "For all record corrections at a minimum an affidavit must be provided. For material errors and omissions eg. in paternity cases, a court order must also be provided.",
+                  description: "The title for the corrector form"
+                }
               },
-              defaultValue: "",
-              configuration: {
-                styles: {
-                  size: "NORMAL"
+              {
+                id: "correction.supportingDocs",
+                type: FieldType.FILE,
+                label: {
+                  id: "correction.corrector.title",
+                  defaultMessage: "Upload supporting documents",
+                  description: "The title for the corrector form"
                 }
               },
-              options: [
-                {
-                  value: "ATTEST",
-                  label: {
-                    id: "correction.supportingDocuments.attest.label",
-                    defaultMessage: "I attest to seeing supporting documentation and have a copy filed at my office",
-                    description: ""
+              {
+                id: "correction.request.supportingDocuments",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "correction.corrector.title",
+                  defaultMessage: "Who is requesting a change to this record?",
+                  description: "The title for the corrector form"
+                },
+                defaultValue: "",
+                configuration: {
+                  styles: {
+                    size: "NORMAL"
                   }
                 },
-                {
-                  value: "NOT_NEEDED",
-                  label: {
-                    id: "correction.supportingDocuments.notNeeded.label",
-                    defaultMessage: "No supporting documents required",
-                    description: ""
+                options: [
+                  {
+                    value: "ATTEST",
+                    label: {
+                      id: "correction.supportingDocuments.attest.label",
+                      defaultMessage: "I attest to seeing supporting documentation and have a copy filed at my office",
+                      description: ""
+                    }
+                  },
+                  {
+                    value: "NOT_NEEDED",
+                    label: {
+                      id: "correction.supportingDocuments.notNeeded.label",
+                      defaultMessage: "No supporting documents required",
+                      description: ""
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: "correction-request.additional-details",
-          type: PageTypes.enum.FORM,
-          title: {
-            id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
-            defaultMessage: "Reason for correction",
-            description: "This is the title of the section"
+                ]
+              }
+            ]
           },
-          fields: [
-            {
-              id: "correction.request.reason",
-              type: FieldType.TEXT,
-              label: {
-                id: "correction.reason.title",
-                defaultMessage: "Reason for correction?",
-                description: "The title for the corrector form"
+          {
+            id: "correction-request.additional-details",
+            type: PageTypes.enum.FORM,
+            title: {
+              id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
+              defaultMessage: "Reason for correction",
+              description: "This is the title of the section"
+            },
+            fields: [
+              {
+                id: "correction.request.reason",
+                type: FieldType.TEXT,
+                label: {
+                  id: "correction.reason.title",
+                  defaultMessage: "Reason for correction?",
+                  description: "The title for the corrector form"
+                }
               }
-            }
-          ]
-        }
-      ]
+            ]
+          }
+        ]
+      }
     },
     {
       type: ActionType.APPROVE_CORRECTION,
@@ -6194,14 +5653,6 @@ var v2BirthEvent = defineConfig({
 });
 
 // ../commons/src/events/test.utils.ts
-var import_zod33 = require("zod");
-var TestUserRole = import_zod33.z.enum([
-  "FIELD_AGENT",
-  "LOCAL_REGISTRAR",
-  "LOCAL_SYSTEM_ADMIN",
-  "NATIONAL_REGISTRAR",
-  "REGISTRATION_AGENT"
-]);
 function pickRandom(rng, items) {
   return items[Math.floor(rng() * items.length)];
 }
@@ -6374,7 +5825,6 @@ function eventPayloadGenerator(rng) {
           },
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           createdBy: "@todo",
-          createdByUserType: TokenUserType.Enum.user,
           createdByRole: "@todo",
           createdAtLocation: "@todo"
         }
@@ -6560,18 +6010,16 @@ function generateActionDocument({
   configuration,
   action,
   rng = () => 0.1,
-  defaults = {},
-  user: user2 = {}
+  defaults = {}
 }) {
   const actionBase = {
     // Offset is needed so the createdAt timestamps for events, actions and drafts make logical sense in storybook tests.
     // @TODO: This should be fixed in the future.
     createdAt: new Date(Date.now() - 500).toISOString(),
-    createdBy: user2.id ?? getUUID(),
-    createdByUserType: TokenUserType.Enum.user,
-    createdByRole: TestUserRole.Enum.FIELD_AGENT,
+    createdBy: getUUID(),
+    createdByRole: "FIELD_AGENT",
     id: getUUID(),
-    createdAtLocation: user2.primaryOfficeId ?? "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
+    createdAtLocation: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
     declaration: generateActionDeclarationInput(configuration, action, rng),
     annotation: {},
     status: ActionStatus.Accepted,
@@ -6586,7 +6034,7 @@ function generateActionDocument({
     case ActionType.DECLARE:
       return { ...actionBase, type: action };
     case ActionType.UNASSIGN:
-      return { ...actionBase, type: action };
+      return { ...actionBase, type: action, assignedTo: null };
     case ActionType.ASSIGN:
       return { ...actionBase, assignedTo: getUUID(), type: action };
     case ActionType.VALIDATE:
@@ -6625,14 +6073,13 @@ function generateActionDocument({
 function generateEventDocument({
   configuration,
   actions,
-  rng = () => 0.1,
-  user: user2
+  rng = () => 0.1
 }) {
   return {
     trackingId: getUUID(),
     type: configuration.id,
     actions: actions.map(
-      (action) => generateActionDocument({ configuration, action, rng, user: user2 })
+      (action) => generateActionDocument({ configuration, action, rng })
     ),
     // Offset is needed so the createdAt timestamps for events, actions and drafts make logical sense in storybook tests.
     // @TODO: This should be fixed in the future.
@@ -6700,7 +6147,7 @@ function createPrng(seed) {
     return state / MODULUS;
   };
 }
-function generateUuid(rng = () => 0.1) {
+function generateUuid(rng) {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.floor(rng() * 16);
     const v = c === "x" ? r : r & 3 | 8;
@@ -6712,11 +6159,6 @@ function generateTrackingId(rng) {
   const trackingId = uuid.slice(0, 6).toUpperCase();
   return trackingId;
 }
-function generateRegistrationNumber(rng) {
-  const uuid = generateUuid(rng).replace(/-/g, "");
-  const registrationNumber = uuid.slice(0, 12).toUpperCase();
-  return registrationNumber;
-}
 function generateRandomSignature(rng) {
   return `/random-bucket/${generateUuid(rng)}.png`;
 }
@@ -6732,7 +6174,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
     type: overrides.type ?? TENNIS_CLUB_MEMBERSHIP,
     status: overrides.status ?? pickRandom(rng, EventStatus.options),
     createdAt: overrides.createdAt ?? createdAt,
-    createdByUserType: overrides.createdByUserType ?? "user",
     createdBy: overrides.createdBy ?? generateUuid(rng),
     createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
     updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
@@ -6810,6 +6251,234 @@ function isFieldConfigDefaultValue(value) {
 
 // ../commons/src/events/scopes.ts
 var import_lodash3 = require("lodash");
+
+// ../commons/src/scopes.ts
+var import_zod31 = require("zod");
+var SCOPES = {
+  // TODO v1.8 legacy scopes
+  NATLSYSADMIN: "natlsysadmin",
+  BYPASSRATELIMIT: "bypassratelimit",
+  DECLARE: "declare",
+  REGISTER: "register",
+  VALIDATE: "validate",
+  DEMO: "demo",
+  CERTIFY: "certify",
+  PERFORMANCE: "performance",
+  SYSADMIN: "sysadmin",
+  TEAMS: "teams",
+  CONFIG: "config",
+  // systems / integrations
+  WEBHOOK: "webhook",
+  NATIONALID: "nationalId",
+  NOTIFICATION_API: "notification-api",
+  RECORDSEARCH: "recordsearch",
+  /**
+   * @TODO This is a temporary scope to be used for V2 Events custom events declaration
+   */
+  RECORD_DECLARE: "record.declare-birth",
+  // declare
+  RECORD_IMPORT: "record.import",
+  // declare
+  RECORD_DECLARE_BIRTH: "record.declare-birth",
+  RECORD_DECLARE_BIRTH_MY_JURISDICTION: "record.declare-birth:my-jurisdiction",
+  RECORD_DECLARE_DEATH: "record.declare-death",
+  RECORD_DECLARE_DEATH_MY_JURISDICTION: "record.declare-death:my-jurisdiction",
+  RECORD_DECLARE_MARRIAGE: "record.declare-marriage",
+  RECORD_DECLARE_MARRIAGE_MY_JURISDICTION: "record.declare-marriage:my-jurisdiction",
+  RECORD_SUBMIT_INCOMPLETE: "record.declaration-submit-incomplete",
+  RECORD_SUBMIT_FOR_REVIEW: "record.declaration-submit-for-review",
+  RECORD_UNASSIGN_OTHERS: "record.unassign-others",
+  // validate
+  RECORD_SUBMIT_FOR_APPROVAL: "record.declaration-submit-for-approval",
+  RECORD_SUBMIT_FOR_UPDATES: "record.declaration-submit-for-updates",
+  RECORD_DECLARATION_EDIT: "record.declaration-edit",
+  RECORD_REVIEW_DUPLICATES: "record.review-duplicates",
+  RECORD_DECLARATION_ARCHIVE: "record.declaration-archive",
+  RECORD_DECLARATION_REINSTATE: "record.declaration-reinstate",
+  // register
+  RECORD_REGISTER: "record.register",
+  // certify
+  RECORD_EXPORT_RECORDS: "record.export-records",
+  RECORD_DECLARATION_PRINT: "record.declaration-print",
+  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS: "record.declaration-print-supporting-documents",
+  RECORD_REGISTRATION_PRINT: "record.registration-print",
+  // v1.8
+  /**
+   * This scope is used to **print and **issue certified copies of a record
+   * after it has been registered. Previously Registrars had this permission.
+   */
+  RECORD_PRINT_ISSUE_CERTIFIED_COPIES: "record.registration-print&issue-certified-copies",
+  RECORD_PRINT_CERTIFIED_COPIES: "record.registration-print-certified-copies",
+  // v1.8
+  RECORD_BULK_PRINT_CERTIFIED_COPIES: "record.registration-bulk-print-certified-copies",
+  // v1.8
+  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES: "record.registration-verify-certified-copies",
+  // v1.8
+  // correct
+  RECORD_REGISTRATION_REQUEST_CORRECTION: "record.registration-request-correction",
+  RECORD_REGISTRATION_CORRECT: "record.registration-correct",
+  RECORD_REGISTRATION_REQUEST_REVOCATION: "record.registration-request-revocation",
+  // v1.8
+  RECORD_REGISTRATION_REVOKE: "record.registration-revoke",
+  // v1.8
+  RECORD_REGISTRATION_REQUEST_REINSTATEMENT: "record.registration-request-reinstatement",
+  // v1.8
+  RECORD_REGISTRATION_REINSTATE: "record.registration-reinstate",
+  // v1.8
+  RECORD_CONFIRM_REGISTRATION: "record.confirm-registration",
+  RECORD_REJECT_REGISTRATION: "record.reject-registration",
+  // search
+  SEARCH_BIRTH_MY_JURISDICTION: "search.birth:my-jurisdiction",
+  SEARCH_BIRTH: "search.birth",
+  SEARCH_DEATH_MY_JURISDICTION: "search.death:my-jurisdiction",
+  SEARCH_DEATH: "search.death",
+  SEARCH_MARRIAGE_MY_JURISDICTION: "search.marriage:my-jurisdiction",
+  SEARCH_MARRIAGE: "search.marriage",
+  // audit v1.8
+  RECORD_READ: "record.read",
+  RECORD_READ_AUDIT: "record.read-audit",
+  RECORD_READ_COMMENTS: "record.read-comments",
+  RECORD_CREATE_COMMENTS: "record.create-comments",
+  // profile
+  PROFILE_UPDATE: "profile.update",
+  //v1.8
+  PROFILE_ELECTRONIC_SIGNATURE: "profile.electronic-signature",
+  // performance
+  PERFORMANCE_READ: "performance.read",
+  PERFORMANCE_READ_DASHBOARDS: "performance.read-dashboards",
+  PERFORMANCE_EXPORT_VITAL_STATISTICS: "performance.vital-statistics-export",
+  // organisation
+  ORGANISATION_READ_LOCATIONS: "organisation.read-locations:all",
+  ORGANISATION_READ_LOCATIONS_MY_OFFICE: "organisation.read-locations:my-office",
+  ORGANISATION_READ_LOCATIONS_MY_JURISDICTION: "organisation.read-locations:my-jurisdiction",
+  // user
+  USER_READ: "user.read:all",
+  USER_READ_MY_OFFICE: "user.read:my-office",
+  USER_READ_MY_JURISDICTION: "user.read:my-jurisdiction",
+  USER_READ_ONLY_MY_AUDIT: "user.read:only-my-audit",
+  //v1.8
+  USER_CREATE: "user.create:all",
+  USER_CREATE_MY_JURISDICTION: "user.create:my-jurisdiction",
+  USER_UPDATE: "user.update:all",
+  USER_UPDATE_MY_JURISDICTION: "user.update:my-jurisdiction",
+  // config
+  CONFIG_UPDATE_ALL: "config.update:all",
+  // data seeding
+  USER_DATA_SEEDING: "user.data-seeding"
+};
+var LiteralScopes = import_zod31.z.union([
+  import_zod31.z.literal(SCOPES.NATLSYSADMIN),
+  import_zod31.z.literal(SCOPES.BYPASSRATELIMIT),
+  import_zod31.z.literal(SCOPES.DECLARE),
+  import_zod31.z.literal(SCOPES.REGISTER),
+  import_zod31.z.literal(SCOPES.VALIDATE),
+  import_zod31.z.literal(SCOPES.DEMO),
+  import_zod31.z.literal(SCOPES.CERTIFY),
+  import_zod31.z.literal(SCOPES.PERFORMANCE),
+  import_zod31.z.literal(SCOPES.SYSADMIN),
+  import_zod31.z.literal(SCOPES.TEAMS),
+  import_zod31.z.literal(SCOPES.CONFIG),
+  import_zod31.z.literal(SCOPES.WEBHOOK),
+  import_zod31.z.literal(SCOPES.NATIONALID),
+  import_zod31.z.literal(SCOPES.NOTIFICATION_API),
+  import_zod31.z.literal(SCOPES.RECORDSEARCH),
+  import_zod31.z.literal(SCOPES.RECORD_IMPORT),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_BIRTH),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_DEATH),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_INCOMPLETE),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_REVIEW),
+  import_zod31.z.literal(SCOPES.RECORD_UNASSIGN_OTHERS),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_APPROVAL),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_UPDATES),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_EDIT),
+  import_zod31.z.literal(SCOPES.RECORD_REVIEW_DUPLICATES),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_ARCHIVE),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_REINSTATE),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTER),
+  import_zod31.z.literal(SCOPES.RECORD_EXPORT_RECORDS),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_PRINT),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_PRINT),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_BULK_PRINT_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_CORRECT),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REVOCATION),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REVOKE),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REINSTATEMENT),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REINSTATE),
+  import_zod31.z.literal(SCOPES.RECORD_CONFIRM_REGISTRATION),
+  import_zod31.z.literal(SCOPES.RECORD_REJECT_REGISTRATION),
+  import_zod31.z.literal(SCOPES.SEARCH_BIRTH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_BIRTH),
+  import_zod31.z.literal(SCOPES.SEARCH_DEATH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_DEATH),
+  import_zod31.z.literal(SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_MARRIAGE),
+  import_zod31.z.literal(SCOPES.RECORD_READ),
+  import_zod31.z.literal(SCOPES.RECORD_READ_AUDIT),
+  import_zod31.z.literal(SCOPES.RECORD_READ_COMMENTS),
+  import_zod31.z.literal(SCOPES.RECORD_CREATE_COMMENTS),
+  import_zod31.z.literal(SCOPES.PROFILE_UPDATE),
+  import_zod31.z.literal(SCOPES.PROFILE_ELECTRONIC_SIGNATURE),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_READ),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_READ_DASHBOARDS),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_READ),
+  import_zod31.z.literal(SCOPES.USER_READ_MY_OFFICE),
+  import_zod31.z.literal(SCOPES.USER_READ_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_READ_ONLY_MY_AUDIT),
+  import_zod31.z.literal(SCOPES.USER_CREATE),
+  import_zod31.z.literal(SCOPES.USER_CREATE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_UPDATE),
+  import_zod31.z.literal(SCOPES.USER_UPDATE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.CONFIG_UPDATE_ALL),
+  import_zod31.z.literal(SCOPES.USER_DATA_SEEDING)
+]);
+var rawConfigurableScopeRegex = /^([a-zA-Z\.]+)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
+var rawConfigurableScope = import_zod31.z.string().regex(rawConfigurableScopeRegex);
+var CreateUserScope = import_zod31.z.object({
+  type: import_zod31.z.literal("user.create"),
+  options: import_zod31.z.object({
+    role: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var EditUserScope = import_zod31.z.object({
+  type: import_zod31.z.literal("user.edit"),
+  options: import_zod31.z.object({
+    role: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var WorkqueueScope = import_zod31.z.object({
+  type: import_zod31.z.literal("workqueue"),
+  options: import_zod31.z.object({
+    id: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var NotifyRecordScope = import_zod31.z.object({
+  type: import_zod31.z.literal("record.notify"),
+  options: import_zod31.z.object({
+    event: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var ConfigurableScopes = import_zod31.z.discriminatedUnion("type", [
+  CreateUserScope,
+  EditUserScope,
+  WorkqueueScope,
+  NotifyRecordScope
+]);
+var scopes = Object.values(SCOPES);
+
+// ../commons/src/events/scopes.ts
 var CONFIG_GET_ALLOWED_SCOPES = [
   SCOPES.RECORD_DECLARE,
   SCOPES.RECORD_READ,
@@ -6856,7 +6525,8 @@ var ACTION_ALLOWED_SCOPES = {
   [ActionType.REGISTER]: [SCOPES.RECORD_REGISTER],
   [ActionType.PRINT_CERTIFICATE]: [SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES],
   [ActionType.REQUEST_CORRECTION]: [
-    SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION
+    SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION,
+    SCOPES.RECORD_REGISTRATION_CORRECT
   ],
   [ActionType.REJECT_CORRECTION]: [SCOPES.RECORD_REGISTRATION_CORRECT],
   [ActionType.APPROVE_CORRECTION]: [SCOPES.RECORD_REGISTRATION_CORRECT],
@@ -6886,20 +6556,30 @@ var ACTION_ALLOWED_CONFIGURABLE_SCOPES = {
   [ActionType.UNASSIGN]: [],
   [ActionType.DETECT_DUPLICATE]: []
 };
-var WRITE_ACTION_SCOPES = [
-  ...ACTION_ALLOWED_SCOPES[ActionType.DECLARE],
-  ...ACTION_ALLOWED_SCOPES[ActionType.VALIDATE],
-  ...ACTION_ALLOWED_SCOPES[ActionType.REGISTER],
-  ...ACTION_ALLOWED_SCOPES[ActionType.PRINT_CERTIFICATE]
-];
 function hasAnyOfScopes(a, b) {
   return (0, import_lodash3.intersection)(a, b).length > 0;
 }
+function filterUnallowedActions(actions, userScopes) {
+  const allowedActions = actions.filter((action) => {
+    const requiredScopes = ACTION_ALLOWED_SCOPES[action];
+    if (requiredScopes === null) {
+      return true;
+    }
+    return hasAnyOfScopes(userScopes, requiredScopes);
+  });
+  const hasOtherAllowedActions = allowedActions.some(
+    (action) => !isMetaAction(action)
+  );
+  if (hasOtherAllowedActions) {
+    return allowedActions;
+  }
+  return [ActionType.READ];
+}
 
 // ../commons/src/events/serializers/user/deserializer.ts
-var import_zod34 = require("zod");
+var import_zod32 = require("zod");
 var UserWithPrimaryOffice = User.extend({
-  primaryOfficeId: import_zod34.z.string()
+  primaryOfficeId: import_zod32.z.string()
 });
 function userDeserializer(serializedUserField, user2) {
   if (typeof serializedUserField === "string") {
@@ -6919,7 +6599,6 @@ function deserializeQueryExpression(expression, user2) {
       ...expression.assignedTo,
       term: userDeserializer(expression.assignedTo.term, user2)
     },
-    createdByUserType: expression.createdByUserType,
     createdBy: expression.createdBy && {
       ...expression.createdBy,
       term: userDeserializer(expression.createdBy.term, user2)
@@ -6960,51 +6639,3 @@ function deserializeQuery(query, user2) {
     )
   };
 }
-
-// ../commons/src/events/state/availableActions.ts
-var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
-  [EventStatus.enum.CREATED]: [
-    ActionType.READ,
-    ActionType.DECLARE,
-    ActionType.NOTIFY,
-    ActionType.DELETE
-  ],
-  [EventStatus.enum.NOTIFIED]: [
-    ActionType.READ,
-    ActionType.DECLARE,
-    ActionType.ARCHIVE,
-    ActionType.REJECT
-  ],
-  [EventStatus.enum.DECLARED]: [
-    ActionType.READ,
-    ActionType.VALIDATE,
-    ActionType.ARCHIVE,
-    ActionType.REJECT
-  ],
-  [EventStatus.enum.VALIDATED]: [
-    ActionType.READ,
-    ActionType.REGISTER,
-    ActionType.ARCHIVE,
-    ActionType.REJECT
-  ],
-  [EventStatus.enum.REJECTED]: [
-    ActionType.READ,
-    ActionType.DECLARE,
-    ActionType.VALIDATE
-  ],
-  [EventStatus.enum.REGISTERED]: [
-    ActionType.READ,
-    ActionType.PRINT_CERTIFICATE,
-    ActionType.REQUEST_CORRECTION
-  ],
-  [EventStatus.enum.CERTIFIED]: [
-    ActionType.READ,
-    ActionType.PRINT_CERTIFICATE,
-    ActionType.REQUEST_CORRECTION
-  ],
-  [EventStatus.enum.ARCHIVED]: [
-    ActionType.READ,
-    ActionType.ASSIGN,
-    ActionType.UNASSIGN
-  ]
-};