@ukhomeoffice/cop-react-form-renderer 5.71.4 → 5.71.6

package/dist/components/CollectionSummary/RenderListView.js

@@ -9,6 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = _interopRequireDefault(require("../../utils"));
 var _getComponentRowForCYA = _interopRequireDefault(require("../../utils/CheckYourAnswers/getComponentRowForCYA"));
+var _Condition = _interopRequireDefault(require("../../utils/Condition"));
 require("./RenderListView.scss");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -80,7 +81,10 @@ var RenderListView = function RenderListView(_ref) {
       return _utils.default.Component.elevateNested([component], entryData);
     }).flat().filter(Boolean);
     return (_childPage$summaryLay = childPage.summaryLayout) === null || _childPage$summaryLay === void 0 || (_childPage$summaryLay = _childPage$summaryLay.sections) === null || _childPage$summaryLay === void 0 ? void 0 : _childPage$summaryLay.flatMap(function (section) {
-      var summaryFields = section.columns.flatMap(function (column) {
+      var filteredColumns = section.columns.filter(function (column) {
+        return _Condition.default.meetsAll(column, _objectSpread(_objectSpread({}, childPage.formData), entryData));
+      });
+      var summaryFields = filteredColumns.flatMap(function (column) {
         return column.fields || [];
       });
       if (summaryFields.length) {
@@ -88,7 +92,7 @@ var RenderListView = function RenderListView(_ref) {
           var component = elevatedComponents.find(function (comp) {
             return comp.fieldId === fieldId;
           });
-          if (!component) {
+          if (!component || !_Condition.default.meetsAll(component, _objectSpread(_objectSpread({}, childPage.formData), entryData))) {
             return null;
           }
           return (0, _getComponentRowForCYA.default)(childPage, component, listClass, entryData);

package/dist/components/CollectionSummary/RenderListView.test.js

@@ -19,6 +19,7 @@ describe('components.CollectionSummary.RenderListView', function () {
       label: 'Value 3',
       value: 'Value 3'
     },
+    condition: 'test',
     index: 0
   };
   var MASTER_PAGE = {
@@ -26,7 +27,12 @@ describe('components.CollectionSummary.RenderListView', function () {
       summaryLayout: {
         sections: [{
           columns: [{
-            fields: ['item1', 'item2', 'item3']
+            fields: ['item1', 'item2', 'item3'],
+            show_when: {
+              field: "condition",
+              op: "in",
+              values: ["test"]
+            }
           }]
         }]
       },

package/dist/components/CollectionSummary/SummaryCard.js

@@ -67,8 +67,8 @@ var SummaryCard = function SummaryCard(_ref) {
     setQuickEdit = _useState2[1];
   var classes = _copReactComponents.Utils.classBuilder(DEFAULT_CLASS, classModifiers, config.className);
   var quickEditPage = (0, _react.useMemo)(function () {
-    return config.quickEdit ? (0, _getQuickEditPage.default)(masterPage, entryData) : null;
-  }, [masterPage, config, entryData, quickEdit]);
+    return config.quickEdit ? (0, _getQuickEditPage.default)(masterPage, formData, entryData) : null;
+  }, [masterPage, config, formData, entryData, quickEdit]);
 
   // The validation context used here is a custom one for Summary Cards,
   // not the standard context. See SummaryCardValidationContext.jsx.

package/dist/utils/CollectionPage/duplicateCollectionPageEntry.js

@@ -40,7 +40,15 @@ var duplicateCollectionPageEntry = function duplicateCollectionPageEntry(collect
   fieldsToIgnore.forEach(function (field) {
     return delete newEntry[field];
   });
-  collectionData.push(newEntry);
+  var insertionIndex = collectionData.findIndex(function (entry) {
+    return entry.id === entryId;
+  }) + 1;
+  if (insertionIndex === -1) {
+    collectionData.push(newEntry);
+  } else {
+    collectionData.splice(insertionIndex, 0, newEntry);
+  }
+
   // eslint-disable-next-line no-param-reassign
   formData["".concat(collectionName.split('.').pop(), "ActiveId")] = newEntry.id;
   return newEntryId;

package/dist/utils/CollectionPage/duplicateCollectionPageEntry.test.js

@@ -24,6 +24,26 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")]).toBeTruthy();
     expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")] === '1').toBeFalsy();
   });
+  it('should put the new entry under the original one', function () {
+    var _FORM_DATA2;
+    var FORM_DATA = (_FORM_DATA2 = {}, _defineProperty(_FORM_DATA2, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA2, COLLECTION_NAME, [{
+      id: '1',
+      value: 'value1'
+    }, {
+      id: '2',
+      value: 'value2'
+    }, {
+      id: '3',
+      value: 'value1'
+    }]), _FORM_DATA2);
+    (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '1');
+    expect(FORM_DATA[COLLECTION_NAME].length).toEqual(4);
+    expect(FORM_DATA[COLLECTION_NAME][1].value).toEqual(FORM_DATA[COLLECTION_NAME][0].value);
+    expect(FORM_DATA[COLLECTION_NAME][1].id).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][1].id === '1').toBeFalsy();
+    expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")]).toBeTruthy();
+    expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")] === '1').toBeFalsy();
+  });
   it('should duplicate entries in nested collections correctly', function () {
     var FORM_DATA = {
       parentsActiveId: '2',
@@ -54,8 +74,8 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect((0, _getCollectionPageActiveId.default)('parents.children', FORM_DATA) === '2').toBeFalsy();
   });
   it('should ignore fields in the fieldToIgnore array', function () {
-    var _FORM_DATA2;
-    var FORM_DATA = (_FORM_DATA2 = {}, _defineProperty(_FORM_DATA2, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA2, COLLECTION_NAME, [OBJ]), _FORM_DATA2);
+    var _FORM_DATA3;
+    var FORM_DATA = (_FORM_DATA3 = {}, _defineProperty(_FORM_DATA3, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA3, COLLECTION_NAME, [OBJ]), _FORM_DATA3);
     ;
     var FIELDS_TO_IGNORE = ['value'];
     (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '1', FIELDS_TO_IGNORE);
@@ -66,8 +86,8 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA[COLLECTION_NAME][1].value).toBeUndefined();
   });
   it('should add fields from the fieldsToAdd object', function () {
-    var _FORM_DATA3;
-    var FORM_DATA = (_FORM_DATA3 = {}, _defineProperty(_FORM_DATA3, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA3, COLLECTION_NAME, [OBJ]), _FORM_DATA3);
+    var _FORM_DATA4;
+    var FORM_DATA = (_FORM_DATA4 = {}, _defineProperty(_FORM_DATA4, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA4, COLLECTION_NAME, [OBJ]), _FORM_DATA4);
     ;
     var FIELDS_TO_ADD = {
       addedKey: 'addedValue'
@@ -81,8 +101,8 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA[COLLECTION_NAME][1].addedKey).toEqual('addedValue');
   });
   it('should do nothing if an entry with the given id does not exist', function () {
-    var _FORM_DATA4, _expect$toEqual;
-    var FORM_DATA = (_FORM_DATA4 = {}, _defineProperty(_FORM_DATA4, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA4, COLLECTION_NAME, [OBJ]), _FORM_DATA4);
+    var _FORM_DATA5, _expect$toEqual;
+    var FORM_DATA = (_FORM_DATA5 = {}, _defineProperty(_FORM_DATA5, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA5, COLLECTION_NAME, [OBJ]), _FORM_DATA5);
     ;
     (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '0');
     expect(FORM_DATA).toEqual((_expect$toEqual = {}, _defineProperty(_expect$toEqual, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_expect$toEqual, COLLECTION_NAME, [OBJ]), _expect$toEqual));

package/dist/utils/CollectionPage/getQuickEditPage.js

@@ -50,16 +50,17 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * editable or not. 
  * 
  * @param {object} masterPage The master page for the collection.
+ * @param {object} formData The top-level formData object.
  * @param {object} entryData The data for the current collection entry.
  * @returns Page suitble for rendering in a QuickEdit
  */
-var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
+var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData) {
   if (!masterPage) {
     return null;
   }
   var fullComponents = [];
   masterPage.childPages.forEach(function (page) {
-    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, _objectSpread(_objectSpread({}, page.formData), entryData))) {
+    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, _objectSpread(_objectSpread({}, formData), entryData))) {
       return;
     }
     page.summaryQuickEdit.forEach(function (quickEditComponent) {
@@ -81,7 +82,7 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
       // that as a specific test for when the component should be quick
       // editable - it doesn't get spread to the merged object.
       if (quickEditComponent.show_when) {
-        if ((0, _meetsAllConditions.default)(quickEditComponent.show_when, _objectSpread(_objectSpread({}, page.formData), entryData))) {
+        if ((0, _meetsAllConditions.default)(quickEditComponent.show_when, _objectSpread(_objectSpread({}, formData), entryData))) {
           fullComponents.push(_objectSpread(_objectSpread({}, mergedComponent), {}, {
             show_when: originalComponent.show_when || []
           }));
@@ -93,7 +94,9 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
   });
 
   // Put components and actions onto page object
-  var pageToReturn = _objectSpread({}, masterPage.childPages[0]);
+  var pageToReturn = _objectSpread(_objectSpread({}, masterPage.childPages[0]), {}, {
+    formData: formData
+  });
   pageToReturn.components = fullComponents;
   pageToReturn.actions = [{
     type: 'save',

package/dist/utils/CollectionPage/getQuickEditPage.test.js

@@ -9,6 +9,15 @@ 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); }
 describe('Utils.CollectionPage.getQuickEditPage', function () {
+  var FORM_DATA = {
+    items: [{
+      id: '123',
+      testText1: 'value 1',
+      testText2: 'value 2',
+      conditionText: 'true',
+      testText3: 'value 3'
+    }]
+  };
   var MASTER_PAGE = {
     childPages: [{
       id: 'firstPage',
@@ -44,15 +53,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
         fieldId: 'testText2',
         required: true
       }],
-      formData: {
-        items: [{
-          id: '123',
-          testText1: 'value 1',
-          testText2: 'value 2',
-          conditionText: 'true',
-          testText3: 'value 3'
-        }]
-      },
+      formData: FORM_DATA,
       summaryQuickEdit: [{
         use: "testText2",
         show_when: {
@@ -69,15 +70,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
         fieldId: 'testText3',
         required: true
       }],
-      formData: {
-        items: [{
-          id: '123',
-          testText1: 'value 1',
-          testText2: 'value 2',
-          conditionText: 'true',
-          testText3: 'value 3'
-        }]
-      },
+      formData: FORM_DATA,
       summaryQuickEdit: ["testText3"]
     }]
   };
@@ -103,15 +96,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
       fieldId: 'testText3',
       required: true
     }],
-    formData: {
-      items: [{
-        id: '123',
-        testText1: 'value 1',
-        testText2: 'value 2',
-        conditionText: 'true',
-        testText3: 'value 3'
-      }]
-    },
+    formData: FORM_DATA,
     actions: [{
       type: 'save',
       label: 'Save',
@@ -131,7 +116,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     testText3: 'value 3'
   };
   it('should return a quick edit page', function () {
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, ENTRY_DATA);
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
     expect(createdPage).toMatchObject(EXPECTED_OUTPUT);
   });
   it('should return a quick edit page without components that fail the quick edit show_when', function () {
@@ -144,7 +129,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     var CUSTOM_ENTRY_DATA = _objectSpread(_objectSpread({}, ENTRY_DATA), {}, {
       conditionText: 'false'
     });
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, CUSTOM_ENTRY_DATA);
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
 });

package/dist/utils/Validate/validateEmail.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // eslint-disable-next-line no-control-regex
 // const EMAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
-var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
+var HODS_EMAIL_REGEX = /^[a-z0-9._\-']+@(digital\.)?homeoffice.gov.uk$/i;
 
 /**
  * Validates an email address, ensuring it is in the correct domain and

package/package.json

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