@opencrvs/toolkit 1.8.1-rc.25f3d5c → 1.8.1-rc.3068713

package/dist/events/index.js

@@ -39,7 +39,6 @@ __export(events_exports, {
   ActionConfig: () => ActionConfig,
   ActionConfigBase: () => ActionConfigBase,
   ActionCreationMetadata: () => ActionCreationMetadata,
-  ActionDetails: () => ActionDetails,
   ActionDocument: () => ActionDocument,
   ActionFormConfig: () => ActionFormConfig,
   ActionInput: () => ActionInput,
@@ -140,6 +139,7 @@ __export(events_exports, {
   PageConfig: () => PageConfig,
   PageTypes: () => PageTypes,
   PrintCertificateActionInput: () => PrintCertificateActionInput,
+  PrintContent: () => PrintContent,
   QueryExpression: () => QueryExpression,
   QueryInput: () => QueryInput,
   QueryType: () => QueryType,
@@ -607,8 +607,8 @@ var UrbanAddressUpdateValue = AdminStructure.extend({
   zipCode: import_zod5.z.string().nullish()
 });
 var NameFieldValue = import_zod5.z.object({
-  firstname: import_zod5.z.string(),
-  surname: import_zod5.z.string(),
+  firstname: import_zod5.z.string().min(1),
+  surname: import_zod5.z.string().min(1),
   middlename: import_zod5.z.string().optional()
 });
 var NameFieldUpdateValue = import_zod5.z.object({
@@ -1341,7 +1341,7 @@ var SummaryConfig = import_zod14.z.object({
 
 // ../commons/src/events/AdvancedSearchConfig.ts
 var import_zod15 = require("zod");
-var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range"]);
+var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range", "within"]);
 var BaseField3 = import_zod15.z.object({
   config: import_zod15.z.object({
     type: MatchType.describe("Determines the type of field")
@@ -1883,10 +1883,6 @@ var ActionStatus = {
   Accepted: "Accepted",
   Rejected: "Rejected"
 };
-var ActionDetails = import_zod19.z.object({
-  templateId: import_zod19.z.string().optional(),
-  isImmediateCorrection: import_zod19.z.boolean().optional()
-});
 var ActionBase = import_zod19.z.object({
   id: UUID,
   transactionId: import_zod19.z.string(),
@@ -1898,7 +1894,6 @@ var ActionBase = import_zod19.z.object({
   createdAtLocation: CreatedAtLocation,
   declaration: ActionUpdate,
   annotation: ActionUpdate.optional().nullable(),
-  actionDetails: ActionDetails.optional().nullable(),
   status: import_zod19.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
@@ -1908,11 +1903,15 @@ var ActionBase = import_zod19.z.object({
   originalActionId: UUID.optional().nullable().describe(
     "Reference to the original action that was asynchronously rejected or accepted by 3rd party integration."
   )
+  // 'content' field reserved for additional data
+  // Each action can define its own content specifc to the action
+  // See PrintCertificateAction
 });
 var AssignedAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.ASSIGN),
     assignedTo: import_zod19.z.string()
+    // TODO move into 'content' property
   })
 );
 var UnassignedAction = ActionBase.merge(
@@ -1924,6 +1923,7 @@ var RegisterAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REGISTER),
     registrationNumber: import_zod19.z.string().optional()
+    // TODO move into 'content' property
   })
 );
 var DeclareAction = ActionBase.merge(
@@ -1944,6 +1944,7 @@ var RejectAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REJECT),
     reason: RejectionReason
+    // TODO move into 'content' property
   })
 );
 var MarkAsDuplicateAction = ActionBase.merge(
@@ -1955,6 +1956,7 @@ var ArchiveAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.ARCHIVE),
     reason: RejectionReason
+    // TODO move into 'content' property
   })
 );
 var CreatedAction = ActionBase.merge(
@@ -1967,9 +1969,13 @@ var NotifiedAction = ActionBase.merge(
     type: import_zod19.z.literal(ActionType.NOTIFY)
   })
 );
+var PrintContent = import_zod19.z.object({
+  templateId: import_zod19.z.string().optional()
+});
 var PrintCertificateAction = ActionBase.merge(
   import_zod19.z.object({
-    type: import_zod19.z.literal(ActionType.PRINT_CERTIFICATE)
+    type: import_zod19.z.literal(ActionType.PRINT_CERTIFICATE),
+    content: PrintContent.optional().nullable()
   })
 );
 var RequestedCorrectionAction = ActionBase.merge(
@@ -1981,12 +1987,15 @@ var ApprovedCorrectionAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.APPROVE_CORRECTION),
     requestId: import_zod19.z.string()
+    // TODO move into 'content' property
   })
 );
 var RejectedCorrectionAction = ActionBase.merge(
   import_zod19.z.object({
     type: import_zod19.z.literal(ActionType.REJECT_CORRECTION),
-    requestId: import_zod19.z.string()
+    requestId: import_zod19.z.string(),
+    // TODO move into 'content' property
+    reason: RejectionReason
   })
 );
 var ReadAction = ActionBase.merge(
@@ -3180,6 +3189,19 @@ function createSearchConfig(baseField) {
     fuzzy: () => ({
       ...baseField,
       config: { type: "fuzzy" }
+    }),
+    /**
+     * Creates a configuration for matching locations and the child locations
+     * @returns  An object containing the field ID and a configuration object with a type of 'within'.
+     * @example field('createdAtLocation').within()
+     * // {
+     * //   ...
+     * //   config: { type: 'within' }
+     * // }
+     */
+    within: () => ({
+      ...baseField,
+      config: { type: "within" }
     })
   };
 }
