@ukhomeoffice/cop-react-form-renderer 5.2.0 → 5.3.0

package/dist/utils/Condition/meetsCondition.js

@@ -77,8 +77,8 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           if (!value || !compare) {
             return false;
           }
-          var _valFloat = parseFloat(value.replace(',', ''));
-          var _compareFloat = parseFloat(compare.replace(',', ''));
+          var _valFloat = parseFloat(value.replace(/,/g, ''));
+          var _compareFloat = parseFloat(compare.replace(/,/g, ''));
           return _valFloat > _compareFloat;
         }
       case 'contains':

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

@@ -502,6 +502,13 @@ describe('utils.Condition.meetsCondition', function () {
       };
       expect((0, _meetsCondition.default)(CONDITION, '99')).toBeTruthy();
     });
+    it('less than should handle values with commas in', function () {
+      var CONDITION = {
+        op: '<',
+        value: '10,000'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '9,999')).toBeTruthy();
+    });
     it('greater than should reject when value is null', function () {
       var CONDITION = {
         op: '>',
@@ -537,6 +544,13 @@ describe('utils.Condition.meetsCondition', function () {
       };
       expect((0, _meetsCondition.default)(CONDITION, '101')).toBeTruthy();
     });
+    it('greater than should handle values with commas in', function () {
+      var CONDITION = {
+        op: '>',
+        value: '10,000'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '10,000,000')).toBeTruthy();
+    });
   });
   describe('operator includes', function () {
     it('should accept a string that exists within the value', function () {

package/dist/utils/Data/setupFormData.js

@@ -15,7 +15,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var setDefaultDateValue = function setDefaultDateValue(date, data, fullPath) {
-  var val = date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : date.defaultValue;
+  var dateFormat = /^(\d{1,2})-\d{1,2}-(\d{4})$/;
+  var defaultDate = dateFormat.test(date.defaultValue) ? date.defaultValue : (0, _getSourceData.default)(data, date.defaultValue);
+  var val = date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : defaultDate;
   (0, _setDataItem.default)(data, "".concat(fullPath).concat(date.fieldId), val);
 };
 

package/dist/utils/Data/setupFormData.test.js

@@ -405,6 +405,29 @@ describe('utils', function () {
           }
         });
       });
+      it('should handle default values given it is a date with a dot-separated field identifier within pages', function () {
+        var PAGES = [{
+          components: [{
+            fieldId: 'pageFieldA',
+            type: 'date',
+            defaultValue: 'test.a'
+          }, {
+            fieldId: 'pageFieldB',
+            type: 'date',
+            defaultValue: 'test.b'
+          }]
+        }];
+        var COMPONENTS = [];
+        var DATA = {
+          'test': {
+            'a': '11-04-2023',
+            'b': '12-5-2023'
+          }
+        };
+        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
+        expect(RESULT.pageFieldA).toEqual('11-04-2023');
+        expect(RESULT.pageFieldB).toEqual('12-5-2023');
+      });
     });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",