@opencrvs/toolkit 1.8.0-rc.f8be155 → 1.8.0-rc.f8e0ee5

package/dist/events/index.js

@@ -56,7 +56,6 @@ __export(events_exports, {
   ArchiveActionInput: () => ArchiveActionInput,
   AssignActionInput: () => AssignActionInput,
   AsyncRejectActionDocument: () => AsyncRejectActionDocument,
-  BIRTH_EVENT: () => BIRTH_EVENT,
   BaseActionInput: () => BaseActionInput,
   BearerTokenByUserType: () => BearerTokenByUserType,
   CONFIG_GET_ALLOWED_SCOPES: () => CONFIG_GET_ALLOWED_SCOPES,
@@ -102,6 +101,8 @@ __export(events_exports, {
   EventSearchIndex: () => EventSearchIndex,
   EventState: () => EventState,
   EventStatus: () => EventStatus,
+  EventStatusEnum: () => EventStatusEnum,
+  EventStatuses: () => EventStatuses,
   Exact: () => Exact,
   ExactStatus: () => ExactStatus,
   FieldConditional: () => FieldConditional,
@@ -126,8 +127,6 @@ __export(events_exports, {
   LegalStatuses: () => LegalStatuses,
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
   MimeType: () => MimeType,
-  NameFieldUpdateValue: () => NameFieldUpdateValue,
-  NameFieldValue: () => NameFieldValue,
   NonEmptyTextValue: () => NonEmptyTextValue,
   Not: () => Not,
   NotifyActionInput: () => NotifyActionInput,
@@ -167,7 +166,6 @@ __export(events_exports, {
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
   Within: () => Within,
-  WorkqueueActionsWithDefault: () => WorkqueueActionsWithDefault,
   WorkqueueColumn: () => WorkqueueColumn,
   WorkqueueColumnKeys: () => WorkqueueColumnKeys,
   WorkqueueColumnKeysArray: () => WorkqueueColumnKeysArray,
@@ -186,8 +184,9 @@ __export(events_exports, {
   createEmptyDraft: () => createEmptyDraft,
   createEventConditionals: () => createEventConditionals,
   createFieldConditionals: () => createFieldConditionals,
-  createPrng: () => createPrng,
+  createPseudoRandomNumberGenerator: () => createPseudoRandomNumberGenerator,
   createValidationSchema: () => createValidationSchema,
+  dateOfEventColumn: () => dateOfEventColumn,
   deepDropNulls: () => deepDropNulls,
   deepMerge: () => deepMerge,
   defaultWorkqueueColumns: () => defaultWorkqueueColumns,
@@ -207,6 +206,7 @@ __export(events_exports, {
   eventMetadataLabelMap: () => eventMetadataLabelMap,
   eventPayloadGenerator: () => eventPayloadGenerator,
   eventQueryDataGenerator: () => eventQueryDataGenerator,
+  eventStatuses: () => eventStatuses,
   field: () => field,
   fieldTypes: () => fieldTypes,
   filterUnallowedActions: () => filterUnallowedActions,
@@ -219,7 +219,6 @@ __export(events_exports, {
   generateActionDocument: () => generateActionDocument,
   generateEventDocument: () => generateEventDocument,
   generateEventDraftDocument: () => generateEventDraftDocument,
-  generateRandomName: () => generateRandomName,
   generateRandomSignature: () => generateRandomSignature,
   generateTransactionId: () => generateTransactionId,
   generateTranslationConfig: () => generateTranslationConfig,
@@ -230,22 +229,17 @@ __export(events_exports, {
   getActionReview: () => getActionReview,
   getActionReviewFields: () => getActionReviewFields,
   getActionVerificationPageIds: () => getActionVerificationPageIds,
-  getAllUniqueFields: () => getAllUniqueFields,
   getAnnotationFromDrafts: () => getAnnotationFromDrafts,
   getAssignedUserFromActions: () => getAssignedUserFromActions,
   getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
   getCurrentEventState: () => getCurrentEventState,
   getCurrentEventStateWithDrafts: () => getCurrentEventStateWithDrafts,
   getDeclaration: () => getDeclaration,
-  getDeclarationFieldById: () => getDeclarationFieldById,
   getDeclarationFields: () => getDeclarationFields,
   getDeclarationPages: () => getDeclarationPages,
-  getEventConfigById: () => getEventConfigById,
   getMixedPath: () => getMixedPath,
-  getRandomDate: () => getRandomDate,
   getRandomDatetime: () => getRandomDatetime,
   getStatusFromActions: () => getStatusFromActions,
-  getValidatorsForField: () => getValidatorsForField,
   getVisibleVerificationPageIds: () => getVisibleVerificationPageIds,
   hasAnyOfScopes: () => hasAnyOfScopes,
   isAddressFieldType: () => isAddressFieldType,
@@ -268,17 +262,13 @@ __export(events_exports, {
   isFieldVisible: () => isFieldVisible,
   isFileFieldType: () => isFileFieldType,
   isFileFieldWithOptionType: () => isFileFieldWithOptionType,
-  isIdFieldType: () => isIdFieldType,
   isLocationFieldType: () => isLocationFieldType,
-  isMetaAction: () => isMetaAction,
-  isNameFieldType: () => isNameFieldType,
   isNonInteractiveFieldType: () => isNonInteractiveFieldType,
   isNumberFieldType: () => isNumberFieldType,
   isOfficeFieldType: () => isOfficeFieldType,
   isPageHeaderFieldType: () => isPageHeaderFieldType,
   isPageVisible: () => isPageVisible,
   isParagraphFieldType: () => isParagraphFieldType,
-  isPhoneFieldType: () => isPhoneFieldType,
   isRadioGroupFieldType: () => isRadioGroupFieldType,
   isSelectFieldType: () => isSelectFieldType,
   isSignatureFieldType: () => isSignatureFieldType,
@@ -288,7 +278,6 @@ __export(events_exports, {
   isUndeclaredDraft: () => isUndeclaredDraft,
   isVerificationPage: () => isVerificationPage,
   isWriteAction: () => isWriteAction,
-  mandatoryColumns: () => mandatoryColumns,
   mapFieldTypeToEmptyValue: () => mapFieldTypeToEmptyValue,
   mapFieldTypeToMockValue: () => mapFieldTypeToMockValue,
   mapFieldTypeToZod: () => mapFieldTypeToZod,
@@ -302,14 +291,12 @@ __export(events_exports, {
   user: () => user,
   validate: () => validate,
   validateFieldInput: () => validateFieldInput,
-  workqueueActions: () => workqueueActions,
   writeActions: () => writeActions
 });
 module.exports = __toCommonJS(events_exports);
 
 // ../commons/src/events/Constants.ts
 var TENNIS_CLUB_MEMBERSHIP = "tennis-club-membership";
-var BIRTH_EVENT = "v2-birth";
 
 // ../commons/src/events/ActionConfig.ts
 var import_zod9 = require("zod");
@@ -363,12 +350,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");
@@ -386,11 +367,88 @@ 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
+]);
+
+// ../commons/src/events/FieldConfig.ts
+var import_zod6 = require("zod");
+
 // ../commons/src/events/FieldType.ts
 var FieldType = {
-  NAME: "NAME",
-  PHONE: "PHONE",
-  ID: "ID",
   ADDRESS: "ADDRESS",
   TEXT: "TEXT",
   NUMBER: "NUMBER",
@@ -424,10 +482,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"
@@ -436,98 +494,88 @@ 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()
-});
-var NameFieldValue = import_zod3.z.object({
-  firstname: import_zod3.z.string(),
-  surname: import_zod3.z.string(),
-  middlename: import_zod3.z.string().optional()
+  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 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 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,
@@ -538,11 +586,9 @@ var FieldValue = import_zod4.z.union([
   UrbanAddressValue,
   RuralAddressValue,
   DataFieldValue,
-  GenericAddressValue,
-  NameFieldValue,
-  NameFieldUpdateValue
+  GenericAddressValue
 ]);
-var FieldUpdateValue = import_zod4.z.union([
+var FieldUpdateValue = import_zod5.z.union([
   TextValue,
   DateValue,
   DateRangeFieldValue,
@@ -553,69 +599,68 @@ var FieldUpdateValue = import_zod4.z.union([
   UrbanAddressUpdateValue,
   RuralAddressUpdateValue,
   DataFieldValue,
-  GenericAddressUpdateValue,
-  NameFieldUpdateValue
+  GenericAddressUpdateValue
 ]);
 
 // ../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 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(
-    import_zod5.z.object({
+  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",
@@ -624,38 +669,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()
@@ -663,7 +708,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",
@@ -673,27 +718,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(),
@@ -702,123 +751,103 @@ 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({
-    firstname: NonEmptyTextValue,
-    surname: NonEmptyTextValue
-  }).optional(),
-  configuration: import_zod5.z.object({
-    maxLength: import_zod5.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)
-}).describe("Phone input field");
-var IdField = BaseField.extend({
-  defaultValue: NonEmptyTextValue.optional(),
-  type: import_zod5.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,
@@ -830,9 +859,6 @@ var FieldConfig = import_zod5.z.discriminatedUnion("type", [
   BulletList,
   PageHeader,
   Select,
-  NameField,
-  PhoneField,
-  IdField,
   Checkbox,
   File,
   Country,
@@ -850,14 +876,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."
   )
@@ -866,13 +896,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
     })
@@ -882,112 +912,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 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)
@@ -1069,8 +1002,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(
@@ -1238,7 +1170,8 @@ var Field = BaseField2.extend({
   value: TranslationConfig.describe(
     "Summary field value. Can utilise values defined in configuration and EventMetadata"
   ),
-  label: TranslationConfig
+  label: TranslationConfig,
+  emptyValueMessage: TranslationConfig.optional()
 }).describe("Custom configured field");
 var SummaryConfig = import_zod13.z.object({
   fields: import_zod13.z.array(import_zod13.z.union([Field, ReferenceField])).describe("Fields rendered in summary view.")
@@ -1254,35 +1187,35 @@ var BaseField3 = import_zod14.z.object({
   options: import_zod14.z.array(SelectOption).optional(),
   searchCriteriaLabelPrefix: TranslationConfig.optional().describe(
     `
-    This property determines whether to add a prefix (such as "Child" or "Applicant") before the field label
+    This property determines whether to add a prefix (such as "Child" or "Applicant") before the field label 
     when rendering search parameter labels \u2014 for example, in the search results page to indicate which fields were used in the search.
 
-    For example, a field config like { id: "child.name.firstname", label: { defaultMessage: "First Name(s)" } } would render as "First Name(s)" by default.
+    For example, a field config like { id: "child.firstname", label: { defaultMessage: "First Name(s)" } } would render as "First Name(s)" by default.
 
     A field config like { id: "mother.firstname", label: { defaultMessage: "First Name(s)" } } would also render as "First Name(s)" by default.
 
-    So, if both child.name.firstname and mother.firstname are used in a search, the resulting search criteria labels would be "First Name(s)", "First Name(s)",
+    So, if both child.firstname and mother.firstname are used in a search, the resulting search criteria labels would be "First Name(s)", "First Name(s)", 
     which is ambiguous.
 
-    Now, if we treat the field ID prefix as a label (e.g., "applicant.firstname" \u2192 "Applicant"), and the field label is already
-    descriptive \u2014 like { id: "applicant.firstname", label: { defaultMessage: "Applicant's First Name" } } \u2014 then the resulting
+    Now, if we treat the field ID prefix as a label (e.g., "applicant.firstname" \u2192 "Applicant"), and the field label is already 
+    descriptive \u2014 like { id: "applicant.firstname", label: { defaultMessage: "Applicant's First Name" } } \u2014 then the resulting 
     label would be "Applicant Applicant's First Name", which is redundant and awkward.
 
-    By setting searchCriteriaLabelPrefix to a translation config object, we can explicitly define the desired prefix
+    By setting searchCriteriaLabelPrefix to a translation config object, we can explicitly define the desired prefix 
     in the country-config > event.advancedSearch configuration. For example: field("child.dob", { searchCriteriaLabelPrefix: TranslationConfig }).
     `
   ),
   conditionals: import_zod14.z.array(FieldConditional).default([]).optional().describe(
     `
        In advanced search, we sometimes need to override the default field visibility conditionals.
-
-       For example, Informant fields in the declaration form may have conditional logic
-       that hides them based on other field values. Since the advanced search form reuses
+       
+       For example, Informant fields in the declaration form may have conditional logic 
+       that hides them based on other field values. Since the advanced search form reuses 
        the declaration form config, those same conditionals would apply by default.
-
+       
        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
+       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.
       `
   )
@@ -1323,16 +1256,9 @@ var import_lodash = require("lodash");
 var import_zod16 = 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();
+var import_zod15 = require("zod");
+var CreatedAtLocation = import_zod15.z.string().nullish();
 
 // ../commons/src/events/ActionDocument.ts
 (0, import_zod_openapi7.extendZodWithOpenApi)(import_zod16.z);
@@ -1344,7 +1270,7 @@ var ActionStatus = {
   Rejected: "Rejected"
 };
 var ActionBase = import_zod16.z.object({
-  id: UUID,
+  id: import_zod16.z.string(),
   transactionId: import_zod16.z.string(),
   createdAt: import_zod16.z.string().datetime(),
   createdBy: import_zod16.z.string(),
@@ -1352,14 +1278,14 @@ var ActionBase = import_zod16.z.object({
   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(),
+  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()
+  originalActionId: import_zod16.z.string().optional()
 });
 var AssignedAction = ActionBase.merge(
   import_zod16.z.object({
@@ -1520,8 +1446,6 @@ function mapFieldTypeToZod(type, required) {
     case FieldType.ADMINISTRATIVE_AREA:
     case FieldType.FACILITY:
     case FieldType.OFFICE:
-    case FieldType.PHONE:
-    case FieldType.ID:
       schema = required ? NonEmptyTextValue : TextValue;
       break;
     case FieldType.NUMBER:
@@ -1543,9 +1467,6 @@ function mapFieldTypeToZod(type, required) {
     case FieldType.DATA:
       schema = DataFieldValue;
       break;
-    case FieldType.NAME:
-      schema = required ? NameFieldValue : NameFieldUpdateValue;
-      break;
   }
   return required ? schema : schema.nullish();
 }
@@ -1556,6 +1477,58 @@ function createValidationSchema(config) {
   }
   return import_zod17.z.object(shape);
 }
+function mapFieldTypeToMockValue(field2, i) {
+  switch (field2.type) {
+    case FieldType.DIVIDER:
+    case FieldType.TEXT:
+    case FieldType.TEXTAREA:
+    case FieldType.BULLET_LIST:
+    case FieldType.PAGE_HEADER:
+    case FieldType.LOCATION:
+    case FieldType.SELECT:
+    case FieldType.COUNTRY:
+    case FieldType.RADIO_GROUP:
+    case FieldType.PARAGRAPH:
+    case FieldType.ADMINISTRATIVE_AREA:
+    case FieldType.FACILITY:
+    case FieldType.OFFICE:
+      return `${field2.id}-${field2.type}-${i}`;
+    case FieldType.NUMBER:
+      return 19;
+    case FieldType.EMAIL:
+      return "test@opencrvs.org";
+    case FieldType.ADDRESS:
+      return {
+        country: "FAR",
+        addressType: AddressType.DOMESTIC,
+        province: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
+        district: "5ef450bc-712d-48ad-93f3-8da0fa453baa",
+        urbanOrRural: "URBAN",
+        town: "Example Town",
+        residentialArea: "Example Residential Area",
+        street: "Example Street",
+        number: "55",
+        zipCode: "123456"
+      };
+    case FieldType.DATE:
+      return "2021-01-01";
+    case FieldType.DATE_RANGE:
+      return ["2021-01-01", "2021-01-02"];
+    case FieldType.CHECKBOX:
+      return true;
+    case FieldType.SIGNATURE:
+    case FieldType.FILE:
+      return {
+        filename: "4f095fc4-4312-4de2-aa38-86dcc0f71044.png",
+        originalFilename: "abcd.png",
+        type: "image/png"
+      };
+    case FieldType.FILE_WITH_OPTIONS:
+      return null;
+    case FieldType.DATA:
+      return {};
+  }
+}
 function mapFieldTypeToEmptyValue(field2) {
   switch (field2.type) {
     case FieldType.DIVIDER:
@@ -1577,9 +1550,6 @@ function mapFieldTypeToEmptyValue(field2) {
     case FieldType.CHECKBOX:
     case FieldType.DATE_RANGE:
     case FieldType.DATA:
-    case FieldType.NAME:
-    case FieldType.PHONE:
-    case FieldType.ID:
       return null;
     case FieldType.ADDRESS:
       return {
@@ -1624,15 +1594,6 @@ var isTextFieldType = (field2) => {
 var isNumberFieldType = (field2) => {
   return field2.config.type === FieldType.NUMBER;
 };
-var isNameFieldType = (field2) => {
-  return field2.config.type === FieldType.NAME;
-};
-var isPhoneFieldType = (field2) => {
-  return field2.config.type === FieldType.PHONE;
-};
-var isIdFieldType = (field2) => {
-  return field2.config.type === FieldType.ID;
-};
 var isTextAreaFieldType = (field2) => {
   return field2.config.type === FieldType.TEXTAREA;
 };
@@ -1767,11 +1728,6 @@ var errorMessages = {
     defaultMessage: "Invalid input",
     description: "Error message when generic field is invalid",
     id: "v2.error.invalid"
-  },
-  unexpectedField: {
-    defaultMessage: "Unexpected field",
-    description: "Error message when field is not expected",
-    id: "v2.error.unexpectedField"
   }
 };
 function createIntlError(message) {
@@ -1867,44 +1823,11 @@ function runFieldValidations({
     errors: [...fieldValidationResult, ...customValidationResults]
   };
 }
-function getValidatorsForField(fieldId, validations) {
-  return validations.map(({ validator, message }) => {
-    const jsonSchema = validator;
-    const $form = jsonSchema.properties.$form;
-    if ($form.properties?.[fieldId]?.type === "object") {
-      return {
-        message,
-        validator: {
-          ...jsonSchema,
-          properties: {
-            $form: {
-              type: "object",
-              properties: $form.properties?.[fieldId]?.properties || {},
-              required: $form.properties?.[fieldId]?.required || []
-            }
-          }
-        }
-      };
-    }
-    if (!$form.properties?.[fieldId]) {
-      return null;
-    }
-    return {
-      message,
-      validator: {
-        ...jsonSchema,
-        properties: {
-          $form: {
-            type: "object",
-            properties: {
-              [fieldId]: $form.properties?.[fieldId]
-            },
-            required: $form.required?.includes(fieldId) ? [fieldId] : []
-          }
-        }
-      }
-    };
-  }).filter((x) => x !== null);
+
+// ../commons/src/uuid.ts
+var import_uuid = require("uuid");
+function getUUID() {
+  return (0, import_uuid.v4)();
 }
 
 // ../commons/src/utils.ts
@@ -1930,10 +1853,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);
@@ -1946,17 +1866,10 @@ var getActionAnnotationFields = (actionConfig) => {
 function getAllAnnotationFields(config) {
   return (0, import_lodash.flattenDeep)(config.actions.map(getActionAnnotationFields));
 }
-function getAllUniqueFields(eventConfig) {
-  return (0, import_lodash.uniqBy)(getDeclarationFields(eventConfig), (field2) => field2.id);
-}
-function getDeclarationFieldById(config, fieldId) {
-  const field2 = getAllUniqueFields(config).find((f) => f.id === fieldId);
-  return getOrThrow(field2, `Field with id ${fieldId} not found in event config`);
-}
 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;
@@ -2014,7 +1927,7 @@ function createEmptyDraft(eventId, draftId, actionType) {
       annotation: {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       createdBy: "@todo",
-      createdAtLocation: "00000000-0000-0000-0000-000000000000",
+      createdAtLocation: "@todo",
       status: ActionStatus.Accepted,
       transactionId: "@todo",
       createdByRole: "@todo"
@@ -2029,13 +1942,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(
@@ -2058,9 +1968,8 @@ function omitHiddenAnnotationFields(actionConfig, declaration, annotation) {
   );
 }
 function deepMerge(currentDocument, actionDocument) {
-  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
   return (0, import_lodash.mergeWith)(
-    (0, import_lodash.cloneDeep)(currentDocumentClone),
+    currentDocument,
     actionDocument,
     (previousValue, incomingValue) => {
       if (incomingValue === void 0) {
@@ -2108,12 +2017,6 @@ function getMixedPath(obj, path, defaultValue) {
   const result = resolve(obj, parts);
   return (0, import_lodash.isNil)(result) ? defaultValue : result;
 }
-function getEventConfigById(eventConfigs, id) {
-  const eventConfig = eventConfigs.find(
-    (eventConfiguration) => eventConfiguration.id === id
-  );
-  return getOrThrow(eventConfig, `Event config for ${id} not found`);
-}
 
 // ../commons/src/events/EventConfig.ts
 var import_zod_openapi8 = require("zod-openapi");
@@ -2400,7 +2303,7 @@ function createFieldConditionals(fieldId) {
           properties: {
             [fieldId]: {
               type: ["string", "boolean"],
-              const: { $data: `/$form/${comparedFieldId}` }
+              const: { $data: `1/${comparedFieldId}` }
             },
             [comparedFieldId]: { type: ["string", "boolean"] }
           },
@@ -2510,23 +2413,6 @@ function createFieldConditionals(fieldId) {
         }
       },
       required: [fieldId]
-    }),
-    getId: () => ({ fieldId }),
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    object: (options) => defineFormConditional({
-      type: "object",
-      properties: {
-        [fieldId]: {
-          type: "object",
-          properties: Object.fromEntries(
-            Object.entries(options).map(([key, value]) => {
-              return [key, value.properties.$form.properties[key]];
-            })
-          ),
-          required: Object.keys(options)
-        }
-      },
-      required: [fieldId]
     })
   };
 }
@@ -2606,18 +2492,30 @@ var import_zod21 = require("zod");
 
 // ../commons/src/events/EventMetadata.ts
 var import_zod20 = require("zod");
-var EventStatus = import_zod20.z.enum([
-  "CREATED",
-  "NOTIFIED",
-  "DECLARED",
-  "VALIDATED",
-  "REGISTERED",
-  "CERTIFIED",
-  "REJECTED",
-  "ARCHIVED"
-]);
+var EventStatus = {
+  CREATED: "CREATED",
+  NOTIFIED: "NOTIFIED",
+  DECLARED: "DECLARED",
+  VALIDATED: "VALIDATED",
+  REGISTERED: "REGISTERED",
+  CERTIFIED: "CERTIFIED",
+  REJECTED: "REJECTED",
+  ARCHIVED: "ARCHIVED"
+};
+var eventStatusValues = [
+  EventStatus.CREATED,
+  EventStatus.NOTIFIED,
+  EventStatus.DECLARED,
+  EventStatus.VALIDATED,
+  EventStatus.REGISTERED,
+  EventStatus.CERTIFIED,
+  EventStatus.REJECTED,
+  EventStatus.ARCHIVED
+];
+var EventStatusEnum = import_zod20.z.enum(eventStatusValues);
 var CustomFlags = {
-  CERTIFICATE_PRINTED: "certificate-printed"
+  CERTIFICATE_PRINTED: "certificate-printed",
+  CORRECTION_REQUESTED: "correction-requested"
 };
 var Flag = import_zod20.z.string().regex(
   new RegExp(
@@ -2627,6 +2525,8 @@ var Flag = import_zod20.z.string().regex(
   ),
   "Flag must be in the format ActionType:ActionStatus (lowerCase)"
 ).or(import_zod20.z.nativeEnum(CustomFlags));
+var eventStatuses = Object.values(EventStatus);
+var EventStatuses = import_zod20.z.nativeEnum(EventStatus);
 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."),
@@ -2644,13 +2544,13 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
   )
 });
 var LegalStatuses = import_zod20.z.object({
-  [EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
-  [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
+  [EventStatus.DECLARED]: ActionCreationMetadata.nullish(),
+  [EventStatus.REGISTERED]: RegistrationCreationMetadata.nullish()
 });
 var EventMetadata = import_zod20.z.object({
-  id: UUID,
+  id: import_zod20.z.string(),
   type: import_zod20.z.string().describe("The type of event, such as birth, death, or marriage."),
-  status: EventStatus,
+  status: EventStatuses,
   legalStatuses: LegalStatuses.describe(
     "Metadata related to the legal registration of the event, such as who registered it and when."
   ),
@@ -2662,9 +2562,7 @@ var EventMetadata = import_zod20.z.object({
     "Location of the user who created the event."
   ),
   createdBySignature: import_zod20.z.string().nullish().describe("Signature of the user who created the event."),
-  updatedAtLocation: UUID.nullish().describe(
-    "Location of the user who last updated the declaration."
-  ),
+  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."),
@@ -2817,13 +2715,13 @@ var AnyOf = import_zod22.z.object({
 });
 var ExactStatus = import_zod22.z.object({
   type: import_zod22.z.literal("exact"),
-  term: EventStatus
+  term: EventStatusEnum
 }).openapi({
   ref: "ExactStatus"
 });
 var AnyOfStatus = import_zod22.z.object({
   type: import_zod22.z.literal("anyOf"),
-  terms: import_zod22.z.array(EventStatus)
+  terms: import_zod22.z.array(EventStatusEnum)
 }).openapi({
   ref: "AnyOfStatus"
 });
@@ -2860,7 +2758,6 @@ var QueryExpression = import_zod22.z.object({
   "legalStatus.REGISTERED.createdAtLocation": import_zod22.z.optional(
     import_zod22.z.union([Within, Exact])
   ),
-  "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),
@@ -2884,13 +2781,22 @@ var QueryType = import_zod22.z.object({
       }
       return val;
     },
-    import_zod22.z.array(QueryExpression).nonempty("At least one clause is required.").openapi({
+    import_zod22.z.array(QueryExpression).openapi({
       default: [
         {
           eventType: TENNIS_CLUB_MEMBERSHIP,
           status: {
             type: "anyOf",
-            terms: EventStatus.options
+            terms: [
+              "CREATED",
+              "NOTIFIED",
+              "DECLARED",
+              "VALIDATED",
+              "REGISTERED",
+              "CERTIFIED",
+              "REJECTED",
+              "ARCHIVED"
+            ]
           },
           updatedAt: {
             type: "range",
@@ -3054,7 +2960,7 @@ var AvailableIcons = import_zod24.z.enum([
 ]);
 
 // ../commons/src/events/WorkqueueConfig.ts
-var mandatoryColumns = defineWorkqueuesColumns([
+var dateOfEventColumn = defineWorkqueuesColumns([
   {
     label: {
       id: "workqueues.dateOfEvent",
@@ -3072,10 +2978,6 @@ var mandatoryColumns = defineWorkqueuesColumns([
     value: event.field("updatedAt")
   }
 ]);
-var WorkqueueActionsWithDefault = import_zod25.z.enum([
-  ...workqueueActions.options,
-  "DEFAULT"
-]);
 var WorkqueueConfig = import_zod25.z.object({
   slug: import_zod25.z.string().describe("Determines the url of the workqueue."),
   name: TranslationConfig.describe(
@@ -3084,11 +2986,11 @@ var WorkqueueConfig = import_zod25.z.object({
   query: CountryConfigQueryType,
   actions: import_zod25.z.array(
     import_zod25.z.object({
-      type: WorkqueueActionsWithDefault,
+      type: import_zod25.z.string(),
       conditionals: import_zod25.z.array(Conditional).optional()
     })
   ),
-  columns: import_zod25.z.array(WorkqueueColumn).default(mandatoryColumns),
+  columns: import_zod25.z.array(WorkqueueColumn).default(dateOfEventColumn),
   icon: AvailableIcons
 }).describe("Configuration for workqueue.");
 var WorkqueueConfigInput = import_zod25.z.object({
@@ -3099,11 +3001,11 @@ var WorkqueueConfigInput = import_zod25.z.object({
   query: CountryConfigQueryInputType,
   actions: import_zod25.z.array(
     import_zod25.z.object({
-      type: WorkqueueActionsWithDefault,
+      type: import_zod25.z.string(),
       conditionals: import_zod25.z.array(Conditional).optional()
     })
   ),
-  columns: import_zod25.z.array(WorkqueueColumn).default(mandatoryColumns),
+  columns: import_zod25.z.array(WorkqueueColumn).default(dateOfEventColumn),
   icon: AvailableIcons
 });
 function defineWorkqueue(workqueueInput) {
@@ -3145,13 +3047,14 @@ var import_zod27 = require("zod");
 // ../commons/src/events/ActionInput.ts
 var import_zod26 = require("zod");
 var import_zod_openapi10 = require("zod-openapi");
+var import_uuid3 = require("uuid");
 (0, import_zod_openapi10.extendZodWithOpenApi)(import_zod26.z);
 var BaseActionInput = import_zod26.z.object({
-  eventId: UUID,
+  eventId: import_zod26.z.string(),
   transactionId: import_zod26.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  originalActionId: UUID.optional(),
+  originalActionId: import_zod26.z.string().optional(),
   keepAssignment: import_zod26.z.boolean().optional()
 });
 var CreateActionInput = BaseActionInput.merge(
@@ -3179,7 +3082,7 @@ var NotifyActionInput = BaseActionInput.merge(
 ).openapi({
   default: {
     eventId: "<event-id-here>",
-    transactionId: getUUID(),
+    transactionId: (0, import_uuid3.v4)(),
     declaration: {},
     annotation: {},
     type: ActionType.NOTIFY
@@ -3246,7 +3149,7 @@ var ReadActionInput = BaseActionInput.merge(
     type: import_zod26.z.literal(ActionType.READ).default(ActionType.READ)
   })
 );
-var DeleteActionInput = import_zod26.z.object({ eventId: UUID });
+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" }),
@@ -3277,8 +3180,8 @@ var ActionInput = import_zod26.z.discriminatedUnion("type", [
 
 // ../commons/src/events/Draft.ts
 var Draft = import_zod27.z.object({
-  id: UUID,
-  eventId: UUID,
+  id: import_zod27.z.string(),
+  eventId: import_zod27.z.string(),
   transactionId: import_zod27.z.string(),
   createdAt: import_zod27.z.string().datetime(),
   action: ActionBase.extend({
@@ -3296,18 +3199,18 @@ var DraftInput = BaseActionInput.extend({
 
 // ../commons/src/events/EventInput.ts
 var import_zod28 = require("zod");
-var import_uuid8 = require("uuid");
+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_uuid8.v4)(), type: "v2.birth" } });
+}).openapi({ default: { transactionId: (0, import_uuid4.v4)(), type: "v2.birth" } });
 
 // ../commons/src/events/EventDocument.ts
 var import_zod29 = require("zod");
 var import_zod_openapi11 = require("zod-openapi");
 (0, import_zod_openapi11.extendZodWithOpenApi)(import_zod29.z);
 var EventDocument = import_zod29.z.object({
-  id: UUID,
+  id: import_zod29.z.string(),
   type: import_zod29.z.string(),
   createdAt: import_zod29.z.string().datetime(),
   updatedAt: import_zod29.z.string().datetime(),
@@ -3378,43 +3281,85 @@ function getDeclarationActionUpdateMetadata(actions) {
 }
 function getLegalStatuses(actions) {
   return {
-    [EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
+    [EventStatus.DECLARED]: getDeclarationActionCreationMetadata(
       ActionType.DECLARE,
       actions
     ),
-    [EventStatus.enum.REGISTERED]: getDeclarationActionCreationMetadata(
+    [EventStatus.REGISTERED]: getDeclarationActionCreationMetadata(
       ActionType.REGISTER,
       actions
     )
   };
 }
 
+// ../commons/src/events/state/flags.ts
+var customFlagChecks = {
+  [CustomFlags.CERTIFICATE_PRINTED]: (sortedActions) => {
+    return sortedActions.reduce((prev, { type }) => {
+      if (type === ActionType.PRINT_CERTIFICATE) {
+        return true;
+      }
+      if (type === ActionType.APPROVE_CORRECTION) {
+        return false;
+      }
+      return prev;
+    }, false);
+  },
+  [CustomFlags.CORRECTION_REQUESTED]: (sortedActions) => {
+    return sortedActions.some(
+      ({ type }) => type === ActionType.REQUEST_CORRECTION
+    );
+  }
+};
+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;
+  });
+  Object.entries(customFlagChecks).forEach(([flag, check]) => {
+    if (check(sortedActions)) {
+      flags.push(flag);
+    }
+  });
+  return flags;
+}
+
 // ../commons/src/events/state/index.ts
 function getStatusFromActions(actions) {
   const hasRejectedAction = actions.some(
     (a) => a.status === ActionStatus.Rejected
   );
   if (hasRejectedAction) {
-    return EventStatus.enum.REJECTED;
+    return EventStatus.REJECTED;
   }
   return actions.reduce((status, action) => {
     switch (action.type) {
       case ActionType.CREATE:
-        return EventStatus.enum.CREATED;
+        return EventStatus.CREATED;
       case ActionType.DECLARE:
-        return EventStatus.enum.DECLARED;
+        return EventStatus.DECLARED;
       case ActionType.VALIDATE:
-        return EventStatus.enum.VALIDATED;
+        return EventStatus.VALIDATED;
       case ActionType.REGISTER:
-        return EventStatus.enum.REGISTERED;
+        return EventStatus.REGISTERED;
       case ActionType.REJECT:
-        return EventStatus.enum.REJECTED;
+        return EventStatus.REJECTED;
       case ActionType.ARCHIVE:
-        return EventStatus.enum.ARCHIVED;
+        return EventStatus.ARCHIVED;
       case ActionType.NOTIFY:
-        return EventStatus.enum.NOTIFIED;
+        return EventStatus.NOTIFIED;
       case ActionType.PRINT_CERTIFICATE:
-        return EventStatus.enum.CERTIFIED;
+        return EventStatus.CERTIFIED;
       case ActionType.ASSIGN:
       case ActionType.UNASSIGN:
       case ActionType.REQUEST_CORRECTION:
@@ -3425,39 +3370,7 @@ function getStatusFromActions(actions) {
       default:
         return status;
     }
-  }, 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;
+  }, EventStatus.CREATED);
 }
 function getAssignedUserFromActions(actions) {
   return actions.reduce((user2, action) => {
@@ -3517,7 +3430,7 @@ function deepDropNulls(obj) {
   return obj;
 }
 function isUndeclaredDraft(status) {
-  return status === EventStatus.enum.CREATED;
+  return status === EventStatus.CREATED;
 }
 function getAcceptedActions(event2) {
   return event2.actions.filter(
@@ -4343,7 +4256,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} other {Member declaration for {applicant.name.firstname} {applicant.name.surname}}}}}",
+    defaultMessage: "{applicant.firstname, select, __EMPTY__ {Member declaration} other {{applicant.surname, select, __EMPTY__ {Member declaration} other {Member declaration for {applicant.firstname} {applicant.surname}}}}}",
     description: "Title of the review page"
   },
   fields: [
@@ -4388,17 +4301,27 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
       },
       fields: [
         {
-          id: "applicant.name",
-          type: FieldType.NAME,
+          id: "applicant.firstname",
+          type: FieldType.TEXT,
           required: true,
-          hideLabel: true,
           conditionals: [],
           label: {
-            defaultMessage: "Applicant's name",
+            defaultMessage: "Applicant's first name",
             description: "This is the label for the field",
             id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.firstname.label"
           }
         },
+        {
+          id: "applicant.surname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [],
+          label: {
+            defaultMessage: "Applicant's surname",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.surname.label"
+          }
+        },
         {
           id: "applicant.email",
           type: "EMAIL",
@@ -4532,9 +4455,8 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           }
         },
         {
-          id: "recommender.name",
-          type: FieldType.NAME,
-          hideLabel: true,
+          id: "recommender.firstname",
+          type: FieldType.TEXT,
           required: true,
           conditionals: [
             {
@@ -4543,11 +4465,27 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
             }
           ],
           label: {
-            defaultMessage: "Recommender's name",
+            defaultMessage: "Recommender's first name",
             description: "This is the label for the field",
             id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.firstname.label"
           }
         },
+        {
+          id: "recommender.surname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("recommender.none").isFalsy()
+            }
+          ],
+          label: {
+            defaultMessage: "Recommender's surname",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.surname.label"
+          }
+        },
         {
           id: "recommender.id",
           type: FieldType.TEXT,
@@ -4578,7 +4516,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.CREATED,
+    value: EventStatus.CREATED,
     label: {
       defaultMessage: "Draft",
       description: "Option for form field: status of record",
@@ -4586,7 +4524,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.NOTIFIED,
+    value: EventStatus.NOTIFIED,
     label: {
       defaultMessage: "Notified",
       description: "Option for form field: status of record",
@@ -4594,7 +4532,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.DECLARED,
+    value: EventStatus.DECLARED,
     label: {
       defaultMessage: "Declared",
       description: "Option for form field: status of record",
@@ -4602,7 +4540,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.VALIDATED,
+    value: EventStatus.VALIDATED,
     label: {
       defaultMessage: "Validated",
       description: "Option for form field: status of record",
@@ -4610,7 +4548,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.REGISTERED,
+    value: EventStatus.REGISTERED,
     label: {
       defaultMessage: "Registered",
       description: "Option for form field: status of record",
@@ -4618,7 +4556,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.CERTIFIED,
+    value: EventStatus.CERTIFIED,
     label: {
       defaultMessage: "Certified",
       description: "Option for form field: status of record",
@@ -4626,7 +4564,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.REJECTED,
+    value: EventStatus.REJECTED,
     label: {
       defaultMessage: "Rejected",
       description: "Option for form field: status of record",
@@ -4634,7 +4572,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.ARCHIVED,
+    value: EventStatus.ARCHIVED,
     label: {
       defaultMessage: "Archived",
       description: "Option for form field: status of record",
@@ -4698,25 +4636,38 @@ var tennisClubMembershipEvent = defineConfig({
     id: "v2.event.tennis-club-membership.label"
   },
   title: {
-    defaultMessage: "{applicant.name.firstname} {applicant.name.surname}",
+    defaultMessage: "{applicant.firstname} {applicant.surname}",
     description: "This is the title of the summary",
     id: "v2.event.tennis-club-membership.title"
   },
   summary: {
     fields: [
       {
-        fieldId: "applicant.name",
+        id: "applicant.firstname",
         label: {
-          defaultMessage: "Applicant's name",
+          defaultMessage: "Applicant's first name",
           description: "This is the label for the field",
           id: "event.tennis-club-membership.summary.field.firstname.label"
         },
+        value: {
+          defaultMessage: "{applicant.firstname}",
+          description: "This is the value to show in the summary",
+          id: "event.tennis-club-membership.summary.field.firstname"
+        },
         emptyValueMessage: {
           defaultMessage: "First name is not provided",
           description: "This is the message to show when the field is empty",
           id: "event.tennis-club-membership.summary.field.firstname.empty"
         }
       },
+      {
+        fieldId: "applicant.surname",
+        label: {
+          defaultMessage: "Applicant's last name",
+          description: "Label for surname",
+          id: "v2.event.tennis-club-membership.summary.field.surname.label"
+        }
+      },
       {
         fieldId: "applicant.email"
       }
@@ -4766,197 +4717,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: "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.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.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: "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.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,
@@ -5052,7 +5008,8 @@ var tennisClubMembershipEvent = defineConfig({
         id: "v2.event.tennis-club-membership.search.applicants"
       },
       fields: [
-        field("applicant.name").fuzzy(),
+        field("applicant.firstname").fuzzy(),
+        field("applicant.surname").fuzzy(),
         field("applicant.dob").range(),
         field("applicant.email").exact()
       ]
@@ -5063,7 +5020,10 @@ var tennisClubMembershipEvent = defineConfig({
         description: "Recommender details search field section title",
         id: "v2.event.tennis-club-membership.search.recommender"
       },
-      fields: [field("recommender.name").fuzzy()]
+      fields: [
+        field("recommender.firstname").fuzzy(),
+        field("recommender.surname").fuzzy()
+      ]
     }
   ],
   declaration: TENNIS_CLUB_DECLARATION_FORM
@@ -5078,21 +5038,21 @@ var footballClubMembershipEvent = defineConfig({
     id: "event.football-club-membership.label"
   },
   title: {
-    defaultMessage: "{applicant.name.firstname} {applicant.name.surname}",
+    defaultMessage: "{applicant.firstname} {applicant.surname}",
     description: "This is the title of the summary",
     id: "v2.event.football-club-membership.title"
   },
   summary: {
     fields: [
       {
-        id: "applicant.name.firstname",
+        id: "applicant.firstname",
         label: {
           defaultMessage: "Applicant's first name",
           description: "This is the label for the field",
           id: "event.football-club-membership.summary.field.firstname.label"
         },
         value: {
-          defaultMessage: "{applicant.name.firstname}",
+          defaultMessage: "{applicant.firstname}",
           description: "This is the value to show in the summary",
           id: "event.football-club-membership.summary.field.firstname"
         },
@@ -5103,7 +5063,7 @@ var footballClubMembershipEvent = defineConfig({
         }
       },
       {
-        fieldId: "applicant.name.surname",
+        fieldId: "applicant.surname",
         label: {
           defaultMessage: "Applicant's last name",
           description: "Label for surname",
@@ -5159,197 +5119,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"
+                },
+                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: "correction.identity-check.verified",
+                type: "RADIO_GROUP",
+                label: {
+                  id: "correction.corrector.identity.verified.label",
+                  defaultMessage: "Identity verified",
+                  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"
+                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.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.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"
                 },
-                {
-                  value: "REGISTRAR",
-                  label: {
-                    id: "v2.correction.corrector.me",
-                    defaultMessage: "Me (Registrar)",
-                    description: "Label for registrar option in certificate correction form"
+                defaultValue: "",
+                configuration: {
+                  styles: {
+                    size: "NORMAL"
                   }
                 },
-                {
-                  value: "OTHER",
-                  label: {
-                    id: "v2.correction.corrector.others",
-                    defaultMessage: "Someone else",
-                    description: "Label for someone else option in certificate correction 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: ""
+                    }
+                  },
+                  {
+                    value: "NOT_NEEDED",
+                    label: {
+                      id: "correction.supportingDocuments.notNeeded.label",
+                      defaultMessage: "No supporting documents required",
+                      description: ""
+                    }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          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: "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"
             },
-            {
-              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"
-                  }
+            fields: [
+              {
+                id: "correction.request.reason",
+                type: FieldType.TEXT,
+                label: {
+                  id: "correction.reason.title",
+                  defaultMessage: "Reason for correction?",
+                  description: "The title for the corrector form"
                 }
-              ]
-            }
-          ]
-        }
-      ],
-      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.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"
-                }
-              },
-              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"
-              }
-            }
-          ]
-        }
-      ]
+            ]
+          }
+        ]
+      }
     },
     {
       type: ActionType.APPROVE_CORRECTION,
@@ -5445,7 +5410,8 @@ var footballClubMembershipEvent = defineConfig({
         id: "v2.event.football-club-membership.search.applicants"
       },
       fields: [
-        field("applicant.name").fuzzy(),
+        field("applicant.firstname").fuzzy(),
+        field("applicant.surname").fuzzy(),
         field("applicant.dob").range(),
         field("applicant.email").exact()
       ]
@@ -5456,7 +5422,10 @@ var footballClubMembershipEvent = defineConfig({
         description: "Recommender details search field section title",
         id: "v2.event.football-club-membership.search.recommender"
       },
-      fields: [field("recommender.name").fuzzy()]
+      fields: [
+        field("recommender.firstname").fuzzy(),
+        field("recommender.surname").fuzzy()
+      ]
     }
   ],
   declaration: TENNIS_CLUB_DECLARATION_FORM
@@ -5521,253 +5490,33 @@ var libraryMembershipEvent = defineConfig({
   declaration: libraryMembershipForm
 });
 
-// ../commons/src/fixtures/v2-birth-event.ts
-var child = defineFormPage({
-  id: "child",
-  type: PageTypes.enum.FORM,
-  title: {
-    defaultMessage: "Child's details",
-    description: "Form section title for Child",
-    id: "v2.form.birth.child.title"
-  },
-  fields: [
-    {
-      id: "child.firstNames",
-      type: FieldType.TEXT,
-      required: true,
-      configuration: { maxLength: 32 },
-      hideLabel: true,
-      label: {
-        defaultMessage: "Child's  first name",
-        description: "This is the label for the field",
-        id: "v2.event.birth.action.declare.form.section.child.field.name.label"
-      }
-    },
-    {
-      id: "child.familyName",
-      type: FieldType.TEXT,
-      required: true,
-      configuration: { maxLength: 32 },
-      hideLabel: true,
-      label: {
-        defaultMessage: "Child's last name",
-        description: "This is the label for the field",
-        id: "v2.event.birth.action.declare.form.section.child.field.name.label"
-      }
-    },
-    {
-      id: "child.DoB",
-      type: "DATE",
-      required: true,
-      label: {
-        defaultMessage: "Date of birth",
-        description: "This is the label for the field",
-        id: "v2.event.birth.action.declare.form.section.child.field.dob.label"
-      }
-    }
-  ]
-});
-var mother = defineFormPage({
-  id: "mother",
-  type: PageTypes.enum.FORM,
-  title: {
-    defaultMessage: "Mother's details",
-    description: "Form section title for mothers details",
-    id: "v2.form.section.mother.title"
-  },
-  fields: [
-    {
-      id: "mother.firstNames",
-      configuration: { maxLength: 32 },
-      type: FieldType.TEXT,
-      required: true,
-      label: {
-        defaultMessage: "First name(s)",
-        description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.firstname.label`
-      }
-    },
-    {
-      id: `mother.familyName`,
-      configuration: { maxLength: 32 },
-      type: FieldType.TEXT,
-      required: true,
-      label: {
-        defaultMessage: "Last name",
-        description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.surname.label`
-      }
-    },
-    {
-      id: `mother.DoB`,
-      type: "DATE",
-      required: true,
-      label: {
-        defaultMessage: "Date of birth",
-        description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.dob.label`
-      }
-    },
-    {
-      id: "mother.identifier",
-      type: FieldType.ID,
-      required: true,
-      label: {
-        defaultMessage: "ID Number",
-        description: "This is the label for the field",
-        id: `v2.event.birth.action.declare.form.section.person.field.nid.label`
-      }
-    }
-  ]
-});
-var BIRTH_DECLARATION_FORM = defineDeclarationForm({
-  label: {
-    defaultMessage: "Birth decalration form",
-    id: "v2.event.birth.action.declare.form.label",
-    description: "This is what this form is referred as in the system"
-  },
-  pages: [child, mother]
-});
-var v2BirthEvent = defineConfig({
-  id: BIRTH_EVENT,
-  title: {
-    defaultMessage: "{child.name.firstname} {child.name.surname}",
-    description: "This is the title of the summary",
-    id: "v2.event.birth.title"
-  },
-  label: {
-    defaultMessage: "Birth",
-    description: "This is what this event is referred as in the system",
-    id: "v2.event.birth.label"
-  },
-  summary: {
-    fields: []
-  },
-  actions: [],
-  declaration: BIRTH_DECLARATION_FORM
-});
-
 // ../commons/src/events/test.utils.ts
-function pickRandom(rng, items) {
-  return items[Math.floor(rng() * items.length)];
-}
-function generateRandomName(rng) {
-  const firstnames = [
-    "Danny",
-    "John",
-    "Jane",
-    "Emily",
-    "Michael",
-    "Sarah",
-    "Chris",
-    "Jessica",
-    "Sara",
-    "Sarachella",
-    "Sarandera",
-    "Zara"
-  ];
-  const surnames = [
-    "Doe",
-    "Smith",
-    "Johnson",
-    "Brown",
-    "Williams",
-    "Jones",
-    "Garcia",
-    "Miller",
-    "Saranen",
-    "Sarajanen",
-    "Sarthua",
-    "Tsarakovski",
-    "Salamander",
-    "Zarathustra"
-  ];
-  return {
-    firstname: pickRandom(rng, firstnames),
-    surname: pickRandom(rng, surnames)
-  };
-}
-function mapFieldTypeToMockValue(field2, i, rng) {
-  switch (field2.type) {
-    case FieldType.DIVIDER:
-    case FieldType.TEXT:
-    case FieldType.TEXTAREA:
-    case FieldType.BULLET_LIST:
-    case FieldType.PAGE_HEADER:
-    case FieldType.LOCATION:
-    case FieldType.SELECT:
-    case FieldType.COUNTRY:
-    case FieldType.RADIO_GROUP:
-    case FieldType.PARAGRAPH:
-    case FieldType.ADMINISTRATIVE_AREA:
-    case FieldType.FACILITY:
-    case FieldType.PHONE:
-    case FieldType.ID:
-    case FieldType.OFFICE:
-      return `${field2.id}-${field2.type}-${i}`;
-    case FieldType.NAME:
-      return generateRandomName(rng);
-    case FieldType.NUMBER:
-      return 19;
-    case FieldType.EMAIL:
-      return "test@opencrvs.org";
-    case FieldType.ADDRESS:
-      return {
-        country: "FAR",
-        addressType: AddressType.DOMESTIC,
-        province: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
-        district: "5ef450bc-712d-48ad-93f3-8da0fa453baa",
-        urbanOrRural: "URBAN",
-        town: "Example Town",
-        residentialArea: "Example Residential Area",
-        street: "Example Street",
-        number: "55",
-        zipCode: "123456"
-      };
-    case FieldType.DATE:
-      return "2021-01-01";
-    case FieldType.DATE_RANGE:
-      return ["2021-01-01", "2021-01-02"];
-    case FieldType.CHECKBOX:
-      return true;
-    case FieldType.SIGNATURE:
-    case FieldType.FILE:
-      return {
-        filename: "4f095fc4-4312-4de2-aa38-86dcc0f71044.png",
-        originalFilename: "abcd.png",
-        type: "image/png"
-      };
-    case FieldType.FILE_WITH_OPTIONS:
-    case FieldType.DATA:
-      return void 0;
-  }
-}
-function fieldConfigsToActionPayload(fields, rng) {
+function fieldConfigsToActionPayload(fields) {
   return fields.reduce(
     (acc, field2, i) => ({
       ...acc,
-      [field2.id]: mapFieldTypeToMockValue(field2, i, rng)
+      [field2.id]: mapFieldTypeToMockValue(field2, i)
     }),
     {}
   );
 }
-function generateActionDeclarationInput(configuration, action, rng) {
+function generateActionDeclarationInput(configuration, action) {
   const parsed = DeclarationUpdateActions.safeParse(action);
   if (parsed.success) {
     const fields = getDeclarationFields(configuration);
     const declarationConfig = getDeclaration(configuration);
-    const declaration = fieldConfigsToActionPayload(fields, rng);
+    const declaration = fieldConfigsToActionPayload(fields);
     return omitHiddenPaginatedFields(declarationConfig, declaration);
   }
   console.warn(`${action} is not a declaration action. Setting data as {}.`);
   return {};
 }
-function generateActionAnnotationInput(configuration, action, rng) {
+function generateActionAnnotationInput(configuration, action) {
   const actionConfig = configuration.actions.find(
     (ac) => ac.type === action
   );
   const annotationFields = actionConfig ? getActionAnnotationFields(actionConfig) : [];
-  const annotation = fieldConfigsToActionPayload(annotationFields, rng);
+  const annotation = fieldConfigsToActionPayload(annotationFields);
   const visibleVerificationPageIds = getVisibleVerificationPageIds(
     findRecordActionPages(configuration, action),
     annotation
@@ -5785,226 +5534,198 @@ function generateActionAnnotationInput(configuration, action, rng) {
     ...visiblePageVerificationMap
   };
 }
-function eventPayloadGenerator(rng) {
-  return {
-    create: (input = {}) => ({
+var eventPayloadGenerator = {
+  create: (input = {}) => ({
+    transactionId: input.transactionId ?? getUUID(),
+    type: input.type ?? TENNIS_CLUB_MEMBERSHIP
+  }),
+  patch: (id, input = {}) => ({
+    transactionId: input.transactionId ?? getUUID(),
+    type: input.type ?? TENNIS_CLUB_MEMBERSHIP,
+    id
+  }),
+  draft: ({ eventId, actionType }, input = {}) => (0, import_lodash2.merge)(
+    {
+      id: getUUID(),
+      eventId,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      transactionId: getUUID(),
+      action: {
+        transactionId: getUUID(),
+        type: actionType,
+        status: ActionStatus.Accepted,
+        declaration: {
+          "applicant.firstname": "Max",
+          "applicant.surname": "McLaren",
+          "applicant.dob": "2020-01-02",
+          "recommender.none": true
+        },
+        annotation: {
+          "correction.requester.relationship": "ANOTHER_AGENT",
+          "correction.request.reason": "Child's name was incorrect"
+        },
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        createdBy: "@todo",
+        createdByRole: "@todo",
+        createdAtLocation: "@todo"
+      }
+    },
+    input
+  ),
+  actions: {
+    declare: (eventId, input = {}) => ({
+      type: ActionType.DECLARE,
       transactionId: input.transactionId ?? getUUID(),
-      type: input.type ?? TENNIS_CLUB_MEMBERSHIP
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.DECLARE
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
+        tennisClubMembershipEvent,
+        ActionType.DECLARE
+      ),
+      eventId
     }),
-    patch: (id, input = {}) => ({
+    /**
+     * Notify allows sending incomplete data. Think it as 'partial declare' for now.
+     */
+    notify: (eventId, input = {}) => {
+      let declaration = input.declaration;
+      if (!declaration) {
+        const partialDeclaration = (0, import_lodash2.omitBy)(
+          generateActionDeclarationInput(
+            tennisClubMembershipEvent,
+            ActionType.DECLARE
+          ),
+          import_lodash2.isString
+        );
+        declaration = partialDeclaration;
+      }
+      return {
+        type: ActionType.NOTIFY,
+        transactionId: input.transactionId ?? getUUID(),
+        declaration,
+        eventId
+      };
+    },
+    validate: (eventId, input = {}) => ({
+      type: ActionType.VALIDATE,
       transactionId: input.transactionId ?? getUUID(),
-      type: input.type ?? TENNIS_CLUB_MEMBERSHIP,
-      id
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.VALIDATE
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
+        tennisClubMembershipEvent,
+        ActionType.VALIDATE
+      ),
+      duplicates: [],
+      eventId
     }),
-    draft: ({ eventId, actionType }, input = {}) => (0, import_lodash2.merge)(
-      {
-        id: getUUID(),
-        eventId,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        transactionId: getUUID(),
-        action: {
-          transactionId: getUUID(),
-          type: actionType,
-          status: ActionStatus.Accepted,
-          declaration: {
-            "applicant.name": {
-              firstname: "Max",
-              surname: "McLaren"
-            },
-            "applicant.dob": "2020-01-02",
-            "recommender.none": true
-          },
-          annotation: {
-            "correction.requester.relationship": "ANOTHER_AGENT",
-            "correction.request.reason": "Child's name was incorrect"
-          },
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-          createdBy: "@todo",
-          createdByRole: "@todo",
-          createdAtLocation: "@todo"
-        }
-      },
-      input
-    ),
-    actions: {
-      declare: (eventId, input = {}) => ({
-        type: ActionType.DECLARE,
-        transactionId: input.transactionId ?? getUUID(),
-        declaration: input.declaration ?? generateActionDeclarationInput(
-          tennisClubMembershipEvent,
-          ActionType.DECLARE,
-          rng
-        ),
-        annotation: input.annotation ?? generateActionAnnotationInput(
-          tennisClubMembershipEvent,
-          ActionType.DECLARE,
-          rng
-        ),
-        eventId,
-        ...input
-      }),
-      /**
-       * Notify allows sending incomplete data. Think it as 'partial declare' for now.
-       */
-      notify: (eventId, input = {}) => {
-        let declaration = input.declaration;
-        if (!declaration) {
-          const partialDeclaration = (0, import_lodash2.omitBy)(
-            generateActionDeclarationInput(
-              tennisClubMembershipEvent,
-              ActionType.DECLARE,
-              rng
-            ),
-            import_lodash2.isString
-          );
-          declaration = partialDeclaration;
-        }
-        return {
-          type: ActionType.NOTIFY,
-          transactionId: input.transactionId ?? getUUID(),
-          declaration,
-          eventId,
-          keepAssignment: input.keepAssignment
-        };
-      },
-      validate: (eventId, input = {}) => ({
-        type: ActionType.VALIDATE,
+    assign: (eventId, input = {}) => ({
+      type: ActionType.ASSIGN,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: {},
+      assignedTo: input.assignedTo ?? getUUID(),
+      eventId
+    }),
+    unassign: (eventId, input = {}) => ({
+      type: ActionType.UNASSIGN,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: {},
+      assignedTo: null,
+      eventId
+    }),
+    archive: (eventId, input = {}, isDuplicate) => ({
+      type: ActionType.ARCHIVE,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: {},
+      // @TODO: Check whether generator is needed?
+      annotation: {},
+      duplicates: [],
+      eventId,
+      reason: {
+        message: `${ActionType.ARCHIVE}`,
+        isDuplicate: isDuplicate ?? false
+      }
+    }),
+    reject: (eventId, input = {}) => ({
+      type: ActionType.REJECT,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: {},
+      annotation: input.annotation ?? generateActionAnnotationInput(
+        tennisClubMembershipEvent,
+        ActionType.REJECT
+      ),
+      duplicates: [],
+      eventId,
+      reason: { message: `${ActionType.REJECT}` }
+    }),
+    register: (eventId, input = {}) => ({
+      type: ActionType.REGISTER,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.REGISTER
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
+        tennisClubMembershipEvent,
+        ActionType.REGISTER
+      ),
+      eventId
+    }),
+    printCertificate: (eventId, input = {}) => ({
+      type: ActionType.PRINT_CERTIFICATE,
+      transactionId: input.transactionId ?? getUUID(),
+      declaration: {},
+      annotation: input.annotation ?? generateActionAnnotationInput(
+        tennisClubMembershipEvent,
+        ActionType.PRINT_CERTIFICATE
+      ),
+      eventId
+    }),
+    correction: {
+      request: (eventId, input = {}) => ({
+        type: ActionType.REQUEST_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: input.declaration ?? generateActionDeclarationInput(
           tennisClubMembershipEvent,
-          ActionType.VALIDATE,
-          rng
+          ActionType.REQUEST_CORRECTION
         ),
         annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
-          ActionType.VALIDATE,
-          rng
+          ActionType.REQUEST_CORRECTION
         ),
-        duplicates: [],
-        eventId,
-        ...input
-      }),
-      assign: (eventId, input = {}) => ({
-        type: ActionType.ASSIGN,
-        transactionId: input.transactionId ?? getUUID(),
-        declaration: {},
-        assignedTo: input.assignedTo ?? getUUID(),
-        eventId
-      }),
-      unassign: (eventId, input = {}) => ({
-        type: ActionType.UNASSIGN,
-        transactionId: input.transactionId ?? getUUID(),
-        declaration: {},
-        assignedTo: null,
         eventId
       }),
-      archive: (eventId, input = {}, isDuplicate) => ({
-        type: ActionType.ARCHIVE,
+      approve: (eventId, requestId, input = {}) => ({
+        type: ActionType.APPROVE_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: {},
-        // @TODO: Check whether generator is needed?
-        annotation: {},
-        duplicates: [],
-        eventId,
-        reason: {
-          message: `${ActionType.ARCHIVE}`,
-          isDuplicate: isDuplicate ?? false
-        },
-        ...input
-      }),
-      reject: (eventId, input = {}) => ({
-        type: ActionType.REJECT,
-        transactionId: input.transactionId ?? getUUID(),
-        declaration: {},
-        annotation: input.annotation ?? generateActionAnnotationInput(
-          tennisClubMembershipEvent,
-          ActionType.REJECT,
-          rng
-        ),
-        duplicates: [],
-        eventId,
-        reason: { message: `${ActionType.REJECT}` },
-        ...input
-      }),
-      register: (eventId, input = {}) => ({
-        type: ActionType.REGISTER,
-        transactionId: input.transactionId ?? getUUID(),
-        declaration: input.declaration ?? generateActionDeclarationInput(
-          tennisClubMembershipEvent,
-          ActionType.REGISTER,
-          rng
-        ),
         annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
-          ActionType.REGISTER,
-          rng
+          ActionType.APPROVE_CORRECTION
         ),
         eventId,
-        ...input
+        requestId
       }),
-      printCertificate: (eventId, input = {}) => ({
-        type: ActionType.PRINT_CERTIFICATE,
+      reject: (eventId, requestId, input = {}) => ({
+        type: ActionType.REJECT_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: {},
         annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
-          ActionType.PRINT_CERTIFICATE,
-          rng
+          ActionType.REJECT_CORRECTION
         ),
         eventId,
-        ...input
-      }),
-      correction: {
-        request: (eventId, input = {}) => ({
-          type: ActionType.REQUEST_CORRECTION,
-          transactionId: input.transactionId ?? getUUID(),
-          declaration: input.declaration ?? generateActionDeclarationInput(
-            tennisClubMembershipEvent,
-            ActionType.REQUEST_CORRECTION,
-            rng
-          ),
-          annotation: input.annotation ?? generateActionAnnotationInput(
-            tennisClubMembershipEvent,
-            ActionType.REQUEST_CORRECTION,
-            rng
-          ),
-          eventId,
-          keepAssignment: input.keepAssignment
-        }),
-        approve: (eventId, requestId, input = {}) => ({
-          type: ActionType.APPROVE_CORRECTION,
-          transactionId: input.transactionId ?? getUUID(),
-          declaration: {},
-          annotation: input.annotation ?? generateActionAnnotationInput(
-            tennisClubMembershipEvent,
-            ActionType.APPROVE_CORRECTION,
-            rng
-          ),
-          eventId,
-          requestId,
-          keepAssignment: input.keepAssignment
-        }),
-        reject: (eventId, requestId, input = {}) => ({
-          type: ActionType.REJECT_CORRECTION,
-          transactionId: input.transactionId ?? getUUID(),
-          declaration: {},
-          annotation: input.annotation ?? generateActionAnnotationInput(
-            tennisClubMembershipEvent,
-            ActionType.REJECT_CORRECTION,
-            rng
-          ),
-          eventId,
-          requestId,
-          keepAssignment: input.keepAssignment
-        })
-      }
+        requestId
+      })
     }
-  };
-}
+  }
+};
 function generateActionDocument({
   configuration,
   action,
-  rng = () => 0.1,
   defaults = {}
 }) {
   const actionBase = {
@@ -6015,7 +5736,7 @@ function generateActionDocument({
     createdByRole: "FIELD_AGENT",
     id: getUUID(),
     createdAtLocation: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
-    declaration: generateActionDeclarationInput(configuration, action, rng),
+    declaration: generateActionDeclarationInput(configuration, action),
     annotation: {},
     status: ActionStatus.Accepted,
     transactionId: getUUID(),
@@ -6067,14 +5788,13 @@ function generateActionDocument({
 }
 function generateEventDocument({
   configuration,
-  actions,
-  rng = () => 0.1
+  actions
 }) {
   return {
     trackingId: getUUID(),
     type: configuration.id,
     actions: actions.map(
-      (action) => generateActionDocument({ configuration, action, rng })
+      (action) => generateActionDocument({ configuration, action })
     ),
     // 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.
@@ -6085,16 +5805,10 @@ function generateEventDocument({
     updatedAt: new Date(Date.now() - 1e3).toISOString()
   };
 }
-function generateEventDraftDocument({
-  eventId,
-  actionType,
-  rng = () => 0.1,
-  declaration = {}
-}) {
+function generateEventDraftDocument(eventId, actionType = ActionType.DECLARE, declaration = {}) {
   const action = generateActionDocument({
     configuration: tennisClubMembershipEvent,
-    action: actionType,
-    rng
+    action: actionType
   });
   return {
     id: getUUID(),
@@ -6110,29 +5824,51 @@ function generateEventDraftDocument({
     eventId
   };
 }
+function pickRandom(rng, items) {
+  return items[Math.floor(rng() * items.length)];
+}
 function getRandomDatetime(rng, start, end) {
   const range = end.getTime() - start.getTime();
   const offset = Math.floor(rng() * range);
   const randomDate = new Date(start.getTime() + offset);
   return randomDate.toISOString();
 }
-function getRandomDate(rng, start, end) {
-  const datetime = getRandomDatetime(rng, new Date(start), new Date(end));
-  return datetime.split("T")[0];
-}
 function generateRandomApplicant(rng) {
-  const { firstname, surname } = generateRandomName(rng);
-  const randomDob = getRandomDate(rng, "1990-01-01", "2010-12-31");
+  const firstNames = [
+    "Danny",
+    "John",
+    "Jane",
+    "Emily",
+    "Michael",
+    "Sarah",
+    "Chris",
+    "Jessica"
+  ];
+  const surnames = [
+    "Doe",
+    "Smith",
+    "Johnson",
+    "Brown",
+    "Williams",
+    "Jones",
+    "Garcia",
+    "Miller"
+  ];
+  const randomFirstName = pickRandom(rng, firstNames);
+  const randomSurname = pickRandom(rng, surnames);
+  const randomDob = getRandomDatetime(
+    rng,
+    /* @__PURE__ */ new Date("1990-01-01"),
+    /* @__PURE__ */ new Date("2010-12-31")
+  ).split("T")[0];
   return {
     "recommender.none": true,
-    "applicant.name": {
-      firstname,
-      surname
-    },
+    "applicant.firstname": randomFirstName,
+    "applicant.surname": randomSurname,
     "applicant.dob": randomDob
   };
 }
-function createPrng(seed) {
+function createPseudoRandomNumberGenerator(seed) {
   const MODULUS = 2 ** 32;
   const MULTIPLIER = 1664525;
   const INCREMENT = 1013904223;
@@ -6158,7 +5894,7 @@ function generateRandomSignature(rng) {
   return `/random-bucket/${generateUuid(rng)}.png`;
 }
 var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
-  const rng = createPrng(seed);
+  const rng = createPseudoRandomNumberGenerator(seed);
   const createdAt = getRandomDatetime(
     rng,
     /* @__PURE__ */ new Date("2024-01-01"),
@@ -6167,7 +5903,7 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
   return {
     id: overrides.id ?? generateUuid(rng),
     type: overrides.type ?? TENNIS_CLUB_MEMBERSHIP,
-    status: overrides.status ?? pickRandom(rng, EventStatus.options),
+    status: overrides.status ?? pickRandom(rng, eventStatuses),
     createdAt: overrides.createdAt ?? createdAt,
     createdBy: overrides.createdBy ?? generateUuid(rng),
     createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
@@ -6221,9 +5957,7 @@ function isFieldValueWithoutTemplates(value) {
   if (isTemplateVariable(value)) {
     return false;
   }
-  if (typeof value === "object" && // @todo remove ts-ignore
-  //@ts-ignore
-  Object.values(value).some((val) => isTemplateVariable(val))) {
+  if (typeof value === "object" && Object.values(value).some((val) => isTemplateVariable(val))) {
     return false;
   }
   return true;
@@ -6520,7 +6254,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],
@@ -6562,7 +6297,7 @@ function filterUnallowedActions(actions, userScopes) {
     return hasAnyOfScopes(userScopes, requiredScopes);
   });
   const hasOtherAllowedActions = allowedActions.some(
-    (action) => !isMetaAction(action)
+    (action) => action !== ActionType.READ && action !== ActionType.ASSIGN && action !== ActionType.UNASSIGN
   );
   if (hasOtherAllowedActions) {
     return allowedActions;
@@ -6628,8 +6363,6 @@ function deserializeQuery(query, user2) {
     ...query,
     clauses: query.clauses.map(
       (clause) => deserializeQueryExpression(clause, user2)
-      // SAFETY: This cast should be safe because `query.clauses` has already been validated as non-empty by the Zod schema.
-      // Without the cast, TypeScript cannot infer the tuple type required by the target interface.
     )
   };
 }