@opencrvs/toolkit 1.9.2-rc.ebb7011 → 1.9.2-rc.f0b9560

package/dist/events/index.js

@@ -75,9 +75,9 @@ __export(events_exports, {
   ConfirmableActions: () => ConfirmableActions,
   ContainsFlags: () => ContainsFlags,
   CustomActionInput: () => CustomActionInput,
-  CustomFieldValue: () => CustomFieldValue,
   CustomFlag: () => CustomFlag,
   DEFAULT_DATE_OF_EVENT_PROPERTY: () => DEFAULT_DATE_OF_EVENT_PROPERTY,
+  DEFAULT_PLACE_OF_EVENT_PROPERTY: () => DEFAULT_PLACE_OF_EVENT_PROPERTY,
   DataEntry: () => DataEntry,
   DataFieldValue: () => DataFieldValue,
   DateCondition: () => DateCondition,
@@ -100,6 +100,7 @@ __export(events_exports, {
   DraftInput: () => DraftInput,
   DuplicateDetectedAction: () => DuplicateDetectedAction,
   DuplicateDetectedActionInput: () => DuplicateDetectedActionInput,
+  EditActionInput: () => EditActionInput,
   EmailField: () => EmailField,
   EmailValue: () => EmailValue,
   EnableConditional: () => EnableConditional,
@@ -138,6 +139,7 @@ __export(events_exports, {
   FormPageConfig: () => FormPageConfig,
   Fuzzy: () => Fuzzy,
   GeographicalArea: () => GeographicalArea,
+  HiddenFieldValue: () => HiddenFieldValue,
   HttpFieldUpdateValue: () => HttpFieldUpdateValue,
   HttpFieldValue: () => HttpFieldValue,
   IdReaderFieldValue: () => IdReaderFieldValue,
@@ -198,7 +200,6 @@ __export(events_exports, {
   TranslationConfig: () => TranslationConfig,
   UUID: () => UUID,
   UnassignActionInput: () => UnassignActionInput,
-  ValidateActionInput: () => ValidateActionInput,
   ValidationConfig: () => ValidationConfig,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
@@ -318,7 +319,6 @@ __export(events_exports, {
   isCheckboxFieldType: () => isCheckboxFieldType,
   isConditionMet: () => isConditionMet,
   isCountryFieldType: () => isCountryFieldType,
-  isCustomFieldType: () => isCustomFieldType,
   isDataFieldType: () => isDataFieldType,
   isDateFieldType: () => isDateFieldType,
   isDateRangeFieldType: () => isDateRangeFieldType,
@@ -334,6 +334,7 @@ __export(events_exports, {
   isFieldVisible: () => isFieldVisible,
   isFileFieldType: () => isFileFieldType,
   isFileFieldWithOptionType: () => isFileFieldWithOptionType,
+  isHiddenFieldType: () => isHiddenFieldType,
   isHttpFieldType: () => isHttpFieldType,
   isIdFieldType: () => isIdFieldType,
   isIdReaderFieldType: () => isIdReaderFieldType,
@@ -378,6 +379,7 @@ __export(events_exports, {
   or: () => or,
   pickRandom: () => pickRandom,
   resolveDateOfEvent: () => resolveDateOfEvent,
+  resolvePlaceOfEvent: () => resolvePlaceOfEvent,
   runFieldValidations: () => runFieldValidations,
   runStructuralValidations: () => runStructuralValidations,
   safeUnion: () => safeUnion,
@@ -424,8 +426,8 @@ var ActionType = {
   NOTIFY: "NOTIFY",
   // Declaration actions
   DECLARE: "DECLARE",
-  VALIDATE: "VALIDATE",
   REGISTER: "REGISTER",
+  EDIT: "EDIT",
   // Declaration system actions. Non-configurable.
   DUPLICATE_DETECTED: "DUPLICATE_DETECTED",
   REJECT: "REJECT",
@@ -448,7 +450,7 @@ var ActionType = {
 var ConfirmableActions = [
   ActionType.NOTIFY,
   ActionType.DECLARE,
-  ActionType.VALIDATE,
+  ActionType.EDIT,
   ActionType.REGISTER,
   ActionType.REJECT,
   ActionType.ARCHIVE,
@@ -463,7 +465,7 @@ var ActionTypes = z2.enum([
   "CREATE",
   "NOTIFY",
   "DECLARE",
-  "VALIDATE",
+  "EDIT",
   "REGISTER",
   "DUPLICATE_DETECTED",
   "REJECT",
@@ -484,7 +486,7 @@ var ClientSpecificAction = {
 };
 var declarationActionValues = [
   ActionTypes.enum.DECLARE,
-  ActionTypes.enum.VALIDATE,
+  ActionTypes.enum.EDIT,
   ActionTypes.enum.REGISTER,
   ActionTypes.enum.NOTIFY,
   ActionTypes.enum.DUPLICATE_DETECTED
@@ -617,7 +619,7 @@ var FieldType = {
   QR_READER: "QR_READER",
   ID_READER: "ID_READER",
   LOADER: "LOADER",
-  CUSTOM: "CUSTOM"
+  ALPHA_HIDDEN: "ALPHA_HIDDEN"
 };
 var FileFieldType = z4.enum([
   FieldType.FILE,
@@ -642,7 +644,8 @@ var FieldTypesToHideInReview = [
   FieldType.LOADER,
   FieldType.HTTP,
   FieldType.QUERY_PARAM_READER,
-  FieldType.DATA
+  FieldType.DATA,
+  FieldType.ALPHA_HIDDEN
 ];
 
 // ../commons/src/events/FieldValue.ts
@@ -748,10 +751,10 @@ var ReadDataValue = z6.object({
 });
 var QrReaderFieldValue = ReadDataValue;
 var IdReaderFieldValue = ReadDataValue;
-var CustomFieldValue = z6.unknown();
 
 // ../commons/src/events/FieldValue.ts
 var TextValue = z7.string();
+var HiddenFieldValue = z7.string();
 var NonEmptyTextValue = TextValue.min(1);
 var DateValue = z7.iso.date().describe("Date in the format YYYY-MM-DD");
 var AgeValue = z7.object({
@@ -803,8 +806,7 @@ var FieldValuesWithoutDataField = z7.union([
   VerificationStatusValue,
   QueryParamReaderFieldValue,
   QrReaderFieldValue,
-  IdReaderFieldValue,
-  CustomFieldValue
+  IdReaderFieldValue
 ]);
 var DataFieldValue = z7.object({
   data: z7.record(z7.string(), FieldValuesWithoutDataField)
@@ -879,7 +881,7 @@ var FieldUpdateValue = safeUnion([
   NameFieldUpdateValue.describe("NameFieldUpdateValue"),
   HttpFieldUpdateValue.describe("HttpFieldUpdateValue"),
   QueryParamReaderFieldUpdateValue.describe("QueryParamReaderFieldUpdateValue"),
-  CustomFieldValue.describe("CustomFieldValue")
+  HiddenFieldValue.describe("HiddenFieldValue")
 ]);
 
 // ../commons/src/uuid.ts
@@ -1140,7 +1142,7 @@ var RecordScopeType = z10.enum([
   "record.read",
   "record.declare",
   "record.notify",
-  "record.declared.validate",
+  "record.declared.edit",
   "record.declared.reject",
   "record.declared.archive",
   "record.declared.review-duplicates",
@@ -1193,12 +1195,12 @@ function flattenAndMergeScopes(scopes2) {
   }
   return { type, options: mergedOptions };
 }
-function findScope(scopes2, scopeType) {
+function findScopes(scopes2, scopeType) {
   const parsedScopes = scopes2.map(parseConfigurableScope);
   const searchScopes = parsedScopes.filter((scope) => scope?.type === "search");
   const otherScopes = parsedScopes.filter((scope) => scope?.type !== "search");
   const mergedSearchScope = flattenAndMergeScopes(searchScopes);
-  return [...otherScopes, mergedSearchScope].find(
+  return [...otherScopes, mergedSearchScope].filter(
     (scope) => scope?.type === scopeType
   );
 }
@@ -1440,11 +1442,6 @@ var DeclareAction = ActionBase.extend(
     type: z12.literal(ActionType.DECLARE)
   }).shape
 );
-var ValidateAction = ActionBase.extend(
-  z12.object({
-    type: z12.literal(ActionType.VALIDATE)
-  }).shape
-);
 var ReasonContent = z12.object({
   reason: z12.string().min(1, { error: "Message cannot be empty" }).describe(
     "Message describing the reason for rejecting or archiving the event."
@@ -1497,6 +1494,14 @@ var NotifiedAction = ActionBase.extend(
     type: z12.literal(ActionType.NOTIFY)
   }).shape
 );
+var EditAction = ActionBase.extend(
+  z12.object({
+    type: z12.literal(ActionType.EDIT),
+    content: z12.object({
+      comment: z12.string().describe("Comment for the edit action.").optional()
+    })
+  }).shape
+);
 var PrintContent = z12.object({
   templateId: z12.string().optional()
 });
@@ -1539,7 +1544,6 @@ var CustomAction = ActionBase.merge(
 );
 var ActionDocument = z12.discriminatedUnion("type", [
   CreatedAction.meta({ id: "CreatedAction" }),
-  ValidateAction.meta({ id: "ValidateAction" }),
   RejectAction.meta({ id: "RejectAction" }),
   DuplicateDetectedAction.meta({ id: "DuplicateDetectedAction" }),
   MarkNotDuplicateAction.meta({ id: "MarkNotDuplicateAction" }),
@@ -1555,6 +1559,7 @@ var ActionDocument = z12.discriminatedUnion("type", [
   UnassignedAction.meta({ id: "UnassignedAction" }),
   PrintCertificateAction.meta({ id: "PrintCertificateAction" }),
   ReadAction.meta({ id: "ReadAction" }),
+  EditAction.meta({ id: "EditAction" }),
   CustomAction.meta({ id: "CustomAction" })
 ]).meta({
   id: "ActionDocument"
@@ -1577,7 +1582,14 @@ var InherentFlags = {
   INCOMPLETE: "incomplete",
   REJECTED: "rejected",
   CORRECTION_REQUESTED: "correction-requested",
-  POTENTIAL_DUPLICATE: "potential-duplicate"
+  POTENTIAL_DUPLICATE: "potential-duplicate",
+  /**
+   * This flag is set by the Edit-action and removed after the declaration or registration.
+   * A record should never stay with the EDIT_IN_PROGRESS flag, since it should always be declared or registered right after.
+   *
+   * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
+   */
+  EDIT_IN_PROGRESS: "edit-in-progress"
 };
 var ActionFlag = z13.string().regex(
   new RegExp(
@@ -1648,6 +1660,7 @@ var EventMetadata = z14.object({
   ),
   createdAt: z14.iso.datetime().describe("The timestamp when the event was first created and saved."),
   dateOfEvent: ZodDate.nullish(),
+  placeOfEvent: CreatedAtLocation,
   createdBy: z14.string().describe("ID of the user who created the event."),
   createdByUserType: z14.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
   updatedByUserRole: z14.string().describe("Role of the user who last changed the status."),
@@ -1677,6 +1690,7 @@ var EventMetadataKeysArray = [
   "status",
   "createdAt",
   "dateOfEvent",
+  "placeOfEvent",
   "createdBy",
   "createdByUserType",
   "updatedByUserRole",
@@ -1711,6 +1725,11 @@ var eventMetadataLabelMap = {
     defaultMessage: "Date of Event",
     description: "Date of Event"
   },
+  "event.placeOfEvent": {
+    id: "event.placeOfEvent.label",
+    defaultMessage: "Place of Event",
+    description: "Place of Event"
+  },
   "event.createdAtLocation": {
     id: "event.createdAtLocation.label",
     defaultMessage: "Location",
@@ -2443,12 +2462,6 @@ var IdReaderField = BaseField.extend({
     z16.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
   )
 });
-var CustomField = BaseField.extend({
-  type: z16.literal(FieldType.CUSTOM),
-  defaultValue: CustomFieldValue.optional(),
-  src: z16.string().describe("Module source path for the custom field component"),
-  configuration: z16.unknown().optional()
-});
 var LoaderField = BaseField.extend({
   type: z16.literal(FieldType.LOADER),
   configuration: z16.object({
@@ -2457,6 +2470,13 @@ var LoaderField = BaseField.extend({
 }).describe(
   "A non-interactive field that indicates an in progress operation in form"
 );
+var HiddenField = BaseField.extend({
+  type: z16.literal(FieldType.ALPHA_HIDDEN),
+  required: z16.boolean().default(false).optional(),
+  defaultValue: TextValue.optional()
+}).describe(
+  "A non-interactive, hidden field that only hold a value in the form"
+);
 var FieldConfig = z16.discriminatedUnion("type", [
   Address,
   TextField,
@@ -2497,7 +2517,7 @@ var FieldConfig = z16.discriminatedUnion("type", [
   QueryParamReaderField,
   LoaderField,
   SearchField,
-  CustomField
+  HiddenField
 ]).meta({
   description: "Form field configuration",
   id: "FieldConfig"
@@ -2736,6 +2756,7 @@ var AvailableIcons = z20.enum([
   "Users",
   "WarningCircle",
   "X",
+  "ChatText",
   "CircleWavyCheck",
   "CircleWavyQuestion",
   "ArchiveBox",
@@ -2801,11 +2822,6 @@ var RejectConfig = ActionConfigBase.extend(
     type: z21.literal(ActionType.REJECT)
   }).shape
 );
-var ValidateConfig = DeclarationActionBase.extend(
-  z21.object({
-    type: z21.literal(ActionType.VALIDATE)
-  }).shape
-);
 var RegisterConfig = DeclarationActionBase.extend(
   z21.object({
     type: z21.literal(ActionType.REGISTER)
@@ -2841,7 +2857,6 @@ var ActionConfig = z21.discriminatedUnion("type", [
   ReadActionConfig.meta({ id: "ReadActionConfig" }),
   DeclareConfig.meta({ id: "DeclareActionConfig" }),
   RejectConfig.meta({ id: "RejectActionConfig" }),
-  ValidateConfig.meta({ id: "ValidateActionConfig" }),
   RegisterConfig.meta({ id: "RegisterActionConfig" }),
   PrintCertificateActionConfig.meta({
     id: "PrintCertificateActionConfig"
@@ -2856,7 +2871,6 @@ var actionConfigTypes = new Set(
 );
 var DeclarationActionConfig = z21.discriminatedUnion("type", [
   DeclareConfig,
-  ValidateConfig,
   RegisterConfig
 ]);
 
@@ -3129,6 +3143,7 @@ function mapFieldTypeToZod(field3, actionType) {
     case FieldType.VERIFICATION_STATUS:
     case FieldType.ID:
     case FieldType.LOADER:
+    case FieldType.ALPHA_HIDDEN:
       schema = field3.required ? NonEmptyTextValue : TextValue;
       break;
     case FieldType.NUMBER:
@@ -3172,9 +3187,6 @@ function mapFieldTypeToZod(field3, actionType) {
     case FieldType.ID_READER:
       schema = IdReaderFieldValue;
       break;
-    case FieldType.CUSTOM:
-      schema = CustomFieldValue;
-      break;
   }
   return field3.required ? schema : schema.nullish();
 }
@@ -3215,6 +3227,7 @@ function mapFieldTypeToEmptyValue(field3) {
     case FieldType.QR_READER:
     case FieldType.ID_READER:
     case FieldType.LOADER:
+    case FieldType.ALPHA_HIDDEN:
       return null;
     case FieldType.ADDRESS:
       return {
@@ -3232,8 +3245,6 @@ function mapFieldTypeToEmptyValue(field3) {
       };
     case FieldType.FILE_WITH_OPTIONS:
       return [];
-    case FieldType.CUSTOM:
-      return void 0;
   }
 }
 var isParagraphFieldType = (field3) => {
@@ -3353,8 +3364,8 @@ var isIdReaderFieldType = (field3) => {
 var isLoaderFieldType = (field3) => {
   return field3.config.type === FieldType.LOADER;
 };
-var isCustomFieldType = (field3) => {
-  return field3.config.type === FieldType.CUSTOM;
+var isHiddenFieldType = (field3) => {
+  return field3.config.type === FieldType.ALPHA_HIDDEN;
 };
 var isNonInteractiveFieldType = (field3) => {
   return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.HTTP || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.QUERY_PARAM_READER || field3.type === FieldType.LOADER;
@@ -3800,7 +3811,7 @@ function getActionConfig({
     if (a.type === ActionType.CUSTOM && customActionType) {
       return a.customActionType === customActionType;
     }
-    if (actionType === ActionType.NOTIFY) {
+    if (actionType === ActionType.NOTIFY || actionType === ActionType.EDIT) {
       return a.type === ActionType.DECLARE;
     }
     if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
@@ -3862,9 +3873,13 @@ var findRecordActionPages = (config, actionType) => {
   return [];
 };
 function getActionReview(configuration, actionType) {
-  const [actionConfig] = configuration.actions.filter(
-    (a) => a.type === actionType
-  );
+  const actionConfig = getActionConfig({
+    eventConfiguration: configuration,
+    actionType
+  });
+  if (!actionConfig) {
+    throw "Tried to get action review for an action that is not a declaration action";
+  }
   if ("review" in actionConfig) {
     return actionConfig.review;
   }
@@ -4130,9 +4145,12 @@ function aggregateActionDeclarations(event2) {
     return getCompleteActionDeclaration(declaration, event2, action);
   }, {});
 }
-function aggregateActionAnnotations(actions) {
-  return actions.reduce((ann, sortedAction) => {
-    return deepMerge(ann, sortedAction.annotation ?? {});
+function aggregateActionAnnotations(event2) {
+  return event2.actions.reduce((ann, sortedAction) => {
+    if (!("annotation" in sortedAction) || !sortedAction.annotation) {
+      return ann;
+    }
+    return deepMerge(ann, sortedAction.annotation);
   }, {});
 }
 
@@ -4144,6 +4162,9 @@ var EventConfig = z29.object({
   dateOfEvent: FieldReference.optional().describe(
     "Reference to the field capturing the date of the event (e.g. date of birth). Defaults to the event creation date if unspecified."
   ),
+  placeOfEvent: FieldReference.optional().describe(
+    "Reference to the field capturing the place of the event (e.g. place of birth). Defaults to the meta.createdAtLocation if unspecified."
+  ),
   title: TranslationConfig.describe(
     'Title template for the singular event, supporting variables (e.g. "{applicant.name.firstname} {applicant.name.surname}").'
   ),
@@ -4218,6 +4239,19 @@ var EventConfig = z29.object({
       });
     }
   }
+  if (event2.placeOfEvent) {
+    const eventPlaceFieldId = getDeclarationFields(event2).find(
+      ({ id }) => id === event2.placeOfEvent?.$$field
+    );
+    if (!eventPlaceFieldId) {
+      ctx.addIssue({
+        code: "custom",
+        message: `Place of event field id must match a field id in the event.declaration fields.
+            Invalid place of event field ID for event ${event2.id}: ${event2.placeOfEvent.$$field}`,
+        path: ["placeOfEvent"]
+      });
+    }
+  }
   const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
   const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
   const actionFlagIds = event2.actions.flatMap(
@@ -5158,11 +5192,6 @@ var RegisterActionInput = BaseActionInput.extend(
     registrationNumber: z33.string().optional()
   }).shape
 );
-var ValidateActionInput = BaseActionInput.extend(
-  z33.object({
-    type: z33.literal(ActionType.VALIDATE).default(ActionType.VALIDATE)
-  }).shape
-);
 var NotifyActionInput = BaseActionInput.extend(
   z33.object({
     type: z33.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
@@ -5181,6 +5210,14 @@ var DeclareActionInput = BaseActionInput.extend(
     type: z33.literal(ActionType.DECLARE).default(ActionType.DECLARE)
   }).shape
 );
+var EditActionInput = BaseActionInput.extend(
+  z33.object({
+    type: z33.literal(ActionType.EDIT).default(ActionType.EDIT),
+    content: z33.object({
+      comment: z33.string().describe("Comment for the edit action.").optional()
+    })
+  }).shape
+);
 var PrintCertificateActionInput = BaseActionInput.extend(
   z33.object({
     type: z33.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
@@ -5264,7 +5301,6 @@ var CustomActionInput = BaseActionInput.extend(
 );
 var ActionInput = z33.discriminatedUnion("type", [
   CreateActionInput.meta({ id: "CreateActionInput" }),
-  ValidateActionInput.meta({ id: "ValidateActionInput" }),
   RegisterActionInput.meta({ id: "RegisterActionInput" }),
   NotifyActionInput.meta({ id: "NotifyActionInput" }),
   DeclareActionInput.meta({ id: "DeclareActionInput" }),
@@ -5292,7 +5328,8 @@ var ActionInput = z33.discriminatedUnion("type", [
     id: "ApproveCorrectionActionInput"
   }),
   ReadActionInput.meta({ id: "ReadActionInput" }),
-  CustomActionInput.meta({ id: "CustomActionInput" })
+  CustomActionInput.meta({ id: "CustomActionInput" }),
+  EditActionInput.meta({ id: "EditActionInput" })
 ]).meta({
   id: "ActionInput"
 });
@@ -5347,7 +5384,7 @@ var import_lodash4 = require("lodash");
 // ../commons/src/events/state/utils.ts
 var import_lodash2 = require("lodash");
 function getActionRequests(actionType, actions) {
-  const filtered = actions.filter((action) => action.type === actionType);
+  const filtered = actions.filter((action) => action.type === actionType).reverse();
   const accept = filtered.find(
     (action) => action.status === ActionStatus.Accepted
   );
@@ -5388,7 +5425,6 @@ var updateActions = ActionTypes.extract([
   ActionType.CREATE,
   ActionType.NOTIFY,
   ActionType.DECLARE,
-  ActionType.VALIDATE,
   ActionType.REGISTER,
   ActionType.REJECT,
   ActionType.ARCHIVE,
@@ -5435,6 +5471,9 @@ function getLegalStatuses(actions) {
 // ../commons/src/events/state/flags.ts
 var import_lodash3 = require("lodash");
 var import_date_fns3 = require("date-fns");
+function isEditInProgress(actions) {
+  return actions.at(-1)?.type === ActionType.EDIT;
+}
 function isPendingCertification(actions) {
   if (getStatusFromActions(actions) !== EventStatus.enum.REGISTERED) {
     return false;
@@ -5496,9 +5535,23 @@ function isFlagConditionMet(conditional, form, action) {
     }
   });
 }
+function omitOverwrittenActions(sortedActions) {
+  const declareIndexes = sortedActions.map((a, i) => a.type === ActionType.DECLARE ? i : -1).filter((i) => i !== -1);
+  if (declareIndexes.length < 2) {
+    return sortedActions;
+  }
+  const secondLastDeclareIndex = declareIndexes[declareIndexes.length - 2];
+  const editActionIndex = sortedActions.findIndex(
+    (a, index) => a.type === ActionType.EDIT && index > secondLastDeclareIndex
+  );
+  return [
+    ...sortedActions.slice(0, secondLastDeclareIndex),
+    ...sortedActions.slice(editActionIndex)
+  ];
+}
 function resolveEventCustomFlags(event2, eventConfiguration) {
-  const acceptedActions = getAcceptedActions(event2);
-  const actions = acceptedActions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+  const sortedActions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+  const actions = omitOverwrittenActions(sortedActions);
   return actions.reduce((acc, action, idx) => {
     let actionConfig;
     if (isActionConfigType(action.type)) {
@@ -5516,7 +5569,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
       actions: actions.slice(0, idx + 1)
     };
     const declaration = aggregateActionDeclarations(eventUpToThisAction);
-    const annotation = aggregateActionAnnotations(eventUpToThisAction.actions);
+    const annotation = aggregateActionAnnotations(eventUpToThisAction);
     const form = { ...declaration, ...annotation };
     const flagsWithMetConditions = actionConfig.flags.filter(
       ({ conditional }) => (
@@ -5560,6 +5613,9 @@ function getEventFlags(event2, config) {
   if (isPotentialDuplicate(sortedActions)) {
     flags.push(InherentFlags.POTENTIAL_DUPLICATE);
   }
+  if (isEditInProgress(sortedActions)) {
+    flags.push(InherentFlags.EDIT_IN_PROGRESS);
+  }
   return [...flags, ...resolveEventCustomFlags(event2, config)];
 }
 
@@ -5589,8 +5645,7 @@ function getStatusFromActions(actions) {
       case ActionType.MARK_AS_DUPLICATE:
       case ActionType.REJECT_CORRECTION:
       case ActionType.READ:
-      case ActionType.CUSTOM:
-      case ActionType.VALIDATE:
+      case ActionType.EDIT:
       default:
         return status2;
     }
@@ -5645,6 +5700,33 @@ function resolveDateOfEvent(eventMetadata, declaration, config) {
   const parsedDate = ZodDate.safeParse(declaration[config.dateOfEvent.$$field]);
   return parsedDate.success ? parsedDate.data : void 0;
 }
+var DEFAULT_PLACE_OF_EVENT_PROPERTY = "createdAtLocation";
+function getParsedUUID(value, oldValue) {
+  const parsed = UUID.safeParse(value);
+  return parsed.success ? parsed.data : oldValue;
+}
+function resolvePlaceOfEvent(eventMetadata, declaration, config) {
+  let placeOfEvent = getParsedUUID(
+    eventMetadata[DEFAULT_PLACE_OF_EVENT_PROPERTY]
+  );
+  if (config.placeOfEvent) {
+    const addressFieldValue = AddressFieldValue.safeParse(
+      declaration[config.placeOfEvent.$$field]
+    );
+    if (addressFieldValue.success && addressFieldValue.data.addressType === AddressType.DOMESTIC && addressFieldValue.data.administrativeArea) {
+      placeOfEvent = getParsedUUID(
+        addressFieldValue.data.administrativeArea,
+        placeOfEvent
+      );
+    } else {
+      placeOfEvent = getParsedUUID(
+        declaration[config.placeOfEvent.$$field],
+        placeOfEvent
+      );
+    }
+  }
+  return placeOfEvent;
+}
 function extractPotentialDuplicatesFromActions(actions) {
   return actions.reduce((duplicates, action) => {
     if (action.type === ActionType.DUPLICATE_DETECTED) {
@@ -5689,6 +5771,11 @@ function getCurrentEventState(event2, config) {
     trackingId: event2.trackingId,
     updatedByUserRole: requestActionMetadata.createdByRole,
     dateOfEvent: resolveDateOfEvent(event2, declaration, config),
+    placeOfEvent: resolvePlaceOfEvent(
+      { createdAtLocation: creationAction.createdAtLocation },
+      declaration,
+      config
+    ),
     potentialDuplicates: extractPotentialDuplicatesFromActions(sortedActions),
     flags: getEventFlags(event2, config)
   });
@@ -5733,6 +5820,11 @@ function applyDeclarationToEventIndex(eventIndex, declaration, eventConfiguratio
       updatedDeclaration,
       eventConfiguration
     ),
+    placeOfEvent: resolvePlaceOfEvent(
+      eventIndex,
+      updatedDeclaration,
+      eventConfiguration
+    ),
     declaration: updatedDeclaration
   };
 }
@@ -7032,17 +7124,6 @@ var tennisClubMembershipEvent = defineConfig({
       }
     ]
   },
-  flags: [
-    {
-      id: "validated",
-      label: {
-        id: "event.tennis-club-membership.flag.validated",
-        defaultMessage: "Validated",
-        description: "Flag label for validated"
-      },
-      requiresAction: true
-    }
-  ],
   actions: [
     {
       type: ActionType.READ,
@@ -7062,26 +7143,13 @@ var tennisClubMembershipEvent = defineConfig({
       },
       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"
-      },
-      flags: [{ id: "validated", operation: "add" }],
-      conditionals: [
-        { type: ConditionalType.SHOW, conditional: not(flag("validated")) }
-      ]
-    },
     {
       type: ActionType.REJECT,
       label: {
         defaultMessage: "Reject",
         description: "This is shown as the action name anywhere the user can trigger the action from",
         id: "event.tennis-club-membership.action.reject.label"
-      },
-      flags: [{ id: "validated", operation: "remove" }]
+      }
     },
     {
       type: ActionType.REGISTER,
@@ -7404,14 +7472,6 @@ var footballClubMembershipEvent = defineConfig({
       },
       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.football-club-membership.action.validate.label"
-      }
-    },
     {
       type: ActionType.REGISTER,
       label: {
@@ -7936,10 +7996,6 @@ var ChildOnboardingEvent = defineConfig({
       label: generateTranslationConfig("Declare"),
       review: CHILD_ONBOARDING_DECLARATION_REVIEW
     },
-    {
-      type: ActionType.VALIDATE,
-      label: generateTranslationConfig("Validate")
-    },
     {
       type: ActionType.REGISTER,
       label: generateTranslationConfig("Register")
@@ -8040,6 +8096,7 @@ function mapFieldTypeToMockValue(field3, i, rng) {
     case FieldType.OFFICE:
     case FieldType.LINK_BUTTON:
     case FieldType.LOADER:
+    case FieldType.ALPHA_HIDDEN:
       return `${field3.id}-${field3.type}-${i}`;
     case FieldType.VERIFICATION_STATUS:
       return "verified";
@@ -8102,7 +8159,6 @@ function mapFieldTypeToMockValue(field3, i, rng) {
       };
     case FieldType.FILE_WITH_OPTIONS:
     case FieldType.DATA:
-    case FieldType.CUSTOM:
       return void 0;
     case FieldType.QR_READER:
       return /* @__PURE__ */ Object.create(null);
@@ -8267,19 +8323,12 @@ function eventPayloadGenerator(rng, configuration = tennisClubMembershipEvent) {
           keepAssignment: input.keepAssignment
         };
       },
-      validate: (eventId, input = {}) => ({
-        type: ActionType.VALIDATE,
+      edit: (eventId, input = {}) => ({
+        type: ActionType.EDIT,
+        content: { comment: "Test comment" },
         transactionId: input.transactionId ?? getUUID(),
-        declaration: input.declaration ?? generateActionDeclarationInput(
-          configuration,
-          ActionType.VALIDATE,
-          rng
-        ),
-        annotation: input.annotation ?? generateActionAnnotationInput(
-          configuration,
-          ActionType.VALIDATE,
-          rng
-        ),
+        declaration: input.declaration ?? generateActionDeclarationInput(configuration, ActionType.EDIT, rng),
+        annotation: input.annotation ?? generateActionAnnotationInput(configuration, ActionType.EDIT, rng),
         eventId,
         ...input
       }),
@@ -8458,22 +8507,29 @@ function generateActionDocument({
     ...defaults
   };
   switch (action) {
+    case ActionType.READ:
+    case ActionType.MARK_AS_NOT_DUPLICATE:
+    case ActionType.DECLARE:
+    case ActionType.UNASSIGN:
+    case ActionType.CREATE:
+    case ActionType.NOTIFY:
+    case ActionType.REGISTER:
+    case ActionType.REQUEST_CORRECTION:
+      return { ...actionBase, type: action };
+    case ActionType.EDIT:
+      return {
+        ...actionBase,
+        type: action,
+        content: { comment: "Test comment" }
+      };
     case ActionType.CUSTOM:
       return {
         ...actionBase,
         type: action,
         customActionType: "CUSTOM_ACTION_TYPE"
       };
-    case ActionType.READ:
-      return { ...actionBase, type: action };
-    case ActionType.MARK_AS_NOT_DUPLICATE:
-      return { ...actionBase, type: action };
     case ActionType.MARK_AS_DUPLICATE:
       return { ...actionBase, type: action, content: void 0 };
-    case ActionType.DECLARE:
-      return { ...actionBase, type: action };
-    case ActionType.UNASSIGN:
-      return { ...actionBase, type: action };
     case ActionType.ASSIGN: {
       const assignActionDefaults = defaults;
       return {
@@ -8482,16 +8538,10 @@ function generateActionDocument({
         type: action
       };
     }
-    case ActionType.VALIDATE:
-      return { ...actionBase, type: action };
     case ActionType.ARCHIVE:
       return { ...actionBase, type: action, content: { reason: "Archive" } };
     case ActionType.REJECT:
       return { ...actionBase, type: action, content: { reason: "Reject" } };
-    case ActionType.CREATE:
-      return { ...actionBase, type: action };
-    case ActionType.NOTIFY:
-      return { ...actionBase, type: action };
     case ActionType.PRINT_CERTIFICATE: {
       const printActionDefaults = defaults;
       return {
@@ -8500,8 +8550,6 @@ function generateActionDocument({
         content: printActionDefaults?.content
       };
     }
-    case ActionType.REQUEST_CORRECTION:
-      return { ...actionBase, type: action };
     case ActionType.APPROVE_CORRECTION:
       return { ...actionBase, requestId: getUUID(), type: action };
     case ActionType.REJECT_CORRECTION:
@@ -8511,11 +8559,6 @@ function generateActionDocument({
         type: action,
         content: { reason: "Correction rejection" }
       };
-    case ActionType.REGISTER:
-      return {
-        ...actionBase,
-        type: action
-      };
     case ActionType.DUPLICATE_DETECTED: {
       const duplicateActionDefaults = defaults;
       return {
@@ -8736,13 +8779,9 @@ var ACTION_SCOPE_MAP = {
   [ActionType.READ]: ["record.read"],
   [ActionType.CREATE]: ["record.create"],
   [ActionType.NOTIFY]: ["record.notify"],
-  [ActionType.DECLARE]: [
-    "record.declare",
-    "record.declared.validate",
-    "record.register"
-  ],
+  [ActionType.DECLARE]: ["record.declare", "record.register"],
+  [ActionType.EDIT]: ["record.declared.edit"],
   [ActionType.DELETE]: ["record.declare"],
-  [ActionType.VALIDATE]: ["record.declared.validate", "record.register"],
   [ActionType.REGISTER]: ["record.register"],
   [ActionType.PRINT_CERTIFICATE]: ["record.registered.print-certified-copies"],
   [ActionType.REQUEST_CORRECTION]: [
@@ -8766,12 +8805,23 @@ var ACTION_SCOPE_MAP = {
 function hasAnyOfScopes(a, b) {
   return (0, import_lodash6.intersection)(a, b).length > 0;
 }
-function configurableEventScopeAllowed(scopes2, allowedConfigurableScopes, eventType) {
-  const parsedScopes = allowedConfigurableScopes.map((scope) => findScope(scopes2, scope)).filter((scope) => scope !== void 0);
-  const authorizedEvents = getAuthorizedEventsFromScopes(parsedScopes);
+function configurableEventScopeAllowed(scopes2, allowedConfigurableScopes, eventType, customActionType) {
+  const parsedScopes = allowedConfigurableScopes.flatMap(
+    (scope) => findScopes(scopes2, scope)
+  );
+  if (!customActionType) {
+    const authorizedEvents2 = getAuthorizedEventsFromScopes(parsedScopes);
+    return authorizedEvents2.includes(eventType);
+  }
+  const scopesWithCorrectCustomActionType = parsedScopes.filter(
+    ({ options }) => "customActionType" in options && options.customActionType.includes(customActionType)
+  );
+  const authorizedEvents = getAuthorizedEventsFromScopes(
+    scopesWithCorrectCustomActionType
+  );
   return authorizedEvents.includes(eventType);
 }
-function isActionInScope(scopes2, action, eventType) {
+function isActionInScope(scopes2, action, eventType, customActionType) {
   const allowedConfigurableScopes = ACTION_SCOPE_MAP[action];
   if (allowedConfigurableScopes === null) {
     return true;
@@ -8782,7 +8832,8 @@ function isActionInScope(scopes2, action, eventType) {
   return configurableEventScopeAllowed(
     scopes2,
     allowedConfigurableScopes,
-    eventType
+    eventType,
+    customActionType
   );
 }
 function canUserReadEvent(event2, {
@@ -8876,12 +8927,12 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
   ],
   [EventStatus.enum.DECLARED]: [
     ActionType.READ,
-    ActionType.VALIDATE,
     ActionType.REGISTER,
     ActionType.MARK_AS_DUPLICATE,
     ActionType.ARCHIVE,
     ActionType.REJECT,
-    ActionType.CUSTOM
+    ActionType.CUSTOM,
+    ActionType.EDIT
   ],
   [EventStatus.enum.REGISTERED]: [
     ActionType.READ,
@@ -8906,7 +8957,7 @@ var ACTION_FILTERS = {
   [ActionType.APPROVE_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
   [ActionType.REJECT_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
   [ActionType.MARK_AS_DUPLICATE]: (flags) => flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.VALIDATE]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
+  [ActionType.EDIT]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
   [ActionType.REGISTER]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
   [ActionType.REJECT]: (flags) => !flags.includes(InherentFlags.REJECTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
   [ActionType.ARCHIVE]: (flags) => !flags.some((flag2) => flag2.endsWith(":requested"))
@@ -8915,6 +8966,9 @@ function filterActionsByFlags(actions, flags) {
   return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
 }
 function getAvailableActionsWithoutFlagFilters(status2, flags) {
+  if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
+    return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
+  }
   switch (status2) {
     case EventStatus.enum.CREATED: {
       return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
@@ -8924,7 +8978,7 @@ function getAvailableActionsWithoutFlagFilters(status2, flags) {
         return getAvailableActionsWithoutFlagFilters(
           EventStatus.enum.CREATED,
           flags.filter((flag2) => flag2 !== InherentFlags.REJECTED)
-        ).filter((action) => action !== ActionType.DELETE).concat(ActionType.ARCHIVE);
+        ).filter((action) => action !== ActionType.DELETE).concat(ActionType.EDIT).concat(ActionType.ARCHIVE);
       }
       return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
     }
@@ -8933,7 +8987,7 @@ function getAvailableActionsWithoutFlagFilters(status2, flags) {
         return getAvailableActionsWithoutFlagFilters(
           EventStatus.enum.CREATED,
           flags.filter((flag2) => flag2 !== InherentFlags.REJECTED)
-        ).filter((action) => action !== ActionType.DELETE).concat(ActionType.ARCHIVE);
+        ).filter((action) => action !== ActionType.DELETE).concat(ActionType.EDIT).concat(ActionType.ARCHIVE);
       }
       return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
     }