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

package/dist/events/index.js

@@ -158,6 +158,7 @@ __export(events_exports, {
   SelectOption: () => SelectOption,
   ShowConditional: () => ShowConditional,
   SignatureFieldValue: () => SignatureFieldValue,
+  StatusChangingActions: () => StatusChangingActions,
   SummaryConfig: () => SummaryConfig,
   TENNIS_CLUB_MEMBERSHIP: () => TENNIS_CLUB_MEMBERSHIP,
   TestUserRole: () => TestUserRole,
@@ -481,8 +482,8 @@ var NameFieldValue = import_zod3.z.object({
   middlename: import_zod3.z.string().optional()
 });
 var NameFieldUpdateValue = import_zod3.z.object({
-  firstname: import_zod3.z.string().nullish(),
-  surname: import_zod3.z.string().nullish(),
+  firstname: import_zod3.z.string(),
+  surname: import_zod3.z.string(),
   middlename: import_zod3.z.string().nullish()
 }).or(import_zod3.z.null()).or(import_zod3.z.undefined());
 var RuralAddressUpdateValue = AdminStructure.extend({
@@ -582,7 +583,6 @@ var BaseField = import_zod5.z.object({
   parent: ParentReference,
   conditionals: import_zod5.z.array(FieldConditional).default([]).optional(),
   required: import_zod5.z.boolean().default(false).optional(),
-  secured: import_zod5.z.boolean().default(false).optional(),
   placeholder: TranslationConfig.optional(),
   validation: import_zod5.z.array(ValidationConfig).default([]).optional(),
   label: TranslationConfig,
@@ -748,9 +748,7 @@ var NameField = BaseField.extend({
   configuration: import_zod5.z.object({
     maxLength: import_zod5.z.number().optional().describe("Maximum length of the text"),
     prefix: TranslationConfig.optional(),
-    postfix: TranslationConfig.optional(),
-    includeMiddlename: import_zod5.z.boolean().default(false).optional().describe("To make middle name visible in Name form field"),
-    searchMode: import_zod5.z.boolean().optional()
+    postfix: TranslationConfig.optional()
   }).optional()
 }).describe("Name input field");
 var PhoneField = BaseField.extend({
@@ -976,6 +974,16 @@ var writeActions = ActionTypes.exclude([
   ActionType.ASSIGN,
   ActionType.UNASSIGN
 ]);
+var StatusChangingActions = ActionTypes.extract([
+  ActionType.CREATE,
+  ActionType.NOTIFY,
+  ActionType.DECLARE,
+  ActionType.VALIDATE,
+  ActionType.REGISTER,
+  ActionType.REJECT,
+  ActionType.ARCHIVE,
+  ActionType.PRINT_CERTIFICATE
+]);
 var workqueueActions = ActionTypes.exclude([
   ActionType.CREATE,
   ActionType.NOTIFY,
@@ -2221,7 +2229,7 @@ var errorMessages = {
     id: "v2.error.invalidEmail"
   },
   requiredField: {
-    defaultMessage: "Required",
+    defaultMessage: "Required for registration",
     description: "Error message when required field is missing",
     id: "v2.error.required"
   },
@@ -3827,7 +3835,6 @@ var EventDocument = import_zod31.z.object({
 }).openapi({ ref: "EventDocument" });
 
 // ../commons/src/events/state/utils.ts
-var import_lodash2 = require("lodash");
 function getActionRequests(actionType, actions) {
   const filtered = actions.filter((action) => action.type === actionType);
   const accept = filtered.find(
@@ -3866,38 +3873,29 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     registrationNumber
   };
 }
-var updateActions = ActionTypes.extract([
-  ActionType.CREATE,
-  ActionType.NOTIFY,
-  ActionType.DECLARE,
-  ActionType.VALIDATE,
-  ActionType.REGISTER,
-  ActionType.REJECT,
-  ActionType.ARCHIVE,
-  ActionType.PRINT_CERTIFICATE,
-  ActionType.REQUEST_CORRECTION
-]);
 function getActionUpdateMetadata(actions) {
   const createAction = getOrThrow(
     actions.find((action) => action.type === ActionType.CREATE),
     `Event has no ${ActionType.CREATE} action`
   );
-  const metadataFields = [
-    "createdAt",
-    "createdBy",
-    "createdByUserType",
-    "createdAtLocation",
-    "createdByRole"
-  ];
-  return actions.filter(({ type }) => updateActions.safeParse(type).success).filter(({ status }) => status === ActionStatus.Accepted).reduce(
-    (_, action) => {
-      if (action.originalActionId) {
-        const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
-        return (0, import_lodash2.pick)(originalAction, metadataFields);
-      }
-      return (0, import_lodash2.pick)(action, metadataFields);
+  return StatusChangingActions.options.reduce(
+    (metadata, actionType) => {
+      const { accept, request } = getActionRequests(actionType, actions);
+      return {
+        createdAt: request?.createdAt ?? accept?.createdAt ?? metadata.createdAt,
+        createdBy: request?.createdBy ?? accept?.createdBy ?? metadata.createdBy,
+        createdByUserType: request?.createdByUserType ?? accept?.createdByUserType ?? metadata.createdByUserType,
+        createdAtLocation: request?.createdAtLocation ?? accept?.createdAtLocation ?? metadata.createdAtLocation,
+        createdByRole: request?.createdByRole ?? accept?.createdByRole ?? metadata.createdByRole
+      };
     },
-    (0, import_lodash2.pick)(createAction, metadataFields)
+    {
+      createdAt: createAction.createdAt,
+      createdBy: createAction.createdBy,
+      createdByUserType: createAction.createdByUserType,
+      createdAtLocation: createAction.createdAtLocation,
+      createdByRole: createAction.createdByRole
+    }
   );
 }
 function getLegalStatuses(actions) {
@@ -4210,8 +4208,8 @@ var User = import_zod32.z.object({
 });
 
 // ../commons/src/events/test.utils.ts
-var import_lodash3 = require("lodash");
-var import_date_fns3 = require("date-fns");
+var import_lodash2 = require("lodash");
+var import_addDays = __toESM(require("date-fns/addDays"));
 
 // ../commons/src/field-config/field-configuration.ts
 function createFieldConfig(fieldId, options) {
@@ -5030,7 +5028,6 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           id: "applicant.address",
           type: "ADDRESS",
           required: true,
-          secured: true,
           conditionals: [],
           label: {
             defaultMessage: "Applicant's address",
@@ -6353,7 +6350,7 @@ function eventPayloadGenerator(rng) {
       type: input.type ?? TENNIS_CLUB_MEMBERSHIP,
       id
     }),
-    draft: ({ eventId, actionType }, input = {}) => (0, import_lodash3.merge)(
+    draft: ({ eventId, actionType }, input = {}) => (0, import_lodash2.merge)(
       {
         id: getUUID(),
         eventId,
@@ -6407,13 +6404,13 @@ function eventPayloadGenerator(rng) {
       notify: (eventId, input = {}) => {
         let declaration = input.declaration;
         if (!declaration) {
-          const partialDeclaration = (0, import_lodash3.omitBy)(
+          const partialDeclaration = (0, import_lodash2.omitBy)(
             generateActionDeclarationInput(
               tennisClubMembershipEvent,
               ActionType.DECLARE,
               rng
             ),
-            import_lodash3.isString
+            import_lodash2.isString
           );
           declaration = partialDeclaration;
         }
@@ -6740,7 +6737,7 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
     createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
     updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
     createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
-    updatedAt: overrides.updatedAt ?? (0, import_date_fns3.addDays)(new Date(createdAt), 1).toISOString(),
+    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",
@@ -6812,7 +6809,7 @@ function isFieldConfigDefaultValue(value) {
 }
 
 // ../commons/src/events/scopes.ts
-var import_lodash4 = require("lodash");
+var import_lodash3 = require("lodash");
 var CONFIG_GET_ALLOWED_SCOPES = [
   SCOPES.RECORD_DECLARE,
   SCOPES.RECORD_READ,
@@ -6896,7 +6893,7 @@ var WRITE_ACTION_SCOPES = [
   ...ACTION_ALLOWED_SCOPES[ActionType.PRINT_CERTIFICATE]
 ];
 function hasAnyOfScopes(a, b) {
-  return (0, import_lodash4.intersection)(a, b).length > 0;
+  return (0, import_lodash3.intersection)(a, b).length > 0;
 }
 
 // ../commons/src/events/serializers/user/deserializer.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.8.0-rc.fb8e005",
+  "version": "1.8.0-rc.fb96ec1",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {