@opencrvs/toolkit 1.8.0-rc.f8aa0c5 → 1.8.0-rc.f8e0ee5

package/dist/conditionals/index.js

@@ -144,6 +144,9 @@ function createEventConditionals() {
     })
   };
 }
+function getDateFromNow(days) {
+  return new Date(Date.now() - days * 24 * 60 * 60 * 1e3).toISOString().split("T")[0];
+}
 function getDateRangeToFieldReference(fieldId, comparedFieldId, clause) {
   return {
     type: "object",
@@ -162,20 +165,6 @@ function isFieldReference(value) {
   return typeof value === "object" && value !== null && "$$field" in value;
 }
 function createFieldConditionals(fieldId) {
-  const getDayRange = (days, clause) => ({
-    type: "object",
-    properties: {
-      [fieldId]: {
-        type: "string",
-        format: "date",
-        daysFromNow: {
-          days,
-          clause
-        }
-      }
-    },
-    required: [fieldId]
-  });
   const getDateRange = (date, clause) => ({
     type: "object",
     properties: {
@@ -194,8 +183,12 @@ function createFieldConditionals(fieldId) {
     $$field: fieldId,
     isAfter: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(getDayRange(-days, "after")),
-        inFuture: () => defineFormConditional(getDayRange(days, "after"))
+        inPast: () => defineFormConditional(
+          getDateRange(getDateFromNow(days), "formatMinimum")
+        ),
+        inFuture: () => defineFormConditional(
+          getDateRange(getDateFromNow(-days), "formatMinimum")
+        )
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -210,12 +203,16 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMinimum"));
       },
-      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMinimum"))
+      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMinimum"))
     }),
     isBefore: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(getDayRange(days, "before")),
-        inFuture: () => defineFormConditional(getDayRange(-days, "before"))
+        inPast: () => defineFormConditional(
+          getDateRange(getDateFromNow(days), "formatMaximum")
+        ),
+        inFuture: () => defineFormConditional(
+          getDateRange(getDateFromNow(-days), "formatMaximum")
+        )
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -230,7 +227,7 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMaximum"));
       },
-      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMaximum"))
+      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMaximum"))
     }),
     isEqualTo: (value) => {
       if (isFieldReference(value)) {
@@ -240,7 +237,7 @@ function createFieldConditionals(fieldId) {
           properties: {
             [fieldId]: {
               type: ["string", "boolean"],
-              const: { $data: `/$form/${comparedFieldId}` }
+              const: { $data: `1/${comparedFieldId}` }
             },
             [comparedFieldId]: { type: ["string", "boolean"] }
           },
@@ -350,23 +347,6 @@ function createFieldConditionals(fieldId) {
         }
       },
       required: [fieldId]
-    }),
-    getId: () => ({ fieldId }),
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    object: (options) => defineFormConditional({
-      type: "object",
-      properties: {
-        [fieldId]: {
-          type: "object",
-          properties: Object.fromEntries(
-            Object.entries(options).map(([key, value]) => {
-              return [key, value.properties.$form.properties[key]];
-            })
-          ),
-          required: Object.keys(options)
-        }
-      },
-      required: [fieldId]
     })
   };
 }