@@ -3529,6 +3551,9 @@ var QueryExpression = import_zod25.z.object({
   createdAt: import_zod25.z.optional(DateCondition),
   updatedAt: import_zod25.z.optional(DateCondition),
   "legalStatuses.REGISTERED.acceptedAt": import_zod25.z.optional(DateCondition),
+  "legalStatuses.DECLARED.createdAtLocation": import_zod25.z.optional(
+    import_zod25.z.union([Within, Exact])
+  ),
   "legalStatuses.REGISTERED.createdAtLocation": import_zod25.z.optional(
     import_zod25.z.union([Within, Exact])
   ),
@@ -3840,7 +3865,6 @@ var BaseActionInput = import_zod29.z.object({
   transactionId: import_zod29.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  actionDetails: ActionDetails.optional(),
   originalActionId: UUID.optional(),
   // should not be part of base action.
   keepAssignment: import_zod29.z.boolean().optional()
@@ -3883,7 +3907,8 @@ var DeclareActionInput = BaseActionInput.merge(
 );
 var PrintCertificateActionInput = BaseActionInput.merge(
   import_zod29.z.object({
-    type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE)
+    type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
+    content: PrintContent.optional()
   })
 );
 var RejectDeclarationActionInput = BaseActionInput.merge(
@@ -3923,7 +3948,8 @@ var RequestCorrectionActionInput = BaseActionInput.merge(
 var RejectCorrectionActionInput = BaseActionInput.merge(
   import_zod29.z.object({
     requestId: import_zod29.z.string(),
-    type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
+    type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION),
+    reason: RejectionReason
   })
 );
 var ApproveCorrectionActionInput = BaseActionInput.merge(
@@ -6762,7 +6788,7 @@ function eventPayloadGenerator(rng) {
           requestId,
           keepAssignment: input.keepAssignment
         }),
-        reject: (eventId, requestId, input = {}) => ({
+        reject: (eventId, requestId, input) => ({
           type: ActionType.REJECT_CORRECTION,
           transactionId: input.transactionId ?? getUUID(),
           declaration: {},
@@ -6773,7 +6799,8 @@ function eventPayloadGenerator(rng) {
           ),
           eventId,
           requestId,
-          keepAssignment: input.keepAssignment
+          keepAssignment: input.keepAssignment,
+          reason: input.reason ?? { message: "" }
         })
       }
     }
@@ -6832,7 +6859,8 @@ function generateActionDocument({
       return {
         ...actionBase,
         requestId: getUUID(),
-        type: action
+        type: action,
+        reason: { message: "Correction rejection" }
       };
     case ActionType.REGISTER:
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.8.1-rc.25f3d5c",
+  "version": "1.8.1-rc.3068713",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {