@ukhomeoffice/cop-react-form-renderer 6.14.6 → 6.14.8

package/dist/utils/Condition/meetsCondition.js

@@ -20,6 +20,26 @@ const getComparisonValue = (condition, data) => {
   return condition.value;
 };
 
+/**
+ * Processes a value based on its type.
+ * - If it's an array, returns its length.
+ * - If it's a string, parses it as a float.
+ * - If it's a number, returns it as is.
+ * - Returns `undefined` for other types.
+ * 
+ * @param {any} value - The value to process.
+ * @returns {number | undefined} - The processed value or `undefined` if not applicable.
+ */
+const getProcessedValue = obj => {
+  if (Array.isArray(obj)) return obj.length;
+  if (typeof obj === "string") {
+    const cleaned = obj.replace(/,/g, ''); // Remove all commas
+    return Number.isNaN(cleaned) ? null : parseFloat(cleaned);
+  }
+  if (typeof obj === "number") return obj;
+  return null;
+};
+
 /**
  * Looks at a condition object to see if the supplied value meets it.
  * The condition object contains an `op` property, along with a comparator
@@ -66,21 +86,15 @@ const meetsCondition = (condition, value, data) => {
         }
       case '<':
         {
-          if (!value || !compare) {
-            return false;
-          }
-          const valFloat = Array.isArray(value) ? value.length : parseFloat(value.replace(',', ''));
-          const compareFloat = parseFloat(compare.replace(',', ''));
-          return valFloat < compareFloat;
+          const valFloat = getProcessedValue(value);
+          const compareFloat = getProcessedValue(compare);
+          return valFloat != null && compareFloat != null && valFloat < compareFloat;
         }
       case '>':
         {
-          if (!value || !compare) {
-            return false;
-          }
-          const valFloat = Array.isArray(value) ? value.length : parseFloat(value.replace(/,/g, ''));
-          const compareFloat = parseFloat(compare.replace(/,/g, ''));
-          return valFloat > compareFloat;
+          const valFloat = getProcessedValue(value);
+          const compareFloat = getProcessedValue(compare);
+          return valFloat != null && compareFloat != null && valFloat > compareFloat;
         }
       case 'contains':
         {

package/dist/utils/Condition/meetsCondition.test.js

@@ -551,6 +551,27 @@ describe('utils.Condition.meetsCondition', () => {
       };
       expect((0, _meetsCondition.default)(CONDITION, '10,000,000')).toBeTruthy();
     });
+    it('greater than should handle value is 0', () => {
+      const CONDITION = {
+        op: '>',
+        value: 0
+      };
+      expect((0, _meetsCondition.default)(CONDITION, 1)).toBeTruthy();
+    });
+    it('greater than should handle compear is 0', () => {
+      const CONDITION = {
+        op: '<',
+        value: 1
+      };
+      expect((0, _meetsCondition.default)(CONDITION, 0)).toBeTruthy();
+    });
+    it('greater than should handle array is 0', () => {
+      const CONDITION = {
+        op: '>',
+        value: 1
+      };
+      expect((0, _meetsCondition.default)(CONDITION, ["A", "B", "C"])).toBeTruthy();
+    });
   });
   describe('operator includes', () => {
     it('should accept a string that exists within the value', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "6.14.6",
+  "version": "6.14.8",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "yalc-publish": "yarn compile-with-maps && cp -r src dist/src && yalc publish --push"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "4.7.9",
+    "@ukhomeoffice/cop-react-components": "4.7.10",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^5.0.0",