@opencrvs/toolkit 1.8.0-rc.fa49ae3 → 1.8.0-rc.fa564ca

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,
@@ -186,8 +185,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 +207,7 @@ __export(events_exports, {
   eventMetadataLabelMap: () => eventMetadataLabelMap,
   eventPayloadGenerator: () => eventPayloadGenerator,
   eventQueryDataGenerator: () => eventQueryDataGenerator,
+  eventStatuses: () => eventStatuses,
   field: () => field,
   fieldTypes: () => fieldTypes,
   filterUnallowedActions: () => filterUnallowedActions,
@@ -219,7 +220,6 @@ __export(events_exports, {
   generateActionDocument: () => generateActionDocument,
   generateEventDocument: () => generateEventDocument,
   generateEventDraftDocument: () => generateEventDraftDocument,
-  generateRandomName: () => generateRandomName,
   generateRandomSignature: () => generateRandomSignature,
   generateTransactionId: () => generateTransactionId,
   generateTranslationConfig: () => generateTranslationConfig,
@@ -230,22 +230,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 +263,14 @@ __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 +280,6 @@ __export(events_exports, {
   isUndeclaredDraft: () => isUndeclaredDraft,
   isVerificationPage: () => isVerificationPage,
   isWriteAction: () => isWriteAction,
-  mandatoryColumns: () => mandatoryColumns,
   mapFieldTypeToEmptyValue: () => mapFieldTypeToEmptyValue,
   mapFieldTypeToMockValue: () => mapFieldTypeToMockValue,
   mapFieldTypeToZod: () => mapFieldTypeToZod,
@@ -309,7 +300,6 @@ 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");
@@ -388,9 +378,6 @@ var TranslationConfig = import_zod2.z.object({
 
 // ../commons/src/events/FieldType.ts
 var FieldType = {
-  NAME: "NAME",
-  PHONE: "PHONE",
-  ID: "ID",
   ADDRESS: "ADDRESS",
   TEXT: "TEXT",
   NUMBER: "NUMBER",
@@ -467,16 +454,6 @@ var UrbanAddressUpdateValue = AdminStructure.extend({
   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()
-});
-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()
@@ -538,9 +515,7 @@ var FieldValue = import_zod4.z.union([
   UrbanAddressValue,
   RuralAddressValue,
   DataFieldValue,
-  GenericAddressValue,
-  NameFieldValue,
-  NameFieldUpdateValue
+  GenericAddressValue
 ]);
 var FieldUpdateValue = import_zod4.z.union([
   TextValue,
@@ -553,8 +528,7 @@ var FieldUpdateValue = import_zod4.z.union([
   UrbanAddressUpdateValue,
   RuralAddressUpdateValue,
   DataFieldValue,
-  GenericAddressUpdateValue,
-  NameFieldUpdateValue
+  GenericAddressUpdateValue
 ]);
 
 // ../commons/src/events/FieldConfig.ts
@@ -731,26 +705,6 @@ var Select = BaseField.extend({
   defaultValue: TextValue.optional(),
   options: import_zod5.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),
   defaultValue: CheckboxFieldValue.optional()
@@ -830,9 +784,6 @@ var FieldConfig = import_zod5.z.discriminatedUnion("type", [
   BulletList,
   PageHeader,
   Select,
-  NameField,
-  PhoneField,
-  IdField,
   Checkbox,
   File,
   Country,
@@ -1238,7 +1189,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 +1206,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.
       `
   )
@@ -1339,7 +1291,6 @@ var ActionStatus = {
 var ActionBase = import_zod16.z.object({
   id: import_zod16.z.string(),
   transactionId: import_zod16.z.string(),
-  creator: import_zod16.z.enum(["user", "system"]).optional(),
   createdAt: import_zod16.z.string().datetime(),
   createdBy: import_zod16.z.string(),
   createdByRole: import_zod16.z.string(),
@@ -1514,8 +1465,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:
@@ -1537,9 +1486,6 @@ function mapFieldTypeToZod(type, required) {
     case FieldType.DATA:
       schema = DataFieldValue;
       break;
-    case FieldType.NAME:
-      schema = required ? NameFieldValue : NameFieldUpdateValue;
-      break;
   }
   return required ? schema : schema.nullish();
 }
@@ -1550,6 +1496,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:
@@ -1571,9 +1569,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 {
@@ -1618,15 +1613,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;
 };
@@ -1761,11 +1747,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) {
@@ -1861,45 +1842,6 @@ 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");
@@ -1946,13 +1888,6 @@ 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) {
@@ -2013,7 +1948,6 @@ function createEmptyDraft(eventId, draftId, actionType) {
       declaration: {},
       annotation: {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      creator: "user",
       createdBy: "@todo",
       createdAtLocation: "@todo",
       status: ActionStatus.Accepted,
@@ -2059,9 +1993,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) {
@@ -2109,12 +2042,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");
@@ -2401,7 +2328,7 @@ function createFieldConditionals(fieldId) {
           properties: {
             [fieldId]: {
               type: ["string", "boolean"],
-              const: { $data: `/$form/${comparedFieldId}` }
+              const: { $data: `1/${comparedFieldId}` }
             },
             [comparedFieldId]: { type: ["string", "boolean"] }
           },
@@ -2511,23 +2438,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]
     })
   };
 }
@@ -2607,16 +2517,27 @@ 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"
 };
@@ -2628,6 +2549,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."),
@@ -2635,7 +2558,6 @@ var ActionCreationMetadata = import_zod20.z.object({
   createdAtLocation: CreatedAtLocation.describe(
     "Location of the user who created the action request."
   ),
-  creator: import_zod20.z.enum(["user", "system"]).nullish().describe("Whether the user us a normal user or a system."),
   acceptedAt: import_zod20.z.string().datetime().describe("Timestamp when the action request was accepted."),
   createdByRole: import_zod20.z.string().describe("Role of the user at the time of action request creation."),
   createdBySignature: import_zod20.z.string().nullish().describe("Signature of the user who created the action request.")
@@ -2646,20 +2568,19 @@ 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: 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."
   ),
   createdAt: import_zod20.z.string().datetime().describe("The timestamp when the event was first created and saved."),
   dateOfEvent: ZodDate.nullish(),
   createdBy: import_zod20.z.string().describe("ID of the user who created the event."),
-  creator: import_zod20.z.enum(["user", "system"]).nullish().describe("Whether the user us a normal user or a system."),
   updatedByUserRole: import_zod20.z.string().describe("Role of the user who last updated the declaration."),
   createdAtLocation: CreatedAtLocation.describe(
     "Location of the user who created the event."
@@ -2681,7 +2602,6 @@ var EventMetadataKeysArray = [
   "createdAt",
   "dateOfEvent",
   "createdBy",
-  "creator",
   "updatedByUserRole",
   "createdAtLocation",
   "updatedAtLocation",
@@ -2704,11 +2624,6 @@ var eventMetadataLabelMap = {
     defaultMessage: "Created",
     description: "Created At"
   },
-  "event.creator": {
-    id: "event.creator.label",
-    defaultMessage: "Creator",
-    description: "Creator:user or system"
-  },
   "event.dateOfEvent": {
     id: "event.dateOfEvent.label",
     defaultMessage: "Date of Event",
@@ -2824,13 +2739,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"
 });
@@ -2867,11 +2782,9 @@ 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),
-  creator: import_zod22.z.enum(["user", "system"]).optional(),
   createdBy: import_zod22.z.optional(Exact),
   updatedBy: import_zod22.z.optional(Exact),
   trackingId: import_zod22.z.optional(Exact),
@@ -2892,13 +2805,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",
@@ -2936,7 +2858,6 @@ var SerializedQueryExpression = import_zod23.z.object({
   ),
   assignedTo: import_zod23.z.optional(SerializableExact),
   createdBy: import_zod23.z.optional(SerializableExact),
-  creator: import_zod23.z.enum(["user", "system"]).optional(),
   updatedBy: import_zod23.z.optional(SerializableExact),
   trackingId: import_zod23.z.optional(Exact),
   flags: import_zod23.z.optional(import_zod23.z.array(import_zod23.z.union([AnyOf, Not]))),
@@ -3063,7 +2984,7 @@ var AvailableIcons = import_zod24.z.enum([
 ]);
 
 // ../commons/src/events/WorkqueueConfig.ts
-var mandatoryColumns = defineWorkqueuesColumns([
+var dateOfEventColumn = defineWorkqueuesColumns([
   {
     label: {
       id: "workqueues.dateOfEvent",
@@ -3097,7 +3018,7 @@ var WorkqueueConfig = import_zod25.z.object({
       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({
@@ -3112,7 +3033,7 @@ var WorkqueueConfigInput = import_zod25.z.object({
       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) {
@@ -3356,7 +3277,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     // When 3rd party API returns 200 OK, we assume that the request was accepted, and persist single 'accepted' action.
     createdAt: requestAction?.createdAt ?? acceptAction.createdAt,
     createdBy: requestAction?.createdBy ?? acceptAction.createdBy,
-    creator: requestAction?.creator ?? acceptAction.creator,
     createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
     acceptedAt: acceptAction.createdAt,
     createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
@@ -3375,7 +3295,6 @@ function getDeclarationActionUpdateMetadata(actions) {
       return {
         createdAt: request?.createdAt ?? accept?.createdAt ?? metadata.createdAt,
         createdBy: request?.createdBy ?? accept?.createdBy ?? metadata.createdBy,
-        creator: request?.creator ?? accept?.creator ?? metadata.creator,
         createdAtLocation: request?.createdAtLocation ?? accept?.createdAtLocation ?? metadata.createdAtLocation,
         createdByRole: request?.createdByRole ?? accept?.createdByRole ?? metadata.createdByRole
       };
@@ -3383,7 +3302,6 @@ function getDeclarationActionUpdateMetadata(actions) {
     {
       createdAt: createAction.createdAt,
       createdBy: createAction.createdBy,
-      creator: createAction.creator,
       createdAtLocation: createAction.createdAtLocation,
       createdByRole: createAction.createdByRole
     }
@@ -3391,11 +3309,11 @@ 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
     )
@@ -3408,26 +3326,26 @@ function getStatusFromActions(actions) {
     (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:
@@ -3438,7 +3356,7 @@ function getStatusFromActions(actions) {
       default:
         return status;
     }
-  }, EventStatus.enum.CREATED);
+  }, EventStatus.CREATED);
 }
 function getFlagsFromActions(actions) {
   const sortedactions = actions.sort(
@@ -3530,7 +3448,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(
@@ -3568,7 +3486,6 @@ function getCurrentEventState(event2, config) {
     legalStatuses: getLegalStatuses(event2.actions),
     createdAt: creationAction.createdAt,
     createdBy: creationAction.createdBy,
-    creator: creationAction.creator,
     createdAtLocation: creationAction.createdAtLocation,
     createdBySignature: creationAction.createdBySignature,
     updatedAt: declarationUpdateMetadata.createdAt,
@@ -4357,7 +4274,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: [
@@ -4402,17 +4319,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",
@@ -4546,9 +4473,8 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           }
         },
         {
-          id: "recommender.name",
-          type: FieldType.NAME,
-          hideLabel: true,
+          id: "recommender.firstname",
+          type: FieldType.TEXT,
           required: true,
           conditionals: [
             {
@@ -4557,11 +4483,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,
@@ -4592,7 +4534,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.CREATED,
+    value: EventStatus.CREATED,
     label: {
       defaultMessage: "Draft",
       description: "Option for form field: status of record",
@@ -4600,7 +4542,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.NOTIFIED,
+    value: EventStatus.NOTIFIED,
     label: {
       defaultMessage: "Notified",
       description: "Option for form field: status of record",
@@ -4608,7 +4550,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.DECLARED,
+    value: EventStatus.DECLARED,
     label: {
       defaultMessage: "Declared",
       description: "Option for form field: status of record",
@@ -4616,7 +4558,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.VALIDATED,
+    value: EventStatus.VALIDATED,
     label: {
       defaultMessage: "Validated",
       description: "Option for form field: status of record",
@@ -4624,7 +4566,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.REGISTERED,
+    value: EventStatus.REGISTERED,
     label: {
       defaultMessage: "Registered",
       description: "Option for form field: status of record",
@@ -4632,7 +4574,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.CERTIFIED,
+    value: EventStatus.CERTIFIED,
     label: {
       defaultMessage: "Certified",
       description: "Option for form field: status of record",
@@ -4640,7 +4582,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.REJECTED,
+    value: EventStatus.REJECTED,
     label: {
       defaultMessage: "Rejected",
       description: "Option for form field: status of record",
@@ -4648,7 +4590,7 @@ var statusOptions = [
     }
   },
   {
-    value: EventStatus.enum.ARCHIVED,
+    value: EventStatus.ARCHIVED,
     label: {
       defaultMessage: "Archived",
       description: "Option for form field: status of record",
@@ -4712,25 +4654,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"
       }
@@ -5066,7 +5021,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()
       ]
@@ -5077,7 +5033,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
@@ -5092,21 +5051,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"
         },
@@ -5117,7 +5076,7 @@ var footballClubMembershipEvent = defineConfig({
         }
       },
       {
-        fieldId: "applicant.name.surname",
+        fieldId: "applicant.surname",
         label: {
           defaultMessage: "Applicant's last name",
           description: "Label for surname",
@@ -5459,7 +5418,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()
       ]
@@ -5470,7 +5430,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
@@ -5535,253 +5498,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
@@ -5799,227 +5542,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",
-          creator: "user",
-          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,
-        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,
+      approve: (eventId, requestId, input = {}) => ({
+        type: ActionType.APPROVE_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: {},
         annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
-          ActionType.REJECT,
-          rng
+          ActionType.APPROVE_CORRECTION
         ),
-        duplicates: [],
         eventId,
-        reason: { message: `${ActionType.REJECT}` },
-        ...input
+        requestId
       }),
-      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
-        ),
-        eventId,
-        ...input
-      }),
-      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 = {
@@ -6027,11 +5741,10 @@ function generateActionDocument({
     // @TODO: This should be fixed in the future.
     createdAt: new Date(Date.now() - 500).toISOString(),
     createdBy: getUUID(),
-    creator: "user",
     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(),
@@ -6083,14 +5796,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.
@@ -6101,16 +5813,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(),
@@ -6126,29 +5832,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;
@@ -6174,7 +5902,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"),
@@ -6183,9 +5911,8 @@ 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,
-    creator: overrides.creator ?? "user",
     createdBy: overrides.createdBy ?? generateUuid(rng),
     createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
     updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
@@ -6238,9 +5965,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;
@@ -6610,7 +6335,6 @@ function deserializeQueryExpression(expression, user2) {
       ...expression.assignedTo,
       term: userDeserializer(expression.assignedTo.term, user2)
     },
-    creator: expression.creator,
     createdBy: expression.createdBy && {
       ...expression.createdBy,
       term: userDeserializer(expression.createdBy.term, user2)
@@ -6646,8 +6370,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.
     )
   };
 }