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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (91) hide show
  1. package/dist/components/CheckYourAnswers/Answer.js +48 -0
  2. package/dist/components/CheckYourAnswers/Answer.test.js +94 -0
  3. package/dist/components/CheckYourAnswers/CheckYourAnswers.js +64 -19
  4. package/dist/components/CheckYourAnswers/CheckYourAnswers.scss +0 -7
  5. package/dist/components/CheckYourAnswers/CheckYourAnswers.stories.mdx +100 -0
  6. package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js +317 -0
  7. package/dist/components/FormComponent/FormComponent.js +7 -7
  8. package/dist/components/FormComponent/FormComponent.stories.mdx +167 -0
  9. package/dist/components/FormComponent/FormComponent.test.js +137 -0
  10. package/dist/components/FormPage/FormPage.js +12 -11
  11. package/dist/components/FormPage/FormPage.stories.mdx +118 -0
  12. package/dist/components/FormPage/FormPage.test.js +255 -0
  13. package/dist/components/FormRenderer/FormRenderer.js +70 -58
  14. package/dist/components/FormRenderer/FormRenderer.stories.mdx +90 -0
  15. package/dist/components/FormRenderer/FormRenderer.test.js +469 -0
  16. package/dist/components/FormRenderer/handlers/cyaAction.js +28 -0
  17. package/dist/components/FormRenderer/handlers/getPageId.js +28 -0
  18. package/dist/components/FormRenderer/handlers/getPageId.test.js +61 -0
  19. package/dist/components/FormRenderer/handlers/handlers.test.js +97 -0
  20. package/dist/components/FormRenderer/handlers/index.js +23 -0
  21. package/dist/components/FormRenderer/handlers/navigate.js +28 -0
  22. package/dist/components/FormRenderer/handlers/submissionError.js +20 -0
  23. package/dist/components/FormRenderer/helpers/canActionProceed.js +35 -0
  24. package/dist/components/FormRenderer/helpers/canActionProceed.test.js +73 -0
  25. package/dist/components/FormRenderer/helpers/canCYASubmit.js +42 -0
  26. package/dist/components/FormRenderer/helpers/canCYASubmit.test.js +155 -0
  27. package/dist/components/FormRenderer/helpers/getCYA.js +31 -0
  28. package/dist/components/FormRenderer/helpers/getCYA.test.js +38 -0
  29. package/dist/components/FormRenderer/helpers/getFormState.js +32 -0
  30. package/dist/components/FormRenderer/helpers/getFormState.test.js +61 -0
  31. package/dist/components/FormRenderer/helpers/getNextPageId.js +65 -0
  32. package/dist/components/FormRenderer/helpers/getNextPageId.test.js +90 -0
  33. package/dist/components/FormRenderer/helpers/getPage.js +34 -0
  34. package/dist/components/FormRenderer/helpers/getPage.test.js +46 -0
  35. package/dist/components/FormRenderer/helpers/index.js +27 -0
  36. package/dist/components/PageActions/ActionButton.js +58 -0
  37. package/dist/components/PageActions/ActionButton.test.js +116 -0
  38. package/dist/components/PageActions/PageActions.js +18 -25
  39. package/dist/components/PageActions/PageActions.stories.mdx +74 -0
  40. package/dist/components/PageActions/PageActions.test.js +157 -0
  41. package/dist/components/SummaryList/RowAction.js +13 -22
  42. package/dist/components/SummaryList/RowAction.test.js +94 -0
  43. package/dist/components/SummaryList/SummaryList.js +6 -20
  44. package/dist/components/SummaryList/SummaryList.scss +7 -0
  45. package/dist/components/SummaryList/SummaryList.stories.mdx +36 -0
  46. package/dist/components/SummaryList/SummaryList.test.js +197 -0
  47. package/dist/components/SummaryList/helpers/getRowActionAttributes.js +27 -0
  48. package/dist/components/SummaryList/helpers/getRowActionAttributes.test.js +77 -0
  49. package/dist/components/SummaryList/helpers/index.js +15 -0
  50. package/dist/components/index.js +8 -0
  51. package/dist/hooks/useGetRequest.js +16 -1
  52. package/dist/hooks/useHooks.js +16 -5
  53. package/dist/index.js +3 -1
  54. package/dist/models/EventTypes.js +14 -0
  55. package/dist/models/FormPages.js +14 -0
  56. package/dist/models/PageAction.js +40 -0
  57. package/dist/models/index.js +24 -0
  58. package/dist/utils/CheckYourAnswers/getCYAAction.js +9 -0
  59. package/dist/utils/CheckYourAnswers/getCYARow.js +10 -0
  60. package/dist/utils/CheckYourAnswers/getCYARowsForPage.js +9 -0
  61. package/dist/utils/CheckYourAnswers/showComponentCYA.js +6 -5
  62. package/dist/utils/Component/getComponent.js +2 -2
  63. package/dist/utils/Component/getComponent.test.js +1 -1
  64. package/dist/utils/Data/setupFormData.js +3 -3
  65. package/dist/utils/Data/setupFormData.test.js +6 -6
  66. package/dist/utils/Data/setupRefDataUrlForComponent.test.js +4 -4
  67. package/dist/utils/FormPage/getFormPage.js +12 -1
  68. package/dist/utils/FormPage/getFormPage.test.js +178 -0
  69. package/dist/utils/FormPage/getFormPages.js +11 -6
  70. package/dist/utils/FormPage/getFormPages.test.js +95 -0
  71. package/dist/utils/FormPage/getParagraphFromText.js +6 -0
  72. package/dist/utils/FormPage/getParagraphFromText.test.js +29 -0
  73. package/dist/utils/FormPage/useComponent.js +9 -2
  74. package/dist/utils/FormPage/useComponent.test.js +82 -0
  75. package/dist/utils/Format/formatData.js +32 -0
  76. package/dist/utils/Format/formatData.test.js +46 -0
  77. package/dist/utils/Format/formatDataForComponent.js +41 -0
  78. package/dist/utils/Format/formatDataForComponent.test.js +161 -0
  79. package/dist/utils/Format/formatDataForForm.js +33 -0
  80. package/dist/utils/Format/formatDataForForm.test.js +78 -0
  81. package/dist/utils/Format/formatDataForPage.js +37 -0
  82. package/dist/utils/Format/formatDataForPage.test.js +96 -0
  83. package/dist/utils/Format/index.js +26 -0
  84. package/dist/utils/Hub/getFormHub.js +18 -4
  85. package/dist/utils/Hub/getFormHub.test.js +96 -0
  86. package/dist/utils/Hub/index.js +0 -3
  87. package/dist/utils/Validate/validatePage.test.js +1 -1
  88. package/dist/utils/index.js +3 -0
  89. package/package.json +13 -9
  90. package/dist/components/FormRenderer/helpers.js +0 -66
  91. package/dist/components/FormRenderer/helpers.test.js +0 -158
@@ -0,0 +1,77 @@
1
+ "use strict";
2
+
3
+ var _getRowActionAttributes = _interopRequireDefault(require("./getRowActionAttributes"));
4
+
5
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
6
+
7
+ describe('components', function () {
8
+ describe('SummaryList', function () {
9
+ describe('helpers', function () {
10
+ describe('getRowActionAttributes', function () {
11
+ it('should handle a null row', function () {
12
+ expect((0, _getRowActionAttributes.default)(null)).toEqual({});
13
+ });
14
+ it('should handle a row without an action', function () {
15
+ expect((0, _getRowActionAttributes.default)({})).toEqual({});
16
+ });
17
+ it('should handle a row with an empty action', function () {
18
+ var ROW = {
19
+ action: {}
20
+ };
21
+ expect((0, _getRowActionAttributes.default)(ROW)).toEqual({});
22
+ });
23
+ it('should handle a row with an href', function () {
24
+ var HREF = 'http://alpha.homeoffice.gov.uk';
25
+ var ROW = {
26
+ action: {
27
+ href: HREF
28
+ }
29
+ };
30
+ expect((0, _getRowActionAttributes.default)(ROW)).toEqual({
31
+ href: HREF
32
+ });
33
+ });
34
+ it('should handle a row with an onAction function', function () {
35
+ var ON_ACTION_CALLS = [];
36
+
37
+ var ON_ACTION = function ON_ACTION(row) {
38
+ ON_ACTION_CALLS.push(row);
39
+ };
40
+
41
+ var ROW = {
42
+ action: {
43
+ onAction: ON_ACTION
44
+ }
45
+ };
46
+ var ATTRS = (0, _getRowActionAttributes.default)(ROW);
47
+ expect(ATTRS.onClick).toBeDefined();
48
+ expect(ATTRS.href).not.toBeDefined();
49
+ ATTRS.onClick();
50
+ expect(ON_ACTION_CALLS.length).toEqual(1);
51
+ expect(ON_ACTION_CALLS[0]).toEqual(ROW);
52
+ });
53
+ it('should favour onAction over href', function () {
54
+ var ON_ACTION_CALLS = [];
55
+
56
+ var ON_ACTION = function ON_ACTION(row) {
57
+ ON_ACTION_CALLS.push(row);
58
+ };
59
+
60
+ var HREF = 'http://alpha.homeoffice.gov.uk';
61
+ var ROW = {
62
+ action: {
63
+ href: HREF,
64
+ onAction: ON_ACTION
65
+ }
66
+ };
67
+ var ATTRS = (0, _getRowActionAttributes.default)(ROW);
68
+ expect(ATTRS.onClick).toBeDefined();
69
+ expect(ATTRS.href).not.toBeDefined();
70
+ ATTRS.onClick();
71
+ expect(ON_ACTION_CALLS.length).toEqual(1);
72
+ expect(ON_ACTION_CALLS[0]).toEqual(ROW);
73
+ });
74
+ });
75
+ });
76
+ });
77
+ });
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "getRowActionAttributes", {
7
+ enumerable: true,
8
+ get: function get() {
9
+ return _getRowActionAttributes.default;
10
+ }
11
+ });
12
+
13
+ var _getRowActionAttributes = _interopRequireDefault(require("./getRowActionAttributes"));
14
+
15
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -9,6 +9,12 @@ Object.defineProperty(exports, "CheckYourAnswers", {
9
9
  return _CheckYourAnswers.default;
10
10
  }
11
11
  });
12
+ Object.defineProperty(exports, "FormComponent", {
13
+ enumerable: true,
14
+ get: function get() {
15
+ return _FormComponent.default;
16
+ }
17
+ });
12
18
  Object.defineProperty(exports, "FormPage", {
13
19
  enumerable: true,
14
20
  get: function get() {
@@ -24,6 +30,8 @@ Object.defineProperty(exports, "FormRenderer", {
24
30
 
25
31
  var _CheckYourAnswers = _interopRequireDefault(require("./CheckYourAnswers"));
26
32
 
33
+ var _FormComponent = _interopRequireDefault(require("./FormComponent"));
34
+
27
35
  var _FormPage = _interopRequireDefault(require("./FormPage"));
28
36
 
29
37
  var _FormRenderer = _interopRequireDefault(require("./FormRenderer"));
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.default = exports.STATUS_IDLE = exports.STATUS_FETCHING = exports.STATUS_FETCHED = exports.STATUS_ERROR = void 0;
6
+ exports.default = exports.clear = exports.STATUS_IDLE = exports.STATUS_FETCHING = exports.STATUS_FETCHED = exports.STATUS_ERROR = void 0;
7
7
 
8
8
  var _axios = _interopRequireDefault(require("axios"));
9
9
 
@@ -29,8 +29,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
29
29
 
30
30
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
31
31
 
32
+ // Caches for responses and errors.
32
33
  var cache = {};
33
34
  var errorCache = {};
35
+
36
+ var clearCache = function clearCache(cacheObject) {
37
+ var keys = Object.keys(cacheObject);
38
+ keys.forEach(function (key) {
39
+ delete cacheObject[key];
40
+ });
41
+ };
42
+
43
+ var clear = function clear() {
44
+ clearCache(cache);
45
+ clearCache(errorCache);
46
+ };
47
+
48
+ exports.clear = clear;
34
49
  var STATUS_IDLE = 'idle';
35
50
  exports.STATUS_IDLE = STATUS_IDLE;
36
51
  var STATUS_FETCHING = 'fetching';
@@ -3,17 +3,28 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.resetHooks = exports.removeHook = exports.default = exports.addHook = void 0;
7
- var ALLOWED_HOOKS = ['onRequest'];
6
+ exports.resetHooks = exports.removeHook = exports.default = exports.addHook = exports.ALLOWED_HOOKS = void 0;
7
+ var ALLOWED_HOOKS = ['onRequest', 'onFormComplete', 'onFormLoad', 'onPageChange', 'onSubmit'];
8
+ exports.ALLOWED_HOOKS = ALLOWED_HOOKS;
8
9
  var DEFAULT_HOOKS = {
10
+ onFormComplete: function onFormComplete() {},
11
+ onFormLoad: function onFormLoad() {},
12
+ onPageChange: function onPageChange(pageId) {
13
+ return pageId;
14
+ },
9
15
  onRequest: function onRequest(req) {
10
16
  return req;
17
+ },
18
+ onSubmit: function onSubmit(type, payload, onSuccess, onError) {
19
+ if (typeof onSuccess === 'function') onSuccess();
11
20
  }
12
21
  };
13
22
  var hooks = {
14
- onRequest: function onRequest(req) {
15
- return req;
16
- }
23
+ onFormComplete: DEFAULT_HOOKS.onFormComplete,
24
+ onFormLoad: DEFAULT_HOOKS.onFormLoad,
25
+ onPageChange: DEFAULT_HOOKS.onPageChange,
26
+ onRequest: DEFAULT_HOOKS.onRequest,
27
+ onSubmit: DEFAULT_HOOKS.onSubmit
17
28
  };
18
29
 
19
30
  var addHook = function addHook(name, hook) {
package/dist/index.js CHANGED
@@ -41,7 +41,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
41
41
 
42
42
  // Local imports
43
43
  var intercepts = {
44
- add: _useHooks.addHook
44
+ add: _useHooks.addHook,
45
+ remove: _useHooks.removeHook,
46
+ reset: _useHooks.resetHooks
45
47
  };
46
48
  exports.intercepts = intercepts;
47
49
  var _default = _FormRenderer.default;
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var TYPE_BLUR = 'blur';
8
+ var TYPE_SUBMIT = 'submit';
9
+ var EventTypes = {
10
+ BLUR: TYPE_BLUR,
11
+ SUBMIT: TYPE_SUBMIT
12
+ };
13
+ var _default = EventTypes;
14
+ exports.default = _default;
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var PAGE_CYA = 'cya';
8
+ var PAGE_HUB = 'hub';
9
+ var FormPages = {
10
+ CYA: PAGE_CYA,
11
+ HUB: PAGE_HUB
12
+ };
13
+ var _default = FormPages;
14
+ exports.default = _default;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = exports.PageActionTypes = exports.DefaultPageActions = void 0;
7
+
8
+ var _DefaultPageActions;
9
+
10
+ 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; }
11
+
12
+ var TYPE_SUBMIT = 'submit';
13
+ var TYPE_SAVE_AND_CONTINUE = 'saveAndContinue';
14
+ var TYPE_SAVE_AND_RETURN = 'saveAndReturn';
15
+ var PageActionTypes = {
16
+ SUBMIT: TYPE_SUBMIT,
17
+ SAVE_AND_CONTINUE: TYPE_SAVE_AND_CONTINUE,
18
+ SAVE_AND_RETURN: TYPE_SAVE_AND_RETURN
19
+ };
20
+ exports.PageActionTypes = PageActionTypes;
21
+ var DefaultPageActions = (_DefaultPageActions = {}, _defineProperty(_DefaultPageActions, TYPE_SUBMIT, {
22
+ type: TYPE_SUBMIT,
23
+ validate: true
24
+ }), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_CONTINUE, {
25
+ type: TYPE_SAVE_AND_CONTINUE,
26
+ validate: true,
27
+ label: 'Save and continue'
28
+ }), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_RETURN, {
29
+ type: TYPE_SAVE_AND_RETURN,
30
+ validate: false,
31
+ label: 'Save and return later',
32
+ classModifiers: 'secondary'
33
+ }), _DefaultPageActions);
34
+ exports.DefaultPageActions = DefaultPageActions;
35
+ var PageAction = {
36
+ TYPES: PageActionTypes,
37
+ DEFAULTS: DefaultPageActions
38
+ };
39
+ var _default = PageAction;
40
+ exports.default = _default;
@@ -9,6 +9,18 @@ Object.defineProperty(exports, "ComponentTypes", {
9
9
  return _ComponentTypes.default;
10
10
  }
11
11
  });
12
+ Object.defineProperty(exports, "EventTypes", {
13
+ enumerable: true,
14
+ get: function get() {
15
+ return _EventTypes.default;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "FormPages", {
19
+ enumerable: true,
20
+ get: function get() {
21
+ return _FormPages.default;
22
+ }
23
+ });
12
24
  Object.defineProperty(exports, "FormTypes", {
13
25
  enumerable: true,
14
26
  get: function get() {
@@ -21,11 +33,23 @@ Object.defineProperty(exports, "HubFormats", {
21
33
  return _HubFormats.default;
22
34
  }
23
35
  });
36
+ Object.defineProperty(exports, "PageAction", {
37
+ enumerable: true,
38
+ get: function get() {
39
+ return _PageAction.default;
40
+ }
41
+ });
24
42
 
25
43
  var _ComponentTypes = _interopRequireDefault(require("./ComponentTypes"));
26
44
 
45
+ var _EventTypes = _interopRequireDefault(require("./EventTypes"));
46
+
47
+ var _FormPages = _interopRequireDefault(require("./FormPages"));
48
+
27
49
  var _FormTypes = _interopRequireDefault(require("./FormTypes"));
28
50
 
29
51
  var _HubFormats = _interopRequireDefault(require("./HubFormats"));
30
52
 
53
+ var _PageAction = _interopRequireDefault(require("./PageAction"));
54
+
31
55
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -5,6 +5,15 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
+ /**
9
+ * Gets an action object, configured appropriately for a Check your answers component.
10
+ *
11
+ * @param {boolean} readonly Whether or not the component is readonly.
12
+ * @param {object} cya_link A configuration object for any link to show.
13
+ * @param {Function} onAction A function to invoke if the link is clicked.
14
+ *
15
+ * @returns An action object for a Check your answers row.
16
+ */
8
17
  var getCYAAction = function getCYAAction(readonly, cya_link, onAction) {
9
18
  if (readonly !== true && cya_link) {
10
19
  return {
@@ -12,6 +12,16 @@ var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
14
  // Local imports
15
+
16
+ /**
17
+ * Gets a row object, configured appropriately for a Check your answers component.
18
+ *
19
+ * @param {object} page The page to which this component row belongs.
20
+ * @param {object} component The component to render on this row.
21
+ * @param {Function} onAction A function to invoke if the change link is clicked.
22
+ *
23
+ * @returns A configuration object for a Check your answers row.
24
+ */
15
25
  var getCYARow = function getCYARow(page, component, onAction) {
16
26
  return {
17
27
  pageId: page.id,
@@ -12,6 +12,15 @@ var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
14
  // Local imports
15
+
16
+ /**
17
+ * Gets an array of row objects, each configured appropriately for a Check your answers component.
18
+ *
19
+ * @param {object} page The page to show components for.
20
+ * @param {Function} onAction A function to invoke if the change link on any row is clicked.
21
+ *
22
+ * @returns An array of configuration objects for Check your answers rows.
23
+ */
15
24
  var getCYARowsForPage = function getCYARowsForPage(page, onAction) {
16
25
  return page.components.filter(function (c) {
17
26
  return (0, _showComponentCYA.default)(c, page.formData);
@@ -5,20 +5,21 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- var _Component = _interopRequireDefault(require("../Component"));
9
-
10
8
  var _models = require("../../models");
11
9
 
10
+ var _Component = _interopRequireDefault(require("../Component"));
11
+
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
14
  // Local imports
15
15
  var EXCLUDE_FROM_CYA = [_models.ComponentTypes.HEADING, _models.ComponentTypes.HTML, _models.ComponentTypes.INSET_TEXT];
16
16
  /**
17
- * Determines whether a given component should display on the
18
- * Check your answers page.
17
+ * Determines whether a given component should display on the Check your answers screen.
18
+ *
19
19
  * @param {object} options The component options.
20
20
  * @param {object} data The data contained on the form.
21
- * @returns A boolean true, if the component should show; otherwise false.
21
+ *
22
+ * @returns A boolean true if the component should show; otherwise false.
22
23
  */
23
24
 
24
25
  var showComponentCYA = function showComponentCYA(options, data) {
@@ -102,10 +102,10 @@ var getComponentByType = function getComponentByType(config) {
102
102
  };
103
103
 
104
104
  var getComponent = function getComponent(config) {
105
- var noWrap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
105
+ var wrap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
106
106
  var component = getComponentByType(config);
107
107
 
108
- if (component && !noWrap && (0, _isEditable.default)(config)) {
108
+ if (component && wrap && (0, _isEditable.default)(config)) {
109
109
  var attrs = (0, _cleanAttributes.default)(config, ['fieldId', 'displayMenu']);
110
110
  return (0, _wrapInFormGroup.default)(attrs, component);
111
111
  }
@@ -75,7 +75,7 @@ describe('utils', function () {
75
75
 
76
76
  var heading = (0, _react.getByTestId)(container, ID);
77
77
  expect(heading.innerHTML).toContain(CONTENT);
78
- expect(heading.tagName).toEqual('H3');
78
+ expect(heading.tagName).toEqual('H2');
79
79
  expect(heading.classList).toContain("govuk-heading-".concat(SIZE));
80
80
  });
81
81
  it('should return an appropriately rendered inset-text component', function () {
@@ -44,9 +44,9 @@ var setupPageSourceData = function setupPageSourceData(pages, data) {
44
44
  * 2: fieldC: 'value'
45
45
  * In the above example, fieldA will not get a value as fieldB isn't
46
46
  * set until after fieldA is processed.
47
- * @param {*} pages
48
- * @param {*} components
49
- * @param {*} baseData
47
+ * @param {Array} pages
48
+ * @param {Array} components
49
+ * @param {object} baseData
50
50
  * @returns
51
51
  */
52
52
 
@@ -203,12 +203,12 @@ describe('utils', function () {
203
203
  // and data calculated for the fields, based on that source data.
204
204
 
205
205
  expect(RESULT).toEqual(_objectSpread(_objectSpread({}, _userProfileData.default), {}, {
206
- firstName: _userProfileData.default.keycloakContext.givenName,
207
- surname: _userProfileData.default.keycloakContext.familyName,
208
- team: _userProfileData.default.staffDetailsDataContext.defaultteam,
209
- staffGradeId: _userProfileData.default.staffDetailsDataContext.gradeid,
210
- linemanagerEmail: _userProfileData.default.extendedStaffDetailsContext.linemanagerEmail,
211
- delegateEmails: _userProfileData.default.extendedStaffDetailsContext.delegateEmails
206
+ firstName: _userProfileData.default.currentUser.givenName,
207
+ surname: _userProfileData.default.currentUser.familyName,
208
+ team: _userProfileData.default.userDetails.defaultteam,
209
+ staffGradeId: _userProfileData.default.userDetails.gradeid,
210
+ linemanagerEmail: _userProfileData.default.userDetails.linemanagerEmail,
211
+ delegateEmails: _userProfileData.default.userDetails.delegateEmails
212
212
  }));
213
213
  });
214
214
  });
@@ -9,7 +9,7 @@ describe('utils', function () {
9
9
  describe('Data', function () {
10
10
  describe('setupRefDataUrlForComponent', function () {
11
11
  var DATA = {
12
- environmentContext: {
12
+ urls: {
13
13
  refData: '/ref-data'
14
14
  }
15
15
  };
@@ -39,13 +39,13 @@ describe('utils', function () {
39
39
  id: 'component',
40
40
  // eslint-disable-next-line no-template-curly-in-string
41
41
  data: {
42
- url: '${environmentContext.refData}/v1/teams'
42
+ url: '${urls.refData}/v1/teams'
43
43
  }
44
44
  };
45
45
  expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual({
46
46
  id: COMPONENT.id,
47
47
  data: {
48
- url: "".concat(DATA.environmentContext.refData, "/v1/teams")
48
+ url: "".concat(DATA.urls.refData, "/v1/teams")
49
49
  }
50
50
  });
51
51
  });
@@ -68,7 +68,7 @@ describe('utils', function () {
68
68
  id: 'component',
69
69
  // eslint-disable-next-line no-template-curly-in-string
70
70
  data: {
71
- url: '${environmentContext.referenceData}/v1/teams'
71
+ url: '${urls.referenceData}/v1/teams'
72
72
  }
73
73
  };
74
74
  expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual({
@@ -19,7 +19,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
19
19
 
20
20
  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; }
21
21
 
22
+ /**
23
+ * Converts a page object defined in the JSON to a page object for rendering.
24
+ * @param {object} pageOptions The JSON page.
25
+ * @param {Array} formComponents The components defined at the top-level of the form.
26
+ * @param {object} formData The top-level form data, used for setting up components.
27
+ * @returns A page object for rendering.
28
+ */
22
29
  var getFormPage = function getFormPage(pageOptions, formComponents, formData) {
30
+ if (!pageOptions) {
31
+ return null;
32
+ }
33
+
23
34
  var components = pageOptions.components.map(function (componentOptions) {
24
35
  if (typeof componentOptions === 'string') {
25
36
  return (0, _getParagraphFromText.default)(componentOptions);
@@ -33,7 +44,7 @@ var getFormPage = function getFormPage(pageOptions, formComponents, formData) {
33
44
  ret = _objectSpread({}, componentOptions);
34
45
  }
35
46
 
36
- return formData && formData.environmentContext ? _Data.default.refData.setupUrl(ret, formData) : ret;
47
+ return formData && formData.urls ? _Data.default.refData.setupUrl(ret, formData) : ret;
37
48
  });
38
49
  return _objectSpread(_objectSpread({}, pageOptions), {}, {
39
50
  formData: formData,