@ukhomeoffice/cop-react-form-renderer 6.5.1-peter → 6.6.1

package/dist/components/CollectionSummary/RenderListView.js

@@ -92,7 +92,7 @@ var RenderListView = function RenderListView(_ref) {
           var component = elevatedComponents.find(function (comp) {
             return comp.fieldId === fieldId;
           });
-          if (!component || !_Condition.default.meetsAll(component, _objectSpread(_objectSpread({}, childPage.formData), entryData))) {
+          if (!component) {
             return null;
           }
           return (0, _getComponentRowForCYA.default)(childPage, component, listClass, entryData);

package/dist/components/CollectionSummary/RenderListView.scss

@@ -84,7 +84,7 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
     margin-bottom: govuk-spacing(3);
   }
   .hods-form-container .govuk-form-group {
-    margin-bottom: 0px;
+    margin-bottom: 0;
 
     label {
       display: none;

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/components/CollectionSummary/SummaryCardDetails.scss

@@ -1,6 +1,6 @@
 $govuk-font-family: 'Roboto', arial, sans-serif;
 
-@import "node_modules/govuk-frontend/govuk/_base";
+@import 'govuk-frontend/dist/govuk/_base';
 
 .govuk-grid-column-two-thirds:has(.hods-form-summary-card-details) {
   width: 100% !important;
@@ -24,7 +24,7 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
     margin: 0;
 
     .hods-form-container .govuk-form-group {
-      margin-bottom: 0px;
+      margin-bottom: 0;
 
       label {
         display: none;
@@ -167,8 +167,8 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
 
         .hods-form-summary-card-details__divider {
           position: absolute;
-          height: 0%;
-          width: 0%;
+          height: 0;
+          width: 0;
           background-color: #E9EBED;
           grid-column-start: var(--column);
           grid-column-end: var(--column);

package/dist/components/FormRenderer/helpers/index.js

@@ -13,7 +13,6 @@ var _getNextPageId = _interopRequireDefault(require("./getNextPageId"));
 var _getPage = _interopRequireDefault(require("./getPage"));
 var _getSubmissionStatus = _interopRequireDefault(require("./getSubmissionStatus"));
 var _getUpdatedSectionStates = _interopRequireDefault(require("./getUpdatedSectionStates"));
-var _clearOutUncompletedRoutes = _interopRequireDefault(require("./clearOutUncompletedRoutes"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
@@ -26,7 +25,6 @@ var helpers = {
   getNextPageId: _getNextPageId.default,
   getPage: _getPage.default,
   getSubmissionStatus: _getSubmissionStatus.default,
-  getUpdatedSectionStates: _getUpdatedSectionStates.default,
-  clearOutUncompletedRoutes: _clearOutUncompletedRoutes.default
+  getUpdatedSectionStates: _getUpdatedSectionStates.default
 };
 var _default = exports.default = helpers;

package/dist/components/FormRenderer/onPageAction.js

@@ -112,15 +112,8 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         setData(submissionData);
       }
       ;
-      var formPagesAndComponents = {
-        pages: pages,
-        components: components
-      };
-      if (action.type === _models.PageAction.TYPES.SUBMIT) {
-        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
-      }
 
-      // In case of hub-and-spoke if patchLabel has changed then
+      // In case of hub-and-spoke if patchLabel has changed then 
       // save name and value to variables for call to onSubmit hook
       var changedFieldName;
       var changedFieldValue;

package/dist/components/FormRenderer/onPageAction.test.js

@@ -50,11 +50,6 @@ jest.mock('./helpers', function () {
       this.cleanHiddenNestedDataCalls += 1;
       return patch;
     },
-    clearOutUncompletedRoutesCalls: 0,
-    clearOutUncompletedRoutes: function clearOutUncompletedRoutes(pages, allComponents, formData) {
-      this.clearOutUncompletedRoutesCalls += 1;
-      return formData;
-    },
     getNextPageIdCalls: 0,
     getNextPageId: function getNextPageId() {
       this.getNextPageIdCalls += 1;

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/CollectionPage/mergeCollectionPages.js

@@ -32,7 +32,6 @@ var createMasterPage = function createMasterPage(page) {
   return {
     id: page.id,
     name: page.name,
-    deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
     collection: _objectSpread({
       masterPage: true
     }, page.collection),

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

@@ -10,6 +10,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * @param {*} value - the value to check.
  * @param {string} config.collectionPath - the path to the collection within formData
+ * @param {string} config.caseInsensitive - true to ignore case, assumes string values
  * @param {object} component - the component definition
  * @param {object} formData - the current form data
  * @returns true if components value is not the same in any other entry in the collection
@@ -28,6 +29,9 @@ var mustBeUniqueInCollection = function mustBeUniqueInCollection(value, config,
       return false;
     }
     ;
+    if (config.caseInsensitive && typeof value === 'string' && typeof entry[component.id] === 'string') {
+      return entry[component.id].toUpperCase() === value.toUpperCase();
+    }
     return entry[component.id] === value;
   });
   return !result;

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

@@ -121,6 +121,42 @@ describe('utils', function () {
           }), COMPONENT_NESTED, FORM_DATA);
           expect(result).toBeFalsy();
         });
+        test('should return true if other entries have the same value for this field in a different case', function () {
+          var FORM_DATA = {
+            namesActiveId: 2,
+            names: [{
+              id: 1,
+              firstName: 'ALPHA'
+            }, {
+              id: 2,
+              firstName: 'alpha'
+            }, {
+              id: 3,
+              firstName: 'bravo'
+            }]
+          };
+          var result = (0, _mustBeUniqueInCollection.default)('alpha', CONFIG, COMPONENT, FORM_DATA);
+          expect(result).toBeTruthy();
+        });
+        test('should return false if other entries have the same value for this field in a different case and caseInsensitive is true', function () {
+          var FORM_DATA = {
+            namesActiveId: 2,
+            names: [{
+              id: 1,
+              firstName: 'ALPHA'
+            }, {
+              id: 2,
+              firstName: 'alpha'
+            }, {
+              id: 3,
+              firstName: 'bravo'
+            }]
+          };
+          var result = (0, _mustBeUniqueInCollection.default)('alpha', _objectSpread(_objectSpread({}, CONFIG), {}, {
+            caseInsensitive: true
+          }), COMPONENT, FORM_DATA);
+          expect(result).toBeFalsy();
+        });
       });
     });
   });

package/package.json

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

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/component-used-in-multiple-pages-data.json

@@ -1,4 +0,0 @@
-{
-  "componentA": "show",
-  "componentB": "hide"
-}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/component-used-in-multiple-pages-form.json

@@ -1,61 +0,0 @@
-{
-  "components": [
-    {
-      "id": "componentA",
-      "type": "radios",
-      "label": "Field A",
-      "fieldId": "fieldA",
-      "required": true
-    },
-    {
-      "id": "componentB",
-      "type": "collection",
-      "label": "Component B",
-      "fieldId": "componentB"
-    }
-  ],
-  "pages": [
-    {
-      "id": "pageA",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "hide"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    },
-    {
-      "id": "pageB",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "show"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    },
-    {
-      "id": "pageC",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "hide"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    }
-  ]
-}