@ukhomeoffice/cop-react-form-renderer 4.9.0 → 4.10.0

package/dist/components/FormComponent/helpers/getComponentDisabled.js

@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _Utils = _interopRequireDefault(require("@ukhomeoffice/cop-react-components/dist/utils/Utils"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
 var getComponentDisabled = function getComponentDisabled(disabled, formData) {
   if (typeof disabled === 'string') {
-    return !!_Utils.default.interpolateString(disabled, formData);
+    return !!_copReactComponents.Utils.interpolateString(disabled, formData);
   }
 
   return !!disabled;

package/dist/components/FormComponent/helpers/getComponentDisabled.test.js

@@ -18,9 +18,11 @@ describe('components.FormComponent.helpers.getComponentDisabled', function () {
     expect((0, _getComponentDisabled.default)(true, DATA)).toEqual(true);
   });
   it('should interpolate correctly if disabled is a field path', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     expect((0, _getComponentDisabled.default)('${shouldDisable}', DATA)).toEqual(true);
   });
   it('should return false if interpolating a field that does not exist', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     expect((0, _getComponentDisabled.default)('${notARealField}', DATA)).toEqual(false);
   });
 });

package/dist/utils/CheckYourAnswers/getCYACollectionDeleteAction.test.js

@@ -38,7 +38,7 @@ describe('utils', function () {
       it('should remove selected item from the form data', function () {
         var data = null;
 
-        var ON_ACTION = function ON_ACTION(undefined, call_back) {
+        var ON_ACTION = function ON_ACTION(_, call_back) {
           data = call_back(TEST_DATA);
         };
 

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.js

@@ -9,6 +9,8 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
 var _models = require("../../models");
 
+var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
+
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
@@ -28,12 +30,7 @@ var getEntryToCollectionRow = function getEntryToCollectionRow(page, onAction) {
     pageId: page.id,
     key: ((_page$components$0$la = page.components[0].labels) === null || _page$components$0$la === void 0 ? void 0 : _page$components$0$la.empty) || 'Nothing entered',
     required: page.required,
-    action: {
-      page: page.id,
-      label: "Change",
-      aria_suffix: page.cya_link.aria_suffix,
-      onAction: onAction
-    }
+    action: (0, _getCYAAction.default)(false, page, onAction)
   }];
 };
 

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.test.js

@@ -22,6 +22,7 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     collection: {
       name: 'collection',
       labels: {
+        // eslint-disable-next-line no-template-curly-in-string
         item: 'Collection entry ${index}'
       },
       actions: [{

package/dist/utils/Operate/getIndexOfMatchingValueIn.js

@@ -54,9 +54,19 @@ var getIndexOfMatchingValueIn = function getIndexOfMatchingValueIn(config, data)
 
       if (index === ignore) {
         return true;
-      }
+      } // Here we're simply checking if value matches the entry itself. This
+      // will be enough of a check for arrays of simple values.
+
+
+      if (entry === value) {
+        result = index;
+        return false;
+      } // If the last check failed and there is a config.key defined, then
+      // we're most likely checking an array of objects and should use the
+      // key to index in and find a matching value.
+
 
-      if (entry === value || config.key && entry[config.key] === value) {
+      if (config.key && (0, _getSourceData.default)(entry, config.key) === value) {
         result = index;
         return false;
       }

package/dist/utils/Operate/getIndexOfMatchingValueIn.test.js

@@ -6,7 +6,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
   var DATA = {
-    arrayOfValues: ['abc', 'bcd', 'cde', 'def'],
+    arrayOfValues: ['abc', 'bcd', 'cde', 'def', {
+      root: {
+        branch: 'leaf'
+      }
+    }],
     cutoffIndex: 1,
     ignoreIndex: 2,
     valueToSearchFor: 'cde',
@@ -32,6 +36,7 @@ describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
     expect(result).toEqual('2');
   });
   it('Should handle interpolated string for field', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       target: 'arrayOfValues',
       field: '${fieldName}'
@@ -39,6 +44,16 @@ describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
     var result = (0, _getIndexOfMatchingValueIn.default)(CONFIG, DATA);
     expect(result).toEqual('2');
   });
+  it('Should handle interpolated string for key', function () {
+    // eslint-disable-next-line no-template-curly-in-string
+    var CONFIG = {
+      target: 'arrayOfValues',
+      key: 'root.branch',
+      value: 'leaf'
+    };
+    var result = (0, _getIndexOfMatchingValueIn.default)(CONFIG, DATA);
+    expect(result).toEqual('4');
+  });
   it('Should handle a cutoff value being specified', function () {
     var CONFIG = {
       target: 'arrayOfValues',
@@ -62,6 +77,7 @@ describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
     expect(result).toEqual(null); // Cutoff occurs before matching value is reached.
   });
   it('Should handle interpolated string for cutoff.field', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       target: 'arrayOfValues',
       value: 'cde',
@@ -95,6 +111,7 @@ describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
     expect(result).toEqual(null); // Should ignore the matching value.
   });
   it('Should handle interpolated string for ignore.field', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       target: 'arrayOfValues',
       value: 'cde',
@@ -106,6 +123,7 @@ describe('Utils.Operate.getIndexOfPriorMatchingValueIn', function () {
     expect(result).toEqual(null); // Should ignore the matching value.
   });
   it('Should handle interpolated string for target', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       target: '${targetName}',
       value: 'cde'

package/dist/utils/Operate/persistValueInFormData.test.js

@@ -90,6 +90,7 @@ describe('Utils.Operate.persistValueInFormData', function () {
     expect(ON_CHANGE_COUNT).toEqual(0);
   });
   it('Should correctly interpolate a field value', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       name: 'alpha',
       field: '${beta}'

package/dist/utils/Operate/runPageOperations.test.js

@@ -63,6 +63,7 @@ describe('Utils.Operate.runPageOperations', function () {
       }, {
         output: 'secondOpResult',
         function: 'setValueInFormData',
+        // eslint-disable-next-line no-template-curly-in-string
         field: '${firstOpResult}'
       }]
     };
@@ -77,6 +78,7 @@ describe('Utils.Operate.runPageOperations', function () {
       operations: [{
         function: 'setValueInFormData',
         value: 'leaf',
+        // eslint-disable-next-line no-template-curly-in-string
         output: '${delta}.trunk.branch'
       }]
     };

package/dist/utils/Operate/setValueInFormData.test.js

@@ -25,6 +25,7 @@ describe('Utils.Operate.addToFormData', function () {
     expect(result).toEqual(DATA.a);
   });
   it('Should handle interpolated field strings', function () {
+    // eslint-disable-next-line no-template-curly-in-string
     var CONFIG = {
       field: 'b[${indexOfThree}]'
     };

package/package.json

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