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

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,9 +8684,9 @@ 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";
+            fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
             fieldType: "event";
             options?: {
                 value: string;

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

@@ -1,5 +1,5 @@
 import { ActionType } from './ActionType';
-import { EventFieldId } from './AdvancedSearchConfig';
+import { EventFieldIdInput } 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: EventFieldId): {
+declare function eventFn(fieldId: EventFieldIdInput): {
     range: () => {
-        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -18,7 +18,7 @@ declare function eventFn(fieldId: EventFieldId): {
         };
     };
     exact: () => {
-        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
@@ -26,13 +26,21 @@ declare function eventFn(fieldId: EventFieldId): {
         };
     };
     fuzzy: () => {
-        fieldId: "status" | "updatedAt" | "trackingId" | "legalStatuses.REGISTERED.acceptedAt" | "legalStatuses.REGISTERED.createdAtLocation";
+        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
         fieldType: "event";
     } & {
         config: {
             type: "fuzzy";
         };
     };
+    within: () => {
+        fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.legalStatuses.REGISTERED.createdAtLocation";
+        fieldType: "event";
+    } & {
+        config: {
+            type: "within";
+        };
+    };
 };
 declare const event: typeof eventFn & {
     /**

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

@@ -4723,7 +4723,7 @@ export declare const getActionAnnotationFields: (actionConfig: ActionConfig) =>
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
 })[];
-export declare function getAllUniqueFields(eventConfig: EventConfig): import("./FieldConfig").Inferred[];
+export declare function getAllUniqueFields(eventConfig: EventConfig): FieldConfig[];
 export declare function getDeclarationFieldById(config: EventConfig, fieldId: string): FieldConfig;
 /**
  * @TODO: Request correction should have same format as print certificate
@@ -15520,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";
@@ -15547,9 +15547,9 @@ 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";
+            fieldId: "event.status" | "event.updatedAt" | "event.trackingId" | "event.legalStatuses.REGISTERED.acceptedAt" | "event.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,6 +40,7 @@ __export(events_exports, {
   ActionConfigBase: () => ActionConfigBase,
   ActionCreationMetadata: () => ActionCreationMetadata,
   ActionDocument: () => ActionDocument,
+  ActionFlag: () => ActionFlag,
   ActionFormConfig: () => ActionFormConfig,
   ActionInput: () => ActionInput,
   ActionStatus: () => ActionStatus,
@@ -95,6 +96,7 @@ __export(events_exports, {
   EventDocument: () => EventDocument,
   EventFieldConfigSchema: () => EventFieldConfigSchema,
   EventFieldId: () => EventFieldId,
+  EventFieldIdInput: () => EventFieldIdInput,
   EventIndex: () => EventIndex,
   EventInput: () => EventInput,
   EventMetadata: () => EventMetadata,
@@ -129,6 +131,7 @@ __export(events_exports, {
   InherentFlags: () => InherentFlags,
   LanguageConfig: () => LanguageConfig,
   LegalStatuses: () => LegalStatuses,
+  METADATA_FIELD_PREFIX: () => METADATA_FIELD_PREFIX,
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
   MimeType: () => MimeType,
   NameFieldUpdateValue: () => NameFieldUpdateValue,
@@ -139,7 +142,7 @@ __export(events_exports, {
   PageConfig: () => PageConfig,
   PageTypes: () => PageTypes,
   PrintCertificateActionInput: () => PrintCertificateActionInput,
-  PrintDetails: () => PrintDetails,
+  PrintContent: () => PrintContent,
   QueryExpression: () => QueryExpression,
   QueryInput: () => QueryInput,
   QueryType: () => QueryType,
@@ -179,7 +182,6 @@ __export(events_exports, {
   ValidationConfig: () => ValidationConfig,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
-  VisibleStatus: () => VisibleStatus,
   WRITE_ACTION_SCOPES: () => WRITE_ACTION_SCOPES,
   Within: () => Within,
   WorkqueueActionsWithDefault: () => WorkqueueActionsWithDefault,
@@ -555,7 +557,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(
@@ -607,8 +609,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 +1343,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")
@@ -1395,22 +1397,30 @@ 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 EventFieldId = import_zod15.z.enum([
+var EventFieldIdInput = 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")
@@ -1903,14 +1913,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."
   )
-  // 'actionDetails' field reserved for additional metadata
-  // Each action can define its own action details specifc to the action
+  // '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(
@@ -1922,6 +1933,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(
@@ -1942,6 +1954,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(
@@ -1953,6 +1966,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(
@@ -1965,13 +1979,13 @@ var NotifiedAction = ActionBase.merge(
     type: import_zod19.z.literal(ActionType.NOTIFY)
   })
 );
-var PrintDetails = import_zod19.z.object({
+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),
-    actionDetails: PrintDetails.optional().nullable()
+    content: PrintContent.optional().nullable()
   })
 );
 var RequestedCorrectionAction = ActionBase.merge(
@@ -1983,12 +1997,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(
@@ -2712,16 +2729,16 @@ function timePeriodToDateRange(value) {
   let startDate;
   switch (value) {
     case "last7Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 6);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 7);
       break;
     case "last30Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 29);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 30);
       break;
     case "last90Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 89);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 90);
       break;
     case "last365Days":
-      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 364);
+      startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 365);
       break;
   }
   return {
@@ -3088,8 +3105,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."
         }
       }
     }),
@@ -3182,6 +3199,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" }
     })
   };
 }
@@ -3189,7 +3219,7 @@ function createSearchConfig(baseField) {
 // ../commons/src/event-config/event-configuration.ts
 function createEventFieldConfig(fieldId) {
   const baseField = {
-    fieldId,
+    fieldId: `${METADATA_FIELD_PREFIX}${fieldId}`,
     fieldType: "event"
   };
   return createSearchConfig(baseField);
@@ -3246,24 +3276,23 @@ var EventStatus = import_zod23.z.enum([
   "DECLARED",
   "VALIDATED",
   "REGISTERED",
-  "CERTIFIED",
   "ARCHIVED"
 ]);
-var VisibleStatus = import_zod23.z.enum([...EventStatus.options, "REJECTED"]);
 var InherentFlags = {
-  PRINTED: "printed",
+  PENDING_CERTIFICATION: "pending-certification",
   INCOMPLETE: "incomplete",
   REJECTED: "rejected",
   CORRECTION_REQUESTED: "correction-requested"
 };
-var Flag = import_zod23.z.string().regex(
+var ActionFlag = 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)"
-).or(import_zod23.z.nativeEnum(InherentFlags));
+);
+var Flag = ActionFlag.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."),
@@ -3531,6 +3560,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])
   ),
@@ -3776,7 +3808,8 @@ var WorkqueueConfig = import_zod28.z.object({
     })
   ),
   columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
-  icon: AvailableIcons
+  icon: AvailableIcons,
+  emptyMessage: TranslationConfig.optional()
 }).describe("Configuration for workqueue.");
 var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
   query: true,
@@ -3795,7 +3828,8 @@ var WorkqueueConfigInput = import_zod28.z.object({
     })
   ),
   columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
-  icon: AvailableIcons
+  icon: AvailableIcons,
+  emptyMessage: TranslationConfig.optional()
 });
 function defineWorkqueue(workqueueInput) {
   const queryInput = workqueueInput.query;
@@ -3885,7 +3919,7 @@ var DeclareActionInput = BaseActionInput.merge(
 var PrintCertificateActionInput = BaseActionInput.merge(
   import_zod29.z.object({
     type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
-    actionDetails: PrintDetails.optional()
+    content: PrintContent.optional()
   })
 );
 var RejectDeclarationActionInput = BaseActionInput.merge(
@@ -3925,7 +3959,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(
@@ -4096,16 +4131,19 @@ function getLegalStatuses(actions) {
 }
 
 // ../commons/src/events/state/flags.ts
-function isCertificatePrinted(actions) {
+function isPendingCertification(actions) {
+  if (getStatusFromActions(actions) !== EventStatus.enum.REGISTERED) {
+    return false;
+  }
   return actions.reduce((prev, { type }) => {
     if (type === ActionType.PRINT_CERTIFICATE) {
-      return true;
+      return false;
     }
     if (type === ActionType.APPROVE_CORRECTION) {
-      return false;
+      return true;
     }
     return prev;
-  }, false);
+  }, true);
 }
 function isCorrectionRequested(actions) {
   return actions.reduce((prev, { type }) => {
@@ -4140,8 +4178,8 @@ function getFlagsFromActions(actions) {
     const flag = joinValues([type, status], ":").toLowerCase();
     return flag;
   });
-  if (isCertificatePrinted(sortedActions)) {
-    flags.push(InherentFlags.PRINTED);
+  if (isPendingCertification(sortedActions)) {
+    flags.push(InherentFlags.PENDING_CERTIFICATION);
   }
   if (isCorrectionRequested(sortedActions)) {
     flags.push(InherentFlags.CORRECTION_REQUESTED);
@@ -4172,7 +4210,6 @@ 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:
@@ -5359,22 +5396,6 @@ 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: {
@@ -6764,7 +6785,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: {},
@@ -6775,7 +6796,8 @@ function eventPayloadGenerator(rng) {
           ),
           eventId,
           requestId,
-          keepAssignment: input.keepAssignment
+          keepAssignment: input.keepAssignment,
+          reason: input.reason ?? { message: "" }
         })
       }
     }
@@ -6834,7 +6856,8 @@ function generateActionDocument({
       return {
         ...actionBase,
         requestId: getUUID(),
-        type: action
+        type: action,
+        reason: { message: "Correction rejection" }
       };
     case ActionType.REGISTER:
       return {
@@ -7224,14 +7247,6 @@ 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,
@@ -7239,9 +7254,12 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
   ]
 };
 var getAvailableActionsForEvent = (event2) => {
-  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];
+  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];
 };

package/package.json

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