@ukhomeoffice/cop-react-form-renderer 1.0.0-beta → 1.0.0-delta

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -13,12 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _models = require("../../models");
-
 var _utils = _interopRequireDefault(require("../../utils"));
 
-var _PageActions = _interopRequireDefault(require("../PageActions"));
-
 var _SummaryList = _interopRequireDefault(require("../SummaryList"));
 
 var _Answer = _interopRequireDefault(require("./Answer"));
@@ -59,24 +55,17 @@ exports.DEFAULT_MARGIN_BOTTOM = DEFAULT_MARGIN_BOTTOM;
 var CheckYourAnswers = function CheckYourAnswers(_ref) {
   var title = _ref.title,
       _pages = _ref.pages,
-      _onAction = _ref.onAction,
-      onRowAction = _ref.onRowAction,
       hide_page_titles = _ref.hide_page_titles,
-      hide_actions = _ref.hide_actions;
+      onAction = _ref.onAction;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
       pages = _useState2[0],
       setPages = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      errors = _useState4[0],
-      setErrors = _useState4[1];
-
   (0, _react.useEffect)(function () {
     var getRows = function getRows(page, pageIndex) {
-      var rows = _utils.default.CheckYourAnswers.getRows(page, onRowAction);
+      var rows = _utils.default.CheckYourAnswers.getRows(page, onAction);
 
       return rows.map(function (row, index) {
         return _objectSpread(_objectSpread({}, row), {}, {
@@ -97,24 +86,18 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
     }).filter(function (p) {
       return !!p;
     }));
-  }, [_pages, onRowAction, setPages]);
+  }, [_pages, onAction, setPages]);
   var listMarginBottom = hide_page_titles ? 0 : DEFAULT_MARGIN_BOTTOM;
 
   var isLastPage = function isLastPage(index) {
     return index === pages.length - 1;
   };
 
-  var onError = function onError(errors) {
-    setErrors(errors);
-  };
-
   return /*#__PURE__*/_react.default.createElement("div", {
     className: DEFAULT_CLASS
   }, title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, {
     key: "heading"
-  }, title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
-    errors: errors
-  }), pages && pages.map(function (page, pageIndex) {
+  }, title), pages && pages.map(function (page, pageIndex) {
     var pageMarginBottom = isLastPage(pageIndex) ? DEFAULT_MARGIN_BOTTOM : listMarginBottom;
     var className = "govuk-!-margin-bottom-".concat(pageMarginBottom);
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
@@ -123,26 +106,17 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
       className: className,
       rows: page.rows
     }));
-  }), !hide_actions && /*#__PURE__*/_react.default.createElement(_PageActions.default, {
-    actions: [_models.PageAction.TYPES.SUBMIT],
-    onAction: function onAction(action) {
-      return _onAction(action, onError);
-    }
   }));
 };
 
 CheckYourAnswers.propTypes = {
   title: _propTypes.default.string.isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
-  onAction: _propTypes.default.func.isRequired,
-  onRowAction: _propTypes.default.func.isRequired,
-  hide_page_titles: _propTypes.default.bool,
-  hide_actions: _propTypes.default.bool
+  hide_page_titles: _propTypes.default.bool
 };
 CheckYourAnswers.defaultProps = {
   title: DEFAULT_TITLE,
-  hide_page_titles: false,
-  hide_actions: false
+  hide_page_titles: false
 };
 var _default = CheckYourAnswers;
 exports.default = _default;

package/dist/components/CheckYourAnswers/CheckYourAnswers.stories.mdx

@@ -24,19 +24,19 @@ Renders the **Check your answers** screen for a form.
   <Story name="Default" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -67,19 +67,19 @@ Renders the **Check your answers** screen for a form.
   <Story name="No page titles" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS

package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js

@@ -62,36 +62,26 @@ describe('components', function () {
 
     var PAGES = _utils.default.FormPage.getAll(_userProfile.default.pages, _userProfile.default.components, _objectSpread({}, DATA));
 
-    var ON_ROW_ACTION_CALLS = [];
-
-    var ON_ROW_ACTION = function ON_ROW_ACTION(row) {
-      ON_ROW_ACTION_CALLS.push(row);
-    };
-
     var ON_ACTION_CALLS = [];
 
-    var ON_ACTION = function ON_ACTION(action, onError) {
-      ON_ACTION_CALLS.push({
-        action: action,
-        onError: onError
-      });
+    var ON_ACTION = function ON_ACTION(row) {
+      ON_ACTION_CALLS.push(row);
     };
 
     var container = null;
 
     var refDataUrl = function refDataUrl(suffix) {
-      return "".concat(_userProfileData.default.environmentContext.referenceDataUrl, "/").concat(suffix);
+      return "".concat(_userProfileData.default.urls.refData, "/").concat(suffix);
     };
 
     beforeEach(function () {
-      ON_ROW_ACTION_CALLS.length = 0;
       ON_ACTION_CALLS.length = 0;
       container = document.createElement('div');
       document.body.appendChild(container);
       mockAxios.reset();
-      mockAxios.onGet(refDataUrl('v2/entities/areYouACivilServant')).reply(200, _areYouACivilServant.default);
-      mockAxios.onGet(refDataUrl('v2/entities/grade')).reply(200, _grade.default);
-      mockAxios.onGet(refDataUrl('v1/entities/team')).reply(200, _team.default);
+      mockAxios.onGet(refDataUrl('areYouACivilServant')).reply(200, _areYouACivilServant.default);
+      mockAxios.onGet(refDataUrl('grade')).reply(200, _grade.default);
+      mockAxios.onGet(refDataUrl('team')).reply(200, _team.default);
     });
     afterEach(function () {
       (0, _reactDom.unmountComponentAtNode)(container);
@@ -131,7 +121,6 @@ describe('components', function () {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
                           pages: PAGES,
-                          onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION
                         }), container);
 
@@ -172,7 +161,6 @@ describe('components', function () {
                         (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
                           title: TITLE,
                           pages: PAGES,
-                          onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION
                         }), container);
 
@@ -212,7 +200,6 @@ describe('components', function () {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
                           pages: PAGES,
-                          onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION
                         }), container);
 
@@ -255,7 +242,6 @@ describe('components', function () {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
                           pages: PAGES,
-                          onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION
                         }), container);
 
@@ -298,7 +284,6 @@ describe('components', function () {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
                           pages: PAGES,
-                          onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION,
                           hide_page_titles: true
                         }), container);

package/dist/components/FormComponent/FormComponent.stories.mdx

@@ -24,19 +24,19 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
   <Story name="Default" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -47,7 +47,7 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
       const COMPONENT = {
         ...USER_PROFILE.components.find(c => c.id === 'areYouACivilServant'),
         data: {
-          url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`
+          url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`
         }
       };
       const ON_CHANGE = ({ target }) => {
@@ -71,19 +71,19 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
   <Story name="Autocomplete" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -94,7 +94,7 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
       const COMPONENT = {
         ...USER_PROFILE.components.find(c => c.id === 'team'),
         data: {
-          url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`
+          url: `${USER_PROFILE_DATA.urls.refData}/team`
         }
       };
       const ON_CHANGE = ({ target }) => {
@@ -128,19 +128,19 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
   <Story name="Unwrapped autocomplete" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -153,7 +153,7 @@ on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configu
         id: 'team2',
         fieldId: 'team2',
         data: {
-          url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`
+          url: `${USER_PROFILE_DATA.urls.refData}/team`
         }
       };
       const ON_CHANGE = ({ target }) => {

package/dist/components/FormPage/FormPage.stories.mdx

@@ -25,19 +25,19 @@ on the basis of a <Link href="/?path=/docs/f-json-page">JSON</Link> configuratio
   <Story name="Default" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -68,19 +68,19 @@ on the basis of a <Link href="/?path=/docs/f-json-page">JSON</Link> configuratio
   <Story name="With autocomplete" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS

package/dist/components/FormRenderer/FormRenderer.js

@@ -154,12 +154,7 @@ var FormRenderer = function FormRenderer(_ref) {
         } // Now submit the data to the backend...
 
 
-        hooks.onSubmit(action.type, submissionData, function (response) {
-          // The backend response may well contain data we need so apply it.
-          setData(function (prev) {
-            return _objectSpread(_objectSpread({}, prev), response);
-          });
-
+        hooks.onSubmit(action.type, submissionData, function () {
           var nextPageId = _helpers.default.getNextPageId(type, pages, pageId, action);
 
           onPageChange(nextPageId);
@@ -171,31 +166,8 @@ var FormRenderer = function FormRenderer(_ref) {
   }; // Handle navigation from "Check your answers".
 
 
-  var onCYARowAction = function onCYARowAction(page) {
+  var onCYAAction = function onCYAAction(page) {
     _handlers.default.cyaAction(page, pageId, onPageChange);
-  }; // Handle actions from "Check your answers".
-
-
-  var onCYAAction = function onCYAAction(action, onError) {
-    // Check to see whether the action is able to proceed, which in
-    // in the case of a submission will validate the fields in the page.
-    if (action.type === _models.PageAction.TYPES.SUBMIT) {
-      if (_helpers.default.canCYASubmit(pages, onError)) {
-        // Submit.
-        var submissionData = _utils.default.Format.form({
-          pages: pages,
-          components: components
-        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
-
-        setData(submissionData); // Now submit the data to the backend...
-
-        hooks.onSubmit(action.type, submissionData, function () {
-          hooks.onFormComplete();
-        }, function (errors) {
-          _handlers.default.submissionError(errors, onError);
-        });
-      }
-    }
   };
 
   var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
@@ -205,8 +177,7 @@ var FormRenderer = function FormRenderer(_ref) {
   }, title && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: pages
   }, cya, formState.cya, {
-    onAction: onCYAAction,
-    onRowAction: onCYARowAction
+    onAction: onCYAAction
   })), formState.page && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: formState.page,
     onAction: onPageAction

package/dist/components/FormRenderer/FormRenderer.stories.mdx

@@ -1,7 +1,6 @@
 <!-- Global imports -->
 import { ArgsTable, Canvas, Meta, Story } from '@storybook/addon-docs';
-import { Button, Details, Heading, Link, Panel } from '@ukhomeoffice/cop-react-components';
-import { useState } from 'react';
+import { Details, Heading, Link } from '@ukhomeoffice/cop-react-components';
 import withMock from 'storybook-addon-mock';
 
 <!-- Local imports -->
@@ -10,11 +9,11 @@ import FormRenderer from './FormRenderer';
 
 <!-- JSON documents -->
 import CIVIL_SERVANT from '../../json/areYouACivilServant.json';
-import FIRST_FORM from '../../json/firstForm.json';
 import GRADE from '../../json/grade.json';
 import TEAMS from '../../json/team.json';
 import USER_PROFILE_DATA from '../../json/userProfile.data.json';
 import USER_PROFILE from '../../json/userProfile.json';
+import SAVE_AND_CONTINUE from '../../json/saveAndContinue.json';
 
 <Meta title="Components/Form renderer" id="D-FormRenderer" component={ FormRenderer } decorators={[withMock]} />
 
@@ -27,19 +26,19 @@ on the basis of a <Link href="/?path=/docs/f-json-form">JSON</Link> that describ
   <Story name="Default" parameters={{
     mockData: [
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/areYouACivilServant`,
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
         method: 'GET',
         status: 200,
         response: CIVIL_SERVANT
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v2/entities/grade`,
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
         method: 'GET',
         status: 200,
         response: GRADE
       },
       {
-        url: `${USER_PROFILE_DATA.environmentContext.referenceDataUrl}/v1/entities/team`,
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
         method: 'GET',
         status: 200,
         response: TEAMS
@@ -58,13 +57,11 @@ on the basis of a <Link href="/?path=/docs/f-json-form">JSON</Link> that describ
   <ArgsTable of={ FormRenderer } />
 </Details>
 
-## CYA type
+## Custom hooks
 
 <Canvas>
-  <Story name="CYA">
+  <Story name="Save and continue">
     {() => {
-      const [complete, setComplete] = useState(false);
-      const [returnLater, setReturnLater] = useState(false);
       addHook('onRequest', (req) => {
         // Do whatever you need to do to the request in here, such as adding an Authorization header.
         console.log('onRequest hook called');
@@ -73,42 +70,20 @@ on the basis of a <Link href="/?path=/docs/f-json-form">JSON</Link> that describ
       addHook('onFormLoad', () => {
         console.log('onFormLoad called');
       });
-      addHook('onFormComplete', () => {
-        console.log('onFormComplete called');
-        setComplete(true);
-      });
       addHook('onPageChange', (pageId) => {
         console.log('onPageChange called', pageId);
-        setReturnLater(!!pageId === false);
       });
+      
+      /**
+       * In whatever consumes this, do it as:
+       *   intercepts.add('onSubmit', (...) => { ... })
+       */
       addHook('onSubmit', (type, payload, onSuccess, onError) => {
         console.log('onSubmit called of type', type, 'called, with the payload', payload);
         onSuccess();
       });
-      const reset = () => {
-        setComplete(false);
-        setReturnLater(false);
-      };
       return (
-        <>
-        {!complete && !returnLater && <FormRenderer {...FIRST_FORM} data={{}} />}
-        {complete &&
-          <div>
-            <Panel title="Submission successful">
-              Your submission was successful.
-            </Panel>
-            <Button onClick={() => reset()}>Start again</Button>
-          </div>
-        }
-        {!complete && returnLater &&
-          <div>
-            <Panel title="Saved to return later">
-              You clicked on "Save and return later".
-            </Panel>
-            <Button onClick={() => reset()}>Start again</Button>
-          </div>
-        }
-        </>
+        <FormRenderer {...SAVE_AND_CONTINUE} data={{}} />
       );
     }}
   </Story>

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

@@ -2,24 +2,18 @@
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var _react = require("@testing-library/react");
-
 var _axios = _interopRequireDefault(require("axios"));
 
 var _axiosMockAdapter = _interopRequireDefault(require("axios-mock-adapter"));
 
-var _react2 = _interopRequireDefault(require("react"));
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
 
 var _reactDom = require("react-dom");
 
 var _testUtils = require("react-dom/test-utils");
 
-var _models = require("../../models");
-
-var _CheckYourAnswers = require("../CheckYourAnswers/CheckYourAnswers");
-
-var _FormRenderer = _interopRequireWildcard(require("./FormRenderer"));
-
 var _areYouACivilServant = _interopRequireDefault(require("../../json/areYouACivilServant.json"));
 
 var _grade = _interopRequireDefault(require("../../json/grade.json"));
@@ -30,6 +24,10 @@ var _userProfileData = _interopRequireDefault(require("../../json/userProfile.da
 
 var _userProfile = _interopRequireDefault(require("../../json/userProfile.json"));
 
+var _FormRenderer = _interopRequireWildcard(require("./FormRenderer"));
+
+var _CheckYourAnswers = require("../CheckYourAnswers/CheckYourAnswers");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -60,16 +58,16 @@ describe('components', function () {
     var container = null;
 
     var refDataUrl = function refDataUrl(suffix) {
-      return "".concat(_userProfileData.default.environmentContext.referenceDataUrl, "/").concat(suffix);
+      return "".concat(_userProfileData.default.urls.refData, "/").concat(suffix);
     };
 
     beforeEach(function () {
       container = document.createElement('div');
       document.body.appendChild(container);
       mockAxios.reset();
-      mockAxios.onGet(refDataUrl('v2/entities/areYouACivilServant')).reply(200, _areYouACivilServant.default);
-      mockAxios.onGet(refDataUrl('v2/entities/grade')).reply(200, _grade.default);
-      mockAxios.onGet(refDataUrl('v1/entities/team')).reply(200, _team.default);
+      mockAxios.onGet(refDataUrl('areYouACivilServant')).reply(200, _areYouACivilServant.default);
+      mockAxios.onGet(refDataUrl('grade')).reply(200, _grade.default);
+      mockAxios.onGet(refDataUrl('team')).reply(200, _team.default);
     });
     afterEach(function () {
       (0, _reactDom.unmountComponentAtNode)(container);
@@ -107,7 +105,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default
                         })), container);
 
@@ -158,7 +156,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context3.prev = _context3.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
@@ -203,7 +201,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
@@ -224,7 +222,7 @@ describe('components', function () {
               link = getChangeLink(civilServantList);
               expect(ON_PAGE_CHANGE_CALLS.length).toEqual(0);
 
-              _react.fireEvent.click(link, {});
+              _react2.fireEvent.click(link, {});
 
               expect(ON_PAGE_CHANGE_CALLS.length).toEqual(1);
               expect(ON_PAGE_CHANGE_CALLS[0]).toEqual(_userProfile.default.pages[1].id); // The form layout should have changed to the current page.
@@ -271,7 +269,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context7.prev = _context7.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
@@ -292,17 +290,17 @@ describe('components', function () {
               _hub$childNodes2 = _slicedToArray(hub.childNodes, 3), civilServantList = _hub$childNodes2[2];
               link = getChangeLink(civilServantList);
 
-              _react.fireEvent.click(link, {}); // Should already be answered "Yes", so simply click "Continue".
+              _react2.fireEvent.click(link, {}); // Should already be answered "Yes", so simply click "Continue".
 
 
               page = form.childNodes[0];
               continueButton = getContinueButton(page);
               expect(ON_SUBMIT_CALLS.length).toEqual(0);
 
-              _react.fireEvent.click(continueButton, {});
+              _react2.fireEvent.click(continueButton, {});
 
               expect(ON_SUBMIT_CALLS.length).toEqual(1);
-              expect(ON_SUBMIT_CALLS[0].type).toEqual(_models.PageAction.TYPES.SUBMIT);
+              expect(ON_SUBMIT_CALLS[0].type).toEqual('submit');
               expect(ON_SUBMIT_CALLS[0].payload.areYouACivilServant).toEqual('yes'); // And we should be back on the hub.
 
               expect(form.childNodes.length).toEqual(2); // Title + Hub page (= CYA)
@@ -349,7 +347,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context9.prev = _context9.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
@@ -370,17 +368,17 @@ describe('components', function () {
               _hub$childNodes3 = _slicedToArray(hub.childNodes, 3), civilServantList = _hub$childNodes3[2];
               link = getChangeLink(civilServantList);
 
-              _react.fireEvent.click(link, {}); // Should already be answered "Yes", so simply click "Continue".
+              _react2.fireEvent.click(link, {}); // Should already be answered "Yes", so simply click "Continue".
 
 
               page = form.childNodes[0];
               continueButton = getContinueButton(page);
               expect(ON_SUBMIT_CALLS.length).toEqual(0);
 
-              _react.fireEvent.click(continueButton, {});
+              _react2.fireEvent.click(continueButton, {});
 
               expect(ON_SUBMIT_CALLS.length).toEqual(1);
-              expect(ON_SUBMIT_CALLS[0].type).toEqual(_models.PageAction.TYPES.SUBMIT);
+              expect(ON_SUBMIT_CALLS[0].type).toEqual('submit');
               expect(ON_SUBMIT_CALLS[0].payload.areYouACivilServant).toEqual('yes'); // And we should be kept on the same page.
 
               expect(form.childNodes.length).toEqual(1); // Just the page.
@@ -418,7 +416,7 @@ describe('components', function () {
                   while (1) {
                     switch (_context11.prev = _context11.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
@@ -440,7 +438,7 @@ describe('components', function () {
               link = getChangeLink(lineManagerList);
               expect(ON_PAGE_CHANGE_CALLS.length).toEqual(0);
 
-              _react.fireEvent.click(link, {});
+              _react2.fireEvent.click(link, {});
 
               expect(ON_PAGE_CHANGE_CALLS[0]).toEqual(_userProfile.default.pages[4].id); // Should be on the page explaining what changing the line manager means.
 
@@ -452,7 +450,7 @@ describe('components', function () {
               continueButton = getContinueButton(page);
               expect(ON_PAGE_CHANGE_CALLS.length).toEqual(1);
 
-              _react.fireEvent.click(continueButton, {});
+              _react2.fireEvent.click(continueButton, {});
 
               expect(ON_PAGE_CHANGE_CALLS.length).toEqual(2);
               expect(ON_PAGE_CHANGE_CALLS[1]).toEqual(_userProfile.default.pages[5].id);

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

@@ -203,12 +203,12 @@ describe('utils', function () {
         // and data calculated for the fields, based on that source data.
 
         expect(RESULT).toEqual(_objectSpread(_objectSpread({}, _userProfileData.default), {}, {
-          firstName: _userProfileData.default.keycloakContext.givenName,
-          surname: _userProfileData.default.keycloakContext.familyName,
-          team: _userProfileData.default.staffDetailsDataContext.defaultteam,
-          staffGradeId: _userProfileData.default.staffDetailsDataContext.gradeid,
-          linemanagerEmail: _userProfileData.default.extendedStaffDetailsContext.linemanagerEmail,
-          delegateEmails: _userProfileData.default.extendedStaffDetailsContext.delegateEmails
+          firstName: _userProfileData.default.currentUser.givenName,
+          surname: _userProfileData.default.currentUser.familyName,
+          team: _userProfileData.default.userDetails.defaultteam,
+          staffGradeId: _userProfileData.default.userDetails.gradeid,
+          linemanagerEmail: _userProfileData.default.userDetails.linemanagerEmail,
+          delegateEmails: _userProfileData.default.userDetails.delegateEmails
         }));
       });
     });

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

@@ -9,7 +9,7 @@ describe('utils', function () {
   describe('Data', function () {
     describe('setupRefDataUrlForComponent', function () {
       var DATA = {
-        environmentContext: {
+        urls: {
           refData: '/ref-data'
         }
       };
@@ -39,13 +39,13 @@ describe('utils', function () {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
-            url: '${environmentContext.refData}/v1/teams'
+            url: '${urls.refData}/v1/teams'
           }
         };
         expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual({
           id: COMPONENT.id,
           data: {
-            url: "".concat(DATA.environmentContext.refData, "/v1/teams")
+            url: "".concat(DATA.urls.refData, "/v1/teams")
           }
         });
       });
@@ -68,7 +68,7 @@ describe('utils', function () {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
-            url: '${environmentContext.referenceData}/v1/teams'
+            url: '${urls.referenceData}/v1/teams'
           }
         };
         expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual({

package/dist/utils/FormPage/getFormPage.js

@@ -44,7 +44,7 @@ var getFormPage = function getFormPage(pageOptions, formComponents, formData) {
       ret = _objectSpread({}, componentOptions);
     }
 
-    return formData && formData.environmentContext ? _Data.default.refData.setupUrl(ret, formData) : ret;
+    return formData && formData.urls ? _Data.default.refData.setupUrl(ret, formData) : ret;
   });
   return _objectSpread(_objectSpread({}, pageOptions), {}, {
     formData: formData,

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

@@ -30,11 +30,11 @@ describe('utils', function () {
         label: 'Charlie',
         type: 'radios',
         data: {
-          url: '${environmentContext.refData}/v3/charlies'
+          url: '${urls.refData}/v3/charlies'
         }
       }];
       var FORM_DATA = {
-        environmentContext: {
+        urls: {
           refData: 'https://ho.gov.uk/ref-data/'
         }
       };
@@ -137,7 +137,7 @@ describe('utils', function () {
           }, C), {}, {
             cya_label: C.label,
             data: {
-              url: "".concat(FORM_DATA.environmentContext.refData, "/v3/charlies")
+              url: "".concat(FORM_DATA.urls.refData, "/v3/charlies")
             }
           })],
           formData: FORM_DATA

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

@@ -30,11 +30,11 @@ describe('utils', function () {
         label: 'Charlie',
         type: 'radios',
         data: {
-          url: '${environmentContext.refData}/v3/charlies'
+          url: '${urls.refData}/v3/charlies'
         }
       }];
       var FORM_DATA = {
-        environmentContext: {
+        urls: {
           refData: 'https://ho.gov.uk/ref-data/'
         }
       };
@@ -84,7 +84,7 @@ describe('utils', function () {
           }, C), {}, {
             cya_label: C.label,
             data: {
-              url: "".concat(FORM_DATA.environmentContext.refData, "/v3/charlies")
+              url: "".concat(FORM_DATA.urls.refData, "/v3/charlies")
             }
           })],
           formData: FORM_DATA

package/dist/utils/Hub/getFormHub.test.js

@@ -32,11 +32,11 @@ describe('utils', function () {
         label: 'Charlie',
         type: 'radios',
         data: {
-          url: '${environmentContext.refData}/v3/charlies'
+          url: '${urls.refData}/v3/charlies'
         }
       }];
       var FORM_DATA = {
-        environmentContext: {
+        urls: {
           refData: 'https://ho.gov.uk/ref-data/'
         }
       };

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-delta",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
     "test": "react-scripts test",
+    "test:coverage": "yarn test --coverage --watchAll=false",
     "lint": "eslint --ext .js,.jsx src",
-    "storybook:start": "start-storybook --docs --no-manager-cache -p 6007",
+    "storybook:start": "start-storybook --docs -s src/assets --no-manager-cache -p 6007",
     "storybook:build": "build-storybook --docs -s src/assets",
     "storybook:deploy": "yarn deploy-storybook",
     "storybook": "yarn storybook:start",
     "deploy-storybook": "storybook-to-ghpages -e storybook-static",
     "compile": "yarn clean && cross-env NODE_ENV=production babel src --out-dir dist --copy-files && yarn post-compile",
-    "post-compile": "rimraf dist/**/*.test.* dist/**/*.stories.* dist/json dist/assets"
+    "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/json dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "^0.6.0",
+    "@ukhomeoffice/cop-react-components": "^0.6.1",
     "axios": "^0.21.1",
     "govuk-frontend": "^3.13.0",
     "web-vitals": "^1.0.1"
@@ -44,14 +45,14 @@
     "cross-env": "^7.0.3",
     "html-react-parser": "^0.10.5",
     "node-sass": "^6.0.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-scripts": "4.0.3",
     "storybook-addon-mock": "^2.0.1"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-scripts": "4.0.3"
   },
   "optionalDependencies": {

package/dist/index.test.js

@@ -1,18 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-var _ = _interopRequireWildcard(require("."));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-// Local imports
-it('should have exported everything appropriately', function () {
-  expect(_.default).toBeDefined();
-  expect(_.FormTypes).toBeDefined();
-  expect(_.HubFormats).toBeDefined();
-  expect(_.intercepts).toBeDefined();
-  expect(_.Utils).toBeDefined();
-});