@ukhomeoffice/cop-react-form-renderer 6.14.12-alpha-b → 6.15.0-hotfix

package/dist/hooks/useGetRequest.js

@@ -8,10 +8,6 @@ var _axios = _interopRequireDefault(require("axios"));
 var _react = require("react");
 var _useAxios = _interopRequireDefault(require("./useAxios"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// Global imports
-
-// Local imports
-
 // Caches for responses and errors.
 const cache = {};
 const errorCache = {};
@@ -31,15 +27,18 @@ const STATUS_IDLE = exports.STATUS_IDLE = 'idle';
 const STATUS_FETCHING = exports.STATUS_FETCHING = 'fetching';
 const STATUS_FETCHED = exports.STATUS_FETCHED = 'fetched';
 const STATUS_ERROR = exports.STATUS_ERROR = 'error';
-const useGetRequest = url => {
+const useGetRequest = function (url) {
+  let caching = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   const axiosInstance = (0, _useAxios.default)();
-  const cancelToken = _axios.default.CancelToken.source();
-  const cancelRequests = () => {
-    if (cancelToken) cancelToken.cancel();
-  };
+  const cancelTokenRef = (0, _react.useRef)(_axios.default.CancelToken.source());
   const [status, setStatus] = (0, _react.useState)(STATUS_IDLE);
   const [error, setError] = (0, _react.useState)(null);
   const [data, setData] = (0, _react.useState)(null);
+  const cancelRequests = () => {
+    if (cancelTokenRef.current) {
+      cancelTokenRef.current.cancel();
+    }
+  };
   (0, _react.useEffect)(() => {
     if (!url || !axiosInstance) return;
     const fetchData = async () => {
@@ -47,9 +46,9 @@ const useGetRequest = url => {
         setError(null);
         setStatus(STATUS_FETCHING);
         let fetchedData;
-        if (cache[url]) {
+        if (caching && cache[url]) {
           fetchedData = cache[url];
-        } else if (errorCache[url]) {
+        } else if (caching && errorCache[url]) {
           /**
            * This logic is intended to stop multiple requests being made in succession
            * that all fail. Presently, this will only allow the first request to be
@@ -60,24 +59,25 @@ const useGetRequest = url => {
           throw errorCache[url];
         } else {
           const response = await axiosInstance.get(url, {
-            cancelToken: cancelToken.token
+            cancelToken: cancelTokenRef.current.token
           }).catch(e => {
+            setError(e);
             throw e;
           });
           fetchedData = response.data;
-          cache[url] = fetchedData;
+          if (caching) cache[url] = fetchedData;
         }
         setData(fetchedData);
         setStatus(STATUS_FETCHED);
       } catch (e) {
-        errorCache[url] = e;
+        if (caching) errorCache[url] = e;
         setError(e);
         setData(null);
         setStatus(STATUS_ERROR);
       }
     };
     fetchData();
-  }, [axiosInstance, url, cancelToken.token]);
+  }, [axiosInstance, url, caching]);
   return {
     status,
     error,

package/dist/hooks/useRefData.js

@@ -28,13 +28,14 @@ const getRefDataUrl = component => {
   return undefined;
 };
 const useRefData = (component, formData) => {
+  var _component$data;
   const url = getRefDataUrl(_objectSpread(_objectSpread({}, component), {}, {
     formData
   }));
   const {
     status: _status,
     data: _data
-  } = (0, _useGetRequest.default)(url);
+  } = (0, _useGetRequest.default)(url, component === null || component === void 0 || (_component$data = component.data) === null || _component$data === void 0 ? void 0 : _component$data.useCache);
   const [data, setData] = (0, _react.useState)([]);
   const [status, setStatus] = (0, _react.useState)(STATUS_LOADING);
   (0, _react.useEffect)(() => {
@@ -52,7 +53,7 @@ const useRefData = (component, formData) => {
       setData([]);
       setStatus(STATUS_COMPLETE);
     }
-  }, [component, _status, _data, url, setData, setStatus]);
+  }, [component.id, _status, _data, url]);
   return {
     data,
     status

package/dist/utils/CollectionPage/getQuickEditPage.js

@@ -8,8 +8,8 @@ var _meetsAllConditions = _interopRequireDefault(require("../Condition/meetsAllC
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
 const _excluded = ["id"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -31,6 +31,7 @@ const createMasterPage = page => ({
   id: page.id,
   name: page.name,
   orderInForm: page.orderInForm,
+  deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
   collection: _objectSpread({
     masterPage: true
   }, page.collection),

package/dist/utils/Component/getComponentTests/getComponent.multifile.test.js

@@ -23,7 +23,8 @@ describe('utils.Component.get', () => {
       fieldId: FIELD_ID,
       label: LABEL,
       onChange: ON_CHANGE,
-      'data-testid': ID
+      'data-testid': ID,
+      allowedTypes: []
     };
     const {
       container

package/dist/utils/Operate/doesContainValue.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Global imports.
+
+// Local imports.
+
+/**
+ * Returns if it can find a value in the form data. supports searching in arrays and objects
+ * @param {object} config The config of the operation.
+ * @param {string} config.target the JPath to the object/array that contains the data we want to checkon
+ * @param {string} config.key the JPath to the field we want to check
+ * @param {string} config.value the value that we want to check the the data against
+ * @param {object} data A page's formData.
+ * @returns The index of the matching value if one exists, or null.
+ */
+const doesContainValue = (config, data) => {
+  const targetPath = _copReactComponents.Utils.interpolateString(config.target, data);
+  const target = (0, _getSourceData.default)(data, targetPath);
+  if (target && Array.isArray(target)) {
+    return target.some(entry => config.key ? (0, _getSourceData.default)(entry, config.key) === config.value : entry === config.value);
+  }
+  if (target && typeof target === "object") {
+    return (0, _getSourceData.default)(target, config.key) === config.value;
+  }
+  return false;
+};
+var _default = exports.default = doesContainValue;

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

@@ -0,0 +1,75 @@
+"use strict";
+
+var _doesContainValue = _interopRequireDefault(require("./doesContainValue"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('doesContainValue', () => {
+  const mockData = {
+    arrayOfValues: ['abc', 'bcd', 'cde', 'def', {
+      root: {
+        branch: 'leaf'
+      }
+    }],
+    cutoffIndex: 1,
+    ignoreIndex: 2,
+    valueToSearchFor: 'cde',
+    targetName: 'arrayOfValues',
+    fieldName: 'valueToSearchFor',
+    cutoffName: 'cutoffIndex',
+    ignoreName: 'ignoreIndex'
+  };
+  test('returns true if value exists in array', () => {
+    const config = {
+      target: 'arrayOfValues',
+      value: 'cde'
+    };
+    const result = (0, _doesContainValue.default)(config, mockData);
+    expect(result).toBe(true);
+  });
+  test('returns false if value does not exist in array', () => {
+    const config = {
+      target: 'arrayOfValues',
+      value: 'xyz'
+    };
+    const result = (0, _doesContainValue.default)(config, mockData);
+    expect(result).toBe(false);
+  });
+  test('returns true if key-value pair matches in array object', () => {
+    const config = {
+      target: 'arrayOfValues',
+      key: 'root.branch',
+      value: 'leaf'
+    };
+    const result = (0, _doesContainValue.default)(config, mockData);
+    expect(result).toBe(true);
+  });
+  test('returns false if key-value pair does not match in array object', () => {
+    const config = {
+      target: 'arrayOfValues',
+      key: 'root.branch',
+      value: 'notLeaf'
+    };
+    const result = (0, _doesContainValue.default)(config, mockData);
+    expect(result).toBe(false);
+  });
+  test('handles non-array targets gracefully', () => {
+    const config = {
+      target: 'nonExistentTarget',
+      value: 'value'
+    };
+    const result = (0, _doesContainValue.default)(config, mockData);
+    expect(result).toBe(false);
+  });
+  test('handles objects as target correctly', () => {
+    const config = {
+      target: 'objectTarget',
+      key: 'key',
+      value: 'value'
+    };
+    const result = (0, _doesContainValue.default)(config, {
+      objectTarget: {
+        key: 'value'
+      }
+    });
+    expect(result).toBe(true);
+  });
+});

package/dist/utils/Operate/runPageOperations.js

@@ -14,6 +14,7 @@ var _shouldRun = _interopRequireDefault(require("./shouldRun"));
 var _setDataItem = _interopRequireDefault(require("../Data/setDataItem"));
 var _getFirstOf = _interopRequireDefault(require("./getFirstOf"));
 var _getLength = _interopRequireDefault(require("./getLength"));
+var _doesContainValue = _interopRequireDefault(require("./doesContainValue"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Global imports.
 
@@ -22,6 +23,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const functions = {
   checkValueIsTruthy: _checkValueIsTruthy.default,
   getIndexOfMatchingValueIn: _getIndexOfMatchingValueIn.default,
+  doesContainValue: _doesContainValue.default,
   persistValueInFormData: _persistValueInFormData.default,
   setValueInFormData: _setValueInFormData.default,
   deleteValueInFormData: _deleteValueInFormData.default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "6.14.12-alpha-b",
+  "version": "6.15.0-hotfix",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "yalc-publish": "yarn compile-with-maps && cp -r src dist/src && yalc publish --push"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "4.7.12",
+    "@ukhomeoffice/cop-react-components": "4.7.13",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^5.0.0",