@opencrvs/toolkit 1.8.1-rc.fa83f7b → 1.8.1-rc.faf1965

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

@@ -8686,7 +8686,7 @@ export declare const defineConfig: (config: EventConfigInput) => {
             config: {
                 type: "exact" | "fuzzy" | "range" | "within";
             };
-            fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+            fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
             fieldType: "event";
             options?: {
                 value: string;

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

@@ -1,5 +1,5 @@
 import { ActionType } from './ActionType';
-import { EventFieldIdInput } from './AdvancedSearchConfig';
+import { EventFieldId } from './AdvancedSearchConfig';
 import { WorkqueueColumnKeys, WorkqueueColumnValue } from './WorkqueueColumnConfig';
 /**
  * Creates a function that acts like a callable + static method container.
@@ -8,9 +8,9 @@ import { WorkqueueColumnKeys, WorkqueueColumnValue } from './WorkqueueColumnConf
  * event('status') // → returns search config
  * event.hasAction('CLICKED') // → returns conditional
  */
-declare function eventFn(fieldId: EventFieldIdInput): {
+declare function eventFn(fieldId: EventFieldId): {
     range: () => {
-        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -18,7 +18,7 @@ declare function eventFn(fieldId: EventFieldIdInput): {
         };
     };
     exact: () => {
-        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -26,7 +26,7 @@ declare function eventFn(fieldId: EventFieldIdInput): {
         };
     };
     fuzzy: () => {
-        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -34,7 +34,7 @@ declare function eventFn(fieldId: EventFieldIdInput): {
         };
     };
     within: () => {
-        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -45,9 +45,63 @@ declare function eventFn(fieldId: EventFieldIdInput): {
 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) => import("../conditionals/conditionals").JSONSchema;
+    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 content.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";
+    };
     field(field: WorkqueueColumnKeys): WorkqueueColumnValue;
 };
 export { event };

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

@@ -4723,7 +4723,7 @@ export declare const getActionAnnotationFields: (actionConfig: ActionConfig) =>
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
 })[];
-export declare function getAllUniqueFields(eventConfig: EventConfig): FieldConfig[];
+export declare function getAllUniqueFields(eventConfig: EventConfig): import("./FieldConfig").Inferred[];
 export declare function getDeclarationFieldById(config: EventConfig, fieldId: string): FieldConfig;
 /**
  * @TODO: Request correction should have same format as print certificate
@@ -15549,7 +15549,7 @@ export declare function getEventConfigById(eventConfigs: EventConfig[], id: stri
             config: {
                 type: "exact" | "fuzzy" | "range" | "within";
             };
-            fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+            fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
             fieldType: "event";
             options?: {
                 value: string;

package/dist/conditionals/index.js

@@ -287,8 +287,8 @@ function createFieldConditionals(fieldId) {
       properties: {
         [fieldId]: {
           type: "string",
-          pattern: "^[\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*( [\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*)*$",
-          description: "Name must contain only letters, numbers, and allowed special characters ('.-). No double spaces."
+          pattern: "^[\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*( [\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*)*$",
+          description: "Name must contain only letters, numbers, and allowed special characters ('._-). No double spaces."
         }
       }
     }),

package/dist/events/index.js

@@ -40,7 +40,6 @@ __export(events_exports, {
   ActionConfigBase: () => ActionConfigBase,
   ActionCreationMetadata: () => ActionCreationMetadata,
   ActionDocument: () => ActionDocument,
-  ActionFlag: () => ActionFlag,
   ActionFormConfig: () => ActionFormConfig,
   ActionInput: () => ActionInput,
   ActionStatus: () => ActionStatus,
@@ -96,7 +95,6 @@ __export(events_exports, {
   EventDocument: () => EventDocument,
   EventFieldConfigSchema: () => EventFieldConfigSchema,
   EventFieldId: () => EventFieldId,
-  EventFieldIdInput: () => EventFieldIdInput,
   EventIndex: () => EventIndex,
   EventInput: () => EventInput,
   EventMetadata: () => EventMetadata,
@@ -131,7 +129,6 @@ __export(events_exports, {
   InherentFlags: () => InherentFlags,
   LanguageConfig: () => LanguageConfig,
   LegalStatuses: () => LegalStatuses,
-  METADATA_FIELD_PREFIX: () => METADATA_FIELD_PREFIX,
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
   MimeType: () => MimeType,
   NameFieldUpdateValue: () => NameFieldUpdateValue,
@@ -182,6 +179,7 @@ __export(events_exports, {
   ValidationConfig: () => ValidationConfig,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
+  VisibleStatus: () => VisibleStatus,
   WRITE_ACTION_SCOPES: () => WRITE_ACTION_SCOPES,
   Within: () => Within,
   WorkqueueActionsWithDefault: () => WorkqueueActionsWithDefault,
@@ -200,6 +198,7 @@ __export(events_exports, {
   annotationActions: () => annotationActions,
   applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
   applyDraftsToEventIndex: () => applyDraftsToEventIndex,
+  areCertificateConditionsMet: () => areCertificateConditionsMet,
   areConditionsMet: () => areConditionsMet,
   compositeFieldTypes: () => compositeFieldTypes,
   createEmptyDraft: () => createEmptyDraft,
@@ -557,7 +556,7 @@ var import_zod6 = require("zod");
 var import_zod4 = require("zod");
 var import_zod_openapi3 = require("zod-openapi");
 (0, import_zod_openapi3.extendZodWithOpenApi)(import_zod4.z);
-var FullDocumentUrl = import_zod4.z.string().brand("FullDocumentUrl").describe(
+var FullDocumentURL = import_zod4.z.string().brand("FullDocumentURL").describe(
   "A full url with protocol, host, bucket name, starting from the root of the S3 server, https://minio/bucket-name/document-id.jpg"
 );
 var FullDocumentPath = import_zod4.z.string().transform((val) => val.startsWith("/") ? val : `/${val}`).openapi({ effectType: "input", type: "string" }).describe(
@@ -1225,7 +1224,8 @@ var CertificateConfig = import_zod11.z.object({
     delayed: import_zod11.z.number()
   }),
   svgUrl: import_zod11.z.string(),
-  fonts: import_zod11.z.record(FontFamily).optional()
+  fonts: import_zod11.z.record(FontFamily).optional(),
+  conditionals: import_zod11.z.array(ShowConditional).optional()
 });
 var CertificateTemplateConfig = CertificateConfig.extend({
   hash: import_zod11.z.string().optional(),
@@ -1397,30 +1397,22 @@ var FieldConfigSchema = BaseField3.extend({
   fieldType: import_zod15.z.literal("field"),
   alternateFieldIds: import_zod15.z.array(import_zod15.z.string()).optional().describe(
     `Sometimes there might be need to search a value against multiple field of same FormField type. For example
-      search Country, Province, District against child.address.private and child.address.other. In such case, we
+      search Country, Province, District against child.address.private and child.address.other. In such case, we 
       add a one field as fieldId, and accomodate others in alternateFieldIds`
   ),
-  excludeInSearchQuery: import_zod15.z.boolean().default(false).optional().describe(`Sometimes there will be search fields which are used to
-    conditionally display another search field, but its not needed in search query. For example, child.placeOfBirth
+  excludeInSearchQuery: import_zod15.z.boolean().default(false).optional().describe(`Sometimes there will be search fields which are used to 
+    conditionally display another search field, but its not needed in search query. For example, child.placeOfBirth 
     is select field, which has 3 options, FACILITY, PRIVATE_HOME, OTHER. Upon selecting any of the option, pops up another field
     related to the selected option, whose value is required in the search query. But child.placeOfBirth itself is not needed in the query.
     In such case, populate this field (excludeInSearchQuery) with boolean true`)
 });
-var EventFieldIdInput = import_zod15.z.enum([
+var EventFieldId = import_zod15.z.enum([
   "trackingId",
   "status",
   "legalStatuses.REGISTERED.acceptedAt",
   "legalStatuses.REGISTERED.createdAtLocation",
   "updatedAt"
 ]);
-var METADATA_FIELD_PREFIX = "event.";
-var EventFieldId = import_zod15.z.enum([
-  `${METADATA_FIELD_PREFIX}trackingId`,
-  `${METADATA_FIELD_PREFIX}status`,
-  `${METADATA_FIELD_PREFIX}legalStatuses.REGISTERED.acceptedAt`,
-  `${METADATA_FIELD_PREFIX}legalStatuses.REGISTERED.createdAtLocation`,
-  `${METADATA_FIELD_PREFIX}updatedAt`
-]);
 var EventFieldConfigSchema = BaseField3.extend({
   fieldId: EventFieldId,
   fieldType: import_zod15.z.literal("event")
@@ -2055,7 +2047,7 @@ var ResolvedUser = import_zod19.z.object({
 });
 
 // ../commons/src/conditionals/validate.ts
-var import_ajv = __toESM(require("ajv"));
+var import__ = __toESM(require("ajv/dist/2019"));
 var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_date_fns = require("date-fns");
 
@@ -2269,9 +2261,11 @@ var isNonInteractiveFieldType = (field2) => {
 };
 
 // ../commons/src/conditionals/validate.ts
-var ajv = new import_ajv.default({
+var ajv = new import__.default({
   $data: true,
-  allowUnionTypes: true
+  allowUnionTypes: true,
+  strict: false
+  // Allow minContains and other newer features
 });
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
@@ -2509,6 +2503,11 @@ 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) {
@@ -2729,16 +2728,16 @@ function timePeriodToDateRange(value) {
   let startDate;
   switch (value) {
     case "last7Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 7);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 6);
       break;
     case "last30Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 30);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 29);
       break;
     case "last90Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 90);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 89);
       break;
     case "last365Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 365);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 364);
       break;
   }
   return {
@@ -3105,8 +3104,8 @@ function createFieldConditionals(fieldId) {
       properties: {
         [fieldId]: {
           type: "string",
-          pattern: "^[\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*( [\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*)*$",
-          description: "Name must contain only letters, numbers, and allowed special characters ('.-). No double spaces."
+          pattern: "^[\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*( [\\p{Script=Latin}0-9'._-]*(\\([\\p{Script=Latin}0-9'._-]+\\))?[\\p{Script=Latin}0-9'._-]*)*$",
+          description: "Name must contain only letters, numbers, and allowed special characters ('._-). No double spaces."
         }
       }
     }),
@@ -3219,7 +3218,7 @@ function createSearchConfig(baseField) {
 // ../commons/src/event-config/event-configuration.ts
 function createEventFieldConfig(fieldId) {
   const baseField = {
-    fieldId: `${METADATA_FIELD_PREFIX}${fieldId}`,
+    fieldId,
     fieldType: "event"
   };
   return createSearchConfig(baseField);
@@ -3232,32 +3231,107 @@ 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) => defineConditional({
-    type: "object",
-    properties: {
-      $event: {
+  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({
         type: "object",
         properties: {
-          actions: {
-            type: "array",
-            contains: {
-              type: "object",
-              properties: {
-                type: {
-                  const: action
-                }
-              },
-              required: ["type"]
-            }
+          $event: {
+            type: "object",
+            properties: {
+              actions: {
+                type: "array",
+                contains: {
+                  type: "object",
+                  properties: actionProperties,
+                  required: requiredFields
+                },
+                [countType]: count
+              }
+            },
+            required: ["actions"]
           }
         },
-        required: ["actions"]
-      }
-    },
-    required: ["$event"]
-  }),
+        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 content.templateId to the fields.
+       *
+       * @param id - The template ID to match against.
+       */
+      withTemplate: (id) => withMinMax({
+        content: { templateId: id }
+      }),
+      ...withMinMax()
+    };
+    return { ...basicConditional, ...chainableMethods };
+  },
   field(field2) {
     return {
       $event: field2
@@ -3276,23 +3350,24 @@ var EventStatus = import_zod23.z.enum([
   "DECLARED",
   "VALIDATED",
   "REGISTERED",
+  "CERTIFIED",
   "ARCHIVED"
 ]);
+var VisibleStatus = import_zod23.z.enum([...EventStatus.options, "REJECTED"]);
 var InherentFlags = {
-  PENDING_CERTIFICATION: "pending-certification",
+  PRINTED: "printed",
   INCOMPLETE: "incomplete",
   REJECTED: "rejected",
   CORRECTION_REQUESTED: "correction-requested"
 };
-var ActionFlag = import_zod23.z.string().regex(
+var Flag = import_zod23.z.string().regex(
   new RegExp(
     `^(${Object.values(ActionType).join("|").toLowerCase()}):(${Object.values(
       ActionStatus
     ).join("|").toLowerCase()})$`
   ),
   "Flag must be in the format ActionType:ActionStatus (lowerCase)"
-);
-var Flag = ActionFlag.or(import_zod23.z.nativeEnum(InherentFlags));
+).or(import_zod23.z.nativeEnum(InherentFlags));
 var ZodDate = import_zod23.z.string().date();
 var ActionCreationMetadata = import_zod23.z.object({
   createdAt: import_zod23.z.string().datetime().describe("The timestamp when the action request was created."),
@@ -3341,7 +3416,8 @@ 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)
+  flags: import_zod23.z.array(Flag),
+  modifiedAt: import_zod23.z.string().optional()
 });
 var EventMetadataKeysArray = [
   "id",
@@ -3808,8 +3884,7 @@ var WorkqueueConfig = import_zod28.z.object({
     })
   ),
   columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
-  icon: AvailableIcons,
-  emptyMessage: TranslationConfig.optional()
+  icon: AvailableIcons
 }).describe("Configuration for workqueue.");
 var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
   query: true,
@@ -3828,8 +3903,7 @@ var WorkqueueConfigInput = import_zod28.z.object({
     })
   ),
   columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
-  icon: AvailableIcons,
-  emptyMessage: TranslationConfig.optional()
+  icon: AvailableIcons
 });
 function defineWorkqueue(workqueueInput) {
   const queryInput = workqueueInput.query;
@@ -4131,19 +4205,16 @@ function getLegalStatuses(actions) {
 }
 
 // ../commons/src/events/state/flags.ts
-function isPendingCertification(actions) {
-  if (getStatusFromActions(actions) !== EventStatus.enum.REGISTERED) {
-    return false;
-  }
+function isCertificatePrinted(actions) {
   return actions.reduce((prev, { type }) => {
     if (type === ActionType.PRINT_CERTIFICATE) {
-      return false;
+      return true;
     }
     if (type === ActionType.APPROVE_CORRECTION) {
-      return true;
+      return false;
     }
     return prev;
-  }, true);
+  }, false);
 }
 function isCorrectionRequested(actions) {
   return actions.reduce((prev, { type }) => {
@@ -4178,8 +4249,8 @@ function getFlagsFromActions(actions) {
     const flag = joinValues([type, status], ":").toLowerCase();
     return flag;
   });
-  if (isPendingCertification(sortedActions)) {
-    flags.push(InherentFlags.PENDING_CERTIFICATION);
+  if (isCertificatePrinted(sortedActions)) {
+    flags.push(InherentFlags.PRINTED);
   }
   if (isCorrectionRequested(sortedActions)) {
     flags.push(InherentFlags.CORRECTION_REQUESTED);
@@ -4210,6 +4281,7 @@ function getStatusFromActions(actions) {
       case ActionType.NOTIFY:
         return EventStatus.enum.NOTIFIED;
       case ActionType.PRINT_CERTIFICATE:
+        return EventStatus.enum.CERTIFIED;
       case ActionType.ASSIGN:
       case ActionType.UNASSIGN:
       case ActionType.REJECT:
@@ -5396,6 +5468,22 @@ var statusOptions = [
       id: "v2.advancedSearch.form.recordStatusRegistered"
     }
   },
+  {
+    value: EventStatus.enum.CERTIFIED,
+    label: {
+      defaultMessage: "Certified",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusCertified"
+    }
+  },
+  {
+    value: VisibleStatus.enum.REJECTED,
+    label: {
+      defaultMessage: "Rejected",
+      description: "Option for form field: status of record",
+      id: "v2.advancedSearch.form.recordStatusRejected"
+    }
+  },
   {
     value: EventStatus.enum.ARCHIVED,
     label: {
@@ -6847,7 +6935,11 @@ function generateActionDocument({
     case ActionType.NOTIFY:
       return { ...actionBase, type: action };
     case ActionType.PRINT_CERTIFICATE:
-      return { ...actionBase, type: action };
+      return {
+        ...actionBase,
+        type: action,
+        content: defaults.content
+      };
     case ActionType.REQUEST_CORRECTION:
       return { ...actionBase, type: action };
     case ActionType.APPROVE_CORRECTION:
@@ -7247,6 +7339,14 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
     ActionType.REJECT_CORRECTION,
     ExclusiveActions.REVIEW_CORRECTION_REQUEST
   ],
+  [EventStatus.enum.CERTIFIED]: [
+    ActionType.READ,
+    ActionType.PRINT_CERTIFICATE,
+    ActionType.REQUEST_CORRECTION,
+    ActionType.APPROVE_CORRECTION,
+    ActionType.REJECT_CORRECTION,
+    ExclusiveActions.REVIEW_CORRECTION_REQUEST
+  ],
   [EventStatus.enum.ARCHIVED]: [
     ActionType.READ,
     ActionType.ASSIGN,
@@ -7254,12 +7354,9 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
   ]
 };
 var getAvailableActionsForEvent = (event2) => {
-  if (event2.flags.includes(InherentFlags.REJECTED)) {
-    return [
-      ActionType.READ,
-      event2.status === EventStatus.Enum.VALIDATED ? ActionType.VALIDATE : ActionType.DECLARE,
-      ActionType.ARCHIVE
-    ];
-  }
-  return AVAILABLE_ACTIONS_BY_EVENT_STATUS[event2.status];
+  return event2.flags.includes(InherentFlags.REJECTED) ? [
+    ActionType.READ,
+    event2.status === EventStatus.Enum.VALIDATED ? ActionType.VALIDATE : ActionType.DECLARE,
+    ActionType.ARCHIVE
+  ] : AVAILABLE_ACTIONS_BY_EVENT_STATUS[event2.status];
 };

package/package.json

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