@opencrvs/toolkit 1.9.3-rc.b468b53 → 1.9.3-rc.b95cb0e

package/dist/conditionals/index.js

@@ -251,6 +251,34 @@ function getDateRangeToFieldReference(field, comparedField, clause) {
     required: [field.$$field]
   };
 }
+function getDayRangeToFieldReference(field, comparedField, days, clause) {
+  return {
+    type: "object",
+    properties: {
+      [field.$$field]: wrapToPath(
+        {
+          type: "string",
+          format: "date",
+          daysFromDate: {
+            referenceDate: {
+              $data: `${field.$$subfield.length + 1}/${jsonFieldPath(
+                comparedField
+              )}`
+            },
+            clause,
+            days
+          }
+        },
+        field.$$subfield
+      ),
+      [comparedField.$$field]: wrapToPath(
+        { type: "string", format: "date" },
+        comparedField.$$subfield
+      )
+    },
+    required: [field.$$field]
+  };
+}
 function defineComparison(field, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
@@ -286,16 +314,17 @@ function defineComparison(field, value, keyword) {
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field, days, clause) => ({
+  const getDayRange = (field, days, clause, referenceDate) => ({
     type: "object",
     properties: {
       [field.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
-          daysFromNow: {
+          daysFromDate: {
             days,
-            clause
+            clause,
+            referenceDate
           }
         },
         field.$$subfield
@@ -348,7 +377,19 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "after")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "after"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "after")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(this, comparedField, days, "after")
+              );
+            }
+            return defineFormConditional(getDayRange(this, days, "after", date));
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, days, "after"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -370,7 +411,26 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "before")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "before"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "before")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(
+                  this,
+                  comparedField,
+                  -days,
+                  "before"
+                )
+              );
+            }
+            return defineFormConditional(
+              getDayRange(this, -days, "before", date)
+            );
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, -days, "before"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {

package/dist/events/index.js

@@ -3185,9 +3185,30 @@ var DataContext = import_zod25.z.object({
     $leafAdminStructureLocationIds: import_zod25.z.array(import_zod25.z.object({ id: UUID }))
   })
 });
+function resolveDataPath(rootData, dataPath, instancePath) {
+  const pathParts = dataPath.split("/");
+  const levels = parseInt(pathParts[0], 10);
+  const referencePath = pathParts.slice(1);
+  const instanceParts = instancePath.split("/").filter(Boolean);
+  const traversedParts = instanceParts.slice(0, -levels);
+  let current = rootData;
+  for (const part of traversedParts) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  for (const part of referencePath) {
+    if (current === null || current === void 0) {
+      return void 0;
+    }
+    current = current[part];
+  }
+  return current;
+}
 (0, import_ajv_formats.default)(ajv);
 ajv.addKeyword({
-  keyword: "daysFromNow",
+  keyword: "daysFromDate",
   type: "string",
   schemaType: "object",
   $data: true,
@@ -3204,8 +3225,22 @@ ajv.addKeyword({
     if (isNaN(date.getTime())) {
       return false;
     }
-    const now = new Date(dataContext.rootData.$now);
-    const offsetDate = new Date(now.getTime() + days * 24 * 60 * 60 * 1e3);
+    let referenceDate = schema.referenceDate;
+    if (referenceDate && typeof referenceDate === "object" && "$data" in referenceDate) {
+      referenceDate = resolveDataPath(
+        dataContext.rootData,
+        referenceDate.$data,
+        dataContext.instancePath
+      );
+    }
+    if (!referenceDate) {
+      referenceDate = dataContext.rootData.$now;
+    }
+    const baseDate = new Date(referenceDate);
+    if (isNaN(baseDate.getTime())) {
+      return false;
+    }
+    const offsetDate = new Date(baseDate.getTime() + days * 24 * 60 * 60 * 1e3);
     return clause === "after" ? (0, import_date_fns.isAfter)(date, offsetDate) : (0, import_date_fns.isBefore)(date, offsetDate);
   }
 });
@@ -3268,7 +3303,8 @@ function isConditionMet(conditional, values, context) {
     $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
     $online: isOnline(),
     $user: context.user,
-    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? []
+    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
+    $event: context.event
   });
 }
 function getConditionalActionsForField(field3, values) {
@@ -3294,7 +3330,8 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
     $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
     $online: isOnline(),
     $user: context.user,
-    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? []
+    $leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
+    $event: context.event
   });
   return validConditionals.includes(conditionalType);
 }
