@ukhomeoffice/cop-react-form-renderer 5.6.0 → 5.8.0

package/dist/components/CollectionPage/CollectionPage.js

@@ -95,7 +95,7 @@ var CollectionPage = function CollectionPage(_ref) {
       formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, _defineProperty({}, "".concat(page.collection.name, "ActiveIndex"), activeIndex)),
       components: page.components.map(function (component) {
         return _objectSpread(_objectSpread({}, component), {}, {
-          full_path: "".concat(page.collection.name, "[").concat(activeIndex, "].").concat(component.full_path || component.fieldId)
+          pageCollection: _objectSpread({}, page.collection)
         });
       })
     }),

package/dist/components/CollectionPage/CollectionPage.test.js

@@ -141,7 +141,7 @@ describe('components.CollectionPage', function () {
       expect(label.tagName).toEqual('LABEL');
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toEqual(lbl);
-      expect(label.getAttribute('for')).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
+      expect(label.getAttribute('for')).toEqual(fieldId);
       var hint = formGroup.childNodes[1];
       expect(hint.tagName).toEqual('DIV');
       expect(hint.classList).toContain('govuk-hint');
@@ -149,7 +149,7 @@ describe('components.CollectionPage', function () {
       var input = formGroup.childNodes[2];
       expect(input.tagName).toEqual('INPUT');
       expect(input.classList).toContain('govuk-input');
-      expect(input.id).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
+      expect(input.id).toEqual(fieldId);
       expect(input.value).toEqual(val);
       return input;
     };
@@ -160,7 +160,7 @@ describe('components.CollectionPage', function () {
       expect(label.tagName).toEqual('LABEL');
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toEqual(lbl);
-      expect(label.getAttribute('for')).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
+      expect(label.getAttribute('for')).toEqual(fieldId);
       var hint = formGroup.childNodes[1];
       expect(hint.tagName).toEqual('DIV');
       expect(hint.classList).toContain('govuk-hint');
@@ -174,7 +174,7 @@ describe('components.CollectionPage', function () {
       })[0];
       expect(input.classList).toContain('hods-autocomplete__input');
       expect(input.tagName).toEqual('INPUT');
-      expect(input.id).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
+      expect(input.id).toEqual(fieldId);
       expect(input.value).toEqual(val);
       return input;
     };

package/dist/components/FormComponent/FormComponent.js

@@ -96,10 +96,16 @@ var FormComponent = function FormComponent(_ref) {
     }));
   }
   var changeMetaDocuments = function changeMetaDocuments(document) {
+    var componentPath = component.full_path || component.fieldId;
+    if (component.pageCollection) {
+      var activeIndex = _utils.default.CollectionPage.getActiveIndex(component.pageCollection.name, formData);
+      var pathPrefix = "".concat(component.pageCollection.name, "[").concat(activeIndex, "]");
+      componentPath = "".concat(pathPrefix, ".").concat(componentPath);
+    }
     onTopLevelChange({
       target: {
         name: _utils.default.Meta.name,
-        value: _utils.default.Meta.documents.setForField(document, formData, component.full_path, component.allowMultiple)
+        value: _utils.default.Meta.documents.setForField(document, formData, componentPath, component.allowMultiple)
       }
     });
   };
@@ -153,7 +159,10 @@ FormComponent.propTypes = {
     id: _propTypes.default.string,
     label: _propTypes.default.string,
     suffix: _propTypes.default.string,
-    type: _propTypes.default.string
+    type: _propTypes.default.string,
+    pageCollection: _propTypes.default.shape({
+      name: _propTypes.default.string
+    })
   }).isRequired,
   value: _propTypes.default.oneOfType([_propTypes.default.node,
   // not included in node

package/dist/utils/Data/getAutocompleteSource.js

@@ -21,7 +21,12 @@ var getAutocompleteSource = function getAutocompleteSource(config) {
     var lcQuery = query ? query.toLowerCase() : '';
     populateResults(options.filter(function (opt) {
       var label = labelMaker ? labelMaker(opt) : opt.label || '';
-      return label.toLowerCase().includes(lcQuery);
+      if (label.toLowerCase().includes(lcQuery)) {
+        return true;
+      }
+      return opt.synonyms ? opt.synonyms.some(function (synonym) {
+        return synonym.toLowerCase().includes(lcQuery);
+      }) : false;
     }));
   };
 };

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

@@ -141,6 +141,29 @@ describe('utils', function () {
             }]);
           });
         });
+        it('should match options using a defined synonym', function () {
+          var CONFIG = {
+            data: {
+              options: [{
+                value: 'a',
+                label: 'Alpha',
+                synonyms: ['first']
+              }, {
+                value: 'b'
+              }]
+            }
+          };
+          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          expect(typeof SOURCE === 'function').toBeTruthy();
+          SOURCE('first', function (results) {
+            expect(results.length).toEqual(1);
+            expect(results).toEqual([{
+              value: 'a',
+              label: 'Alpha',
+              synonyms: ['first']
+            }]);
+          });
+        });
       });
       describe('with custom item labels', function () {
         it('should get any specified options from the config', function () {
@@ -346,6 +369,42 @@ describe('utils', function () {
             }]);
           });
         });
+        it('should match options using a defined synonym', function () {
+          var CONFIG = {
+            item: {
+              value: 'currencyCode',
+              label: 'currencyCode',
+              // eslint-disable-next-line no-template-curly-in-string
+              format: '${currencyName} (${currencyCode})'
+            },
+            data: {
+              options: [{
+                currencyName: 'Great British Pounds',
+                currencyCode: 'GBP',
+                value: 'GBP',
+                label: 'GBP'
+              }, {
+                currencyName: 'United States Dollars',
+                currencyCode: 'USD',
+                value: 'USD',
+                label: 'USD',
+                synonyms: ['bucks']
+              }]
+            }
+          };
+          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          expect(typeof SOURCE === 'function').toBeTruthy();
+          SOURCE('bucks', function (results) {
+            expect(results.length).toEqual(1);
+            expect(results).toEqual([{
+              currencyName: 'United States Dollars',
+              currencyCode: 'USD',
+              value: 'USD',
+              label: 'USD',
+              synonyms: ['bucks']
+            }]);
+          });
+        });
       });
     });
   });

package/package.json

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