@opencrvs/toolkit 1.9.6-rc.e1907dc → 1.9.6-rc.e8f0bd3

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

@@ -1768,20 +1768,12 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"DATE">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
     }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$date: "now";
+        $$now: true;
     }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -1840,7 +1832,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date: "now";
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
@@ -1907,8 +1899,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2284,20 +2275,12 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"TIME">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
+    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+        $$now: z.ZodLiteral<true>;
     }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, {
-        $$time: "now";
+        $$now: true;
     }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     }>, z.ZodString]>>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
@@ -2359,7 +2342,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$time: "now";
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: TranslationConfig | undefined;
@@ -2427,8 +2410,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
     defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
+        $$now: true;
     } | undefined;
     configuration?: {
         notice?: {
@@ -2440,7 +2422,6 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     } | undefined;
 }>;
 export type TimeField = z.infer<typeof TimeField>;
-export type TimeField2 = z.input<typeof TimeField>;
 declare const DateRangeField: z.ZodObject<z.objectUtil.extendShape<{
     id: z.ZodEffects<z.ZodString, string, string>;
     label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {

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

@@ -230,6 +230,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
 }, {
     data?: any;
 }>>> | z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}> | z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -239,6 +248,15 @@ export declare function mapFieldTypeToZod(field: FieldConfig, actionType?: Actio
     numericValue?: number | undefined;
     unit?: string | undefined;
 }> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    numericValue: z.ZodNumber;
+    unit: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    numericValue: number;
+    unit: string;
+}, {
+    numericValue: number;
+    unit: string;
+}>>> | z.ZodOptional<z.ZodNullable<z.ZodObject<{
     numericValue: z.ZodOptional<z.ZodNumber>;
     unit: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {

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

@@ -38,6 +38,7 @@ export declare const AgeUpdateValue: z.ZodNullable<z.ZodOptional<z.ZodObject<{
     asOfDateRef: string;
 }>>>;
 export declare const TimeValue: z.ZodString;
+export type TimeValue = z.infer<typeof TimeValue>;
 export declare const DatetimeValue: z.ZodString;
 export declare const SelectDateRangeValue: z.ZodEnum<["last7Days", "last30Days", "last90Days", "last365Days"]>;
 export declare const DateRangeFieldValue: z.ZodUnion<[z.ZodObject<{

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

@@ -8,8 +8,6 @@ import { FieldValue } from './FieldValue';
  * Available system variables for configuration.
  */
 export type SystemVariables = {
-    $$date: string;
-    $$time: string;
     user: {
         id: string;
         province?: string;

package/dist/conditionals/index.js

@@ -110,14 +110,10 @@ function omitKeyDeep(obj, keyToRemove) {
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod2 = require("zod");
 var SerializedNowDateTime = import_zod2.z.object({
-  $$date: import_zod2.z.literal("now").optional(),
-  $$time: import_zod2.z.literal("now").optional()
+  $$now: import_zod2.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/conditionals/conditionals.ts

package/dist/events/index.js

@@ -1909,14 +1909,10 @@ var SearchScopeAccessLevels = {
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now").optional(),
-  $$time: import_zod15.z.literal("now").optional()
+  $$now: import_zod15.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -2052,9 +2048,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -2072,9 +2066,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(
@@ -3017,7 +3009,7 @@ function mapFieldTypeToZod(field3, actionType) {
       schema = NumberFieldValue;
       break;
     case FieldType.NUMBER_WITH_UNIT:
-      schema = NumberWithUnitFieldUpdateValue;
+      schema = field3.required ? NumberWithUnitFieldValue : NumberWithUnitFieldUpdateValue;
       break;
     case FieldType.CHECKBOX:
       schema = CheckboxFieldValue;
@@ -3408,7 +3400,7 @@ function isFieldVisible(field3, form, context) {
 }
 function isFieldEmptyAndNotRequired(field3, form) {
   const fieldValue = form[field3.id];
-  return !field3.required && (fieldValue === void 0 || fieldValue === "");
+  return !field3.required && (fieldValue === void 0 || fieldValue === "" || fieldValue && typeof fieldValue === "object" && Object.values(fieldValue).every((v) => v === void 0 || v === ""));
 }
 function isFieldEnabled(field3, form, context) {
   return isFieldConditionMet(field3, form, ConditionalType.ENABLE, context);
@@ -3904,11 +3896,14 @@ function isRequestedAction(a) {
 function isAcceptedAction(a) {
   return a.status === ActionStatus.Accepted;
 }
+function isRejectedAction(a) {
+  return a.status === ActionStatus.Rejected;
+}
 function getPendingAction(actions) {
   const requestedActions = actions.filter(isRequestedAction);
   const pendingActions = requestedActions.filter(
     ({ id }) => !actions.some(
-      (action) => isAcceptedAction(action) && action.originalActionId === id
+      (action) => (isAcceptedAction(action) || isRejectedAction(action)) && action.originalActionId === id
     )
   );
   if (pendingActions.length !== 1) {
@@ -8907,8 +8902,7 @@ function isFieldValueWithoutTemplates(value) {
   if (isTemplateVariable(value)) {
     return false;
   }
-  if (typeof value === "object" && value !== null && // template variable can exist in both keys and values of an object
-  (Object.values(value).some((val) => isTemplateVariable(val)) || Object.keys(value).some((val) => isTemplateVariable(val)))) {
+  if (typeof value === "object" && value !== null && Object.values(value).some((val) => isTemplateVariable(val))) {
     return false;
   }
   return true;

package/dist/notification/index.js

@@ -1431,14 +1431,10 @@ var SearchQuery = import_zod14.z.object({
 // ../commons/src/events/serializers/date/serializer.ts
 var import_zod15 = require("zod");
 var SerializedNowDateTime = import_zod15.z.object({
-  $$date: import_zod15.z.literal("now").optional(),
-  $$time: import_zod15.z.literal("now").optional()
+  $$now: import_zod15.z.literal(true)
 });
 function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
+  return { $$now: true };
 }
 
 // ../commons/src/events/FieldConfig.ts
@@ -1574,9 +1570,7 @@ var EmailField = BaseField.extend({
 });
 var DateField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.DATE),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$date: "now"
-  })).or(DateValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default date value(yyyy-MM-dd)"),
+  defaultValue: SerializedNowDateTime.or(DateValue).optional().openapi({ effectType: "input", type: "string" }).describe("Default date value(yyyy-MM-dd)"),
   configuration: import_zod16.z.object({
     notice: TranslationConfig.describe(
       "Text to display above the date input"
@@ -1594,9 +1588,7 @@ var AgeField = BaseField.extend({
 }).describe("An age input field which uses the current date as the asOfDate");
 var TimeField = BaseField.extend({
   type: import_zod16.z.literal(FieldType.TIME),
-  defaultValue: SerializedNowDateTime.transform(() => ({
-    $$time: "now"
-  })).or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
+  defaultValue: SerializedNowDateTime.or(TimeValue).optional().openapi({ effectType: "input", type: "object" }).describe("Default time value (HH-mm)"),
   configuration: import_zod16.z.object({
     use12HourFormat: import_zod16.z.boolean().optional().describe("Whether to use 12-hour format"),
     notice: TranslationConfig.describe(

package/package.json

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