@ukhomeoffice/cop-react-form-renderer 3.3.2 → 3.3.3

package/dist/hooks/useRefData.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.STATUS_LOADING = exports.STATUS_COMPLETE = void 0;
 
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+
 var _react = require("react");
 
 var _Data = _interopRequireDefault(require("../utils/Data"));
@@ -40,7 +42,7 @@ var getRefDataUrl = function getRefDataUrl(component) {
   var data = component.data;
 
   if (data && !data.options) {
-    return data.url;
+    return _copReactComponents.Utils.interpolateString(data.url, component.formData);
   }
 
   return undefined;
@@ -66,13 +68,13 @@ var useRefData = function useRefData(component) {
   (0, _react.useEffect)(function () {
     if (!url) {
       if (component.data && component.data.options) {
-        setData(_Data.default.refData.toOptions(component.data.options));
+        setData(_Data.default.refData.toOptions(component.data.options, component.item));
       }
 
       setStatus(STATUS_COMPLETE);
     } else if (_status === _useGetRequest2.STATUS_FETCHED) {
       if (_data) {
-        setData(_Data.default.refData.toOptions(_data.data));
+        setData(_Data.default.refData.toOptions(_data.data, component.item));
       }
 
       setStatus(STATUS_COMPLETE);

package/dist/utils/Data/refDataToOptions.js

@@ -11,22 +11,38 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+var getValueAndLabel = function getValueAndLabel(opt, itemStructure) {
+  var _value;
+
+  var value = opt.value || opt.id;
+  var label = opt.label || opt.name;
+
+  if (itemStructure) {
+    value = opt[itemStructure.value] || value;
+    label = opt[itemStructure.label] || label;
+  }
+
+  return {
+    value: (_value = value) === null || _value === void 0 ? void 0 : _value.toString(),
+    label: label
+  };
+};
 /**
  * Converts ref data items to options.
  * @param {Array} refDataItems An array of ref data items.
+ * @param {Object} itemStructure The structure of the item.
  * @returns An array of options.
  */
-var refDataToOptions = function refDataToOptions(refDataItems) {
+
+
+var refDataToOptions = function refDataToOptions(refDataItems, itemStructure) {
   if (Array.isArray(refDataItems)) {
     return refDataItems.map(function (opt) {
       if (typeof opt === 'string') {
         return opt;
       }
 
-      return _objectSpread(_objectSpread({}, opt), {}, {
-        value: opt.id || opt.value,
-        label: opt.name || opt.label
-      });
+      return _objectSpread(_objectSpread({}, opt), getValueAndLabel(opt, itemStructure));
     });
   }
 

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

@@ -124,6 +124,74 @@ describe('utils', function () {
           type: 'Delta'
         }]);
       });
+      it('can handle refData with custom value and label properties', function () {
+        var REF_DATA = [{
+          id: 1,
+          displayName: 'Alpha'
+        }, {
+          id: 2,
+          displayName: 'Bravo'
+        }, {
+          id: 3,
+          displayName: 'Charlie'
+        }];
+        var ITEM_STRUCTURE = {
+          value: 'id',
+          label: 'displayName'
+        };
+        expect((0, _refDataToOptions.default)(REF_DATA, ITEM_STRUCTURE)).toEqual([{
+          id: 1,
+          displayName: 'Alpha',
+          value: '1',
+          label: 'Alpha'
+        }, {
+          id: 2,
+          displayName: 'Bravo',
+          value: '2',
+          label: 'Bravo'
+        }, {
+          id: 3,
+          displayName: 'Charlie',
+          value: '3',
+          label: 'Charlie'
+        }]);
+      });
+      it('can handle refData with missing custom value and label properties', function () {
+        var REF_DATA = [{
+          id: 1,
+          name: 'Alpha'
+        }, {
+          id: 2,
+          name: 'Bravo',
+          displayName: 'Bravo Zulu'
+        }, {
+          id: 3,
+          objId: 'chaz',
+          name: 'Charlie'
+        }];
+        var ITEM_STRUCTURE = {
+          value: 'objId',
+          label: 'displayName'
+        };
+        expect((0, _refDataToOptions.default)(REF_DATA, ITEM_STRUCTURE)).toEqual([{
+          id: 1,
+          name: 'Alpha',
+          value: '1',
+          label: 'Alpha'
+        }, {
+          id: 2,
+          name: 'Bravo',
+          displayName: 'Bravo Zulu',
+          value: '2',
+          label: 'Bravo Zulu'
+        }, {
+          id: 3,
+          objId: 'chaz',
+          name: 'Charlie',
+          value: 'chaz',
+          label: 'Charlie'
+        }]);
+      });
     });
   });
 });

package/dist/utils/Data/setupRefDataUrlForComponent.js