@@ -4116,6 +4153,34 @@ function getDateRangeToFieldReference(field3, comparedField, clause) {
     required: [field3.$$field]
   };
 }
+function getDayRangeToFieldReference(field3, comparedField, days, clause) {
+  return {
+    type: "object",
+    properties: {
+      [field3.$$field]: wrapToPath(
+        {
+          type: "string",
+          format: "date",
+          daysFromDate: {
+            referenceDate: {
+              $data: `${field3.$$subfield.length + 1}/${jsonFieldPath(
+                comparedField
+              )}`
+            },
+            clause,
+            days
+          }
+        },
+        field3.$$subfield
+      ),
+      [comparedField.$$field]: wrapToPath(
+        { type: "string", format: "date" },
+        comparedField.$$subfield
+      )
+    },
+    required: [field3.$$field]
+  };
+}
 function defineComparison(field3, value, keyword) {
   if (isFieldReference(value)) {
     const comparedField = value;
@@ -4151,16 +4216,17 @@ function defineComparison(field3, value, keyword) {
   });
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (field3, days, clause) => ({
+  const getDayRange = (field3, days, clause, referenceDate) => ({
     type: "object",
     properties: {
       [field3.$$field]: wrapToPath(
         {
           type: "string",
           format: "date",
-          daysFromNow: {
+          daysFromDate: {
             days,
-            clause
+            clause,
+            referenceDate
           }
         },
         field3.$$subfield
@@ -4213,7 +4279,19 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "after")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "after"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "after")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(this, comparedField, days, "after")
+              );
+            }
+            return defineFormConditional(getDayRange(this, days, "after", date));
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, days, "after"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -4235,7 +4313,26 @@ function createFieldConditionals(fieldId) {
       return {
         days: (days) => ({
           inPast: () => defineFormConditional(getDayRange(this, -days, "before")),
-          inFuture: () => defineFormConditional(getDayRange(this, days, "before"))
+          inFuture: () => defineFormConditional(getDayRange(this, days, "before")),
+          fromDate: (date) => {
+            if (isFieldReference(date)) {
+              const comparedField = date;
+              return defineFormConditional(
+                getDayRangeToFieldReference(
+                  this,
+                  comparedField,
+                  -days,
+                  "before"
+                )
+              );
+            }
+            return defineFormConditional(
+              getDayRange(this, -days, "before", date)
+            );
+          },
+          fromNow: () => {
+            return defineFormConditional(getDayRange(this, -days, "before"));
+          }
         }),
         date: (date) => {
           if (isFieldReference(date)) {
@@ -7763,6 +7860,220 @@ var v2BirthEvent = defineConfig({
   advancedSearch: []
 });
 
+// ../commons/src/fixtures/digital-identity-issuance-event.ts
+var PRINT_DIGITAL_ID_CERTIFICATE_FORM = defineActionForm({
+  label: {
+    id: "event.digital-identity.action.certificate.form.label",
+    defaultMessage: "Digital identity certificate printer",
+    description: "This is what this form is referred as in the system"
+  },
+  pages: [
+    {
+      id: "collector",
+      type: PageTypes.enum.FORM,
+      title: {
+        id: "event.tennis-club-membership.action.certificate.form.section.who.title",
+        defaultMessage: "Print certified copy",
+        description: "This is the title of the section"
+      },
+      fields: [
+        {
+          id: "identity.http-fetch",
+          type: FieldType.HTTP,
+          label: {
+            defaultMessage: "Digital identity certificate",
+            description: "Fetch printable digital identity certificate",
+            id: "event.digital-identity.certificate.fetch.label"
+          },
+          configuration: {
+            trigger: field("identity.http-button"),
+            url: "/api/digital-identity/certificate",
+            timeout: 5e3,
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: {
+              subjectId: "$event.subject.id"
+            }
+          }
+        },
+        {
+          id: "identity.http-button",
+          type: FieldType.BUTTON,
+          label: {
+            defaultMessage: "Certificate",
+            description: "Certificate",
+            id: "event.digital-identity.certificate.button.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.ENABLE,
+              conditional: and(
+                field("identity.http-fetch").isUndefined(),
+                user.isOnline()
+              )
+            },
+            {
+              type: ConditionalType.SHOW,
+              conditional: and(
+                field("identity.http-fetch").get("loading").isFalsy(),
+                field("identity.http-fetch").get("data").isFalsy()
+              )
+            }
+          ],
+          configuration: {
+            icon: "IdentificationCard",
+            text: {
+              defaultMessage: "Fetch certificate",
+              description: "Fetch certificate",
+              id: "event.digital-identity.certificate.fetch.text"
+            }
+          }
+        },
+        {
+          id: "identity.http-button",
+          type: FieldType.BUTTON,
+          label: {
+            defaultMessage: "Certificate",
+            description: "Certificate",
+            id: "event.digital-identity.certificate.button.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.ENABLE,
+              conditional: never()
+            },
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("identity.http-fetch").get("loading").isEqualTo(true)
+            }
+          ],
+          configuration: {
+            loading: true,
+            text: {
+              defaultMessage: "Fetching certificate\u2026",
+              description: "Fetching certificate\u2026",
+              id: "event.digital-identity.certificate.fetching.text"
+            }
+          }
+        },
+        {
+          id: "identity.http-button",
+          type: FieldType.BUTTON,
+          label: {
+            defaultMessage: "Certificate",
+            description: "Certificate",
+            id: "event.digital-identity.certificate.button.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.ENABLE,
+              conditional: never()
+            },
+            {
+              type: ConditionalType.SHOW,
+              conditional: not(field("identity.certificateId").isFalsy())
+            }
+          ],
+          configuration: {
+            icon: "Check",
+            text: {
+              defaultMessage: "Certificate ready",
+              description: "Certificate ready",
+              id: "event.digital-identity.certificate.ready.text"
+            }
+          }
+        },
+        {
+          id: "identity.certificateId",
+          type: FieldType.TEXT,
+          parent: field("identity.http-fetch"),
+          label: {
+            defaultMessage: "Certificate ID",
+            description: "Issued digital identity certificate identifier",
+            id: "event.digital-identity.certificate.id.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.ENABLE,
+              conditional: never()
+            }
+          ],
+          value: field("identity.http-fetch").get("data.certificateId")
+        }
+      ]
+    }
+  ]
+});
+var digitalIdentityForm = defineDeclarationForm({
+  label: {
+    id: "event.digital-identity.action.declare.form.label",
+    defaultMessage: "Digital identity issuance",
+    description: "This is what this form is referred as in the system"
+  },
+  pages: [
+    {
+      id: "subject",
+      title: {
+        id: "event.digital-identity.action.declare.form.section.who.title",
+        defaultMessage: "Who is the digital identity issued to?",
+        description: "This is the title of the section"
+      },
+      fields: [
+        {
+          id: "subject.firstname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [],
+          label: {
+            defaultMessage: "Subject's first name",
+            description: "This is the label for the field",
+            id: "event.digital-identity.action.declare.form.section.who.field.firstname.label"
+          }
+        },
+        {
+          id: "subject.surname",
+          type: FieldType.TEXT,
+          required: true,
+          conditionals: [],
+          label: {
+            defaultMessage: "Subject's surname",
+            description: "This is the label for the field",
+            id: "event.digital-identity.action.declare.form.section.who.field.surname.label"
+          }
+        }
+      ]
+    }
+  ]
+});
+var digitalIdentityEvent = defineConfig({
+  id: "digital-identity",
+  label: {
+    defaultMessage: "Digital identity issuance",
+    description: "This is what this event is referred as in the system",
+    id: "event.digital-identity.label"
+  },
+  title: {
+    defaultMessage: "{subject.firstname} {subject.surname}",
+    description: "This is the title of the summary",
+    id: "event.digital-identity.title"
+  },
+  summary: { fields: [] },
+  actions: [
+    {
+      type: ActionType.PRINT_CERTIFICATE,
+      label: {
+        id: "event.football-club-membership.action.collect-certificate.label",
+        defaultMessage: "Print certificate",
+        description: "This is shown as the action name anywhere the user can trigger the action from"
+      },
+      printForm: PRINT_DIGITAL_ID_CERTIFICATE_FORM
+    }
+  ],
+  declaration: digitalIdentityForm
+});
+
 // ../commons/src/events/test.utils.ts
 var import_zod35 = require("zod");
 var TEST_SYSTEM_IANA_TIMEZONE = "Asia/Dhaka";