@opencrvs/toolkit 2.0.0-rc.ff99998 → 2.0.0

package/dist/application-config/index.js

@@ -206,6 +206,11 @@ var FieldTypesToHideInReview = [
   FieldType.ALPHA_PRINT_BUTTON,
   FieldType.ALPHA_HIDDEN
 ];
+var HiddenFieldTypes = [
+  FieldType.HTTP,
+  FieldType.QUERY_PARAM_READER,
+  FieldType.ALPHA_HIDDEN
+];
 
 // ../commons/src/events/FieldValue.ts
 var z7 = __toESM(require("zod/v4"));
@@ -324,7 +329,7 @@ var PlainDate = import_zod.z.string().date().brand("PlainDate").describe("Date i
 // ../commons/src/events/FieldValue.ts
 var TextValue = z7.string();
 var HiddenFieldValue = z7.string();
-var NonEmptyTextValue = TextValue.min(1);
+var NonEmptyTextValue = z7.string().trim().min(1);
 var DateValue = z7.iso.date().describe("Date in the format YYYY-MM-DD");
 var AgeValue = z7.object({
   age: z7.number(),
@@ -1495,6 +1500,7 @@ var NumberField = BaseField.extend({
   configuration: import_v43.default.object({
     min: import_v43.default.number().optional().describe("Minimum value"),
     max: import_v43.default.number().optional().describe("Maximum value"),
+    integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).optional()

package/dist/commons/api/router.d.ts

@@ -7374,9 +7374,18 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             output: void;
             meta: import("trpc-to-openapi").OpenApiMeta;
         }>;
-        sendVerifyCode: import("@trpc/server").TRPCMutationProcedure<{
+        requestEmailChange: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                notificationEvent: "change-phone-number" | "change-email-address";
+                email: string;
+            };
+            output: {
+                nonce: string;
+            };
+            meta: import("trpc-to-openapi").OpenApiMeta;
+        }>;
+        requestPhoneChange: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                phoneNumber: string;
             };
             output: {
                 nonce: string;

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

@@ -267,6 +267,7 @@ declare const NumberField: z.ZodObject<{
     configuration: z.ZodOptional<z.ZodObject<{
         min: z.ZodOptional<z.ZodNumber>;
         max: z.ZodOptional<z.ZodNumber>;
+        integer: z.ZodOptional<z.ZodBoolean>;
         prefix: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
         postfix: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
     }, z.core.$strip>>;

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

@@ -75,4 +75,5 @@ export type FieldType = (typeof fieldTypes)[number];
  */
 export declare const compositeFieldTypes: ("NAME" | "ADDRESS" | "DATE_RANGE" | "FILE" | "FILE_WITH_OPTIONS" | "DATA" | "ID_READER")[];
 export declare const FieldTypesToHideInReview: ("IMAGE_VIEW" | "PARAGRAPH" | "PAGE_HEADER" | "BULLET_LIST" | "DIVIDER" | "DATA" | "ALPHA_PRINT_BUTTON" | "HTTP" | "QUERY_PARAM_READER" | "ID_READER" | "LOADER" | "ALPHA_HIDDEN")[];
+export declare const HiddenFieldTypes: ("HTTP" | "QUERY_PARAM_READER" | "ALPHA_HIDDEN")[];
 //# sourceMappingURL=FieldType.d.ts.map

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

@@ -690,7 +690,7 @@ export declare const isHiddenFieldType: (field: {
     value: undefined;
     config: HiddenField;
 };
-export type NonInteractiveFieldType = Divider | PageHeader | ImageViewField | Paragraph | Heading | BulletList | DataField | AlphaPrintButton | HttpField | LinkButtonField | QueryParamReaderField | LoaderField | AutocompleteField;
+export type NonInteractiveFieldType = Divider | PageHeader | ImageViewField | Paragraph | Heading | BulletList | DataField | AlphaPrintButton | LinkButtonField | LoaderField | AutocompleteField;
 export type InteractiveFieldType = Exclude<FieldConfig, NonInteractiveFieldType>;
 export declare const isNonInteractiveFieldType: (field: FieldConfig) => field is NonInteractiveFieldType;
 export {};

package/dist/events/index.js

@@ -151,6 +151,7 @@ __export(events_exports, {
   FormPageConfig: () => FormPageConfig,
   Fuzzy: () => Fuzzy,
   GeographicalArea: () => GeographicalArea,
+  HiddenFieldTypes: () => HiddenFieldTypes,
   HiddenFieldValue: () => HiddenFieldValue,
   HttpFieldUpdateValue: () => HttpFieldUpdateValue,
   HttpFieldValue: () => HttpFieldValue,
@@ -1219,6 +1220,11 @@ var FieldTypesToHideInReview = [
   FieldType.ALPHA_PRINT_BUTTON,
   FieldType.ALPHA_HIDDEN
 ];
+var HiddenFieldTypes = [
+  FieldType.HTTP,
+  FieldType.QUERY_PARAM_READER,
+  FieldType.ALPHA_HIDDEN
+];
 
 // ../commons/src/events/FieldValue.ts
 var z12 = __toESM(require("zod/v4"));
@@ -1345,7 +1351,7 @@ function plainDateToLocalDate(date) {
 // ../commons/src/events/FieldValue.ts
 var TextValue = z12.string();
 var HiddenFieldValue = z12.string();
-var NonEmptyTextValue = TextValue.min(1);
+var NonEmptyTextValue = z12.string().trim().min(1);
 var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
 var AgeValue = z12.object({
   age: z12.number(),
@@ -2292,6 +2298,7 @@ var NumberField = BaseField.extend({
   configuration: import_v43.default.object({
     min: import_v43.default.number().optional().describe("Minimum value"),
     max: import_v43.default.number().optional().describe("Maximum value"),
+    integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).optional()
@@ -3908,7 +3915,7 @@ var isHiddenFieldType = (field3) => {
   return field3.config.type === FieldType.ALPHA_HIDDEN;
 };
 var isNonInteractiveFieldType = (field3) => {
-  return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.HTTP || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.QUERY_PARAM_READER || field3.type === FieldType.LOADER;
+  return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
 };
 
 // ../commons/src/conditionals/validate.ts
@@ -6485,6 +6492,8 @@ var updateActions = ActionTypes.extract([
   ActionType.ARCHIVE,
   ActionType.PRINT_CERTIFICATE,
   ActionType.REQUEST_CORRECTION,
+  ActionType.APPROVE_CORRECTION,
+  ActionType.REJECT_CORRECTION,
   ActionType.CUSTOM
 ]);
 function getActionUpdateMetadata(actions) {
@@ -6526,9 +6535,6 @@ function getLegalStatuses(actions) {
 // ../commons/src/events/state/flags.ts
 var import_lodash3 = require("lodash");
 var import_date_fns3 = require("date-fns");
-function isEditInProgress(actions) {
-  return actions.at(-1)?.type === ActionType.EDIT;
-}
 function findPendingCorrectionAction(writeActions2) {
   let correctionRequestAction;
   for (let i = writeActions2.length - 1; i >= 0; i--) {
@@ -6543,29 +6549,6 @@ function findPendingCorrectionAction(writeActions2) {
   }
   return correctionRequestAction;
 }
-function isCorrectionRequested(actions) {
-  return findPendingCorrectionAction(actions) !== void 0;
-}
-function isDeclarationIncomplete(actions) {
-  return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
-}
-function isRejected(actions) {
-  const resettingActionTypes = [
-    ActionType.NOTIFY,
-    ActionType.DECLARE,
-    ActionType.EDIT,
-    ActionType.REGISTER
-  ];
-  return actions.reduce((prev, { type }) => {
-    if (type === ActionType.REJECT) {
-      return true;
-    }
-    if (resettingActionTypes.includes(type)) {
-      return false;
-    }
-    return prev;
-  }, false);
-}
 function isPotentialDuplicate(actions) {
   return actions.reduce((prev, { type }) => {
     if (type === ActionType.DUPLICATE_DETECTED) {
@@ -6593,6 +6576,88 @@ function isFlagConditionMet(conditional, form, action) {
     }
   });
 }
+function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
+  if (!isActionConfigType(action.type)) {
+    return false;
+  }
+  const actionConfig = getActionConfig({
+    eventConfiguration,
+    actionType: action.type,
+    customActionType: "customActionType" in action ? action.customActionType : void 0
+  });
+  const removeOperations = (actionConfig?.flags ?? []).filter(
+    ({ id, operation }) => id === flagId && operation === "remove"
+  );
+  if (removeOperations.length === 0) {
+    return false;
+  }
+  const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
+  const declaration = aggregateActionDeclarations(eventUpToThisAction);
+  const annotation = aggregateActionAnnotations(eventUpToThisAction);
+  const form = { ...declaration, ...annotation };
+  return removeOperations.some(
+    ({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
+  );
+}
+var INHERENT_FLAG_RULES = [
+  {
+    flag: InherentFlags.CORRECTION_REQUESTED,
+    setOn: [ActionType.REQUEST_CORRECTION],
+    resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
+  },
+  {
+    // INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
+    // other status-changing action (see getStatusFromActions).
+    flag: InherentFlags.INCOMPLETE,
+    setOn: [ActionType.NOTIFY],
+    resetOn: [
+      ActionType.CREATE,
+      ActionType.DECLARE,
+      ActionType.REGISTER,
+      ActionType.ARCHIVE
+    ]
+  },
+  {
+    flag: InherentFlags.REJECTED,
+    setOn: [ActionType.REJECT],
+    resetOn: [
+      ActionType.NOTIFY,
+      ActionType.DECLARE,
+      ActionType.EDIT,
+      ActionType.REGISTER
+    ]
+  },
+  {
+    flag: InherentFlags.POTENTIAL_DUPLICATE,
+    setOn: [ActionType.DUPLICATE_DETECTED],
+    resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
+  },
+  {
+    flag: InherentFlags.EDIT_IN_PROGRESS,
+    setOn: [ActionType.EDIT],
+    resetOnAnyOtherAction: true
+  }
+];
+function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
+  return acceptedActions.reduce((present, action, idx) => {
+    if (rule.setOn.includes(action.type)) {
+      return true;
+    }
+    if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
+      return false;
+    }
+    if (actionConfigRemovesFlag(
+      action,
+      rule.flag,
+      acceptedActions.slice(0, idx + 1),
+      event2,
+      eventConfiguration
+    )) {
+      return false;
+    }
+    return present;
+  }, false);
+}
 function resolveEventCustomFlags(event2, eventConfiguration) {
   const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
   return actions.reduce((acc, action, idx) => {
@@ -6641,33 +6706,19 @@ function getActionStatusFlags(sortedActions) {
     return flag2;
   });
 }
-function getInherentFlags(sortedActions) {
+function getInherentFlags(sortedActions, event2, eventConfiguration) {
   const acceptedActions = sortedActions.filter(
     ({ status: status2 }) => status2 === ActionStatus.Accepted
   );
-  const inherentFlags = [];
-  if (isCorrectionRequested(acceptedActions)) {
-    inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
-  }
-  if (isDeclarationIncomplete(acceptedActions)) {
-    inherentFlags.push(InherentFlags.INCOMPLETE);
-  }
-  if (isRejected(acceptedActions)) {
-    inherentFlags.push(InherentFlags.REJECTED);
-  }
-  if (isPotentialDuplicate(acceptedActions)) {
-    inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
-  }
-  if (isEditInProgress(acceptedActions)) {
-    inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
-  }
-  return inherentFlags;
+  return INHERENT_FLAG_RULES.filter(
+    (rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
+  ).map(({ flag: flag2 }) => flag2);
 }
 function getEventFlags(event2, config) {
   const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
   return [
     ...getActionStatusFlags(sortedActions),
-    ...getInherentFlags(sortedActions),
+    ...getInherentFlags(sortedActions, event2, config),
     ...resolveEventCustomFlags(event2, config)
   ];
 }
@@ -7672,6 +7723,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
         id: "signature.upload.modal.title",
         defaultMessage: "Draw signature",
         description: "Title for the modal to draw signature"
+      },
+      // Zod applies the schema default at parse time, but this fixture bypasses
+      // parsing — GeneratedInputField accesses configuration.maxFileSize directly.
+      configuration: {
+        maxFileSize: 5 * 1024 * 1024
       }
     }
   ]
@@ -10228,7 +10284,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
     return locationIds.some((id) => id === user2.primaryOfficeId);
   }
   if (filter === JurisdictionFilter.enum.administrativeArea) {
-    return user2.administrativeAreaId === null || locationIds.some((id) => id === user2.administrativeAreaId);
+    return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
   }
   return true;
 }
@@ -10317,7 +10373,7 @@ function canAccessUserWithScope({
   }
   const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
     (id) => user2.administrativeAreaId === id
-  ) || user2.administrativeAreaId === null;
+  ) || !user2.administrativeAreaId;
   if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
     return false;
   }
@@ -10623,18 +10679,19 @@ var ACTION_FILTERS = {
 function filterActionsByFlags(actions, flags) {
   return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
 }
+var REJECTED_ACTIONS = [
+  ActionType.READ,
+  ActionType.NOTIFY,
+  ActionType.CUSTOM,
+  ActionType.EDIT,
+  ActionType.ARCHIVE
+];
 function getAvailableActionsWithoutFlagFilters(status2, flags) {
   if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
     return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
   }
-  if (flags.includes(InherentFlags.REJECTED)) {
-    return [
-      ActionType.READ,
-      ActionType.NOTIFY,
-      ActionType.CUSTOM,
-      ActionType.EDIT,
-      ActionType.ARCHIVE
-    ];
+  if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
+    return REJECTED_ACTIONS;
   }
   return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
 }

package/dist/notification/index.js

@@ -770,6 +770,11 @@ var FieldTypesToHideInReview = [
   FieldType.ALPHA_PRINT_BUTTON,
   FieldType.ALPHA_HIDDEN
 ];
+var HiddenFieldTypes = [
+  FieldType.HTTP,
+  FieldType.QUERY_PARAM_READER,
+  FieldType.ALPHA_HIDDEN
+];
 
 // ../commons/src/events/FieldValue.ts
 var z12 = __toESM(require("zod/v4"));
@@ -888,7 +893,7 @@ var PlainDate = import_zod.z.string().date().brand("PlainDate").describe("Date i
 // ../commons/src/events/FieldValue.ts
 var TextValue = z12.string();
 var HiddenFieldValue = z12.string();
-var NonEmptyTextValue = TextValue.min(1);
+var NonEmptyTextValue = z12.string().trim().min(1);
 var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
 var AgeValue = z12.object({
   age: z12.number(),
@@ -1750,6 +1755,7 @@ var NumberField = BaseField.extend({
   configuration: import_v43.default.object({
     min: import_v43.default.number().optional().describe("Minimum value"),
     max: import_v43.default.number().optional().describe("Maximum value"),
+    integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
     prefix: TranslationConfig.optional(),
     postfix: TranslationConfig.optional()
   }).optional()
@@ -4697,12 +4703,53 @@ var updateActions = ActionTypes.extract([
   ActionType.ARCHIVE,
   ActionType.PRINT_CERTIFICATE,
   ActionType.REQUEST_CORRECTION,
+  ActionType.APPROVE_CORRECTION,
+  ActionType.REJECT_CORRECTION,
   ActionType.CUSTOM
 ]);
 
 // ../commons/src/events/state/flags.ts
 var import_lodash3 = require("lodash");
 var import_date_fns3 = require("date-fns");
+var INHERENT_FLAG_RULES = [
+  {
+    flag: InherentFlags.CORRECTION_REQUESTED,
+    setOn: [ActionType.REQUEST_CORRECTION],
+    resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
+  },
+  {
+    // INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
+    // other status-changing action (see getStatusFromActions).
+    flag: InherentFlags.INCOMPLETE,
+    setOn: [ActionType.NOTIFY],
+    resetOn: [
+      ActionType.CREATE,
+      ActionType.DECLARE,
+      ActionType.REGISTER,
+      ActionType.ARCHIVE
+    ]
+  },
+  {
+    flag: InherentFlags.REJECTED,
+    setOn: [ActionType.REJECT],
+    resetOn: [
+      ActionType.NOTIFY,
+      ActionType.DECLARE,
+      ActionType.EDIT,
+      ActionType.REGISTER
+    ]
+  },
+  {
+    flag: InherentFlags.POTENTIAL_DUPLICATE,
+    setOn: [ActionType.DUPLICATE_DETECTED],
+    resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
+  },
+  {
+    flag: InherentFlags.EDIT_IN_PROGRESS,
+    setOn: [ActionType.EDIT],
+    resetOnAnyOtherAction: true
+  }
+];
 
 // ../commons/src/events/defineConfig.ts
 var IGNORED_EVENT_TYPES = [
@@ -5448,6 +5495,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
         id: "signature.upload.modal.title",
         defaultMessage: "Draw signature",
         description: "Title for the modal to draw signature"
+      },
+      // Zod applies the schema default at parse time, but this fixture bypasses
+      // parsing — GeneratedInputField accesses configuration.maxFileSize directly.
+      configuration: {
+        maxFileSize: 5 * 1024 * 1024
       }
     }
   ]
@@ -7241,6 +7293,13 @@ var ACTION_FILTERS = {
   [ActionType.UNASSIGN]: (flags) => !flags.some((flag) => flag.endsWith(":requested")),
   [ActionType.CUSTOM]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
 };
+var REJECTED_ACTIONS = [
+  ActionType.READ,
+  ActionType.NOTIFY,
+  ActionType.CUSTOM,
+  ActionType.EDIT,
+  ActionType.ARCHIVE
+];
 
 // ../commons/src/events/FileUtils.ts
 var import_lodash7 = require("lodash");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "2.0.0-rc.ff99998",
+  "version": "2.0.0",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "bin": {