@opencrvs/toolkit 1.8.0-rc.fd754eb → 1.8.0-rc.fe87a15

package/dist/events/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/events/index.ts
 var events_exports = {};
 __export(events_exports, {
+  ACTION_ALLOWED_CONFIGURABLE_SCOPES: () => ACTION_ALLOWED_CONFIGURABLE_SCOPES,
   ACTION_ALLOWED_SCOPES: () => ACTION_ALLOWED_SCOPES,
   Action: () => Action,
   ActionBase: () => ActionBase,
@@ -49,11 +50,14 @@ __export(events_exports, {
   AddressType: () => AddressType,
   AdministrativeAreas: () => AdministrativeAreas,
   AdvancedSearchConfig: () => AdvancedSearchConfig,
+  AnyOf: () => AnyOf,
+  AnyOfStatus: () => AnyOfStatus,
   ApproveCorrectionActionInput: () => ApproveCorrectionActionInput,
   ArchiveActionInput: () => ArchiveActionInput,
   AssignActionInput: () => AssignActionInput,
   AsyncRejectActionDocument: () => AsyncRejectActionDocument,
   BaseActionInput: () => BaseActionInput,
+  BearerTokenByUserType: () => BearerTokenByUserType,
   CONFIG_GET_ALLOWED_SCOPES: () => CONFIG_GET_ALLOWED_SCOPES,
   CONFIG_SEARCH_ALLOWED_SCOPES: () => CONFIG_SEARCH_ALLOWED_SCOPES,
   CertificateConfig: () => CertificateConfig,
@@ -67,6 +71,7 @@ __export(events_exports, {
   DEFAULT_DATE_OF_EVENT_PROPERTY: () => DEFAULT_DATE_OF_EVENT_PROPERTY,
   DataEntry: () => DataEntry,
   DataFieldValue: () => DataFieldValue,
+  DateCondition: () => DateCondition,
   DateRangeFieldValue: () => DateRangeFieldValue,
   DateValue: () => DateValue,
   DatetimeValue: () => DatetimeValue,
@@ -92,14 +97,18 @@ __export(events_exports, {
   EventInput: () => EventInput,
   EventMetadata: () => EventMetadata,
   EventMetadataKeys: () => EventMetadataKeys,
-  EventMetadataParameter: () => EventMetadataParameter,
+  EventMetadataKeysArray: () => EventMetadataKeysArray,
   EventSearchIndex: () => EventSearchIndex,
   EventState: () => EventState,
   EventStatus: () => EventStatus,
+  EventStatusEnum: () => EventStatusEnum,
   EventStatuses: () => EventStatuses,
+  Exact: () => Exact,
+  ExactStatus: () => ExactStatus,
   FieldConditional: () => FieldConditional,
   FieldConfig: () => FieldConfig,
   FieldConfigSchema: () => FieldConfigSchema,
+  FieldReference: () => FieldReference,
   FieldType: () => FieldType,
   FieldUpdateValue: () => FieldUpdateValue,
   FieldValue: () => FieldValue,
@@ -109,6 +118,7 @@ __export(events_exports, {
   Flag: () => Flag,
   FormConfig: () => FormConfig,
   FormPageConfig: () => FormPageConfig,
+  Fuzzy: () => Fuzzy,
   GenericAddressUpdateValue: () => GenericAddressUpdateValue,
   GenericAddressValue: () => GenericAddressValue,
   GeographicalArea: () => GeographicalArea,
@@ -118,36 +128,52 @@ __export(events_exports, {
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
   MimeType: () => MimeType,
   NonEmptyTextValue: () => NonEmptyTextValue,
+  Not: () => Not,
   NotifyActionInput: () => NotifyActionInput,
   NumberFieldValue: () => NumberFieldValue,
   PageConfig: () => PageConfig,
   PageTypes: () => PageTypes,
   PrintCertificateActionInput: () => PrintCertificateActionInput,
+  QueryExpression: () => QueryExpression,
   QueryInput: () => QueryInput,
   QueryType: () => QueryType,
+  Range: () => Range,
   ReadActionInput: () => ReadActionInput,
   RegisterAction: () => RegisterAction,
   RegisterActionInput: () => RegisterActionInput,
   RegistrationCreationMetadata: () => RegistrationCreationMetadata,
   RejectCorrectionActionInput: () => RejectCorrectionActionInput,
   RejectDeclarationActionInput: () => RejectDeclarationActionInput,
+  RejectionReason: () => RejectionReason,
   RequestCorrectionActionInput: () => RequestCorrectionActionInput,
   ResolvedUser: () => ResolvedUser,
   RuralAddressUpdateValue: () => RuralAddressUpdateValue,
   RuralAddressValue: () => RuralAddressValue,
   SearchField: () => SearchField,
+  SearchQueryParams: () => SearchQueryParams,
   SelectOption: () => SelectOption,
   ShowConditional: () => ShowConditional,
+  SignatureFieldValue: () => SignatureFieldValue,
   SummaryConfig: () => SummaryConfig,
+  TENNIS_CLUB_MEMBERSHIP: () => TENNIS_CLUB_MEMBERSHIP,
   TextValue: () => TextValue,
   TranslationConfig: () => TranslationConfig,
   UnassignActionInput: () => UnassignActionInput,
   UrbanAddressUpdateValue: () => UrbanAddressUpdateValue,
   UrbanAddressValue: () => UrbanAddressValue,
+  User: () => User,
   ValidateActionInput: () => ValidateActionInput,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
+  Within: () => Within,
+  WorkqueueColumn: () => WorkqueueColumn,
+  WorkqueueColumnKeys: () => WorkqueueColumnKeys,
+  WorkqueueColumnKeysArray: () => WorkqueueColumnKeysArray,
+  WorkqueueColumnValue: () => WorkqueueColumnValue,
   WorkqueueConfig: () => WorkqueueConfig,
+  WorkqueueConfigInput: () => WorkqueueConfigInput,
+  WorkqueueCountInput: () => WorkqueueCountInput,
+  WorkqueueCountOutput: () => WorkqueueCountOutput,
   ZodDate: () => ZodDate,
   alwaysTrue: () => alwaysTrue,
   and: () => and,
@@ -158,9 +184,12 @@ __export(events_exports, {
   createEmptyDraft: () => createEmptyDraft,
   createEventConditionals: () => createEventConditionals,
   createFieldConditionals: () => createFieldConditionals,
+  createPseudoRandomNumberGenerator: () => createPseudoRandomNumberGenerator,
   createValidationSchema: () => createValidationSchema,
+  dateOfEventColumn: () => dateOfEventColumn,
   deepDropNulls: () => deepDropNulls,
   deepMerge: () => deepMerge,
+  defaultWorkqueueColumns: () => defaultWorkqueueColumns,
   defineActionForm: () => defineActionForm,
   defineConditional: () => defineConditional,
   defineConfig: () => defineConfig,
@@ -169,6 +198,9 @@ __export(events_exports, {
   defineFormPage: () => defineFormPage,
   definePage: () => definePage,
   defineWorkqueue: () => defineWorkqueue,
+  defineWorkqueues: () => defineWorkqueues,
+  defineWorkqueuesColumns: () => defineWorkqueuesColumns,
+  deserializeQuery: () => deserializeQuery,
   errorMessages: () => errorMessages,
   event: () => event,
   eventMetadataLabelMap: () => eventMetadataLabelMap,
@@ -187,8 +219,10 @@ __export(events_exports, {
   generateActionDocument: () => generateActionDocument,
   generateEventDocument: () => generateEventDocument,
   generateEventDraftDocument: () => generateEventDraftDocument,
+  generateRandomSignature: () => generateRandomSignature,
   generateTransactionId: () => generateTransactionId,
   generateTranslationConfig: () => generateTranslationConfig,
+  generateWorkqueues: () => generateWorkqueues,
   getAcceptedActions: () => getAcceptedActions,
   getActionAnnotation: () => getActionAnnotation,
   getActionAnnotationFields: () => getActionAnnotationFields,
@@ -197,12 +231,15 @@ __export(events_exports, {
   getActionVerificationPageIds: () => getActionVerificationPageIds,
   getAnnotationFromDrafts: () => getAnnotationFromDrafts,
   getAssignedUserFromActions: () => getAssignedUserFromActions,
+  getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
   getCurrentEventState: () => getCurrentEventState,
   getCurrentEventStateWithDrafts: () => getCurrentEventStateWithDrafts,
   getDeclaration: () => getDeclaration,
   getDeclarationFields: () => getDeclarationFields,
   getDeclarationPages: () => getDeclarationPages,
   getMixedPath: () => getMixedPath,
+  getRandomDatetime: () => getRandomDatetime,
+  getStatusFromActions: () => getStatusFromActions,
   getVisibleVerificationPageIds: () => getVisibleVerificationPageIds,
   hasAnyOfScopes: () => hasAnyOfScopes,
   isAddressFieldType: () => isAddressFieldType,
@@ -226,6 +263,7 @@ __export(events_exports, {
   isFileFieldType: () => isFileFieldType,
   isFileFieldWithOptionType: () => isFileFieldWithOptionType,
   isLocationFieldType: () => isLocationFieldType,
+  isNonInteractiveFieldType: () => isNonInteractiveFieldType,
   isNumberFieldType: () => isNumberFieldType,
   isOfficeFieldType: () => isOfficeFieldType,
   isPageHeaderFieldType: () => isPageHeaderFieldType,
@@ -257,14 +295,20 @@ __export(events_exports, {
 });
 module.exports = __toCommonJS(events_exports);
 
+// ../commons/src/events/Constants.ts
+var TENNIS_CLUB_MEMBERSHIP = "tennis-club-membership";
+
 // ../commons/src/events/ActionConfig.ts
 var import_zod9 = require("zod");
 
 // ../commons/src/events/Conditional.ts
 var import_zod = require("zod");
-var Conditional = import_zod.z.custom(
-  (val) => typeof val === "object" && val !== null
-);
+var import_zod_openapi = require("zod-openapi");
+(0, import_zod_openapi.extendZodWithOpenApi)(import_zod.z);
+var Conditional = import_zod.z.custom((val) => typeof val === "object" && val !== null).openapi({
+  description: "JSON schema conditional configuration",
+  ref: "Conditional"
+});
 var ConditionalType = {
   SHOW: "SHOW",
   ENABLE: "ENABLE",
@@ -301,7 +345,10 @@ var FieldConditional = import_zod.z.discriminatedUnion("type", [
   EnableConditional,
   // Field output can be shown / hidden on the review page
   DisplayOnReviewConditional
-]);
+]).openapi({
+  description: "Field conditional configuration",
+  ref: "FieldConditional"
+});
 
 // ../commons/src/events/PageConfig.ts
 var import_zod6 = require("zod");
@@ -311,6 +358,8 @@ var import_zod5 = require("zod");
 
 // ../commons/src/events/TranslationConfig.ts
 var import_zod2 = require("zod");
+var import_zod_openapi2 = require("zod-openapi");
+(0, import_zod_openapi2.extendZodWithOpenApi)(import_zod2.z);
 var TranslationConfig = import_zod2.z.object({
   id: import_zod2.z.string().describe(
     "The identifier of the translation referred in translation CSV files"
@@ -319,6 +368,9 @@ var TranslationConfig = import_zod2.z.object({
   description: import_zod2.z.string().describe(
     "Describe the translation for a translator to be able to identify it."
   )
+}).openapi({
+  description: "Translation configuration",
+  ref: "TranslationConfig"
 });
 
 // ../commons/src/events/FieldType.ts
@@ -448,6 +500,7 @@ 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([
   TextValue,
   DateValue,
@@ -476,19 +529,15 @@ var FieldUpdateValue = import_zod4.z.union([
 ]);
 
 // ../commons/src/events/FieldConfig.ts
-var FieldId = import_zod5.z.string();
-var ParentReference = import_zod5.z.object({
-  _fieldId: FieldId.optional()
-}).optional();
+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({
+  $$field: FieldId
+}).describe("Reference to a field by its ID");
+var ParentReference = FieldReference.optional();
 var BaseField = import_zod5.z.object({
   id: FieldId,
-  defaultValue: import_zod5.z.union([
-    TextValue,
-    NonEmptyTextValue,
-    DateValue,
-    NumberFieldValue,
-    CheckboxFieldValue
-  ]).optional(),
   parent: ParentReference,
   conditionals: import_zod5.z.array(FieldConditional).default([]).optional(),
   required: import_zod5.z.boolean().default(false).optional(),
@@ -500,6 +549,7 @@ var BaseField = import_zod5.z.object({
     })
   ).default([]).optional(),
   label: TranslationConfig,
+  helperText: TranslationConfig.optional(),
   hideLabel: import_zod5.z.boolean().default(false).optional()
 });
 var Divider = BaseField.extend({
@@ -549,6 +599,7 @@ var SignatureField = BaseField.extend({
   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),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
@@ -608,6 +659,7 @@ var PageHeader = BaseField.extend({
 }).describe("A read-only header component for form pages");
 var File = BaseField.extend({
   type: import_zod5.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),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
@@ -681,6 +733,7 @@ var Location = BaseField.extend({
 var FileUploadWithOptions = BaseField.extend({
   type: import_zod5.z.literal(FieldType.FILE_WITH_OPTIONS),
   options: import_zod5.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),
     acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
@@ -740,9 +793,14 @@ var FieldConfig = import_zod5.z.discriminatedUnion("type", [
   EmailField,
   FileUploadWithOptions,
   DataField
-]);
+]).openapi({
+  description: "Form field configuration",
+  ref: "FieldConfig"
+});
 
 // ../commons/src/events/PageConfig.ts
+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"),
@@ -751,6 +809,9 @@ var PageConfigBase = import_zod6.z.object({
   conditional: Conditional.optional().describe(
     "Page will be shown if condition is met. If conditional is not defined, the page will be always shown."
   )
+}).openapi({
+  description: "Form page configuration",
+  ref: "FormPageConfig"
 });
 var FormPageConfig = PageConfigBase.extend({
   type: import_zod6.z.literal(PageTypes.enum.FORM).default(PageTypes.enum.FORM)
@@ -764,7 +825,10 @@ var VerificationActionConfig = import_zod6.z.object({
       body: TranslationConfig
     })
   })
-}).describe("Actions available on the verification page");
+}).describe("Actions available on the verification page").openapi({
+  description: "Verification action configuration",
+  ref: "VerificationActionConfig"
+});
 var VerificationPageConfig = FormPageConfig.extend({
   type: import_zod6.z.literal(PageTypes.enum.VERIFICATION),
   actions: VerificationActionConfig
@@ -864,8 +928,8 @@ var ActionFormConfig = import_zod8.z.object({
 var FormConfig = import_zod8.z.union([DeclarationFormConfig, ActionFormConfig]);
 
 // ../commons/src/events/ActionConfig.ts
-var import_zod_openapi = require("zod-openapi");
-(0, import_zod_openapi.extendZodWithOpenApi)(import_zod9.z);
+var import_zod_openapi5 = require("zod-openapi");
+(0, import_zod_openapi5.extendZodWithOpenApi)(import_zod9.z);
 var ActionConditional2 = import_zod9.z.discriminatedUnion("type", [
   /** If conditional is defined, the action is shown to the user only if the condition is met */
   ShowConditional,
@@ -881,6 +945,12 @@ var ActionConfigBase = import_zod9.z.object({
   conditionals: import_zod9.z.array(ActionConditional2).optional().default([]),
   draft: import_zod9.z.boolean().optional()
 });
+var ReadActionConfig = ActionConfigBase.merge(
+  import_zod9.z.object({
+    type: import_zod9.z.literal(ActionType.READ),
+    review: DeclarationReviewConfig
+  })
+);
 var DeclareConfig = ActionConfigBase.merge(
   import_zod9.z.object({
     type: import_zod9.z.literal(ActionType.DECLARE),
@@ -947,6 +1017,7 @@ var ActionConfig = import_zod9.z.discriminatedUnion("type", [
    * OpenAPI references are defined here so our generated OpenAPI spec knows to reuse the models
    * and treat them as "models" instead of duplicating the data structure in each endpoint.
    */
+  ReadActionConfig.openapi({ ref: "ReadActionConfig" }),
   DeclareConfig.openapi({ ref: "DeclareActionConfig" }),
   ValidateConfig.openapi({ ref: "ValidateActionConfig" }),
   RejectDeclarationConfig.openapi({ ref: "RejectDeclarationActionConfig" }),
@@ -1004,13 +1075,13 @@ var LanguageConfig = import_zod11.z.object({
 });
 
 // ../commons/src/events/EventConfig.ts
-var import_zod17 = require("zod");
+var import_zod18 = require("zod");
 
 // ../commons/src/events/DeduplicationConfig.ts
 var import_zod12 = require("zod");
-var import_zod_openapi2 = require("zod-openapi");
-(0, import_zod_openapi2.extendZodWithOpenApi)(import_zod12.z);
-var FieldReference = import_zod12.z.string();
+var import_zod_openapi6 = require("zod-openapi");
+(0, import_zod_openapi6.extendZodWithOpenApi)(import_zod12.z);
+var FieldReference2 = import_zod12.z.string();
 var Matcher = import_zod12.z.object({
   fieldId: import_zod12.z.string(),
   options: import_zod12.z.object({
@@ -1039,7 +1110,7 @@ var DateRangeMatcher = Matcher.extend({
   type: import_zod12.z.literal("dateRange"),
   options: import_zod12.z.object({
     days: import_zod12.z.number(),
-    origin: FieldReference,
+    origin: FieldReference2,
     boost: import_zod12.z.number().optional().default(1)
   })
 });
@@ -1047,7 +1118,7 @@ var DateDistanceMatcher = Matcher.extend({
   type: import_zod12.z.literal("dateDistance"),
   options: import_zod12.z.object({
     days: import_zod12.z.number(),
-    origin: FieldReference,
+    origin: FieldReference2,
     boost: import_zod12.z.number().optional().default(1)
   })
 });
@@ -1110,13 +1181,58 @@ var BaseField3 = import_zod14.z.object({
   config: import_zod14.z.object({
     type: MatchType.describe("Determines the type of field")
   }),
-  options: import_zod14.z.array(SelectOption).optional()
+  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 
+    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.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.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 
+    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 
+    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 
+       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 
+       are always rendered in the advanced search form.
+      `
+  )
 });
+var SearchQueryParams = import_zod14.z.object({
+  eventType: import_zod14.z.string().optional().describe(
+    "Defines type of event so that when redirecting to Advanced Search page, appropriate tab can be selected"
+  )
+}).catchall(FieldValue);
 var FieldConfigSchema = BaseField3.extend({
   fieldId: import_zod14.z.string(),
   fieldType: import_zod14.z.literal("field")
 });
-var EventFieldId = import_zod14.z.enum(["trackingId", "status"]);
+var EventFieldId = import_zod14.z.enum([
+  "trackingId",
+  "status",
+  "legalStatus.REGISTERED.createdAt",
+  "legalStatus.REGISTERED.createdAtLocation",
+  "updatedAt"
+]);
 var EventFieldConfigSchema = BaseField3.extend({
   fieldId: EventFieldId,
   fieldType: import_zod14.z.literal("event")
@@ -1134,114 +1250,134 @@ var AdvancedSearchConfig = import_zod14.z.object({
 var import_lodash = require("lodash");
 
 // ../commons/src/events/ActionDocument.ts
+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 import_zod_openapi3 = require("zod-openapi");
-(0, import_zod_openapi3.extendZodWithOpenApi)(import_zod15.z);
-var ActionUpdate = import_zod15.z.record(import_zod15.z.string(), FieldUpdateValue);
-var EventState = import_zod15.z.record(import_zod15.z.string(), FieldValue);
+var UUID = import_zod15.z.string().uuid().brand("UUID");
+function getUUID() {
+  return (0, import_uuid.v4)();
+}
+
+// ../commons/src/events/CreatedAtLocation.ts
+var CreatedAtLocation = UUID.nullish();
+
+// ../commons/src/events/ActionDocument.ts
+(0, import_zod_openapi7.extendZodWithOpenApi)(import_zod16.z);
+var ActionUpdate = import_zod16.z.record(import_zod16.z.string(), FieldUpdateValue);
+var EventState = import_zod16.z.record(import_zod16.z.string(), FieldValue);
 var ActionStatus = {
   Requested: "Requested",
   Accepted: "Accepted",
   Rejected: "Rejected"
 };
-var ActionBase = import_zod15.z.object({
-  id: import_zod15.z.string(),
-  transactionId: import_zod15.z.string(),
-  createdAt: import_zod15.z.string().datetime(),
-  createdBy: import_zod15.z.string(),
-  createdByRole: import_zod15.z.string(),
+var ActionBase = import_zod16.z.object({
+  id: import_zod16.z.string(),
+  transactionId: import_zod16.z.string(),
+  createdAt: import_zod16.z.string().datetime(),
+  createdBy: import_zod16.z.string(),
+  createdByRole: import_zod16.z.string(),
+  createdBySignature: import_zod16.z.string().nullish().describe("Reference to signature of the user who created the action"),
+  createdAtLocation: CreatedAtLocation,
   declaration: ActionUpdate,
-  annotation: ActionUpdate.optional(),
-  createdAtLocation: import_zod15.z.string(),
-  status: import_zod15.z.enum([
+  annotation: ActionUpdate.optional().nullable(),
+  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: import_zod15.z.string().optional()
+  originalActionId: UUID.optional().nullable()
 });
 var AssignedAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.ASSIGN),
-    assignedTo: import_zod15.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.ASSIGN),
+    assignedTo: import_zod16.z.string()
   })
 );
 var UnassignedAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.UNASSIGN),
-    assignedTo: import_zod15.z.literal(null)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.UNASSIGN),
+    assignedTo: import_zod16.z.literal(null)
   })
 );
 var RegisterAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.REGISTER),
-    registrationNumber: import_zod15.z.string().optional()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REGISTER),
+    registrationNumber: import_zod16.z.string().optional()
   })
 );
 var DeclareAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.DECLARE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.DECLARE)
   })
 );
 var ValidateAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.VALIDATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.VALIDATE)
   })
 );
+var RejectionReason = import_zod16.z.object({
+  message: import_zod16.z.string().min(1, { message: "Message cannot be empty" }).describe("Message describing reason for rejection or archiving"),
+  isDuplicate: import_zod16.z.boolean().optional().describe("If a declaration is duplicated")
+});
 var RejectAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.REJECT)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REJECT),
+    reason: RejectionReason
   })
 );
 var MarkAsDuplicateAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.MARKED_AS_DUPLICATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.MARKED_AS_DUPLICATE)
   })
 );
 var ArchiveAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.ARCHIVE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.ARCHIVE),
+    reason: RejectionReason
   })
 );
 var CreatedAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.CREATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.CREATE)
   })
 );
 var NotifiedAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.NOTIFY)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.NOTIFY)
   })
 );
 var PrintCertificateAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.PRINT_CERTIFICATE)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.PRINT_CERTIFICATE)
   })
 );
 var RequestedCorrectionAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.REQUEST_CORRECTION)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REQUEST_CORRECTION)
   })
 );
 var ApprovedCorrectionAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.APPROVE_CORRECTION),
-    requestId: import_zod15.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.APPROVE_CORRECTION),
+    requestId: import_zod16.z.string()
   })
 );
 var RejectedCorrectionAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.REJECT_CORRECTION),
-    requestId: import_zod15.z.string()
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.REJECT_CORRECTION),
+    requestId: import_zod16.z.string()
   })
 );
 var ReadAction = ActionBase.merge(
-  import_zod15.z.object({
-    type: import_zod15.z.literal(ActionType.READ)
+  import_zod16.z.object({
+    type: import_zod16.z.literal(ActionType.READ)
   })
 );
-var ActionDocument = import_zod15.z.discriminatedUnion("type", [
+var ActionDocument = import_zod16.z.discriminatedUnion("type", [
   CreatedAction.openapi({ ref: "CreatedAction" }),
   ValidateAction.openapi({ ref: "ValidateAction" }),
   RejectAction.openapi({ ref: "RejectAction" }),
@@ -1264,20 +1400,20 @@ var AsyncRejectActionDocument = ActionBase.omit({
   declaration: true,
   annotation: true
 }).merge(
-  import_zod15.z.object({
-    type: import_zod15.z.enum(ConfirmableActions),
-    status: import_zod15.z.literal(ActionStatus.Rejected)
+  import_zod16.z.object({
+    type: import_zod16.z.enum(ConfirmableActions),
+    status: import_zod16.z.literal(ActionStatus.Rejected)
   })
 );
-var Action = import_zod15.z.union([ActionDocument, AsyncRejectActionDocument]);
-var ResolvedUser = import_zod15.z.object({
-  id: import_zod15.z.string(),
-  role: import_zod15.z.string(),
-  name: import_zod15.z.array(
-    import_zod15.z.object({
-      use: import_zod15.z.string(),
-      given: import_zod15.z.array(import_zod15.z.string()),
-      family: import_zod15.z.string()
+var Action = import_zod16.z.union([ActionDocument, AsyncRejectActionDocument]);
+var ResolvedUser = import_zod16.z.object({
+  id: import_zod16.z.string(),
+  role: import_zod16.z.string(),
+  name: import_zod16.z.array(
+    import_zod16.z.object({
+      use: import_zod16.z.string(),
+      given: import_zod16.z.array(import_zod16.z.string()),
+      family: import_zod16.z.string()
     })
   )
 });
@@ -1288,7 +1424,7 @@ var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
 // ../commons/src/events/FieldTypeMapping.ts
-var import_zod16 = require("zod");
+var import_zod17 = require("zod");
 function mapFieldTypeToZod(type, required) {
   let schema;
   switch (type) {
@@ -1314,7 +1450,6 @@ function mapFieldTypeToZod(type, required) {
     case FieldType.ADMINISTRATIVE_AREA:
     case FieldType.FACILITY:
     case FieldType.OFFICE:
-    case FieldType.SIGNATURE:
       schema = required ? NonEmptyTextValue : TextValue;
       break;
     case FieldType.NUMBER:
@@ -1323,6 +1458,7 @@ function mapFieldTypeToZod(type, required) {
     case FieldType.CHECKBOX:
       schema = CheckboxFieldValue;
       break;
+    case FieldType.SIGNATURE:
     case FieldType.FILE:
       schema = FileFieldValue;
       break;
@@ -1343,7 +1479,7 @@ function createValidationSchema(config) {
   for (const field2 of config) {
     shape[field2.id] = mapFieldTypeToZod(field2.type, field2.required);
   }
-  return import_zod16.z.object(shape);
+  return import_zod17.z.object(shape);
 }
 function mapFieldTypeToMockValue(field2, i) {
   switch (field2.type) {
@@ -1356,7 +1492,6 @@ function mapFieldTypeToMockValue(field2, i) {
     case FieldType.SELECT:
     case FieldType.COUNTRY:
     case FieldType.RADIO_GROUP:
-    case FieldType.SIGNATURE:
     case FieldType.PARAGRAPH:
     case FieldType.ADMINISTRATIVE_AREA:
     case FieldType.FACILITY:
@@ -1385,6 +1520,7 @@ function mapFieldTypeToMockValue(field2, i) {
       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",
@@ -1408,7 +1544,6 @@ function mapFieldTypeToEmptyValue(field2) {
     case FieldType.SELECT:
     case FieldType.COUNTRY:
     case FieldType.RADIO_GROUP:
-    case FieldType.SIGNATURE:
     case FieldType.PARAGRAPH:
     case FieldType.ADMINISTRATIVE_AREA:
     case FieldType.FACILITY:
@@ -1434,6 +1569,7 @@ function mapFieldTypeToEmptyValue(field2) {
         number: null,
         zipCode: null
       };
+    case FieldType.SIGNATURE:
     case FieldType.FILE:
       return {
         filename: "",
@@ -1513,6 +1649,9 @@ var isOfficeFieldType = (field2) => {
 var isDataFieldType = (field2) => {
   return field2.config.type === FieldType.DATA;
 };
+var isNonInteractiveFieldType = (field2) => {
+  return field2.type === FieldType.DIVIDER || field2.type === FieldType.PAGE_HEADER || field2.type === FieldType.PARAGRAPH || field2.type === FieldType.BULLET_LIST || field2.type === FieldType.DATA;
+};
 
 // ../commons/src/conditionals/validate.ts
 var ajv = new import_ajv.default({
@@ -1689,12 +1828,6 @@ function runFieldValidations({
   };
 }
 
-// ../commons/src/uuid.ts
-var import_uuid = require("uuid");
-function getUUID() {
-  return (0, import_uuid.v4)();
-}
-
 // ../commons/src/utils.ts
 function getOrThrow(x, message) {
   if (x === void 0 || x === null) {
@@ -1795,7 +1928,7 @@ function createEmptyDraft(eventId, draftId, actionType) {
       annotation: {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       createdBy: "@todo",
-      createdAtLocation: "@todo",
+      createdAtLocation: "00000000-0000-0000-0000-000000000000",
       status: ActionStatus.Accepted,
       transactionId: "@todo",
       createdByRole: "@todo"
@@ -1890,23 +2023,23 @@ function getMixedPath(obj, path, defaultValue) {
 }
 
 // ../commons/src/events/EventConfig.ts
-var import_zod_openapi4 = require("zod-openapi");
-(0, import_zod_openapi4.extendZodWithOpenApi)(import_zod17.z);
-var EventConfig = import_zod17.z.object({
-  id: import_zod17.z.string().describe(
+var import_zod_openapi8 = require("zod-openapi");
+(0, import_zod_openapi8.extendZodWithOpenApi)(import_zod18.z);
+var EventConfig = import_zod18.z.object({
+  id: import_zod18.z.string().describe(
     'A machine-readable identifier for the event, e.g. "birth" or "death"'
   ),
-  dateOfEvent: import_zod17.z.object({ fieldId: import_zod17.z.string() }).optional(),
+  dateOfEvent: FieldReference.optional(),
   title: TranslationConfig,
   fallbackTitle: TranslationConfig.optional().describe(
     "This is a fallback title if actual title resolves to empty string"
   ),
   summary: SummaryConfig,
   label: TranslationConfig,
-  actions: import_zod17.z.array(ActionConfig),
+  actions: import_zod18.z.array(ActionConfig),
   declaration: DeclarationFormConfig,
-  deduplication: import_zod17.z.array(DeduplicationConfig).optional().default([]),
-  advancedSearch: import_zod17.z.array(AdvancedSearchConfig).optional().default([])
+  deduplication: import_zod18.z.array(DeduplicationConfig).optional().default([]),
+  advancedSearch: import_zod18.z.array(AdvancedSearchConfig).optional().default([])
 }).superRefine((event2, ctx) => {
   const allFields = findAllFields(event2);
   const fieldIds = allFields.map((field2) => field2.id);
@@ -1940,13 +2073,13 @@ var EventConfig = import_zod17.z.object({
   }
   if (event2.dateOfEvent) {
     const eventDateFieldId = getDeclarationFields(event2).find(
-      ({ id }) => id === event2.dateOfEvent?.fieldId
+      ({ id }) => id === event2.dateOfEvent?.$$field
     );
     if (!eventDateFieldId) {
       ctx.addIssue({
         code: "custom",
         message: `Date of event field id must match a field id in fields array.
-          Invalid date of event field ID for event ${event2.id}: ${event2.dateOfEvent.fieldId}`,
+          Invalid date of event field ID for event ${event2.id}: ${event2.dateOfEvent.$$field}`,
         path: ["dateOfEvent"]
       });
     } else if (eventDateFieldId.type !== FieldType.DATE) {
@@ -1968,215 +2101,24 @@ var definePage = (page) => PageConfig.parse(page);
 var defineFormPage = (formPage) => FormPageConfig.parse(formPage);
 
 // ../commons/src/events/WorkqueueConfig.ts
-var import_zod20 = require("zod");
+var import_zod25 = require("zod");
 
-// ../commons/src/events/EventIndex.ts
+// ../commons/src/events/serializers/user/serializer.ts
 var import_zod19 = require("zod");
-
-// ../commons/src/events/EventMetadata.ts
-var import_zod18 = require("zod");
-var EventStatus = {
-  CREATED: "CREATED",
-  NOTIFIED: "NOTIFIED",
-  DECLARED: "DECLARED",
-  VALIDATED: "VALIDATED",
-  REGISTERED: "REGISTERED",
-  CERTIFIED: "CERTIFIED",
-  REJECTED: "REJECTED",
-  ARCHIVED: "ARCHIVED"
-};
-var CustomFlags = {
-  CERTIFICATE_PRINTED: "certificate-printed"
-};
-var Flag = import_zod18.z.string().regex(
-  new RegExp(
-    `^(${Object.values(ActionType).join("|").toLowerCase()}):(${Object.values(ActionStatus).join("|").toLowerCase()})$`
-  ),
-  "Flag must be in the format ActionType:ActionStatus (lowerCase)"
-).or(import_zod18.z.nativeEnum(CustomFlags));
-var eventStatuses = Object.values(EventStatus);
-var EventStatuses = import_zod18.z.nativeEnum(EventStatus);
-var ZodDate = import_zod18.z.string().date();
-var ActionCreationMetadata = import_zod18.z.object({
-  createdAt: import_zod18.z.string().datetime().describe("The timestamp when the action request was created."),
-  createdBy: import_zod18.z.string().describe("ID of the user who created the action request."),
-  createdAtLocation: import_zod18.z.string().describe("Location of the user who created the action request."),
-  acceptedAt: import_zod18.z.string().datetime().describe("Timestamp when the action request was accepted."),
-  createdByRole: import_zod18.z.string().describe("Role of the user at the time of action request creation.")
-});
-var RegistrationCreationMetadata = ActionCreationMetadata.extend({
-  registrationNumber: import_zod18.z.string().describe(
-    "Registration number of the event. Always present for accepted registrations."
-  )
-});
-var LegalStatuses = import_zod18.z.object({
-  [EventStatus.DECLARED]: ActionCreationMetadata.nullish(),
-  [EventStatus.REGISTERED]: RegistrationCreationMetadata.nullish()
-});
-var EventMetadata = import_zod18.z.object({
-  id: import_zod18.z.string(),
-  type: import_zod18.z.string().describe("The type of event, such as birth, death, or marriage."),
-  status: EventStatuses,
-  legalStatuses: LegalStatuses.describe(
-    "Metadata related to the legal registration of the event, such as who registered it and when."
-  ),
-  createdAt: import_zod18.z.string().datetime().describe("The timestamp when the event was first created and saved."),
-  dateOfEvent: ZodDate.nullish(),
-  createdBy: import_zod18.z.string().describe("ID of the user who created the event."),
-  updatedByUserRole: import_zod18.z.string().describe("Role of the user who last updated the declaration."),
-  createdAtLocation: import_zod18.z.string().describe("Location of the user who created the event."),
-  updatedAtLocation: import_zod18.z.string().nullish().describe("Location of the user who last updated the declaration."),
-  updatedAt: import_zod18.z.string().datetime().describe("Timestamp of the most recent declaration update."),
-  assignedTo: import_zod18.z.string().nullish().describe("ID of the user currently assigned to the event."),
-  updatedBy: import_zod18.z.string().nullish().describe("ID of the user who last updated the declaration."),
-  trackingId: import_zod18.z.string().describe(
-    "System-generated tracking ID used by informants or registrars to look up the event."
-  ),
-  flags: import_zod18.z.array(Flag)
-});
-var EventMetadataKeys = import_zod18.z.enum([
-  "id",
-  "type",
-  "status",
-  "createdAt",
-  "dateOfEvent",
-  "createdBy",
-  "updatedByUserRole",
-  "createdAtLocation",
-  "updatedAtLocation",
-  "updatedAt",
-  "assignedTo",
-  "updatedBy",
-  "trackingId",
-  "legalStatuses",
-  "flags"
-]);
-var EventMetadataParameter = import_zod18.z.object({
-  // @TODO: Reconcile with the event metadata definition. How could we derive one from the other?
-  $event: EventMetadataKeys
-});
-var eventMetadataLabelMap = {
-  "event.assignedTo": {
-    id: "event.assignedTo.label",
-    defaultMessage: "Assigned To",
-    description: "Assigned To"
-  },
-  "event.createdAt": {
-    id: "event.createdAt.label",
-    defaultMessage: "Created",
-    description: "Created At"
-  },
-  "event.dateOfEvent": {
-    id: "event.dateOfEvent.label",
-    defaultMessage: "Date of Event",
-    description: "Date of Event"
-  },
-  "event.createdAtLocation": {
-    id: "event.createdAtLocation.label",
-    defaultMessage: "Location",
-    description: "Created At Location"
-  },
-  "event.updatedAtLocation": {
-    id: "event.updatedAtLocation.label",
-    defaultMessage: "Location",
-    description: "Updated At Location"
-  },
-  "event.createdBy": {
-    id: "event.createdBy.label",
-    defaultMessage: "Created By",
-    description: "Created By"
-  },
-  "event.updatedByUserRole": {
-    id: "event.updatedByUserRole.label",
-    defaultMessage: "Updated By Role",
-    description: "Updated By Role"
-  },
-  "event.id": {
-    id: "event.id.label",
-    defaultMessage: "ID",
-    description: "ID"
-  },
-  "event.updatedAt": {
-    id: "event.modifiedAt.label",
-    defaultMessage: "Updated",
-    description: "Modified At"
-  },
-  "event.status": {
-    id: "event.status.label",
-    defaultMessage: "Status",
-    description: "Status"
-  },
-  "event.type": {
-    id: "event.type.label",
-    defaultMessage: "Type",
-    description: "Type"
-  },
-  "event.updatedBy": {
-    id: "event.updatedBy.label",
-    defaultMessage: "Updated By",
-    description: "Updated By"
-  },
-  "event.trackingId": {
-    id: "event.trackingId.label",
-    defaultMessage: "Tracking ID",
-    description: "Tracking ID"
-  },
-  "event.flags": {
-    id: "event.flags.label",
-    defaultMessage: "Flags",
-    description: "Flags"
-  }
-};
-
-// ../commons/src/events/EventIndex.ts
-var EventIndex = EventMetadata.extend({
-  declaration: EventState
-});
-var EventSearchIndex = import_zod19.z.record(import_zod19.z.string(), import_zod19.z.any()).and(
-  import_zod19.z.object({
-    type: import_zod19.z.string()
-    // Ensures "type" (event-id) exists and is a string
-  })
-);
-var Fuzzy = import_zod19.z.object({ type: import_zod19.z.literal("fuzzy"), term: import_zod19.z.string() });
-var Exact = import_zod19.z.object({ type: import_zod19.z.literal("exact"), term: import_zod19.z.string() });
-var AnyOf = import_zod19.z.object({
-  type: import_zod19.z.literal("anyOf"),
-  terms: import_zod19.z.array(import_zod19.z.string())
-});
-var Range = import_zod19.z.object({
-  type: import_zod19.z.literal("range"),
-  gte: import_zod19.z.string(),
-  lte: import_zod19.z.string()
-});
-var Not = import_zod19.z.object({ type: import_zod19.z.literal("not"), term: import_zod19.z.string() });
-var Within = import_zod19.z.object({ type: import_zod19.z.literal("within"), location: import_zod19.z.string() });
-var DateCondition = import_zod19.z.union([Exact, Range]);
-var QueryInput = import_zod19.z.lazy(
-  () => import_zod19.z.union([
-    import_zod19.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf, Not]),
-    import_zod19.z.record(import_zod19.z.string(), QueryInput)
+var SerializedUserField = import_zod19.z.object({
+  $userField: import_zod19.z.enum([
+    "id",
+    "name",
+    "role",
+    "signatureFilename",
+    "primaryOfficeId"
   ])
-);
-var QueryExpression = import_zod19.z.object({
-  type: import_zod19.z.literal("and"),
-  eventType: import_zod19.z.string(),
-  status: import_zod19.z.optional(import_zod19.z.union([AnyOf, Exact])),
-  createdAt: import_zod19.z.optional(DateCondition),
-  updatedAt: import_zod19.z.optional(DateCondition),
-  createAtLocation: import_zod19.z.optional(import_zod19.z.union([Within, Exact])),
-  updatedAtLocation: import_zod19.z.optional(import_zod19.z.union([Within, Exact])),
-  createdBy: import_zod19.z.optional(Exact),
-  updatedBy: import_zod19.z.optional(Exact),
-  trackingId: import_zod19.z.optional(Exact),
-  flags: import_zod19.z.optional(import_zod19.z.array(import_zod19.z.union([AnyOf, Not]))),
-  data: QueryInput
-}).partial();
-var Or2 = import_zod19.z.object({
-  type: import_zod19.z.literal("or"),
-  clauses: import_zod19.z.array(QueryExpression)
 });
-var QueryType = import_zod19.z.discriminatedUnion("type", [QueryExpression, Or2]);
+function userSerializer(userField) {
+  return {
+    $userField: userField
+  };
+}
 
 // ../commons/src/conditionals/conditionals.ts
 function defineConditional(schema) {
@@ -2219,7 +2161,7 @@ function not(condition) {
 function never() {
   return not(alwaysTrue());
 }
-var user = {
+var user = Object.assign(userSerializer, {
   hasScope: (scope) => defineConditional({
     type: "object",
     properties: {
@@ -2239,7 +2181,7 @@ var user = {
     },
     required: ["$user"]
   })
-};
+});
 function createEventConditionals() {
   return {
     /**
@@ -2290,7 +2232,7 @@ function getDateRangeToFieldReference(fieldId, comparedFieldId, clause) {
   };
 }
 function isFieldReference(value) {
-  return typeof value === "object" && value !== null && "_fieldId" in value;
+  return typeof value === "object" && value !== null && "$$field" in value;
 }
 function createFieldConditionals(fieldId) {
   const getDateRange = (date, clause) => ({
@@ -2305,6 +2247,10 @@ function createFieldConditionals(fieldId) {
     required: [fieldId]
   });
   return {
+    /**
+     * @private Internal property used for field reference tracking.
+     */
+    $$field: fieldId,
     isAfter: () => ({
       days: (days) => ({
         inPast: () => defineFormConditional(
@@ -2316,7 +2262,7 @@ function createFieldConditionals(fieldId) {
       }),
       date: (date) => {
         if (isFieldReference(date)) {
-          const comparedFieldId = date._fieldId;
+          const comparedFieldId = date.$$field;
           return defineFormConditional(
             getDateRangeToFieldReference(
               fieldId,
@@ -2340,7 +2286,7 @@ function createFieldConditionals(fieldId) {
       }),
       date: (date) => {
         if (isFieldReference(date)) {
-          const comparedFieldId = date._fieldId;
+          const comparedFieldId = date.$$field;
           return defineFormConditional(
             getDateRangeToFieldReference(
               fieldId,
@@ -2355,7 +2301,7 @@ function createFieldConditionals(fieldId) {
     }),
     isEqualTo: (value) => {
       if (isFieldReference(value)) {
-        const comparedFieldId = value._fieldId;
+        const comparedFieldId = value.$$field;
         return defineFormConditional({
           type: "object",
           properties: {
@@ -2471,19 +2417,65 @@ function createFieldConditionals(fieldId) {
         }
       },
       required: [fieldId]
+    })
+  };
+}
+
+// ../commons/src/searchConfigs.ts
+function createSearchConfig(baseField) {
+  return {
+    /**
+     * Creates a range configuration for the specified field.
+     *
+     * @returns An object containing the field ID and a configuration object with a type of 'range'.
+     *
+     * @example event('legalStatus.REGISTERED.createdAt').range()
+     * // {
+     * //   ...
+     * //   config: { type: 'range' }
+     * // }
+     */
+    range: () => ({
+      ...baseField,
+      config: { type: "range" }
+    }),
+    /**
+     * Creates a configuration for exact matching of the specified field.
+     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
+     * @example field('dob').exact()
+     * // {
+     * //   ...
+     * //   config: { type: 'exact' }
+     * // }
+     */
+    exact: () => ({
+      ...baseField,
+      config: { type: "exact" }
     }),
-    getId: () => ({ fieldId })
+    /**
+     * Creates a configuration for fuzzy matching of the specified field.
+     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
+     * @example field('name').fuzzy()
+     * // {
+     * //   ...
+     * //   config: { type: 'fuzzy' }
+     * // }
+     */
+    fuzzy: () => ({
+      ...baseField,
+      config: { type: "fuzzy" }
+    })
   };
 }
 
 // ../commons/src/event-config/event-configuration.ts
 function createEventFieldConfig(fieldId, options) {
-  return {
+  const baseField = {
     fieldId,
     options,
-    config: { type: "exact" },
     fieldType: "event"
   };
+  return createSearchConfig(baseField);
 }
 
 // ../commons/src/events/event.ts
@@ -2499,135 +2491,670 @@ var event = Object.assign(eventFn, {
   }
 });
 
+// ../commons/src/events/WorkqueueColumnConfig.ts
+var import_zod21 = require("zod");
+
+// ../commons/src/events/EventMetadata.ts
+var import_zod20 = require("zod");
+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"
+};
+var Flag = import_zod20.z.string().regex(
+  new RegExp(
+    `^(${Object.values(ActionType).join("|").toLowerCase()}):(${Object.values(
+      ActionStatus
+    ).join("|").toLowerCase()})$`
+  ),
+  "Flag must be in the format ActionType:ActionStatus (lowerCase)"
+).or(import_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."),
+  createdBy: import_zod20.z.string().describe("ID of the user who created the action request."),
+  createdAtLocation: CreatedAtLocation.describe(
+    "Location of the user who created the action request."
+  ),
+  acceptedAt: import_zod20.z.string().datetime().describe("Timestamp when the action request was accepted."),
+  createdByRole: import_zod20.z.string().describe("Role of the user at the time of action request creation."),
+  createdBySignature: import_zod20.z.string().nullish().describe("Signature of the user who created the action request.")
+});
+var RegistrationCreationMetadata = ActionCreationMetadata.extend({
+  registrationNumber: import_zod20.z.string().describe(
+    "Registration number of the event. Always present for accepted registrations."
+  )
+});
+var LegalStatuses = import_zod20.z.object({
+  [EventStatus.DECLARED]: ActionCreationMetadata.nullish(),
+  [EventStatus.REGISTERED]: RegistrationCreationMetadata.nullish()
+});
+var EventMetadata = import_zod20.z.object({
+  id: UUID,
+  type: import_zod20.z.string().describe("The type of event, such as birth, death, or marriage."),
+  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."),
+  updatedByUserRole: import_zod20.z.string().describe("Role of the user who last updated the declaration."),
+  createdAtLocation: CreatedAtLocation.describe(
+    "Location of the user who created the event."
+  ),
+  createdBySignature: import_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."
+  ),
+  updatedAt: import_zod20.z.string().datetime().describe("Timestamp of the most recent declaration update."),
+  assignedTo: import_zod20.z.string().nullish().describe("ID of the user currently assigned to the event."),
+  updatedBy: import_zod20.z.string().nullish().describe("ID of the user who last updated the declaration."),
+  trackingId: import_zod20.z.string().describe(
+    "System-generated tracking ID used by informants or registrars to look up the event."
+  ),
+  flags: import_zod20.z.array(Flag)
+});
+var EventMetadataKeysArray = [
+  "id",
+  "type",
+  "status",
+  "createdAt",
+  "dateOfEvent",
+  "createdBy",
+  "updatedByUserRole",
+  "createdAtLocation",
+  "updatedAtLocation",
+  "updatedAt",
+  "assignedTo",
+  "updatedBy",
+  "trackingId",
+  "legalStatuses",
+  "flags"
+];
+var EventMetadataKeys = import_zod20.z.enum(EventMetadataKeysArray);
+var eventMetadataLabelMap = {
+  "event.assignedTo": {
+    id: "event.assignedTo.label",
+    defaultMessage: "Assigned To",
+    description: "Assigned To"
+  },
+  "event.createdAt": {
+    id: "event.createdAt.label",
+    defaultMessage: "Created",
+    description: "Created At"
+  },
+  "event.dateOfEvent": {
+    id: "event.dateOfEvent.label",
+    defaultMessage: "Date of Event",
+    description: "Date of Event"
+  },
+  "event.createdAtLocation": {
+    id: "event.createdAtLocation.label",
+    defaultMessage: "Location",
+    description: "Created At Location"
+  },
+  "event.updatedAtLocation": {
+    id: "event.updatedAtLocation.label",
+    defaultMessage: "Location",
+    description: "Updated At Location"
+  },
+  "event.createdBy": {
+    id: "event.createdBy.label",
+    defaultMessage: "Created By",
+    description: "Created By"
+  },
+  "event.updatedByUserRole": {
+    id: "event.updatedByUserRole.label",
+    defaultMessage: "Updated By Role",
+    description: "Updated By Role"
+  },
+  "event.id": {
+    id: "event.id.label",
+    defaultMessage: "ID",
+    description: "ID"
+  },
+  "event.updatedAt": {
+    id: "event.modifiedAt.label",
+    defaultMessage: "Updated",
+    description: "Modified At"
+  },
+  "event.status": {
+    id: "event.status.label",
+    defaultMessage: "Status",
+    description: "Status"
+  },
+  "event.type": {
+    id: "event.type.label",
+    defaultMessage: "Type",
+    description: "Type"
+  },
+  "event.updatedBy": {
+    id: "event.updatedBy.label",
+    defaultMessage: "Updated By",
+    description: "Updated By"
+  },
+  "event.trackingId": {
+    id: "event.trackingId.label",
+    defaultMessage: "Tracking ID",
+    description: "Tracking ID"
+  },
+  "event.flags": {
+    id: "event.flags.label",
+    defaultMessage: "Flags",
+    description: "Flags"
+  }
+};
+
+// ../commons/src/events/WorkqueueColumnConfig.ts
+var WorkqueueColumnKeysArray = [
+  ...EventMetadataKeysArray,
+  "title"
+];
+var WorkqueueColumnKeys = import_zod21.z.enum(WorkqueueColumnKeysArray);
+var WorkqueueColumnValue = import_zod21.z.object({
+  $event: WorkqueueColumnKeys
+});
+var WorkqueueColumn = import_zod21.z.object({
+  label: TranslationConfig,
+  value: WorkqueueColumnValue
+});
+function defineWorkqueuesColumns(workqueueColumns) {
+  return workqueueColumns.map(
+    (workqueueColumn) => WorkqueueColumn.parse(workqueueColumn)
+  );
+}
+
+// ../commons/src/events/CountryConfigQueryInput.ts
+var import_zod23 = require("zod");
+
+// ../commons/src/events/EventIndex.ts
+var import_zod22 = require("zod");
+var import_zod_openapi9 = require("zod-openapi");
+(0, import_zod_openapi9.extendZodWithOpenApi)(import_zod22.z);
+var EventIndex = EventMetadata.extend({
+  declaration: EventState
+}).openapi({
+  ref: "EventIndex"
+});
+var EventSearchIndex = import_zod22.z.record(import_zod22.z.string(), import_zod22.z.any()).and(
+  import_zod22.z.object({
+    type: import_zod22.z.string()
+    // Ensures "type" (event-id) exists and is a string
+  })
+).openapi({
+  ref: "EventSearchIndex"
+});
+var Fuzzy = import_zod22.z.object({ type: import_zod22.z.literal("fuzzy"), term: import_zod22.z.string() }).openapi({
+  ref: "Fuzzy"
+});
+var Exact = import_zod22.z.object({ type: import_zod22.z.literal("exact"), term: import_zod22.z.string() }).openapi({
+  ref: "Exact"
+});
+var AnyOf = import_zod22.z.object({
+  type: import_zod22.z.literal("anyOf"),
+  terms: import_zod22.z.array(import_zod22.z.string())
+}).openapi({
+  ref: "AnyOf"
+});
+var ExactStatus = import_zod22.z.object({
+  type: import_zod22.z.literal("exact"),
+  term: EventStatusEnum
+}).openapi({
+  ref: "ExactStatus"
+});
+var AnyOfStatus = import_zod22.z.object({
+  type: import_zod22.z.literal("anyOf"),
+  terms: import_zod22.z.array(EventStatusEnum)
+}).openapi({
+  ref: "AnyOfStatus"
+});
+var Range = import_zod22.z.object({
+  type: import_zod22.z.literal("range"),
+  gte: import_zod22.z.string(),
+  lte: import_zod22.z.string()
+}).openapi({
+  ref: "Range"
+});
+var Not = import_zod22.z.object({ type: import_zod22.z.literal("not"), term: import_zod22.z.string() }).openapi({
+  ref: "Not"
+});
+var Within = import_zod22.z.object({ type: import_zod22.z.literal("within"), location: import_zod22.z.string() }).openapi({
+  ref: "Within"
+});
+var DateCondition = import_zod22.z.union([Exact, Range]).openapi({
+  ref: "DateCondition"
+});
+var QueryInput = import_zod22.z.lazy(
+  () => import_zod22.z.union([
+    import_zod22.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf, Not]),
+    import_zod22.z.record(import_zod22.z.string(), QueryInput)
+  ])
+).openapi({
+  ref: "QueryInput"
+});
+var QueryExpression = import_zod22.z.object({
+  eventType: import_zod22.z.string(),
+  status: import_zod22.z.optional(import_zod22.z.union([AnyOfStatus, ExactStatus])),
+  createdAt: import_zod22.z.optional(DateCondition),
+  updatedAt: import_zod22.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAt": import_zod22.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAtLocation": import_zod22.z.optional(
+    import_zod22.z.union([Within, Exact])
+  ),
+  createdAtLocation: import_zod22.z.optional(import_zod22.z.union([Within, Exact])),
+  updatedAtLocation: import_zod22.z.optional(import_zod22.z.union([Within, Exact])),
+  assignedTo: import_zod22.z.optional(Exact),
+  createdBy: import_zod22.z.optional(Exact),
+  updatedBy: import_zod22.z.optional(Exact),
+  trackingId: import_zod22.z.optional(Exact),
+  flags: import_zod22.z.optional(import_zod22.z.array(import_zod22.z.union([AnyOf, Not]))),
+  data: QueryInput
+}).partial().openapi({
+  ref: "QueryExpression"
+});
+var QueryType = import_zod22.z.object({
+  type: import_zod22.z.literal("and").or(import_zod22.z.literal("or")).openapi({ default: "and" }),
+  clauses: import_zod22.z.preprocess(
+    (val) => {
+      if (typeof val === "string") {
+        return [JSON.parse(val)];
+      }
+      if (Array.isArray(val)) {
+        return val.map((v) => typeof v === "string" ? JSON.parse(v) : v);
+      }
+      return val;
+    },
+    import_zod22.z.array(QueryExpression).openapi({
+      default: [
+        {
+          eventType: TENNIS_CLUB_MEMBERSHIP,
+          status: {
+            type: "anyOf",
+            terms: [
+              "CREATED",
+              "NOTIFIED",
+              "DECLARED",
+              "VALIDATED",
+              "REGISTERED",
+              "CERTIFIED",
+              "REJECTED",
+              "ARCHIVED"
+            ]
+          },
+          updatedAt: {
+            type: "range",
+            gte: "2025-05-22",
+            lte: "2025-05-29"
+          },
+          data: {}
+        }
+      ]
+    })
+  )
+}).openapi({
+  ref: "QueryType"
+});
+
+// ../commons/src/events/CountryConfigQueryInput.ts
+var SerializableExact = import_zod23.z.object({
+  type: import_zod23.z.literal("exact"),
+  term: import_zod23.z.union([import_zod23.z.string(), SerializedUserField])
+});
+var SerializableWithin = import_zod23.z.object({
+  type: import_zod23.z.literal("within"),
+  location: import_zod23.z.union([import_zod23.z.string(), SerializedUserField])
+});
+var SerializedQueryExpression = import_zod23.z.object({
+  eventType: import_zod23.z.string(),
+  status: import_zod23.z.optional(import_zod23.z.union([AnyOfStatus, ExactStatus])),
+  createdAt: import_zod23.z.optional(DateCondition),
+  updatedAt: import_zod23.z.optional(DateCondition),
+  createdAtLocation: import_zod23.z.optional(
+    import_zod23.z.union([SerializableWithin, SerializableExact])
+  ),
+  updatedAtLocation: import_zod23.z.optional(
+    import_zod23.z.union([SerializableWithin, SerializableExact])
+  ),
+  assignedTo: import_zod23.z.optional(SerializableExact),
+  createdBy: import_zod23.z.optional(SerializableExact),
+  updatedBy: import_zod23.z.optional(SerializableExact),
+  trackingId: import_zod23.z.optional(Exact),
+  flags: import_zod23.z.optional(import_zod23.z.array(import_zod23.z.union([AnyOf, Not]))),
+  data: QueryInput
+}).partial();
+var Or2 = import_zod23.z.object({
+  type: import_zod23.z.literal("or"),
+  clauses: import_zod23.z.array(SerializedQueryExpression)
+});
+var And2 = import_zod23.z.object({
+  type: import_zod23.z.literal("and"),
+  clauses: import_zod23.z.array(SerializedQueryExpression)
+});
+var CountryConfigQueryType = import_zod23.z.discriminatedUnion("type", [And2, Or2]);
+var CountryConfigQueryInputType = import_zod23.z.union([
+  SerializedQueryExpression,
+  And2,
+  Or2
+]);
+
+// ../commons/src/icons.ts
+var import_zod24 = require("zod");
+var AvailableIcons = import_zod24.z.enum([
+  "Archived",
+  "Assigned",
+  "Certified",
+  "Close",
+  "Collapse",
+  "Draft",
+  "DuplicateYellow",
+  "Expand",
+  "ExternalValidate",
+  "FilledCheck",
+  "InReview",
+  "Offline",
+  "Registered",
+  "RequiresUpdates",
+  "Sent",
+  "Validated",
+  "WaitingApproval",
+  "ChartActivity",
+  "Activity",
+  "Archive",
+  "ArchiveTray",
+  "ArrowLeft",
+  "ArrowRight",
+  "Buildings",
+  "Circle",
+  "CaretDown",
+  "CaretLeft",
+  "CaretRight",
+  "ChartBar",
+  "ChartLine",
+  "ChatCircle",
+  "CheckSquare",
+  "Compass",
+  "Check",
+  "Copy",
+  "Database",
+  "DotsThreeVertical",
+  "DownloadSimple",
+  "ArrowCounterClockwise",
+  "MagnifyingGlassMinus",
+  "MagnifyingGlassPlus",
+  "Export",
+  "Eye",
+  "EyeSlash",
+  "Envelope",
+  "File",
+  "FileSearch",
+  "FileMinus",
+  "FilePlus",
+  "FileText",
+  "FileX",
+  "Handshake",
+  "Gear",
+  "GitBranch",
+  "IdentificationCard",
+  "List",
+  "ListBullets",
+  "Lock",
+  "MagnifyingGlass",
+  "MapPin",
+  "Medal",
+  "NotePencil",
+  "Paperclip",
+  "PaperPlaneTilt",
+  "Pen",
+  "Pencil",
+  "PencilSimpleLine",
+  "Phone",
+  "Plus",
+  "Printer",
+  "SignOut",
+  "Star",
+  "Target",
+  "TextT",
+  "Trash",
+  "UploadSimple",
+  "User",
+  "UserPlus",
+  "Users",
+  "WarningCircle",
+  "X",
+  "CircleWavyCheck",
+  "CircleWavyQuestion",
+  "ArchiveBox",
+  "ArrowCircleDown",
+  "FileArrowUp",
+  "FileDotted",
+  "Files",
+  "PencilLine",
+  "PencilCircle",
+  "UserCircle",
+  "Clock",
+  "QrCode",
+  "Webcam",
+  "Sun",
+  "DeviceTabletCamera",
+  "Globe",
+  "Fingerprint",
+  "PushPin",
+  "Timer"
+]);
+
 // ../commons/src/events/WorkqueueConfig.ts
-var WorkqueueConfig = import_zod20.z.object({
-  slug: import_zod20.z.string().describe("Determines the url of the workqueue."),
+var dateOfEventColumn = defineWorkqueuesColumns([
+  {
+    label: {
+      id: "workqueues.dateOfEvent",
+      defaultMessage: "Date of Event",
+      description: "Label for workqueue column: dateOfEvent"
+    },
+    value: event.field("dateOfEvent")
+  },
+  {
+    label: {
+      defaultMessage: "Last updated",
+      description: "This is the label for the workqueue column",
+      id: "workqueue.default.column.modifiedAt"
+    },
+    value: event.field("updatedAt")
+  }
+]);
+var WorkqueueConfig = import_zod25.z.object({
+  slug: import_zod25.z.string().describe("Determines the url of the workqueue."),
   name: TranslationConfig.describe(
     "Title of the workflow (both in navigation and on the page)"
   ),
-  query: QueryType,
-  actions: import_zod20.z.array(
-    import_zod20.z.object({
-      type: import_zod20.z.string(),
-      conditionals: import_zod20.z.array(Conditional).optional()
+  query: CountryConfigQueryType,
+  actions: import_zod25.z.array(
+    import_zod25.z.object({
+      type: import_zod25.z.string(),
+      conditionals: import_zod25.z.array(Conditional).optional()
     })
   ),
-  columns: import_zod20.z.array(
-    import_zod20.z.object({ label: TranslationConfig, value: EventMetadataParameter })
-  ).default([
-    {
-      label: {
-        id: "workqueues.dateOfEvent",
-        defaultMessage: "Date of Event",
-        description: "Label for workqueue column: dateOfEvent"
-      },
-      value: event.field("dateOfEvent")
-    }
-  ])
+  columns: import_zod25.z.array(WorkqueueColumn).default(dateOfEventColumn),
+  icon: AvailableIcons
 }).describe("Configuration for workqueue.");
-function defineWorkqueue(workqueues) {
-  return workqueues.map((workqueue) => WorkqueueConfig.parse(workqueue));
+var WorkqueueConfigInput = import_zod25.z.object({
+  slug: import_zod25.z.string().describe("Determines the url of the workqueue."),
+  name: TranslationConfig.describe(
+    "Title of the workflow (both in navigation and on the page)"
+  ),
+  query: CountryConfigQueryInputType,
+  actions: import_zod25.z.array(
+    import_zod25.z.object({
+      type: import_zod25.z.string(),
+      conditionals: import_zod25.z.array(Conditional).optional()
+    })
+  ),
+  columns: import_zod25.z.array(WorkqueueColumn).default(dateOfEventColumn),
+  icon: AvailableIcons
+});
+function defineWorkqueue(workqueueInput) {
+  const queryInput = workqueueInput.query;
+  const query = "type" in queryInput ? queryInput : { type: "and", clauses: [queryInput] };
+  return WorkqueueConfig.parse({ ...workqueueInput, query });
 }
+function defineWorkqueues(workqueues) {
+  return workqueues.map((workqueue) => defineWorkqueue(workqueue));
+}
+var WorkqueueCountInput = import_zod25.z.array(
+  import_zod25.z.object({ slug: import_zod25.z.string(), query: QueryType })
+);
+var WorkqueueCountOutput = import_zod25.z.record(import_zod25.z.string(), import_zod25.z.number());
+
+// ../commons/src/events/workqueueDefaultColumns.ts
+var defaultWorkqueueColumns = [
+  {
+    label: {
+      defaultMessage: "Title",
+      description: "This is the label for the workqueue column",
+      id: "workqueue.in-reveiw.column.title"
+    },
+    value: event.field("title")
+  },
+  {
+    label: {
+      defaultMessage: "Event",
+      description: "This is the label for the workqueue column",
+      id: "workqueue.default.column.event"
+    },
+    value: event.field("type")
+  }
+];
 
 // ../commons/src/events/Draft.ts
-var import_zod22 = require("zod");
+var import_zod27 = require("zod");
 
 // ../commons/src/events/ActionInput.ts
-var import_zod21 = require("zod");
-var import_zod_openapi5 = require("zod-openapi");
-(0, import_zod_openapi5.extendZodWithOpenApi)(import_zod21.z);
-var BaseActionInput = import_zod21.z.object({
-  eventId: import_zod21.z.string(),
-  transactionId: import_zod21.z.string(),
+var import_zod26 = require("zod");
+var import_zod_openapi10 = require("zod-openapi");
+(0, import_zod_openapi10.extendZodWithOpenApi)(import_zod26.z);
+var BaseActionInput = import_zod26.z.object({
+  eventId: UUID,
+  transactionId: import_zod26.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  originalActionId: import_zod21.z.string().optional(),
-  keepAssignment: import_zod21.z.boolean().optional()
+  originalActionId: UUID.optional(),
+  keepAssignment: import_zod26.z.boolean().optional()
 });
 var CreateActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.CREATE).default(ActionType.CREATE),
-    createdAtLocation: import_zod21.z.string()
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.CREATE).default(ActionType.CREATE),
+    createdAtLocation: CreatedAtLocation
   })
 );
 var RegisterActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.REGISTER).default(ActionType.REGISTER),
-    registrationNumber: import_zod21.z.string().optional()
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REGISTER).default(ActionType.REGISTER),
+    registrationNumber: import_zod26.z.string().optional()
   })
 );
 var ValidateActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.VALIDATE).default(ActionType.VALIDATE),
-    duplicates: import_zod21.z.array(import_zod21.z.string())
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.VALIDATE).default(ActionType.VALIDATE),
+    duplicates: import_zod26.z.array(import_zod26.z.string())
   })
 );
 var NotifyActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
   })
-);
+).openapi({
+  default: {
+    eventId: "<event-id-here>",
+    transactionId: getUUID(),
+    declaration: {},
+    annotation: {},
+    type: ActionType.NOTIFY
+  }
+});
 var DeclareActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.DECLARE).default(ActionType.DECLARE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.DECLARE).default(ActionType.DECLARE)
   })
 );
 var PrintCertificateActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
   })
 );
 var RejectDeclarationActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.REJECT).default(ActionType.REJECT)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REJECT).default(ActionType.REJECT),
+    reason: RejectionReason
   })
 );
 var MarkedAsDuplicateActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.MARKED_AS_DUPLICATE).default(ActionType.MARKED_AS_DUPLICATE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.MARKED_AS_DUPLICATE).default(ActionType.MARKED_AS_DUPLICATE)
   })
 );
 var ArchiveActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.ARCHIVE).default(ActionType.ARCHIVE)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.ARCHIVE).default(ActionType.ARCHIVE),
+    reason: RejectionReason
   })
 );
 var AssignActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.ASSIGN).default(ActionType.ASSIGN),
-    assignedTo: import_zod21.z.string()
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.ASSIGN).default(ActionType.ASSIGN),
+    assignedTo: import_zod26.z.string()
   })
 );
 var UnassignActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.UNASSIGN).default(ActionType.UNASSIGN),
-    assignedTo: import_zod21.z.literal(null).default(null)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.UNASSIGN).default(ActionType.UNASSIGN),
+    assignedTo: import_zod26.z.literal(null).default(null)
   })
 );
 var RequestCorrectionActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.REQUEST_CORRECTION).default(ActionType.REQUEST_CORRECTION)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.REQUEST_CORRECTION).default(ActionType.REQUEST_CORRECTION)
   })
 );
 var RejectCorrectionActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    requestId: import_zod21.z.string(),
-    type: import_zod21.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
+  import_zod26.z.object({
+    requestId: import_zod26.z.string(),
+    type: import_zod26.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
   })
 );
 var ApproveCorrectionActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    requestId: import_zod21.z.string(),
-    type: import_zod21.z.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
+  import_zod26.z.object({
+    requestId: import_zod26.z.string(),
+    type: import_zod26.z.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
   })
 );
 var ReadActionInput = BaseActionInput.merge(
-  import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.READ).default(ActionType.READ)
+  import_zod26.z.object({
+    type: import_zod26.z.literal(ActionType.READ).default(ActionType.READ)
   })
 );
-var DeleteActionInput = import_zod21.z.object({ eventId: import_zod21.z.string() });
-var ActionInput = import_zod21.z.discriminatedUnion("type", [
+var DeleteActionInput = import_zod26.z.object({ eventId: UUID });
+var ActionInput = import_zod26.z.discriminatedUnion("type", [
   CreateActionInput.openapi({ ref: "CreateActionInput" }),
   ValidateActionInput.openapi({ ref: "ValidateActionInput" }),
   RegisterActionInput.openapi({ ref: "RegisterActionInput" }),
@@ -2656,18 +3183,18 @@ var ActionInput = import_zod21.z.discriminatedUnion("type", [
 });
 
 // ../commons/src/events/Draft.ts
-var Draft = import_zod22.z.object({
-  id: import_zod22.z.string(),
-  eventId: import_zod22.z.string(),
-  transactionId: import_zod22.z.string(),
-  createdAt: import_zod22.z.string().datetime(),
+var Draft = import_zod27.z.object({
+  id: UUID,
+  eventId: UUID,
+  transactionId: import_zod27.z.string(),
+  createdAt: import_zod27.z.string().datetime(),
   action: ActionBase.extend({
     type: ActionTypes
   }).omit({ id: true })
 });
 var DraftInput = BaseActionInput.extend({
   type: ActionTypes,
-  status: import_zod22.z.enum([
+  status: import_zod27.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
     ActionStatus.Rejected
@@ -2675,25 +3202,24 @@ var DraftInput = BaseActionInput.extend({
 });
 
 // ../commons/src/events/EventInput.ts
-var import_zod23 = require("zod");
-var EventInput = import_zod23.z.object({
-  transactionId: import_zod23.z.string(),
-  type: import_zod23.z.string(),
-  dateOfEvent: import_zod23.z.object({ fieldId: import_zod23.z.string() }).optional()
-});
+var import_zod28 = require("zod");
+var import_uuid8 = 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" } });
 
 // ../commons/src/events/EventDocument.ts
-var import_zod24 = require("zod");
-var import_zod_openapi6 = require("zod-openapi");
-(0, import_zod_openapi6.extendZodWithOpenApi)(import_zod24.z);
-var EventDocument = import_zod24.z.object({
-  id: import_zod24.z.string(),
-  type: import_zod24.z.string(),
-  dateOfEvent: import_zod24.z.object({ fieldId: import_zod24.z.string() }).optional(),
-  createdAt: import_zod24.z.string().datetime(),
-  updatedAt: import_zod24.z.string().datetime(),
-  actions: import_zod24.z.array(Action),
-  trackingId: import_zod24.z.string()
+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,
+  type: import_zod29.z.string(),
+  createdAt: import_zod29.z.string().datetime(),
+  updatedAt: import_zod29.z.string().datetime(),
+  actions: import_zod29.z.array(Action),
+  trackingId: import_zod29.z.string()
 }).openapi({ ref: "EventDocument" });
 
 // ../commons/src/events/state/utils.ts
@@ -2730,6 +3256,7 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
     acceptedAt: acceptAction.createdAt,
     createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
+    createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
     registrationNumber
   };
 }
@@ -2850,23 +3377,34 @@ function getAssignedUserFromActions(actions) {
     return user2;
   }, null);
 }
+function getAssignedUserSignatureFromActions(actions) {
+  return actions.reduce((signature, action) => {
+    if (action.type === ActionType.ASSIGN) {
+      return action.createdBySignature || null;
+    }
+    if (action.type === ActionType.UNASSIGN) {
+      return null;
+    }
+    return signature;
+  }, null);
+}
 function aggregateActionDeclarations(actions) {
   const excludedActions = [
     ActionType.REQUEST_CORRECTION,
     ActionType.PRINT_CERTIFICATE
   ];
-  return actions.reduce((status, action) => {
+  return actions.reduce((declaration, action) => {
     if (excludedActions.some((excludedAction) => excludedAction === action.type)) {
-      return status;
+      return declaration;
     }
     if (action.type === ActionType.APPROVE_CORRECTION) {
       const requestAction = actions.find(({ id }) => id === action.requestId);
       if (!requestAction) {
-        return status;
+        return declaration;
       }
-      return deepMerge(status, requestAction.declaration);
+      return deepMerge(declaration, requestAction.declaration);
     }
-    return deepMerge(status, action.declaration);
+    return deepMerge(declaration, action.declaration);
   }, {});
 }
 function deepDropNulls(obj) {
@@ -2894,7 +3432,7 @@ function getAcceptedActions(event2) {
   );
 }
 var DEFAULT_DATE_OF_EVENT_PROPERTY = "createdAt";
-function getCurrentEventState(event2) {
+function getCurrentEventState(event2, config) {
   const creationAction = event2.actions.find(
     (action) => action.type === ActionType.CREATE
   );
@@ -2906,9 +3444,17 @@ function getCurrentEventState(event2) {
     event2.actions
   );
   const declaration = aggregateActionDeclarations(acceptedActions);
-  const dateOfEvent = ZodDate.safeParse(
-    event2.dateOfEvent?.fieldId ? declaration[event2.dateOfEvent.fieldId] : event2[DEFAULT_DATE_OF_EVENT_PROPERTY]
-  ).data ?? null;
+  let dateOfEvent;
+  if (config.dateOfEvent) {
+    const parsedDate = ZodDate.safeParse(
+      declaration[config.dateOfEvent.$$field]
+    );
+    if (parsedDate.success) {
+      dateOfEvent = parsedDate.data;
+    }
+  } else {
+    dateOfEvent = event2[DEFAULT_DATE_OF_EVENT_PROPERTY].split("T")[0];
+  }
   return deepDropNulls({
     id: event2.id,
     type: event2.type,
@@ -2917,19 +3463,24 @@ function getCurrentEventState(event2) {
     createdAt: creationAction.createdAt,
     createdBy: creationAction.createdBy,
     createdAtLocation: creationAction.createdAtLocation,
+    createdBySignature: creationAction.createdBySignature,
     updatedAt: declarationUpdateMetadata.createdAt,
     assignedTo: getAssignedUserFromActions(acceptedActions),
+    assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
     updatedBy: declarationUpdateMetadata.createdBy,
     updatedAtLocation: declarationUpdateMetadata.createdAtLocation,
     declaration,
     trackingId: event2.trackingId,
-    // @TODO: unify this with rest of the code. It will trip us if updatedBy has different rules than updatedByUserRole
     updatedByUserRole: declarationUpdateMetadata.createdByRole,
     dateOfEvent,
     flags: getFlagsFromActions(event2.actions)
   });
 }
-function getCurrentEventStateWithDrafts(event2, drafts) {
+function getCurrentEventStateWithDrafts({
+  event: event2,
+  drafts,
+  configuration
+}) {
   const actions = event2.actions.slice().sort((a, b) => a.createdAt.localeCompare(b.createdAt));
   const activeDrafts = findActiveDrafts(event2, drafts).map((draft) => draft.action).flatMap((action) => {
     if (action.type === ActionType.REQUEST_CORRECTION) {
@@ -2948,7 +3499,7 @@ function getCurrentEventStateWithDrafts(event2, drafts) {
     ...event2,
     actions: actionWithDrafts
   };
-  return getCurrentEventState(withDrafts);
+  return getCurrentEventState(withDrafts, configuration);
 }
 function applyDraftsToEventIndex(eventIndex, drafts) {
   const indexedAt = eventIndex.updatedAt;
@@ -3002,73 +3553,45 @@ function generateTransactionId() {
   return getUUID();
 }
 
+// ../commons/src/events/User.ts
+var import_zod30 = require("zod");
+var User = import_zod30.z.object({
+  id: import_zod30.z.string(),
+  name: import_zod30.z.array(
+    import_zod30.z.object({
+      use: import_zod30.z.string(),
+      given: import_zod30.z.array(import_zod30.z.string()),
+      family: import_zod30.z.string()
+    })
+  ),
+  role: import_zod30.z.string(),
+  signatureFilename: import_zod30.z.string().optional()
+});
+
 // ../commons/src/events/test.utils.ts
 var import_lodash2 = require("lodash");
+var import_addDays = __toESM(require("date-fns/addDays"));
 
 // ../commons/src/field-config/field-configuration.ts
-function createFieldConfigs(fieldId) {
+function createFieldConfig(fieldId, options) {
   const baseField = {
     fieldId,
-    fieldType: "field"
+    fieldType: "field",
+    ...options
   };
+  return createSearchConfig(baseField);
+}
+
+// ../commons/src/events/field.ts
+function field(fieldId, options = {}) {
   return {
-    /**
-     * Creates a range configuration for the specified field.
-     *
-     * @returns An object containing the field ID and a configuration object with a type of 'range'.
-     *
-     * @example field('age').range()
-     * // {
-     * //   fieldId: 'age',
-     * //   config: { type: 'range' }
-     * // }
-     */
-    range: () => ({
-      ...baseField,
-      config: { type: "range" }
-    }),
-    /**
-     * Creates a configuration for exact matching of the specified field.
-     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
-     * @example field('dob').exact()
-     * // {
-     * //   fieldId: 'dob',
-     * //   config: { type: 'exact' }
-     * // }
-     */
-    exact: () => ({
-      ...baseField,
-      config: { type: "exact" }
-    }),
-    /**
-     * Creates a configuration for fuzzy matching of the specified field.
-     * @returns  An object containing the field ID and a configuration object with a type of 'exact'.
-     * @example field('name').fuzzy()
-     * // {
-     * //   fieldId: 'name',
-     * //   config: { type: 'fuzzy' }
-     * // }
-     */
-    fuzzy: () => ({
-      ...baseField,
-      config: { type: "fuzzy" }
-    })
-  };
-}
-
-// ../commons/src/events/field.ts
-function field(fieldId) {
-  return {
-    /**
-     * @private Internal property used for field reference tracking.
-     */
-    _fieldId: fieldId,
     ...createFieldConditionals(fieldId),
-    ...createFieldConfigs(fieldId)
+    ...createFieldConfig(fieldId, options)
   };
 }
 
-// ../commons/src/fixtures/tennis-club-membership-event.ts
+// ../commons/src/fixtures/forms.ts
+var import_date_fns2 = require("date-fns");
 var PRINT_CERTIFICATE_FORM = defineActionForm({
   label: {
     id: "v2.event.tennis-club-membership.action.certificate.form.label",
@@ -3886,108 +4409,627 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
       ]
     },
     {
-      id: "senior-pass",
-      conditional: field("applicant.dob").isBefore().date("1950-01-01"),
+      id: "senior-pass",
+      conditional: field("applicant.dob").isBefore().date("1950-01-01"),
+      title: {
+        id: "v2.event.tennis-club-membership.action.declare.form.section.senior-pass.title",
+        defaultMessage: "Assign senior pass for applicant",
+        description: "This is the title of the section"
+      },
+      fields: [
+        {
+          id: "senior-pass.id",
+          type: FieldType.TEXT,
+          required: true,
+          label: {
+            defaultMessage: "Senior pass ID",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.senior-pass.field.id.label"
+          }
+        }
+      ]
+    },
+    {
+      id: "recommender",
+      title: {
+        id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.title",
+        defaultMessage: "Who is recommending the applicant?",
+        description: "This is the title of the section"
+      },
+      fields: [
+        {
+          id: "recommender.none",
+          type: "CHECKBOX",
+          required: false,
+          conditionals: [],
+          label: {
+            defaultMessage: "No recommender",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.none.label"
+          }
+        },
+        {
+          id: "recommender.firstname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("recommender.none").isFalsy()
+            }
+          ],
+          label: {
+            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,
+          required: true,
+          conditionals: [
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("recommender.none").isFalsy()
+            }
+          ],
+          label: {
+            defaultMessage: "Recommender's membership ID",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.id.label"
+          }
+        }
+      ]
+    }
+  ]
+});
+var statusOptions = [
+  {
+    value: "ALL",
+    label: {
+      defaultMessage: "Any status",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusAny"
+    }
+  },
+  {
+    value: EventStatus.CREATED,
+    label: {
+      defaultMessage: "Draft",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusCreated"
+    }
+  },
+  {
+    value: EventStatus.NOTIFIED,
+    label: {
+      defaultMessage: "Notified",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusNotified"
+    }
+  },
+  {
+    value: EventStatus.DECLARED,
+    label: {
+      defaultMessage: "Declared",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusDeclared"
+    }
+  },
+  {
+    value: EventStatus.VALIDATED,
+    label: {
+      defaultMessage: "Validated",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusValidated"
+    }
+  },
+  {
+    value: EventStatus.REGISTERED,
+    label: {
+      defaultMessage: "Registered",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusRegistered"
+    }
+  },
+  {
+    value: EventStatus.CERTIFIED,
+    label: {
+      defaultMessage: "Certified",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusCertified"
+    }
+  },
+  {
+    value: EventStatus.REJECTED,
+    label: {
+      defaultMessage: "Rejected",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusRejected"
+    }
+  },
+  {
+    value: EventStatus.ARCHIVED,
+    label: {
+      defaultMessage: "Archived",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusArchived"
+    }
+  }
+];
+var timePeriodOptions = [
+  {
+    label: {
+      defaultMessage: "Last 7 days",
+      description: "Label for option of time period select: last 7 days",
+      id: "form.section.label.timePeriodLast7Days"
+    },
+    value: `${(0, import_date_fns2.format)((0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 7), "yyyy-MM-dd")},${(0, import_date_fns2.format)(
+      /* @__PURE__ */ new Date(),
+      "yyyy-MM-dd"
+    )}`
+  },
+  {
+    label: {
+      defaultMessage: "Last 30 days",
+      description: "Label for option of time period select: last 30 days",
+      id: "form.section.label.timePeriodLast30Days"
+    },
+    value: `${(0, import_date_fns2.format)((0, import_date_fns2.subMonths)(/* @__PURE__ */ new Date(), 1), "yyyy-MM-dd")},${(0, import_date_fns2.format)(
+      /* @__PURE__ */ new Date(),
+      "yyyy-MM-dd"
+    )}`
+  },
+  {
+    label: {
+      defaultMessage: "Last 90 days",
+      description: "Label for option of time period select: last 90 days",
+      id: "form.section.label.timePeriodLast90Days"
+    },
+    value: `${(0, import_date_fns2.format)((0, import_date_fns2.subQuarters)(/* @__PURE__ */ new Date(), 1), "yyyy-MM-dd")},${(0, import_date_fns2.format)(
+      /* @__PURE__ */ new Date(),
+      "yyyy-MM-dd"
+    )}`
+  },
+  {
+    label: {
+      defaultMessage: "Last year",
+      description: "Label for option of time period select: last year",
+      id: "form.section.label.timePeriodLastYear"
+    },
+    value: `${(0, import_date_fns2.format)((0, import_date_fns2.subYears)(/* @__PURE__ */ new Date(), 1), "yyyy-MM-dd")},${(0, import_date_fns2.format)(
+      /* @__PURE__ */ new Date(),
+      "yyyy-MM-dd"
+    )}`
+  }
+];
+
+// ../commons/src/fixtures/tennis-club-membership-event.ts
+var tennisClubMembershipEvent = defineConfig({
+  id: TENNIS_CLUB_MEMBERSHIP,
+  label: {
+    defaultMessage: "Tennis club membership application",
+    description: "This is what this event is referred as in the system",
+    id: "v2.event.tennis-club-membership.label"
+  },
+  title: {
+    defaultMessage: "{applicant.firstname} {applicant.surname}",
+    description: "This is the title of the summary",
+    id: "v2.event.tennis-club-membership.title"
+  },
+  summary: {
+    fields: [
+      {
+        id: "applicant.firstname",
+        label: {
+          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"
+      }
+    ]
+  },
+  actions: [
+    {
+      type: ActionType.READ,
+      label: {
+        id: "v2.event.tennis-club-membership.action.read.label",
+        defaultMessage: "Read",
+        description: "Title of the read only page"
+      },
+      review: TENNIS_CLUB_DECLARATION_REVIEW
+    },
+    {
+      type: ActionType.DECLARE,
+      label: {
+        defaultMessage: "Send an application",
+        description: "This is shown as the action name anywhere the user can trigger the action from",
+        id: "event.tennis-club-membership.action.declare.label"
+      },
+      review: TENNIS_CLUB_DECLARATION_REVIEW
+    },
+    {
+      type: ActionType.VALIDATE,
+      label: {
+        defaultMessage: "Validate",
+        description: "This is shown as the action name anywhere the user can trigger the action from",
+        id: "event.tennis-club-membership.action.validate.label"
+      },
+      review: TENNIS_CLUB_DECLARATION_REVIEW
+    },
+    {
+      type: ActionType.REGISTER,
+      label: {
+        defaultMessage: "Register",
+        description: "This is shown as the action name anywhere the user can trigger the action from",
+        id: "event.tennis-club-membership.action.register.label"
+      },
+      review: TENNIS_CLUB_DECLARATION_REVIEW
+    },
+    {
+      type: ActionType.REQUEST_CORRECTION,
+      label: {
+        defaultMessage: "Request correction",
+        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"
+              }
+            },
+            {
+              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.tennis-club-membership.action.requestCorrection.form.section.verify",
+            defaultMessage: "Verify their identity",
+            description: "This is the title of the section"
+          },
+          fields: [
+            {
+              id: "correction.identity-check.instructions",
+              type: "PAGE_HEADER",
+              label: {
+                id: "correction.corrector.identity.instruction",
+                defaultMessage: "Please verify the identity of the person making this request",
+                description: "The title for the corrector form"
+              }
+            },
+            {
+              id: "correction.identity-check.verified",
+              type: "RADIO_GROUP",
+              label: {
+                id: "correction.corrector.identity.verified.label",
+                defaultMessage: "Identity verified",
+                description: "The title for the corrector form"
+              },
+              defaultValue: "",
+              required: true,
+              options: [
+                {
+                  value: "VERIFIED",
+                  label: {
+                    id: "correction.corrector.identity.verified",
+                    defaultMessage: "I have verified their identity",
+                    description: "Label for verified option in corrector identity check page"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      additionalDetailsForm: [
+        {
+          id: "correction-request.supporting-documents",
+          type: PageTypes.enum.FORM,
+          title: {
+            id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
+            defaultMessage: "Upload supporting documents",
+            description: "This is the title of the section"
+          },
+          fields: [
+            {
+              id: "correction.supportingDocs.introduction",
+              type: "PAGE_HEADER",
+              label: {
+                id: "correction.corrector.paragraph.title",
+                defaultMessage: "For all record corrections at a minimum an affidavit must be provided. For material errors and omissions eg. in paternity cases, a court order must also be provided.",
+                description: "The title for the corrector form"
+              }
+            },
+            {
+              id: "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.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,
+      label: {
+        defaultMessage: "Approve correction",
+        description: "This is shown as the action name anywhere the user can trigger the action from",
+        id: "event.tennis-club-membership.action.correction.approve.label"
+      }
+    },
+    {
+      type: ActionType.PRINT_CERTIFICATE,
+      label: {
+        id: "v2.event.tennis-club-membership.action.collect-certificate.label",
+        defaultMessage: "Print certificate",
+        description: "This is shown as the action name anywhere the user can trigger the action from"
+      },
+      printForm: PRINT_CERTIFICATE_FORM,
+      conditionals: [
+        {
+          type: "SHOW",
+          conditional: defineConditional({
+            type: "object",
+            properties: {
+              $event: {
+                type: "object",
+                properties: {
+                  actions: {
+                    type: "array",
+                    contains: {
+                      type: "object",
+                      properties: {
+                        type: {
+                          const: "REGISTER"
+                        },
+                        draft: {
+                          type: "boolean"
+                        }
+                      },
+                      required: ["type"],
+                      not: {
+                        properties: {
+                          draft: {
+                            const: true
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                required: ["actions"]
+              }
+            },
+            required: ["$event"]
+          })
+        }
+      ]
+    },
+    {
+      type: ActionType.ARCHIVE,
+      label: {
+        id: "v2.event.tennis-club-membership.action.archive.label",
+        defaultMessage: "Archive",
+        description: "This is shown as the action name anywhere the user can trigger the action from"
+      }
+    },
+    {
+      type: ActionType.REJECT,
+      label: {
+        id: "v2.event.tennis-club-membership.action.reject.label",
+        defaultMessage: "Reject",
+        description: "This is shown as the action name anywhere the user can trigger the action from"
+      }
+    }
+  ],
+  advancedSearch: [
+    {
       title: {
-        id: "v2.event.tennis-club-membership.action.declare.form.section.senior-pass.title",
-        defaultMessage: "Assign senior pass for applicant",
-        description: "This is the title of the section"
+        defaultMessage: "Registration details",
+        description: "The title of Registration details accordion",
+        id: "v2.advancedSearch.form.registrationDetails"
       },
       fields: [
-        {
-          id: "senior-pass.id",
-          type: FieldType.TEXT,
-          required: true,
-          label: {
-            defaultMessage: "Senior pass ID",
-            description: "This is the label for the field",
-            id: "v2.event.tennis-club-membership.action.declare.form.section.senior-pass.field.id.label"
-          }
-        }
+        event("legalStatus.REGISTERED.createdAtLocation").exact(),
+        event("legalStatus.REGISTERED.createdAt").range(),
+        event("status", statusOptions).exact(),
+        event("updatedAt", timePeriodOptions).range()
       ]
     },
     {
-      id: "recommender",
       title: {
-        id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.title",
-        defaultMessage: "Who is recommending the applicant?",
-        description: "This is the title of the section"
+        defaultMessage: "Applicant's details",
+        description: "Applicant details search field section title",
+        id: "v2.event.tennis-club-membership.search.applicants"
       },
       fields: [
-        {
-          id: "recommender.none",
-          type: "CHECKBOX",
-          required: false,
-          conditionals: [],
-          label: {
-            defaultMessage: "No recommender",
-            description: "This is the label for the field",
-            id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.none.label"
-          }
-        },
-        {
-          id: "recommender.firstname",
-          type: FieldType.TEXT,
-          required: true,
-          conditionals: [
-            {
-              type: ConditionalType.SHOW,
-              conditional: field("recommender.none").isFalsy()
-            }
-          ],
-          label: {
-            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,
-          required: true,
-          conditionals: [
-            {
-              type: ConditionalType.SHOW,
-              conditional: field("recommender.none").isFalsy()
-            }
-          ],
-          label: {
-            defaultMessage: "Recommender's membership ID",
-            description: "This is the label for the field",
-            id: "v2.event.tennis-club-membership.action.declare.form.section.recommender.field.id.label"
-          }
-        }
+        field("applicant.firstname").fuzzy(),
+        field("applicant.surname").fuzzy(),
+        field("applicant.dob").range(),
+        field("applicant.email").exact()
+      ]
+    },
+    {
+      title: {
+        defaultMessage: "Recommender's details",
+        description: "Recommender details search field section title",
+        id: "v2.event.tennis-club-membership.search.recommender"
+      },
+      fields: [
+        field("recommender.firstname").fuzzy(),
+        field("recommender.surname").fuzzy()
       ]
     }
-  ]
+  ],
+  declaration: TENNIS_CLUB_DECLARATION_FORM
 });
-var tennisClubMembershipEvent = defineConfig({
-  id: "TENNIS_CLUB_MEMBERSHIP",
+
+// ../commons/src/fixtures/football-club-membership-event.ts
+var footballClubMembershipEvent = defineConfig({
+  id: "FOOTBALL_CLUB_MEMBERSHIP",
   label: {
-    defaultMessage: "Tennis club membership application",
+    defaultMessage: "Football club membership application",
     description: "This is what this event is referred as in the system",
-    id: "event.tennis-club-membership.label"
+    id: "event.football-club-membership.label"
   },
   title: {
     defaultMessage: "{applicant.firstname} {applicant.surname}",
     description: "This is the title of the summary",
-    id: "v2.event.tennis-club-membership.title"
+    id: "v2.event.football-club-membership.title"
   },
   summary: {
     fields: [
@@ -3996,17 +5038,17 @@ var tennisClubMembershipEvent = defineConfig({
         label: {
           defaultMessage: "Applicant's first name",
           description: "This is the label for the field",
-          id: "event.tennis-club-membership.summary.field.firstname.label"
+          id: "event.football-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"
+          id: "event.football-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"
+          id: "event.football-club-membership.summary.field.firstname.empty"
         }
       },
       {
@@ -4014,7 +5056,7 @@ var tennisClubMembershipEvent = defineConfig({
         label: {
           defaultMessage: "Applicant's last name",
           description: "Label for surname",
-          id: "v2.event.tennis-club-membership.summary.field.surname.label"
+          id: "v2.event.football-club-membership.summary.field.surname.label"
         }
       },
       {
@@ -4023,12 +5065,21 @@ var tennisClubMembershipEvent = defineConfig({
     ]
   },
   actions: [
+    {
+      type: ActionType.READ,
+      label: {
+        id: "v2.event.football-club-membership.action.read.label",
+        defaultMessage: "Read",
+        description: "Title of the read only page"
+      },
+      review: TENNIS_CLUB_DECLARATION_REVIEW
+    },
     {
       type: ActionType.DECLARE,
       label: {
         defaultMessage: "Send an application",
         description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.tennis-club-membership.action.declare.label"
+        id: "event.football-club-membership.action.declare.label"
       },
       review: TENNIS_CLUB_DECLARATION_REVIEW
     },
@@ -4037,7 +5088,7 @@ var tennisClubMembershipEvent = defineConfig({
       label: {
         defaultMessage: "Validate",
         description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.tennis-club-membership.action.validate.label"
+        id: "event.football-club-membership.action.validate.label"
       },
       review: TENNIS_CLUB_DECLARATION_REVIEW
     },
@@ -4046,7 +5097,7 @@ var tennisClubMembershipEvent = defineConfig({
       label: {
         defaultMessage: "Register",
         description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.tennis-club-membership.action.register.label"
+        id: "event.football-club-membership.action.register.label"
       },
       review: TENNIS_CLUB_DECLARATION_REVIEW
     },
@@ -4055,14 +5106,14 @@ var tennisClubMembershipEvent = defineConfig({
       label: {
         defaultMessage: "Request correction",
         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"
+        id: "event.football-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",
+            id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
             defaultMessage: "Correction requester",
             description: "This is the title of the section"
           },
@@ -4126,7 +5177,7 @@ var tennisClubMembershipEvent = defineConfig({
           id: "identity-check",
           type: PageTypes.enum.FORM,
           title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
+            id: "event.football-club-membership.action.requestCorrection.form.section.verify",
             defaultMessage: "Verify their identity",
             description: "This is the title of the section"
           },
@@ -4169,7 +5220,7 @@ var tennisClubMembershipEvent = defineConfig({
           id: "correction-request.supporting-documents",
           type: PageTypes.enum.FORM,
           title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.verify",
+            id: "event.football-club-membership.action.requestCorrection.form.section.verify",
             defaultMessage: "Upload supporting documents",
             description: "This is the title of the section"
           },
@@ -4231,7 +5282,7 @@ var tennisClubMembershipEvent = defineConfig({
           id: "correction-request.additional-details",
           type: PageTypes.enum.FORM,
           title: {
-            id: "event.tennis-club-membership.action.requestCorrection.form.section.corrector",
+            id: "event.football-club-membership.action.requestCorrection.form.section.corrector",
             defaultMessage: "Reason for correction",
             description: "This is the title of the section"
           },
@@ -4254,13 +5305,13 @@ var tennisClubMembershipEvent = defineConfig({
       label: {
         defaultMessage: "Approve correction",
         description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.tennis-club-membership.action.correction.approve.label"
+        id: "event.football-club-membership.action.correction.approve.label"
       }
     },
     {
       type: ActionType.PRINT_CERTIFICATE,
       label: {
-        id: "v2.event.tennis-club-membership.action.collect-certificate.label",
+        id: "v2.event.football-club-membership.action.collect-certificate.label",
         defaultMessage: "Print certificate",
         description: "This is shown as the action name anywhere the user can trigger the action from"
       },
@@ -4308,7 +5359,7 @@ var tennisClubMembershipEvent = defineConfig({
     {
       type: ActionType.ARCHIVE,
       label: {
-        id: "v2.event.tennis-club-membership.action.archive.label",
+        id: "v2.event.football-club-membership.action.archive.label",
         defaultMessage: "Archive",
         description: "This is shown as the action name anywhere the user can trigger the action from"
       }
@@ -4316,7 +5367,7 @@ var tennisClubMembershipEvent = defineConfig({
     {
       type: ActionType.REJECT,
       label: {
-        id: "v2.event.tennis-club-membership.action.reject.label",
+        id: "v2.event.football-club-membership.action.reject.label",
         defaultMessage: "Reject",
         description: "This is shown as the action name anywhere the user can trigger the action from"
       }
@@ -4325,16 +5376,104 @@ var tennisClubMembershipEvent = defineConfig({
   advancedSearch: [
     {
       title: {
-        defaultMessage: "Tennis club registration search",
-        description: "This is what this event is referred as in the system",
-        id: "v2.event.tennis-club-membership.search"
+        defaultMessage: "Registration details",
+        description: "The title of Registration details accordion",
+        id: "v2.advancedSearch.form.registrationDetails"
+      },
+      fields: [
+        event("legalStatus.REGISTERED.createdAtLocation").exact(),
+        event("legalStatus.REGISTERED.createdAt").range(),
+        event("status", statusOptions).exact(),
+        event("updatedAt", timePeriodOptions).range()
+      ]
+    },
+    {
+      title: {
+        defaultMessage: "Applicant's details",
+        description: "Applicant details search field section title",
+        id: "v2.event.football-club-membership.search.applicants"
+      },
+      fields: [
+        field("applicant.firstname").fuzzy(),
+        field("applicant.surname").fuzzy(),
+        field("applicant.dob").range(),
+        field("applicant.email").exact()
+      ]
+    },
+    {
+      title: {
+        defaultMessage: "Recommender's details",
+        description: "Recommender details search field section title",
+        id: "v2.event.football-club-membership.search.recommender"
       },
-      fields: [field("applicant.dob").exact()]
+      fields: [
+        field("recommender.firstname").fuzzy(),
+        field("recommender.surname").fuzzy()
+      ]
     }
   ],
   declaration: TENNIS_CLUB_DECLARATION_FORM
 });
 
+// ../commons/src/fixtures/library-membership-event.ts
+var libraryMembershipForm = defineDeclarationForm({
+  label: {
+    id: "v2.event.library-membership.action.declare.form.label",
+    defaultMessage: "Library membership application",
+    description: "This is what this form is referred as in the system"
+  },
+  pages: [
+    {
+      id: "member",
+      title: {
+        id: "v2.event.library-membership.action.declare.form.section.who.title",
+        defaultMessage: "Who is applying for the membership?",
+        description: "This is the title of the section"
+      },
+      fields: [
+        {
+          id: "member.firstname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [],
+          label: {
+            defaultMessage: "Member's first name",
+            description: "This is the label for the field",
+            id: "v2.event.library-membership.action.declare.form.section.who.field.firstname.label"
+          }
+        },
+        {
+          id: "member.surname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [],
+          label: {
+            defaultMessage: "Member's surname",
+            description: "This is the label for the field",
+            id: "v2.event.library-membership.action.declare.form.section.who.field.surname.label"
+          }
+        }
+      ]
+    }
+  ]
+});
+var libraryMembershipEvent = defineConfig({
+  id: "library-membership",
+  label: {
+    defaultMessage: "Library membership application",
+    description: "This is what this event is referred as in the system",
+    id: "event.library-membership.label"
+  },
+  title: {
+    defaultMessage: "{member.firstname} {member.surname}",
+    description: "This is the title of the summary",
+    id: "v2.event.library-membership.title"
+  },
+  summary: { fields: [] },
+  actions: [],
+  declaration: libraryMembershipForm
+});
+
 // ../commons/src/events/test.utils.ts
 function fieldConfigsToActionPayload(fields) {
   return fields.reduce(
@@ -4382,11 +5521,11 @@ function generateActionAnnotationInput(configuration, action) {
 var eventPayloadGenerator = {
   create: (input = {}) => ({
     transactionId: input.transactionId ?? getUUID(),
-    type: input.type ?? "TENNIS_CLUB_MEMBERSHIP"
+    type: input.type ?? TENNIS_CLUB_MEMBERSHIP
   }),
   patch: (id, input = {}) => ({
     transactionId: input.transactionId ?? getUUID(),
-    type: input.type ?? "TENNIS_CLUB_MEMBERSHIP",
+    type: input.type ?? TENNIS_CLUB_MEMBERSHIP,
     id
   }),
   draft: ({ eventId, actionType }, input = {}) => (0, import_lodash2.merge)(
@@ -4412,7 +5551,7 @@ var eventPayloadGenerator = {
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         createdBy: "@todo",
         createdByRole: "@todo",
-        createdAtLocation: "@todo"
+        createdAtLocation: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c"
       }
     },
     input
@@ -4486,9 +5625,13 @@ var eventPayloadGenerator = {
       transactionId: input.transactionId ?? getUUID(),
       declaration: {},
       // @TODO: Check whether generator is needed?
-      annotation: { isDuplicate: isDuplicate ?? false },
+      annotation: {},
       duplicates: [],
-      eventId
+      eventId,
+      reason: {
+        message: `${ActionType.ARCHIVE}`,
+        isDuplicate: isDuplicate ?? false
+      }
     }),
     reject: (eventId, input = {}) => ({
       type: ActionType.REJECT,
@@ -4499,7 +5642,8 @@ var eventPayloadGenerator = {
         ActionType.REJECT
       ),
       duplicates: [],
-      eventId
+      eventId,
+      reason: { message: `${ActionType.REJECT}` }
     }),
     register: (eventId, input = {}) => ({
       type: ActionType.REGISTER,
@@ -4596,9 +5740,9 @@ function generateActionDocument({
     case ActionType.VALIDATE:
       return { ...actionBase, type: action };
     case ActionType.ARCHIVE:
-      return { ...actionBase, type: action };
+      return { ...actionBase, type: action, reason: { message: "Archive" } };
     case ActionType.REJECT:
-      return { ...actionBase, type: action };
+      return { ...actionBase, type: action, reason: { message: "Reject" } };
     case ActionType.CREATE:
       return { ...actionBase, type: action };
     case ActionType.NOTIFY:
@@ -4610,7 +5754,11 @@ function generateActionDocument({
     case ActionType.APPROVE_CORRECTION:
       return { ...actionBase, requestId: getUUID(), type: action };
     case ActionType.REJECT_CORRECTION:
-      return { ...actionBase, requestId: getUUID(), type: action };
+      return {
+        ...actionBase,
+        requestId: getUUID(),
+        type: action
+      };
     case ActionType.REGISTER:
       return {
         ...actionBase,
@@ -4638,8 +5786,7 @@ function generateEventDocument({
     id: getUUID(),
     // 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.
-    updatedAt: new Date(Date.now() - 1e3).toISOString(),
-    dateOfEvent: configuration.dateOfEvent
+    updatedAt: new Date(Date.now() - 1e3).toISOString()
   };
 }
 function generateEventDraftDocument(eventId, actionType = ActionType.DECLARE, declaration = {}) {
@@ -4661,21 +5808,16 @@ function generateEventDraftDocument(eventId, actionType = ActionType.DECLARE, de
     eventId
   };
 }
-function getEventStatus() {
-  const statuses = [
-    EventStatus.CREATED,
-    EventStatus.REGISTERED,
-    EventStatus.DECLARED
-  ];
-  const randomIndex = Math.floor(Math.random() * 3);
-  return statuses[randomIndex];
+function pickRandom(rng, items) {
+  return items[Math.floor(rng() * items.length)];
 }
-function getTrackingId() {
-  const uuid = getUUID().replace(/-/g, "");
-  const trackingId = uuid.slice(0, 6).toUpperCase();
-  return trackingId;
+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 getRandomApplicant() {
+function generateRandomApplicant(rng) {
   const firstNames = [
     "Danny",
     "John",
@@ -4696,18 +5838,13 @@ function getRandomApplicant() {
     "Garcia",
     "Miller"
   ];
-  function getRandomDate(start, end) {
-    const randomDate = new Date(
-      start.getTime() + Math.random() * (end.getTime() - start.getTime())
-    );
-    return randomDate.toISOString().split("T")[0];
-  }
-  const randomFirstName = firstNames[Math.floor(Math.random() * firstNames.length)];
-  const randomSurname = surnames[Math.floor(Math.random() * surnames.length)];
-  const randomDob = getRandomDate(
+  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.firstname": randomFirstName,
@@ -4715,28 +5852,84 @@ function getRandomApplicant() {
     "applicant.dob": randomDob
   };
 }
-var eventQueryDataGenerator = (overrides = {}) => ({
-  id: overrides.id ?? getUUID(),
-  type: overrides.type ?? "TENNIS_CLUB_MEMBERSHIP",
-  status: overrides.status ?? getEventStatus(),
-  createdAt: overrides.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-  createdBy: overrides.createdBy ?? getUUID(),
-  createdAtLocation: overrides.createdAtLocation ?? getUUID(),
-  updatedAtLocation: overrides.updatedAtLocation ?? getUUID(),
-  updatedAt: overrides.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-  assignedTo: overrides.assignedTo ?? null,
-  updatedBy: overrides.updatedBy ?? getUUID(),
-  updatedByUserRole: overrides.updatedByUserRole ?? "FIELD_AGENT",
-  flags: [],
-  legalStatuses: overrides.legalStatuses ?? {},
-  declaration: overrides.declaration ?? getRandomApplicant(),
-  trackingId: overrides.trackingId ?? getTrackingId()
-});
+function createPseudoRandomNumberGenerator(seed) {
+  const MODULUS = 2 ** 32;
+  const MULTIPLIER = 1664525;
+  const INCREMENT = 1013904223;
+  let state = seed >>> 0;
+  return () => {
+    state = (MULTIPLIER * state + INCREMENT) % MODULUS;
+    return state / MODULUS;
+  };
+}
+function generateUuid(rng) {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+    const r = Math.floor(rng() * 16);
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
+function generateTrackingId(rng) {
+  const uuid = generateUuid(rng).replace(/-/g, "");
+  const trackingId = uuid.slice(0, 6).toUpperCase();
+  return trackingId;
+}
+function generateRandomSignature(rng) {
+  return `/random-bucket/${generateUuid(rng)}.png`;
+}
+var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
+  const rng = createPseudoRandomNumberGenerator(seed);
+  const createdAt = getRandomDatetime(
+    rng,
+    /* @__PURE__ */ new Date("2024-01-01"),
+    /* @__PURE__ */ new Date("2024-12-31")
+  );
+  return {
+    id: overrides.id ?? generateUuid(rng),
+    type: overrides.type ?? TENNIS_CLUB_MEMBERSHIP,
+    status: overrides.status ?? pickRandom(rng, eventStatuses),
+    createdAt: overrides.createdAt ?? createdAt,
+    createdBy: overrides.createdBy ?? generateUuid(rng),
+    createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
+    updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
+    createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
+    updatedAt: overrides.updatedAt ?? (0, import_addDays.default)(new Date(createdAt), 1).toISOString(),
+    assignedTo: overrides.assignedTo ?? null,
+    updatedBy: overrides.updatedBy ?? generateUuid(rng),
+    updatedByUserRole: overrides.updatedByUserRole ?? "FIELD_AGENT",
+    flags: [],
+    legalStatuses: overrides.legalStatuses ?? {},
+    declaration: overrides.declaration ?? generateRandomApplicant(rng),
+    trackingId: overrides.trackingId ?? generateTrackingId(rng)
+  };
+};
 var generateTranslationConfig = (message) => ({
   defaultMessage: message,
   description: "Description for ${message}",
   id: message
 });
+var BearerTokenByUserType = {
+  fieldAgent: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzY29wZSI6WyJyZWNvcmQuZGVjbGFyZS1iaXJ0aCIsInJlY29yZC5kZWNsYXJlLWRlYXRoIiwicmVjb3JkLmRlY2xhcmUtbWFycmlhZ2UiLCJyZWNvcmQuZGVjbGFyYXRpb24tc3VibWl0LWluY29tcGxldGUiLCJyZWNvcmQuZGVjbGFyYXRpb24tc3VibWl0LWZvci1yZXZpZXciLCJzZWFyY2guYmlydGgiLCJzZWFyY2guZGVhdGgiLCJzZWFyY2gubWFycmlhZ2UiLCJkZW1vIl0sInVzZXJUeXBlIjoidXNlciIsImlhdCI6MTc0ODUyNjQ4OCwiZXhwIjoxNzQ5MTMxMjg4LCJhdWQiOlsib3BlbmNydnM6YXV0aC11c2VyIiwib3BlbmNydnM6dXNlci1tZ250LXVzZXIiLCJvcGVuY3J2czpoZWFydGgtdXNlciIsIm9wZW5jcnZzOmdhdGV3YXktdXNlciIsIm9wZW5jcnZzOm5vdGlmaWNhdGlvbi11c2VyIiwib3BlbmNydnM6d29ya2Zsb3ctdXNlciIsIm9wZW5jcnZzOnNlYXJjaC11c2VyIiwib3BlbmNydnM6bWV0cmljcy11c2VyIiwib3BlbmNydnM6Y291bnRyeWNvbmZpZy11c2VyIiwib3BlbmNydnM6d2ViaG9va3MtdXNlciIsIm9wZW5jcnZzOmNvbmZpZy11c2VyIiwib3BlbmNydnM6ZG9jdW1lbnRzLXVzZXIiXSwiaXNzIjoib3BlbmNydnM6YXV0aC1zZXJ2aWNlIiwic3ViIjoiNjc3ZmIwODYzMGYzYWJmYTMzMDcyNzBmIn0.qLif2TmTPpqfbSUWR3TSfWf5syyCtRRJV-fDOZBtN9th-gdT0sUPZp5PB_t2QHHCLes7JLDlSA9CGNIbVvRR8a7EedXTAf0T7pwiE96PgljHSKI9jLMCYb_rhqnl8BwfsxAU3qv8EBYM9rDlcabl5iKnAOM-YLMv63CRMQxZOZ0O3Wl1Xil82dp6PqW_Lom5Qd-Esftt9BWXk5gxmqq-YegT8qU9n3hDXEsOvmIyYQvPDwmUOB-xp74CKJk_o3eBuq4TVCMYxY-tS9qkkn2A7Txhh-bzWMVNrQjQ1Yumvs8gi_F-XYTi89QbZVz8PzJ9kT8w3jshYwmAy7be9M-EQg",
+  registrationAgent: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzY29wZSI6WyJyZWNvcmQucmVhZCIsInJlY29yZC5kZWNsYXJlLWJpcnRoIiwicmVjb3JkLmRlY2xhcmUtZGVhdGgiLCJyZWNvcmQuZGVjbGFyZS1tYXJyaWFnZSIsInJlY29yZC5kZWNsYXJhdGlvbi1lZGl0IiwicmVjb3JkLmRlY2xhcmF0aW9uLXN1Ym1pdC1mb3ItYXBwcm92YWwiLCJyZWNvcmQuZGVjbGFyYXRpb24tc3VibWl0LWZvci11cGRhdGVzIiwicmVjb3JkLmRlY2xhcmF0aW9uLWFyY2hpdmUiLCJyZWNvcmQuZGVjbGFyYXRpb24tcmVpbnN0YXRlIiwicmVjb3JkLnJlZ2lzdHJhdGlvbi1yZXF1ZXN0LWNvcnJlY3Rpb24iLCJyZWNvcmQuZGVjbGFyYXRpb24tcHJpbnQtc3VwcG9ydGluZy1kb2N1bWVudHMiLCJyZWNvcmQuZXhwb3J0LXJlY29yZHMiLCJyZWNvcmQucmVnaXN0cmF0aW9uLXByaW50Jmlzc3VlLWNlcnRpZmllZC1jb3BpZXMiLCJwZXJmb3JtYW5jZS5yZWFkIiwicGVyZm9ybWFuY2UucmVhZC1kYXNoYm9hcmRzIiwib3JnYW5pc2F0aW9uLnJlYWQtbG9jYXRpb25zOm15LW9mZmljZSIsInNlYXJjaC5iaXJ0aCIsInNlYXJjaC5kZWF0aCIsInNlYXJjaC5tYXJyaWFnZSIsImRlbW8iXSwidXNlclR5cGUiOiJ1c2VyIiwiaWF0IjoxNzQ4NTI2NDY4LCJleHAiOjE3NDkxMzEyNjgsImF1ZCI6WyJvcGVuY3J2czphdXRoLXVzZXIiLCJvcGVuY3J2czp1c2VyLW1nbnQtdXNlciIsIm9wZW5jcnZzOmhlYXJ0aC11c2VyIiwib3BlbmNydnM6Z2F0ZXdheS11c2VyIiwib3BlbmNydnM6bm90aWZpY2F0aW9uLXVzZXIiLCJvcGVuY3J2czp3b3JrZmxvdy11c2VyIiwib3BlbmNydnM6c2VhcmNoLXVzZXIiLCJvcGVuY3J2czptZXRyaWNzLXVzZXIiLCJvcGVuY3J2czpjb3VudHJ5Y29uZmlnLXVzZXIiLCJvcGVuY3J2czp3ZWJob29rcy11c2VyIiwib3BlbmNydnM6Y29uZmlnLXVzZXIiLCJvcGVuY3J2czpkb2N1bWVudHMtdXNlciJdLCJpc3MiOiJvcGVuY3J2czphdXRoLXNlcnZpY2UiLCJzdWIiOiI2NzdmYjA4NjMwZjNhYmZhMzMwNzI3MTgifQ.C0R3cda9tczdJyadyJzk_wjVx79yiQ4r2BZbrF5VMTol97CwqMk1cPKVv5xZR1fHW5nhYl1X_vsmTYx-p9oSmcAYVud-4Z24TrA3oZ214zCB8RW_RmmFzJSczwe-9Son-96JOpRJTz2F-F_SSmblF0cjndJ-iXCAbOn1hmQ1q45NqaV-oFaFWigvAaRoBFcEvGufQxss_NjRmG12ooENSfWQl0tYM9BmTw4JQo2xerwJcgaJTrtDgRagkuiR7zhVNjcoT64AQiSRp5KmWRhbU4ozlJ2tfy1ccD9jJkbQTf1AZT2pl1diusjstJYFuM9QPFPOyCO0umaxYfgSer_Hmg",
+  localRegistrar: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzY29wZSI6WyJyZWNvcmQucmVhZCIsInJlY29yZC5kZWNsYXJlLWJpcnRoIiwicmVjb3JkLmRlY2xhcmUtZGVhdGgiLCJyZWNvcmQuZGVjbGFyZS1tYXJyaWFnZSIsInJlY29yZC5kZWNsYXJhdGlvbi1lZGl0IiwicmVjb3JkLmRlY2xhcmF0aW9uLXN1Ym1pdC1mb3ItdXBkYXRlcyIsInJlY29yZC5yZXZpZXctZHVwbGljYXRlcyIsInJlY29yZC5kZWNsYXJhdGlvbi1hcmNoaXZlIiwicmVjb3JkLmRlY2xhcmF0aW9uLXJlaW5zdGF0ZSIsInJlY29yZC5yZWdpc3RlciIsInJlY29yZC5yZWdpc3RyYXRpb24tY29ycmVjdCIsInJlY29yZC5kZWNsYXJhdGlvbi1wcmludC1zdXBwb3J0aW5nLWRvY3VtZW50cyIsInJlY29yZC5leHBvcnQtcmVjb3JkcyIsInJlY29yZC51bmFzc2lnbi1vdGhlcnMiLCJyZWNvcmQucmVnaXN0cmF0aW9uLXByaW50Jmlzc3VlLWNlcnRpZmllZC1jb3BpZXMiLCJyZWNvcmQuY29uZmlybS1yZWdpc3RyYXRpb24iLCJyZWNvcmQucmVqZWN0LXJlZ2lzdHJhdGlvbiIsInBlcmZvcm1hbmNlLnJlYWQiLCJwZXJmb3JtYW5jZS5yZWFkLWRhc2hib2FyZHMiLCJwcm9maWxlLmVsZWN0cm9uaWMtc2lnbmF0dXJlIiwib3JnYW5pc2F0aW9uLnJlYWQtbG9jYXRpb25zOm15LW9mZmljZSIsInNlYXJjaC5iaXJ0aCIsInNlYXJjaC5kZWF0aCIsInNlYXJjaC5tYXJyaWFnZSIsImRlbW8iXSwidXNlclR5cGUiOiJ1c2VyIiwiaWF0IjoxNzQ4NTI2NDIwLCJleHAiOjE3NDkxMzEyMjAsImF1ZCI6WyJvcGVuY3J2czphdXRoLXVzZXIiLCJvcGVuY3J2czp1c2VyLW1nbnQtdXNlciIsIm9wZW5jcnZzOmhlYXJ0aC11c2VyIiwib3BlbmNydnM6Z2F0ZXdheS11c2VyIiwib3BlbmNydnM6bm90aWZpY2F0aW9uLXVzZXIiLCJvcGVuY3J2czp3b3JrZmxvdy11c2VyIiwib3BlbmNydnM6c2VhcmNoLXVzZXIiLCJvcGVuY3J2czptZXRyaWNzLXVzZXIiLCJvcGVuY3J2czpjb3VudHJ5Y29uZmlnLXVzZXIiLCJvcGVuY3J2czp3ZWJob29rcy11c2VyIiwib3BlbmNydnM6Y29uZmlnLXVzZXIiLCJvcGVuY3J2czpkb2N1bWVudHMtdXNlciJdLCJpc3MiOiJvcGVuY3J2czphdXRoLXNlcnZpY2UiLCJzdWIiOiI2NzdmYjA4NjMwZjNhYmZhMzMwNzI3MjEifQ.Exwojy_1lsoPmp-kQ79SMWI0eQy8Qt7yO_ynGvb_oIVdqSwTxFkkNr9x4UxhBA-o0P6LkMZ2ELKOlSzBr3PRJ8IQnfMQ7Db8oG8HAPsY8sKqra_L6ryV088NW2e2LqAjoOX0dXRIqYMolUhF_OOuZpHW5K8nvog5SLlnJ1gKysQ1EuWBg2dcKbjkkB16v-9NGz4XHye3vcoZlalyha5OOujzbPhkmr9UGiksSIXFNbanBhkQdt-EJlLX9SXvQ4ACJWPKFb_f4gv8p84jdLiryzQux46zHPpTicZHzg0nZtoKKIH1AyFtqWfBFm4y8qWC3ht9TAk93NAXTfkS0wzxKA"
+};
+var generateWorkqueues = (slug = "all-events") => defineWorkqueues([
+  {
+    slug,
+    name: {
+      id: "workqueues.inProgress.title",
+      defaultMessage: slug.charAt(0).toUpperCase() + slug.slice(1).split("-").join(" "),
+      description: "Title of in progress workqueue"
+    },
+    query: {
+      type: "and",
+      clauses: [{ eventType: tennisClubMembershipEvent.id }]
+    },
+    actions: [],
+    icon: "Draft",
+    columns: []
+  }
+]);
 
 // ../commons/src/events/TemplateConfig.ts
 function isTemplateVariable(value) {
@@ -4774,7 +5967,7 @@ function isFieldConfigDefaultValue(value) {
 var import_lodash3 = require("lodash");
 
 // ../commons/src/scopes.ts
-var import_zod25 = require("zod");
+var import_zod31 = require("zod");
 var SCOPES = {
   // TODO v1.8 legacy scopes
   NATLSYSADMIN: "natlsysadmin",
@@ -4798,6 +5991,8 @@ var SCOPES = {
    */
   RECORD_DECLARE: "record.declare-birth",
   // declare
+  RECORD_IMPORT: "record.import",
+  // declare
   RECORD_DECLARE_BIRTH: "record.declare-birth",
   RECORD_DECLARE_BIRTH_MY_JURISDICTION: "record.declare-birth:my-jurisdiction",
   RECORD_DECLARE_DEATH: "record.declare-death",
@@ -4885,107 +6080,119 @@ var SCOPES = {
   // data seeding
   USER_DATA_SEEDING: "user.data-seeding"
 };
-var LiteralScopes = import_zod25.z.union([
-  import_zod25.z.literal(SCOPES.NATLSYSADMIN),
-  import_zod25.z.literal(SCOPES.BYPASSRATELIMIT),
-  import_zod25.z.literal(SCOPES.DECLARE),
-  import_zod25.z.literal(SCOPES.REGISTER),
-  import_zod25.z.literal(SCOPES.VALIDATE),
-  import_zod25.z.literal(SCOPES.DEMO),
-  import_zod25.z.literal(SCOPES.CERTIFY),
-  import_zod25.z.literal(SCOPES.PERFORMANCE),
-  import_zod25.z.literal(SCOPES.SYSADMIN),
-  import_zod25.z.literal(SCOPES.TEAMS),
-  import_zod25.z.literal(SCOPES.CONFIG),
-  import_zod25.z.literal(SCOPES.WEBHOOK),
-  import_zod25.z.literal(SCOPES.NATIONALID),
-  import_zod25.z.literal(SCOPES.NOTIFICATION_API),
-  import_zod25.z.literal(SCOPES.RECORDSEARCH),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_BIRTH),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_DEATH),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.RECORD_SUBMIT_INCOMPLETE),
-  import_zod25.z.literal(SCOPES.RECORD_SUBMIT_FOR_REVIEW),
-  import_zod25.z.literal(SCOPES.RECORD_UNASSIGN_OTHERS),
-  import_zod25.z.literal(SCOPES.RECORD_SUBMIT_FOR_APPROVAL),
-  import_zod25.z.literal(SCOPES.RECORD_SUBMIT_FOR_UPDATES),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARATION_EDIT),
-  import_zod25.z.literal(SCOPES.RECORD_REVIEW_DUPLICATES),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARATION_ARCHIVE),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARATION_REINSTATE),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTER),
-  import_zod25.z.literal(SCOPES.RECORD_EXPORT_RECORDS),
-  import_zod25.z.literal(SCOPES.RECORD_DECLARATION_PRINT),
-  import_zod25.z.literal(SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_PRINT),
-  import_zod25.z.literal(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES),
-  import_zod25.z.literal(SCOPES.RECORD_PRINT_CERTIFIED_COPIES),
-  import_zod25.z.literal(SCOPES.RECORD_BULK_PRINT_CERTIFIED_COPIES),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_CORRECT),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REVOCATION),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_REVOKE),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REINSTATEMENT),
-  import_zod25.z.literal(SCOPES.RECORD_REGISTRATION_REINSTATE),
-  import_zod25.z.literal(SCOPES.RECORD_CONFIRM_REGISTRATION),
-  import_zod25.z.literal(SCOPES.RECORD_REJECT_REGISTRATION),
-  import_zod25.z.literal(SCOPES.SEARCH_BIRTH_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.SEARCH_BIRTH),
-  import_zod25.z.literal(SCOPES.SEARCH_DEATH_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.SEARCH_DEATH),
-  import_zod25.z.literal(SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.SEARCH_MARRIAGE),
-  import_zod25.z.literal(SCOPES.RECORD_READ),
-  import_zod25.z.literal(SCOPES.RECORD_READ_AUDIT),
-  import_zod25.z.literal(SCOPES.RECORD_READ_COMMENTS),
-  import_zod25.z.literal(SCOPES.RECORD_CREATE_COMMENTS),
-  import_zod25.z.literal(SCOPES.PROFILE_UPDATE),
-  import_zod25.z.literal(SCOPES.PROFILE_ELECTRONIC_SIGNATURE),
-  import_zod25.z.literal(SCOPES.PERFORMANCE_READ),
-  import_zod25.z.literal(SCOPES.PERFORMANCE_READ_DASHBOARDS),
-  import_zod25.z.literal(SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS),
-  import_zod25.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS),
-  import_zod25.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE),
-  import_zod25.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.USER_READ),
-  import_zod25.z.literal(SCOPES.USER_READ_MY_OFFICE),
-  import_zod25.z.literal(SCOPES.USER_READ_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.USER_READ_ONLY_MY_AUDIT),
-  import_zod25.z.literal(SCOPES.USER_CREATE),
-  import_zod25.z.literal(SCOPES.USER_CREATE_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.USER_UPDATE),
-  import_zod25.z.literal(SCOPES.USER_UPDATE_MY_JURISDICTION),
-  import_zod25.z.literal(SCOPES.CONFIG_UPDATE_ALL),
-  import_zod25.z.literal(SCOPES.USER_DATA_SEEDING)
+var LiteralScopes = import_zod31.z.union([
+  import_zod31.z.literal(SCOPES.NATLSYSADMIN),
+  import_zod31.z.literal(SCOPES.BYPASSRATELIMIT),
+  import_zod31.z.literal(SCOPES.DECLARE),
+  import_zod31.z.literal(SCOPES.REGISTER),
+  import_zod31.z.literal(SCOPES.VALIDATE),
+  import_zod31.z.literal(SCOPES.DEMO),
+  import_zod31.z.literal(SCOPES.CERTIFY),
+  import_zod31.z.literal(SCOPES.PERFORMANCE),
+  import_zod31.z.literal(SCOPES.SYSADMIN),
+  import_zod31.z.literal(SCOPES.TEAMS),
+  import_zod31.z.literal(SCOPES.CONFIG),
+  import_zod31.z.literal(SCOPES.WEBHOOK),
+  import_zod31.z.literal(SCOPES.NATIONALID),
+  import_zod31.z.literal(SCOPES.NOTIFICATION_API),
+  import_zod31.z.literal(SCOPES.RECORDSEARCH),
+  import_zod31.z.literal(SCOPES.RECORD_IMPORT),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_BIRTH),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_DEATH),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_INCOMPLETE),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_REVIEW),
+  import_zod31.z.literal(SCOPES.RECORD_UNASSIGN_OTHERS),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_APPROVAL),
+  import_zod31.z.literal(SCOPES.RECORD_SUBMIT_FOR_UPDATES),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_EDIT),
+  import_zod31.z.literal(SCOPES.RECORD_REVIEW_DUPLICATES),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_ARCHIVE),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_REINSTATE),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTER),
+  import_zod31.z.literal(SCOPES.RECORD_EXPORT_RECORDS),
+  import_zod31.z.literal(SCOPES.RECORD_DECLARATION_PRINT),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_PRINT),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_PRINT_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_BULK_PRINT_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_CORRECT),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REVOCATION),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REVOKE),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REQUEST_REINSTATEMENT),
+  import_zod31.z.literal(SCOPES.RECORD_REGISTRATION_REINSTATE),
+  import_zod31.z.literal(SCOPES.RECORD_CONFIRM_REGISTRATION),
+  import_zod31.z.literal(SCOPES.RECORD_REJECT_REGISTRATION),
+  import_zod31.z.literal(SCOPES.SEARCH_BIRTH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_BIRTH),
+  import_zod31.z.literal(SCOPES.SEARCH_DEATH_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_DEATH),
+  import_zod31.z.literal(SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.SEARCH_MARRIAGE),
+  import_zod31.z.literal(SCOPES.RECORD_READ),
+  import_zod31.z.literal(SCOPES.RECORD_READ_AUDIT),
+  import_zod31.z.literal(SCOPES.RECORD_READ_COMMENTS),
+  import_zod31.z.literal(SCOPES.RECORD_CREATE_COMMENTS),
+  import_zod31.z.literal(SCOPES.PROFILE_UPDATE),
+  import_zod31.z.literal(SCOPES.PROFILE_ELECTRONIC_SIGNATURE),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_READ),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_READ_DASHBOARDS),
+  import_zod31.z.literal(SCOPES.PERFORMANCE_EXPORT_VITAL_STATISTICS),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE),
+  import_zod31.z.literal(SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_READ),
+  import_zod31.z.literal(SCOPES.USER_READ_MY_OFFICE),
+  import_zod31.z.literal(SCOPES.USER_READ_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_READ_ONLY_MY_AUDIT),
+  import_zod31.z.literal(SCOPES.USER_CREATE),
+  import_zod31.z.literal(SCOPES.USER_CREATE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.USER_UPDATE),
+  import_zod31.z.literal(SCOPES.USER_UPDATE_MY_JURISDICTION),
+  import_zod31.z.literal(SCOPES.CONFIG_UPDATE_ALL),
+  import_zod31.z.literal(SCOPES.USER_DATA_SEEDING)
 ]);
-var rawConfigurableScopeRegex = /^([a-zA-Z]+\.[a-zA-Z]+)\[((?:\w+=\w+(?:\|\w+)*)(:?,\w+=\w+(?:\|\w+)*)*)\]$/;
-var rawConfigurableScope = import_zod25.z.string().regex(rawConfigurableScopeRegex);
-var CreateUserScope = import_zod25.z.object({
-  type: import_zod25.z.literal("user.create"),
-  options: import_zod25.z.object({
-    role: import_zod25.z.array(import_zod25.z.string())
+var rawConfigurableScopeRegex = /^([a-zA-Z\.]+)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
+var rawConfigurableScope = import_zod31.z.string().regex(rawConfigurableScopeRegex);
+var CreateUserScope = import_zod31.z.object({
+  type: import_zod31.z.literal("user.create"),
+  options: import_zod31.z.object({
+    role: import_zod31.z.array(import_zod31.z.string())
   })
 });
-var EditUserScope = import_zod25.z.object({
-  type: import_zod25.z.literal("user.edit"),
-  options: import_zod25.z.object({
-    role: import_zod25.z.array(import_zod25.z.string())
+var EditUserScope = import_zod31.z.object({
+  type: import_zod31.z.literal("user.edit"),
+  options: import_zod31.z.object({
+    role: import_zod31.z.array(import_zod31.z.string())
   })
 });
-var ConfigurableScopes = import_zod25.z.discriminatedUnion("type", [
+var WorkqueueScope = import_zod31.z.object({
+  type: import_zod31.z.literal("workqueue"),
+  options: import_zod31.z.object({
+    id: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var NotifyRecordScope = import_zod31.z.object({
+  type: import_zod31.z.literal("record.notify"),
+  options: import_zod31.z.object({
+    event: import_zod31.z.array(import_zod31.z.string())
+  })
+});
+var ConfigurableScopes = import_zod31.z.discriminatedUnion("type", [
   CreateUserScope,
-  EditUserScope
+  EditUserScope,
+  WorkqueueScope,
+  NotifyRecordScope
 ]);
 var scopes = Object.values(SCOPES);
 
 // ../commons/src/events/scopes.ts
-function hasAnyOfScopes(a, b) {
-  return (0, import_lodash3.intersection)(a, b).length > 0;
-}
 var CONFIG_GET_ALLOWED_SCOPES = [
   SCOPES.RECORD_DECLARE,
   SCOPES.RECORD_READ,
@@ -5043,6 +6250,28 @@ var ACTION_ALLOWED_SCOPES = {
   [ActionType.UNASSIGN]: null,
   [ActionType.DETECT_DUPLICATE]: []
 };
+var ACTION_ALLOWED_CONFIGURABLE_SCOPES = {
+  [ActionType.READ]: [],
+  [ActionType.CREATE]: ["record.notify"],
+  [ActionType.NOTIFY]: ["record.notify"],
+  [ActionType.DECLARE]: [],
+  [ActionType.DELETE]: [],
+  [ActionType.VALIDATE]: [],
+  [ActionType.REGISTER]: [],
+  [ActionType.PRINT_CERTIFICATE]: [],
+  [ActionType.REQUEST_CORRECTION]: [],
+  [ActionType.REJECT_CORRECTION]: [],
+  [ActionType.APPROVE_CORRECTION]: [],
+  [ActionType.MARKED_AS_DUPLICATE]: [],
+  [ActionType.ARCHIVE]: [],
+  [ActionType.REJECT]: [],
+  [ActionType.ASSIGN]: [],
+  [ActionType.UNASSIGN]: [],
+  [ActionType.DETECT_DUPLICATE]: []
+};
+function hasAnyOfScopes(a, b) {
+  return (0, import_lodash3.intersection)(a, b).length > 0;
+}
 function filterUnallowedActions(actions, userScopes) {
   const allowedActions = actions.filter((action) => {
     const requiredScopes = ACTION_ALLOWED_SCOPES[action];
@@ -5059,3 +6288,65 @@ function filterUnallowedActions(actions, userScopes) {
   }
   return [ActionType.READ];
 }
+
+// ../commons/src/events/serializers/user/deserializer.ts
+var import_zod32 = require("zod");
+var UserWithPrimaryOffice = User.extend({
+  primaryOfficeId: import_zod32.z.string()
+});
+function userDeserializer(serializedUserField, user2) {
+  if (typeof serializedUserField === "string") {
+    return serializedUserField;
+  }
+  if (serializedUserField.$userField === "name" || serializedUserField.$userField === "signatureFilename") {
+    throw new Error(
+      `Deserializer for ${serializedUserField.$userField} is not implemented yet`
+    );
+  }
+  return user2[serializedUserField.$userField];
+}
+function deserializeQueryExpression(expression, user2) {
+  return {
+    ...expression,
+    assignedTo: expression.assignedTo && {
+      ...expression.assignedTo,
+      term: userDeserializer(expression.assignedTo.term, user2)
+    },
+    createdBy: expression.createdBy && {
+      ...expression.createdBy,
+      term: userDeserializer(expression.createdBy.term, user2)
+    },
+    updatedBy: expression.updatedBy && {
+      ...expression.updatedBy,
+      term: userDeserializer(expression.updatedBy.term, user2)
+    },
+    createdAtLocation: expression.createdAtLocation && (expression.createdAtLocation.type === "within" ? {
+      ...expression.createdAtLocation,
+      location: userDeserializer(
+        expression.createdAtLocation.location,
+        user2
+      )
+    } : {
+      ...expression.createdAtLocation,
+      term: userDeserializer(expression.createdAtLocation.term, user2)
+    }),
+    updatedAtLocation: expression.updatedAtLocation && (expression.updatedAtLocation.type === "within" ? {
+      ...expression.updatedAtLocation,
+      location: userDeserializer(
+        expression.updatedAtLocation.location,
+        user2
+      )
+    } : {
+      ...expression.updatedAtLocation,
+      term: userDeserializer(expression.updatedAtLocation.term, user2)
+    })
+  };
+}
+function deserializeQuery(query, user2) {
+  return {
+    ...query,
+    clauses: query.clauses.map(
+      (clause) => deserializeQueryExpression(clause, user2)
+    )
+  };
+}