@@ -7,19 +7,49 @@ exports.default = void 0;
 
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
+var _models = require("../../models");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+var setupRefDataForContainer = function setupRefDataForContainer(container, data) {
+  return _objectSpread(_objectSpread({}, container), {}, {
+    components: setupRefDataUrlForComponents(container.components, data)
+  });
+};
+
+var setupRefDataForCollection = function setupRefDataForCollection(collection, data) {
+  return _objectSpread(_objectSpread({}, collection), {}, {
+    item: setupRefDataUrlForComponents(collection.item, data)
+  });
+};
+
+var setupRefDataUrlForComponents = function setupRefDataUrlForComponents(components, data) {
+  return components.map(function (component) {
+    return setupRefDataUrlForComponent(component, data);
+  });
+};
+
 var setupRefDataUrlForComponent = function setupRefDataUrlForComponent(component, data) {
-  if (component && component.data && component.data.url) {
-    return _objectSpread(_objectSpread({}, component), {}, {
-      data: _objectSpread(_objectSpread({}, component.data), {}, {
-        url: _copReactComponents.Utils.interpolateString(component.data.url, data)
-      })
-    });
+  if (component) {
+    if (component.type === _models.ComponentTypes.CONTAINER) {
+      return setupRefDataForContainer(component, data);
+    }
+
+    if (component.type === _models.ComponentTypes.COLLECTION) {
+      return setupRefDataForCollection(component, data);
+    }
+
+    if (component.data && component.data.url) {
+      return _objectSpread(_objectSpread({}, component), {}, {
+        data: _objectSpread(_objectSpread({}, component.data), {}, {
+          url: _copReactComponents.Utils.interpolateString(component.data.url, data)
+        })
+      });
+    }
   }
 
   return component;

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

@@ -1,5 +1,7 @@
 "use strict";
 
+var _models = require("../../models");
+
 var _setupRefDataUrlForComponent = _interopRequireDefault(require("./setupRefDataUrlForComponent"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -34,7 +36,7 @@ describe('utils', function () {
         };
         expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual(COMPONENT);
       });
-      it('should appropriately updates the component URL', function () {
+      it('should appropriately update the component URL', function () {
         var COMPONENT = {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
@@ -78,6 +80,54 @@ describe('utils', function () {
           }
         });
       });
+      it('should appropriately update the component URLs within a container', function () {
+        var COMPONENT = {
+          id: 'component',
+          // eslint-disable-next-line no-template-curly-in-string
+          data: {
+            url: '${urls.refData}/v1/teams'
+          }
+        };
+        var CONTAINER = {
+          id: 'container',
+          type: _models.ComponentTypes.CONTAINER,
+          components: [COMPONENT]
+        };
+        expect((0, _setupRefDataUrlForComponent.default)(CONTAINER, DATA)).toEqual({
+          id: CONTAINER.id,
+          type: CONTAINER.type,
+          components: [{
+            id: COMPONENT.id,
+            data: {
+              url: "".concat(DATA.urls.refData, "/v1/teams")
+            }
+          }]
+        });
+      });
+      it('should appropriately update the component URLs within a collection', function () {
+        var COMPONENT = {
+          id: 'component',
+          // eslint-disable-next-line no-template-curly-in-string
+          data: {
+            url: '${urls.refData}/v1/teams'
+          }
+        };
+        var COLLECTION = {
+          id: 'container',
+          type: _models.ComponentTypes.COLLECTION,
+          item: [COMPONENT]
+        };
+        expect((0, _setupRefDataUrlForComponent.default)(COLLECTION, DATA)).toEqual({
+          id: COLLECTION.id,
+          type: COLLECTION.type,
+          item: [{
+            id: COMPONENT.id,
+            data: {
+              url: "".concat(DATA.urls.refData, "/v1/teams")
+            }
+          }]
+        });
+      });
     });
   });
 });

package/dist/utils/FormPage/getFormPage.js

@@ -48,7 +48,7 @@ var getFormPage = function getFormPage(pageOptions, formComponents, formData) {
       ret = _objectSpread({}, componentOptions);
     }
 
-    return formData && formData.urls ? _Data.default.refData.setupUrl(ret, formData) : ret;
+    return formData ? _Data.default.refData.setupUrl(ret, formData) : ret;
   });
   var actions = (0, _getPageActions.default)(pageOptions);
   return _Container.default.setup(_objectSpread(_objectSpread({}, pageOptions), {}, {

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

@@ -194,7 +194,7 @@ describe('utils', function () {
             cya_label: C.label,
             full_path: C.fieldId,
             data: {
-              url: '${urls.refData}/v3/charlies'
+              url: '/v3/charlies'
             }
           })],
           formData: {}

package/package.json

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