@ecrvs/opencrvs-toolkit 1.8.1-rc.9775e4e → 1.8.1-rc.b48c48d

package/dist/commons/conditionals/conditionals.d.ts

@@ -122,6 +122,7 @@ export declare function createFieldConditionals(fieldId: string): {
         isLessThan: (value: number | FieldReference) => JSONSchema;
         isEqualTo(value: string | boolean | FieldReference): JSONSchema;
         isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+        isGreaterThanOrEqualTo(value: number | string | FieldReference): JSONSchema;
         /**
          * Use case: Some fields are rendered when selection is not made, or boolean false is explicitly selected.
          * @example field('recommender.none').isFalsy() vs not(field('recommender.none').isEqualTo(true))
@@ -167,6 +168,7 @@ export declare function createFieldConditionals(fieldId: string): {
     isLessThan: (value: number | FieldReference) => JSONSchema;
     isEqualTo(value: string | boolean | FieldReference): JSONSchema;
     isEqualToSumOf(val1: FieldReference, val2: FieldReference): JSONSchema;
+    isGreaterThanOrEqualTo(value: number | string | FieldReference): JSONSchema;
     /**
      * Use case: Some fields are rendered when selection is not made, or boolean false is explicitly selected.
      * @example field('recommender.none').isFalsy() vs not(field('recommender.none').isEqualTo(true))

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

@@ -100,6 +100,9 @@ export declare function field(fieldId: string, options?: {
         }, val2: {
             $$field: string;
         }): import("../conditionals/conditionals").JSONSchema;
+        isGreaterThanOrEqualTo(value: number | string | {
+            $$field: string;
+        }): import("../conditionals/conditionals").JSONSchema;
         isFalsy(): import("../conditionals/conditionals").JSONSchema;
         isUndefined(): import("../conditionals/conditionals").JSONSchema;
         inArray: (values: string[]) => import("../conditionals/conditionals").JSONSchema;
@@ -146,6 +149,9 @@ export declare function field(fieldId: string, options?: {
     }, val2: {
         $$field: string;
     }): import("../conditionals/conditionals").JSONSchema;
+    isGreaterThanOrEqualTo(value: number | string | {
+        $$field: string;
+    }): import("../conditionals/conditionals").JSONSchema;
     isFalsy(): import("../conditionals/conditionals").JSONSchema;
     isUndefined(): import("../conditionals/conditionals").JSONSchema;
     inArray: (values: string[]) => import("../conditionals/conditionals").JSONSchema;

package/dist/conditionals/index.js

@@ -366,11 +366,35 @@ function createFieldConditionals(fieldId) {
           [field2Id]: { type: "number" }
         },
         required: [fieldId, field1Id, field2Id],
-        sumOf: [
-          { $data: `/$form/${fieldId}` },
-          { $data: `/$form/${field1Id}` },
-          { $data: `/$form/${field2Id}` }
-        ]
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
       });
     },
     /**

package/dist/events/index.js

@@ -2543,18 +2543,24 @@ ajv.addKeyword({
 ajv.addKeyword({
   keyword: "sumOf",
   type: "object",
-  schemaType: "array",
+  schemaType: "object",
   errors: true,
   $data: true,
-  validate(schema) {
-    if (!Array.isArray(schema) || schema.length !== 3) {
-      return true;
-    }
-    const [a, b, c] = schema;
-    if ([a, b, c].some((v) => typeof v !== "number")) {
+  validate(schema, data) {
+    const { sum, field1, field2: field22 } = schema;
+    console.log(schema, data);
+    const getRefPath = (ref) => typeof ref === "object" && "$data" in ref ? ref.$data : ref;
+    const sumKey = getRefPath(sum);
+    const field1Key = getRefPath(field1);
+    const field2Key = getRefPath(field22);
+    const total = data?.$form?.[sumKey];
+    const num1 = data?.$form?.[field1Key];
+    const num2 = data?.$form?.[field2Key];
+    console.log(total, num1, num2);
+    if (typeof total !== "number" || typeof num1 !== "number" || typeof num2 !== "number") {
       return true;
     }
-    const valid = a === b + c;
+    const valid = total === num1 + num2;
     return valid;
   }
 });
@@ -3545,11 +3551,35 @@ function createFieldConditionals(fieldId) {
           [field2Id]: { type: "number" }
         },
         required: [fieldId, field1Id, field2Id],
-        sumOf: [
-          { $data: `/$form/${fieldId}` },
-          { $data: `/$form/${field1Id}` },
-          { $data: `/$form/${field2Id}` }
-        ]
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
       });
     },
     /**

package/dist/notification/index.js

@@ -1949,18 +1949,24 @@ ajv.addKeyword({
 ajv.addKeyword({
   keyword: "sumOf",
   type: "object",
-  schemaType: "array",
+  schemaType: "object",
   errors: true,
   $data: true,
-  validate(schema) {
-    if (!Array.isArray(schema) || schema.length !== 3) {
-      return true;
-    }
-    const [a, b, c] = schema;
-    if ([a, b, c].some((v) => typeof v !== "number")) {
+  validate(schema, data) {
+    const { sum, field1, field2: field22 } = schema;
+    console.log(schema, data);
+    const getRefPath = (ref) => typeof ref === "object" && "$data" in ref ? ref.$data : ref;
+    const sumKey = getRefPath(sum);
+    const field1Key = getRefPath(field1);
+    const field2Key = getRefPath(field22);
+    const total = data?.$form?.[sumKey];
+    const num1 = data?.$form?.[field1Key];
+    const num2 = data?.$form?.[field2Key];
+    console.log(total, num1, num2);
+    if (typeof total !== "number" || typeof num1 !== "number" || typeof num2 !== "number") {
       return true;
     }
-    const valid = a === b + c;
+    const valid = total === num1 + num2;
     return valid;
   }
 });
@@ -2364,11 +2370,35 @@ function createFieldConditionals(fieldId) {
           [field2Id]: { type: "number" }
         },
         required: [fieldId, field1Id, field2Id],
-        sumOf: [
-          { $data: `/$form/${fieldId}` },
-          { $data: `/$form/${field1Id}` },
-          { $data: `/$form/${field2Id}` }
-        ]
+        sumOf: {
+          sum: { $data: `/$form/${fieldId}` },
+          field1: { $data: `/$form/${field1Id}` },
+          field2: { $data: `/$form/${field2Id}` }
+        }
+      });
+    },
+    isGreaterThanOrEqualTo(value) {
+      const fieldSchema = { type: "number" };
+      const properties = {};
+      const required = [fieldId];
+      if (typeof value === "number") {
+        fieldSchema.minimum = value;
+      } else {
+        let refField = "";
+        if (isFieldReference(value)) {
+          refField = value.$$field;
+        } else {
+          refField = value;
+        }
+        fieldSchema.minimum = { $data: `/$form/${refField}` };
+        properties[refField] = { type: "number" };
+        required.push(refField);
+      }
+      properties[fieldId] = fieldSchema;
+      return defineFormConditional({
+        type: "object",
+        properties,
+        required
       });
     },
     /**

package/package.json

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