@ukhomeoffice/cop-react-form-renderer 4.18.0 → 4.19.1

package/dist/utils/FormPage/useComponent.js

@@ -19,38 +19,55 @@ var getComponentToUse = function getComponentToUse(toUse, formComponents) {
     return fc.id === firstId;
   }));
 
+  var component = wrapper;
   var parent = wrapper;
 
   var _loop = function _loop() {
     var id = path.shift();
 
-    if (Array.isArray(parent.components)) {
+    if (Array.isArray(component.components)) {
       // Filter the parent components down to just the one referenced
       // by the current id.
+      parent = component;
       parent.components = parent.components.filter(function (c) {
         return c.id === id;
       });
 
       if (parent.components.length > 0) {
         // Make the found child the parent so we can iterate.
-        parent = parent.components[0];
+        component = parent.components[0];
       } else {
         // If no child was found, there can be no parent.
-        parent = undefined;
+        component = undefined;
       }
     } else {
       // We cannot find the child with this id if there are no child
       // components on this parent.
-      parent = undefined;
+      component = undefined;
     }
   };
 
-  while (parent && path.length > 0) {
+  while (component && path.length > 0) {
     _loop();
+  }
+
+  if (component) {
+    component = _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
+      cya_label: component.label || component.cya_label,
+      fieldId: toUse.fieldId || component.fieldId
+    });
+
+    if (parent && parent.id !== component.id) {
+      parent.components[0] = component;
+    } else {
+      wrapper = component;
+    }
+
+    return wrapper;
   } // If we missed a nested reference along the way, don't return the wrapper.
 
 
-  return parent ? wrapper : undefined;
+  return undefined;
 };
 /**
  * Use an existing component from the formComponents, overriding any properties
@@ -66,11 +83,7 @@ var useComponent = function useComponent(toUse, formComponents) {
     var component = getComponentToUse(toUse, formComponents);
 
     if (component) {
-      var fieldId = toUse.fieldId || component.fieldId;
-      return _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
-        cya_label: component.label || component.cya_label,
-        fieldId: fieldId
-      });
+      return component;
     }
   }
 

package/dist/utils/FormPage/useComponent.test.js

@@ -142,11 +142,12 @@ describe('utils', function () {
         var TO_USE = {
           use: ID
         };
-        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({
-          use: ID
-        }, CONTAINER), {}, {
-          cya_label: CONTAINER.label,
-          components: [ZULU // Foxtrot is not included
+        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({}, CONTAINER), {}, {
+          components: [_objectSpread(_objectSpread({
+            use: ID
+          }, ZULU), {}, {
+            cya_label: ZULU.label
+          }) // Foxtrot is not included
           ]
         }));
       });

package/dist/utils/Validate/additional/mustBeAfter.js

@@ -17,19 +17,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Local imports
 _dayjs.default.extend(_customParseFormat.default);
 /**
- * Function returns true if the date string parameter is for a date more than ('is before') N months
- * in the past, where N is the number of months parameter
- * NOTE:  the one minute reduction on the threshold date is a workaround for as apparent bug in the
- * day.js isBefore() function when checking on 'same dates'
+ * Checks that a date is after either:
+ *  - A specified, fixed date.
+ *  Or
+ *  - An offset to the current date in days/months/years.
+ * 
  * @param {string} date - date string in a valid date format e.g. DD-MM-YYYY
+ * @param {string} config.date - fixed date string that date must be after, in the format DD-MM-YYYY
  * @param {string} config.unit - day, month or year
  * @param {number} config.value - number of the unit to be after
- * @returns false if date is NOT after the no of months in the past.
+ * @returns false if date is not after the given date/offset or true if it is.
  */
 
 
 var mustBeAfter = function mustBeAfter(date, config) {
-  var dateToCompare = (0, _dayjs.default)().add(config.value, config.unit);
+  var dateToCompare = config.date ? (0, _dayjs.default)((0, _utils.formatString)(config.date), _utils.DATE_FORMAT) : (0, _dayjs.default)().add(config.value, config.unit);
   return (0, _dayjs.default)((0, _utils.formatString)(date), _utils.DATE_FORMAT).isAfter(dateToCompare);
 };
 

package/dist/utils/Validate/additional/mustBeAfter.test.js

@@ -84,7 +84,7 @@ describe('utils', function () {
           });
           expect(result).toEqual(true);
         });
-        test('should return true given a date before the given number of days in the future', function () {
+        test('should return false given a date before the given number of days in the future', function () {
           var date = (0, _dayjs.default)().add(250, 'day').format(_utils.DATE_FORMAT);
           var result = (0, _mustBeAfter.default)(date, {
             value: 275,
@@ -92,6 +92,20 @@ describe('utils', function () {
           });
           expect(result).toEqual(false);
         });
+        test('should return false given a date before the specified fixed date', function () {
+          var date = (0, _dayjs.default)().format(_utils.DATE_FORMAT);
+          var result = (0, _mustBeAfter.default)(date, {
+            date: '01-01-5000'
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return true given a date after the specified fixed date', function () {
+          var date = (0, _dayjs.default)().format(_utils.DATE_FORMAT);
+          var result = (0, _mustBeAfter.default)(date, {
+            date: '01-01-2000'
+          });
+          expect(result).toEqual(true);
+        });
       });
     });
   });

package/dist/utils/Validate/additional/mustBeBefore.js

@@ -17,17 +17,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Local imports
 _dayjs.default.extend(_customParseFormat.default);
 /**
- * Function returns false if the date string parameter is for a date more than N in the future
- * where N is the number of months parameter
- * @param {string} dateToCheck - date string in a valid date format e.g. DD-MM-YYYY
+ * Checks that a date is before either:
+ *  - A specified, fixed date.
+ *  Or
+ *  - An offset to the current date in days/months/years.
+ * 
+ * @param {string} date - date string in a valid date format e.g. DD-MM-YYYY
+ * @param {string} config.date - fixed date string that date must be before, in the format DD-MM-YYYY
  * @param {string} config.unit - day, month or year
  * @param {number} config.value - number of the unit to be before
- * @returns true if date is not after the no of months in future.
+ * @returns false if date is not before the given date/offset or true if it is.
  */
 
 
 var mustBeBefore = function mustBeBefore(date, config) {
-  var dateToCompare = (0, _dayjs.default)().add(config.value, config.unit);
+  var dateToCompare = config.date ? (0, _dayjs.default)((0, _utils.formatString)(config.date), _utils.DATE_FORMAT) : (0, _dayjs.default)().add(config.value, config.unit);
   return (0, _dayjs.default)((0, _utils.formatString)(date), _utils.DATE_FORMAT).isBefore(dateToCompare);
 };
 

package/dist/utils/Validate/additional/mustBeBefore.test.js

@@ -60,6 +60,20 @@ describe('utils', function () {
           });
           expect(result).toEqual(false);
         });
+        test('should return false given a date after the specified fixed date', function () {
+          var date = (0, _dayjs.default)().format(_utils.DATE_FORMAT);
+          var result = (0, _mustBeBefore.default)(date, {
+            date: '01-01-2000'
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return true given a date before the specified fixed date', function () {
+          var date = (0, _dayjs.default)().format(_utils.DATE_FORMAT);
+          var result = (0, _mustBeBefore.default)(date, {
+            date: '01-01-5000'
+          });
+          expect(result).toEqual(true);
+        });
       });
     });
   });

package/package.json

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