@opencrvs/toolkit 1.8.1-rc.bbbfede → 1.8.1-rc.d31fe05

package/dist/commons/events/EventIndex.d.ts

@@ -117,8 +117,6 @@ export declare const EventIndex: z.ZodObject<z.objectUtil.extendShape<{
         readonly REJECTED: "rejected";
         readonly CORRECTION_REQUESTED: "correction-requested";
     }>]>, "many">;
-    copiesPrintedForTemplate: z.ZodOptional<z.ZodNumber>;
-    modifiedAt: z.ZodOptional<z.ZodString>;
 }, {
     declaration: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodString, z.ZodString, z.ZodUnion<[z.ZodObject<{
         start: z.ZodString;
@@ -354,8 +352,6 @@ export declare const EventIndex: z.ZodObject<z.objectUtil.extendShape<{
     dateOfEvent?: string | null | undefined;
     updatedAtLocation?: (string & z.BRAND<"UUID">) | null | undefined;
     updatedBy?: string | null | undefined;
-    copiesPrintedForTemplate?: number | undefined;
-    modifiedAt?: string | undefined;
 }, {
     type: string;
     id: string;
@@ -443,8 +439,6 @@ export declare const EventIndex: z.ZodObject<z.objectUtil.extendShape<{
     dateOfEvent?: string | null | undefined;
     updatedAtLocation?: string | null | undefined;
     updatedBy?: string | null | undefined;
-    copiesPrintedForTemplate?: number | undefined;
-    modifiedAt?: string | undefined;
 }>;
 export declare const EventSearchIndex: z.ZodIntersection<z.ZodRecord<z.ZodString, z.ZodAny>, z.ZodObject<{
     type: z.ZodString;

package/dist/commons/events/EventMetadata.d.ts

@@ -297,8 +297,6 @@ export declare const EventMetadata: z.ZodObject<{
         readonly REJECTED: "rejected";
         readonly CORRECTION_REQUESTED: "correction-requested";
     }>]>, "many">;
-    copiesPrintedForTemplate: z.ZodOptional<z.ZodNumber>;
-    modifiedAt: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: string;
     id: string & z.BRAND<"UUID">;
@@ -337,8 +335,6 @@ export declare const EventMetadata: z.ZodObject<{
     dateOfEvent?: string | null | undefined;
     updatedAtLocation?: (string & z.BRAND<"UUID">) | null | undefined;
     updatedBy?: string | null | undefined;
-    copiesPrintedForTemplate?: number | undefined;
-    modifiedAt?: string | undefined;
 }, {
     type: string;
     id: string;
@@ -377,8 +373,6 @@ export declare const EventMetadata: z.ZodObject<{
     dateOfEvent?: string | null | undefined;
     updatedAtLocation?: string | null | undefined;
     updatedBy?: string | null | undefined;
-    copiesPrintedForTemplate?: number | undefined;
-    modifiedAt?: string | undefined;
 }>;
 export type EventMetadata = z.infer<typeof EventMetadata>;
 export declare const EventMetadataKeysArray: readonly ["id", "type", "status", "createdAt", "dateOfEvent", "createdBy", "createdByUserType", "updatedByUserRole", "createdAtLocation", "updatedAtLocation", "updatedAt", "assignedTo", "updatedBy", "trackingId", "legalStatuses", "flags"];

package/dist/commons/events/defineConfig.d.ts

@@ -8657,7 +8657,7 @@ export declare const defineConfig: (config: EventConfigInput) => {
         title: import("./TranslationConfig").TranslationConfig;
         fields: ({
             config: {
-                type: "exact" | "fuzzy" | "range";
+                type: "exact" | "fuzzy" | "range" | "within";
             };
             fieldId: string;
             fieldType: "field";
@@ -8684,7 +8684,7 @@ export declare const defineConfig: (config: EventConfigInput) => {
             excludeInSearchQuery?: boolean | undefined;
         } | {
             config: {
-                type: "exact" | "fuzzy" | "range";
+                type: "exact" | "fuzzy" | "range" | "within";
             };
             fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
             fieldType: "event";

package/dist/commons/events/event.d.ts

@@ -33,67 +33,21 @@ declare function eventFn(fieldId: EventFieldId): {
             type: "fuzzy";
         };
     };
+    within: () => {
+        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
+        fieldType: "event";
+    } & {
+        config: {
+            type: "within";
+        };
+    };
 };
 declare const event: typeof eventFn & {
     /**
      * Checks if the event contains a specific action type.
-     * Can be used directly as a conditional or chained with additional methods.
      * @param action - The action type to check for.
      */
-    hasAction: (action: ActionType) => {
-        /**
-         * Creates a conditional that checks if the event contains a specific action type
-         * with a minimum count of occurrences.
-         *
-         * @param minCount - The minimum number of actions required.
-         */
-        minCount: (minCount: number) => import("../conditionals/conditionals").JSONSchema;
-        /**
-         * Builds a conditional that sets a maximum count for the number of actions.
-         * This is useful for limiting the number of actions of a specific type in a single event.
-         */
-        maxCount: (maxCount: number) => import("../conditionals/conditionals").JSONSchema;
-        /**
-         * Adds additional field constraints to the action matching.
-         *
-         * @param fields - Object containing additional fields to match on the action.
-         */
-        withFields: (fields: Record<string, unknown>) => {
-            /**
-             * Creates a conditional that checks if the event contains a specific action type
-             * with a minimum count of occurrences.
-             *
-             * @param minCount - The minimum number of actions required.
-             */
-            minCount: (minCount: number) => import("../conditionals/conditionals").JSONSchema;
-            /**
-             * Builds a conditional that sets a maximum count for the number of actions.
-             * This is useful for limiting the number of actions of a specific type in a single event.
-             */
-            maxCount: (maxCount: number) => import("../conditionals/conditionals").JSONSchema;
-        };
-        /**
-         * Adds template ID constraint to the action matching.
-         * This is a convenience method that adds actionDetails.templateId to the fields.
-         *
-         * @param id - The template ID to match against.
-         */
-        withTemplate: (id: string) => {
-            /**
-             * Creates a conditional that checks if the event contains a specific action type
-             * with a minimum count of occurrences.
-             *
-             * @param minCount - The minimum number of actions required.
-             */
-            minCount: (minCount: number) => import("../conditionals/conditionals").JSONSchema;
-            /**
-             * Builds a conditional that sets a maximum count for the number of actions.
-             * This is useful for limiting the number of actions of a specific type in a single event.
-             */
-            maxCount: (maxCount: number) => import("../conditionals/conditionals").JSONSchema;
-        };
-        __nominal__type: "JSONSchema";
-    };
+    hasAction: (action: ActionType) => import("../conditionals/conditionals").JSONSchema;
     field(field: WorkqueueColumnKeys): WorkqueueColumnValue;
 };
 export { event };

package/dist/commons/events/field.d.ts

@@ -56,6 +56,20 @@ export declare function field(fieldId: string, options?: {
             type: "fuzzy";
         };
     };
+    within: () => {
+        options?: SelectOption[];
+        excludeInSearchQuery?: boolean;
+        alternateFieldIds?: string[];
+        conditionals?: FieldConditional[];
+        validations?: ValidationConfig[];
+        searchCriteriaLabelPrefix?: TranslationConfig;
+        fieldId: string;
+        fieldType: "field";
+    } & {
+        config: {
+            type: "within";
+        };
+    };
     $$field: string;
     isAfter: () => {
         days: (days: number) => {

package/dist/commons/events/test.utils.d.ts

@@ -414,7 +414,7 @@ export declare function eventPayloadGenerator(rng: () => number): {
                 requestId: string;
                 keepAssignment: boolean | undefined;
             };
-            reject: (eventId: string, requestId: string, input?: Partial<Pick<RejectCorrectionActionInput, "transactionId" | "annotation" | "keepAssignment">>) => {
+            reject: (eventId: string, requestId: string, input: Partial<Pick<RejectCorrectionActionInput, "transactionId" | "annotation" | "keepAssignment" | "reason">>) => {
                 type: "REJECT_CORRECTION";
                 transactionId: string;
                 declaration: {};
@@ -422,6 +422,10 @@ export declare function eventPayloadGenerator(rng: () => number): {
                 eventId: string;
                 requestId: string;
                 keepAssignment: boolean | undefined;
+                reason: {
+                    message: string;
+                    isDuplicate?: boolean | undefined;
+                };
             };
         };
     };

package/dist/commons/events/utils.d.ts

@@ -6758,10 +6758,6 @@ export declare function findActiveDrafts(event: EventDocument, drafts: Draft[]):
             start: string;
             end: string;
         } | null | undefined> | null | undefined;
-        actionDetails?: {
-            templateId?: string | undefined;
-            isImmediateCorrection?: boolean | undefined;
-        } | null | undefined;
         originalActionId?: (string & import("zod").BRAND<"UUID">) | null | undefined;
     };
 }[];
@@ -15524,7 +15520,7 @@ export declare function getEventConfigById(eventConfigs: EventConfig[], id: stri
         title: import("./TranslationConfig").TranslationConfig;
         fields: ({
             config: {
-                type: "exact" | "fuzzy" | "range";
+                type: "exact" | "fuzzy" | "range" | "within";
             };
             fieldId: string;
             fieldType: "field";
@@ -15551,7 +15547,7 @@ export declare function getEventConfigById(eventConfigs: EventConfig[], id: stri
             excludeInSearchQuery?: boolean | undefined;
         } | {
             config: {
-                type: "exact" | "fuzzy" | "range";
+                type: "exact" | "fuzzy" | "range" | "within";
             };
             fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
             fieldType: "event";

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,
@@ -198,7 +197,6 @@ __export(events_exports, {
   annotationActions: () => annotationActions,
   applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
   applyDraftsToEventIndex: () => applyDraftsToEventIndex,
-  areCertificateConditionsMet: () => areCertificateConditionsMet,
   areConditionsMet: () => areConditionsMet,
   compositeFieldTypes: () => compositeFieldTypes,
   createEmptyDraft: () => createEmptyDraft,
@@ -1224,8 +1222,7 @@ var CertificateConfig = import_zod11.z.object({
     delayed: import_zod11.z.number()
   }),
   svgUrl: import_zod11.z.string(),
-  fonts: import_zod11.z.record(FontFamily).optional(),
-  conditionals: import_zod11.z.array(ShowConditional).optional()
+  fonts: import_zod11.z.record(FontFamily).optional()
 });
 var CertificateTemplateConfig = CertificateConfig.extend({
   hash: import_zod11.z.string().optional(),
@@ -1343,7 +1340,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")
@@ -1885,10 +1882,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(),
@@ -1900,7 +1893,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,
@@ -1988,7 +1980,8 @@ var ApprovedCorrectionAction = ActionBase.merge(
 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(),
+    reason: RejectionReason
   })
 );
 var ReadAction = ActionBase.merge(
@@ -2038,7 +2031,7 @@ var ResolvedUser = import_zod19.z.object({
 });
 
 // ../commons/src/conditionals/validate.ts
-var import__ = __toESM(require("ajv/dist/2019"));
+var import_ajv = __toESM(require("ajv"));
 var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
@@ -2252,11 +2245,9 @@ var isNonInteractiveFieldType = (field2) => {
 };
 
 // ../commons/src/conditionals/validate.ts
-var ajv = new import__.default({
+var ajv = new import_ajv.default({
   $data: true,
-  allowUnionTypes: true,
-  strict: false
-  // Allow minContains and other newer features
+  allowUnionTypes: true
 });
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
@@ -2494,11 +2485,6 @@ function getValidatorsForField(fieldId, validations) {
     };
   }).filter((x) => x !== null);
 }
-function areCertificateConditionsMet(conditions, values) {
-  return conditions.every((condition) => {
-    return ajv.validate(condition.conditional, values);
-  });
-}
 
 // ../commons/src/utils.ts
 function getOrThrow(x, message) {
@@ -3189,6 +3175,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" }
     })
   };
 }
@@ -3209,107 +3208,32 @@ function eventFn(fieldId) {
 var event = Object.assign(eventFn, {
   /**
    * Checks if the event contains a specific action type.
-   * Can be used directly as a conditional or chained with additional methods.
    * @param action - The action type to check for.
    */
-  hasAction: (action) => {
-    const basicConditional = defineConditional({
-      type: "object",
-      properties: {
-        $event: {
-          type: "object",
-          properties: {
-            actions: {
-              type: "array",
-              contains: {
-                type: "object",
-                properties: {
-                  type: {
-                    const: action
-                  }
-                },
-                required: ["type"]
-              }
-            }
-          },
-          required: ["actions"]
-        }
-      },
-      required: ["$event"]
-    });
-    const buildActionConstraints = (additionalFields) => {
-      const actionProperties = {
-        type: { const: action }
-      };
-      const requiredFields = ["type"];
-      if (additionalFields) {
-        Object.entries(additionalFields).forEach(([key, value]) => {
-          actionProperties[key] = { const: value };
-          requiredFields.push(key);
-        });
-      }
-      return { actionProperties, requiredFields };
-    };
-    const createCountConditional = (countType, count, additionalFields) => {
-      const { actionProperties, requiredFields } = buildActionConstraints(additionalFields);
-      return defineConditional({
+  hasAction: (action) => defineConditional({
+    type: "object",
+    properties: {
+      $event: {
         type: "object",
         properties: {
-          $event: {
-            type: "object",
-            properties: {
-              actions: {
-                type: "array",
-                contains: {
-                  type: "object",
-                  properties: actionProperties,
-                  required: requiredFields
-                },
-                [countType]: count
-              }
-            },
-            required: ["actions"]
+          actions: {
+            type: "array",
+            contains: {
+              type: "object",
+              properties: {
+                type: {
+                  const: action
+                }
+              },
+              required: ["type"]
+            }
           }
         },
-        required: ["$event"]
-      });
-    };
-    const withMinMax = (additionalFields) => {
-      return {
-        /**
-         * Creates a conditional that checks if the event contains a specific action type
-         * with a minimum count of occurrences.
-         *
-         * @param minCount - The minimum number of actions required.
-         */
-        minCount: (minCount) => createCountConditional("minContains", minCount, additionalFields),
-        /**
-         * Builds a conditional that sets a maximum count for the number of actions.
-         * This is useful for limiting the number of actions of a specific type in a single event.
-         */
-        maxCount: (maxCount) => createCountConditional("maxContains", maxCount, additionalFields)
-      };
-    };
-    const chainableMethods = {
-      /**
-       * Adds additional field constraints to the action matching.
-       *
-       * @param fields - Object containing additional fields to match on the action.
-       */
-      withFields: (fields) => withMinMax(fields),
-      /**
-       * Adds template ID constraint to the action matching.
-       * This is a convenience method that adds actionDetails.templateId to the fields.
-       *
-       * @param id - The template ID to match against.
-       */
-      withTemplate: (id) => withMinMax({
-        actionDetails: { templateId: id }
-      }),
-      ...withMinMax()
-    };
-    return { ...basicConditional, ...chainableMethods };
-  },
+        required: ["actions"]
+      }
+    },
+    required: ["$event"]
+  }),
   field(field2) {
     return {
       $event: field2
@@ -3394,9 +3318,7 @@ var EventMetadata = import_zod23.z.object({
   trackingId: import_zod23.z.string().describe(
     "System-generated tracking ID used by informants or registrars to look up the event."
   ),
-  flags: import_zod23.z.array(Flag),
-  copiesPrintedForTemplate: import_zod23.z.number().optional(),
-  modifiedAt: import_zod23.z.string().optional()
+  flags: import_zod23.z.array(Flag)
 });
 var EventMetadataKeysArray = [
   "id",
@@ -3926,7 +3848,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()
@@ -4009,7 +3930,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(
@@ -4376,8 +4298,7 @@ function getCurrentEventState(event2, config) {
     trackingId: event2.trackingId,
     updatedByUserRole: requestActionMetadata.createdByRole,
     dateOfEvent: resolveDateOfEvent(event2, declaration, config),
-    flags: getFlagsFromActions(event2.actions),
-    copiesPrintedForTemplate: event2.copiesPrintedForTemplate ?? 0
+    flags: getFlagsFromActions(event2.actions)
   });
 }
 function getCurrentEventStateWithDrafts({
@@ -6849,7 +6770,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: {},
@@ -6860,7 +6781,8 @@ function eventPayloadGenerator(rng) {
           ),
           eventId,
           requestId,
-          keepAssignment: input.keepAssignment
+          keepAssignment: input.keepAssignment,
+          reason: input.reason ?? { message: "" }
         })
       }
     }
@@ -6919,7 +6841,8 @@ function generateActionDocument({
       return {
         ...actionBase,
         requestId: getUUID(),
-        type: action
+        type: action,
+        reason: { message: "Correction rejection" }
       };
     case ActionType.REGISTER:
       return {
@@ -7054,8 +6977,7 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
     flags: [],
     legalStatuses: overrides.legalStatuses ?? {},
     declaration: overrides.declaration ?? generateRandomApplicant(rng),
-    trackingId: overrides.trackingId ?? generateTrackingId(rng),
-    copiesPrintedForTemplate: overrides.copiesPrintedForTemplate ?? 0
+    trackingId: overrides.trackingId ?? generateTrackingId(rng)
   };
 };
 var generateTranslationConfig = (message) => ({

package/package.json

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