@ukhomeoffice/cop-react-form-renderer 3.26.3 → 3.32.0
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.
- package/dist/components/CheckYourAnswers/CheckYourAnswers.js +5 -2
- package/dist/components/CollectionPage/CollectionPage.js +149 -0
- package/dist/components/CollectionPage/CollectionPage.test.js +428 -0
- package/dist/components/CollectionPage/index.js +13 -0
- package/dist/components/FormPage/FormPage.js +6 -1
- package/dist/components/FormRenderer/FormRenderer.js +61 -17
- package/dist/components/PageActions/ActionButton.js +1 -1
- package/dist/components/TaskList/TaskList.js +11 -7
- package/dist/components/TaskList/TaskList.scss +26 -4
- package/dist/components/TaskList/TaskList.test.js +5 -5
- package/dist/models/PageAction.js +5 -1
- package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js +85 -0
- package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.test.js +107 -0
- package/dist/utils/CheckYourAnswers/getCYARowsForPage.js +6 -0
- package/dist/utils/CheckYourAnswers/showComponentCYA.js +4 -0
- package/dist/utils/CheckYourAnswers/showComponentCYA.test.js +10 -0
- package/dist/utils/CollectionPage/duplicateCollectionPageActiveEntry.js +45 -0
- package/dist/utils/CollectionPage/duplicateCollectionPageActiveEntry.test.js +41 -0
- package/dist/utils/CollectionPage/getCollectionPageActiveIndex.js +34 -0
- package/dist/utils/CollectionPage/getCollectionPageActiveIndex.test.js +54 -0
- package/dist/utils/CollectionPage/index.js +23 -0
- package/dist/utils/CollectionPage/mergeCollectionPages.js +69 -0
- package/dist/utils/CollectionPage/mergeCollectionPages.test.js +131 -0
- package/dist/utils/Validate/validatePage.js +16 -2
- package/dist/utils/Validate/validatePage.test.js +352 -206
- package/dist/utils/index.js +3 -0
- package/package.json +2 -2
|
@@ -99,14 +99,17 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
|
|
|
99
99
|
});
|
|
100
100
|
};
|
|
101
101
|
|
|
102
|
-
|
|
102
|
+
var pagesWithMergedCollections = _utils.default.CollectionPage.mergePages(_pages);
|
|
103
|
+
|
|
104
|
+
var pagesWithRows = pagesWithMergedCollections.map(function (page, index) {
|
|
103
105
|
var rows = getRows(page, index);
|
|
104
106
|
return rows.length > 0 ? _objectSpread(_objectSpread({}, page), {}, {
|
|
105
107
|
rows: rows
|
|
106
108
|
}) : null;
|
|
107
109
|
}).filter(function (p) {
|
|
108
110
|
return !!p;
|
|
109
|
-
})
|
|
111
|
+
});
|
|
112
|
+
setPages(pagesWithRows);
|
|
110
113
|
}, [_pages, onRowAction, setPages]);
|
|
111
114
|
var listMarginBottom = hide_page_titles ? 0 : DEFAULT_MARGIN_BOTTOM;
|
|
112
115
|
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = exports.DEFAULT_CLASS = void 0;
|
|
9
|
+
|
|
10
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
|
+
|
|
12
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
13
|
+
|
|
14
|
+
var _utils = _interopRequireDefault(require("../../utils"));
|
|
15
|
+
|
|
16
|
+
var _FormPage = _interopRequireDefault(require("../FormPage"));
|
|
17
|
+
|
|
18
|
+
require("../FormPage/FormPage.scss");
|
|
19
|
+
|
|
20
|
+
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); }
|
|
21
|
+
|
|
22
|
+
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; }
|
|
23
|
+
|
|
24
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
25
|
+
|
|
26
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
27
|
+
|
|
28
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
29
|
+
|
|
30
|
+
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; }
|
|
31
|
+
|
|
32
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
33
|
+
|
|
34
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
35
|
+
|
|
36
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
37
|
+
|
|
38
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
39
|
+
|
|
40
|
+
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
|
|
41
|
+
|
|
42
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
43
|
+
|
|
44
|
+
var DEFAULT_CLASS = 'hods-form';
|
|
45
|
+
exports.DEFAULT_CLASS = DEFAULT_CLASS;
|
|
46
|
+
|
|
47
|
+
var CollectionPage = function CollectionPage(_ref) {
|
|
48
|
+
var page = _ref.page,
|
|
49
|
+
onAction = _ref.onAction,
|
|
50
|
+
classBlock = _ref.classBlock,
|
|
51
|
+
classModifiers = _ref.classModifiers,
|
|
52
|
+
className = _ref.className;
|
|
53
|
+
|
|
54
|
+
var _useState = (0, _react.useState)({}),
|
|
55
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
56
|
+
patch = _useState2[0],
|
|
57
|
+
setPatch = _useState2[1];
|
|
58
|
+
|
|
59
|
+
var activeIndex = _utils.default.CollectionPage.getActiveIndex(page.collection.name, page.formData);
|
|
60
|
+
|
|
61
|
+
var data = page.formData[page.collection.name] || patch[page.collection.name] || [];
|
|
62
|
+
/**
|
|
63
|
+
* Handle the state of the data directly within the page.
|
|
64
|
+
* This is so that the overall form data isn't affected until such
|
|
65
|
+
* time as the onAction handler is invoked.
|
|
66
|
+
*/
|
|
67
|
+
|
|
68
|
+
var onPageChange = function onPageChange(_ref2) {
|
|
69
|
+
var target = _ref2.target;
|
|
70
|
+
page.formData[target.name] = target.value;
|
|
71
|
+
setPatch(function (prev) {
|
|
72
|
+
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
|
|
73
|
+
});
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
var reportChange = function reportChange(newValue) {
|
|
77
|
+
onPageChange({
|
|
78
|
+
target: {
|
|
79
|
+
name: page.collection.name,
|
|
80
|
+
value: newValue
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
};
|
|
84
|
+
|
|
85
|
+
var reportActiveIdChange = function reportActiveIdChange(newActiveId) {
|
|
86
|
+
onPageChange({
|
|
87
|
+
target: {
|
|
88
|
+
name: "".concat(page.collection.name, "ActiveId"),
|
|
89
|
+
value: newActiveId
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
var onInnerPageAction = function onInnerPageAction(action) {
|
|
95
|
+
onAction(action, patch);
|
|
96
|
+
};
|
|
97
|
+
|
|
98
|
+
var onInnerPageChange = function onInnerPageChange(_ref3) {
|
|
99
|
+
var target = _ref3.target;
|
|
100
|
+
|
|
101
|
+
if (activeIndex === null) {
|
|
102
|
+
// If there is no active entry in the collection, we create
|
|
103
|
+
// a new entry and generate a new ID for it.
|
|
104
|
+
// This ID becomes the active ID for the collection.
|
|
105
|
+
var newId = Date.now().toString();
|
|
106
|
+
reportActiveIdChange(newId);
|
|
107
|
+
reportChange([].concat(data, [_defineProperty({
|
|
108
|
+
id: newId
|
|
109
|
+
}, target.name, target.value)]));
|
|
110
|
+
} else {
|
|
111
|
+
// Update an existing entry.
|
|
112
|
+
reportChange([].concat(data.slice(0, activeIndex), [_objectSpread(_objectSpread({}, data[activeIndex]), {}, _defineProperty({}, target.name, target.value))], data.slice(activeIndex + 1)));
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
|
|
116
|
+
return /*#__PURE__*/_react.default.createElement(_FormPage.default, {
|
|
117
|
+
page: _objectSpread(_objectSpread({}, page), {}, {
|
|
118
|
+
formData: _objectSpread(_objectSpread({}, page.formData), data[activeIndex])
|
|
119
|
+
}),
|
|
120
|
+
onAction: onInnerPageAction,
|
|
121
|
+
onWrapperChange: onInnerPageChange,
|
|
122
|
+
classBlock: classBlock,
|
|
123
|
+
classModifiers: classModifiers,
|
|
124
|
+
className: className
|
|
125
|
+
});
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
CollectionPage.propTypes = {
|
|
129
|
+
page: _propTypes.default.shape({
|
|
130
|
+
id: _propTypes.default.string.isRequired,
|
|
131
|
+
title: _propTypes.default.string,
|
|
132
|
+
collection: _propTypes.default.shape({
|
|
133
|
+
name: _propTypes.default.string.isRequired
|
|
134
|
+
}).isRequired,
|
|
135
|
+
components: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.object])).isRequired,
|
|
136
|
+
actions: _propTypes.default.array,
|
|
137
|
+
formData: _propTypes.default.object.isRequired
|
|
138
|
+
}).isRequired,
|
|
139
|
+
onAction: _propTypes.default.func.isRequired,
|
|
140
|
+
classBlock: _propTypes.default.string,
|
|
141
|
+
classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
|
|
142
|
+
className: _propTypes.default.string
|
|
143
|
+
};
|
|
144
|
+
CollectionPage.defaultProps = {
|
|
145
|
+
classBlock: DEFAULT_CLASS,
|
|
146
|
+
classModifiers: []
|
|
147
|
+
};
|
|
148
|
+
var _default = CollectionPage;
|
|
149
|
+
exports.default = _default;
|
|
@@ -0,0 +1,428 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
4
|
+
|
|
5
|
+
var _react = require("@testing-library/react");
|
|
6
|
+
|
|
7
|
+
var _react2 = _interopRequireDefault(require("react"));
|
|
8
|
+
|
|
9
|
+
var _models = require("../../models");
|
|
10
|
+
|
|
11
|
+
var _setupTests = require("../../setupTests");
|
|
12
|
+
|
|
13
|
+
var _ActionButton = require("../PageActions/ActionButton");
|
|
14
|
+
|
|
15
|
+
var _CollectionPage = _interopRequireWildcard(require("./CollectionPage"));
|
|
16
|
+
|
|
17
|
+
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); }
|
|
18
|
+
|
|
19
|
+
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; }
|
|
20
|
+
|
|
21
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
22
|
+
|
|
23
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
24
|
+
|
|
25
|
+
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
26
|
+
|
|
27
|
+
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; }
|
|
28
|
+
|
|
29
|
+
describe('components.CollectionPage', function () {
|
|
30
|
+
describe('CollectionPage', function () {
|
|
31
|
+
var _formData, _formData2, _formData3;
|
|
32
|
+
|
|
33
|
+
var TEXT = {
|
|
34
|
+
id: 'text',
|
|
35
|
+
fieldId: 'text',
|
|
36
|
+
type: 'text',
|
|
37
|
+
label: 'Text component',
|
|
38
|
+
hint: 'Text hint'
|
|
39
|
+
}; // eslint-disable-next-line no-template-curly-in-string
|
|
40
|
+
|
|
41
|
+
var TEXT_WITH_EXPRESSION = {
|
|
42
|
+
id: 'text1',
|
|
43
|
+
fieldId: 'text1',
|
|
44
|
+
type: 'text',
|
|
45
|
+
label: 'Email to ${wrapper.email}',
|
|
46
|
+
hint: 'Text hint ${currentUser.givenName}'
|
|
47
|
+
}; // eslint-disable-next-line no-template-curly-in-string
|
|
48
|
+
|
|
49
|
+
var AUTO_WITH_EXPRESSION = {
|
|
50
|
+
id: 'text2',
|
|
51
|
+
fieldId: 'text2',
|
|
52
|
+
label: '${text2} ${currentUser.givenName}',
|
|
53
|
+
hint: '${wrapper.email}',
|
|
54
|
+
type: 'autocomplete',
|
|
55
|
+
required: true,
|
|
56
|
+
source: [],
|
|
57
|
+
disabled: false
|
|
58
|
+
};
|
|
59
|
+
var VALUE = 'Text value';
|
|
60
|
+
var COLLECTION_NAME = 'testCollection';
|
|
61
|
+
var ACTIVE_ID = '01';
|
|
62
|
+
var PAGE = {
|
|
63
|
+
id: 'pageId',
|
|
64
|
+
title: 'Page 1',
|
|
65
|
+
collection: {
|
|
66
|
+
name: COLLECTION_NAME
|
|
67
|
+
},
|
|
68
|
+
components: [TEXT],
|
|
69
|
+
actions: [_models.PageAction.TYPES.SUBMIT],
|
|
70
|
+
formData: (_formData = {}, _defineProperty(_formData, "".concat(COLLECTION_NAME, "ActiveId"), ACTIVE_ID), _defineProperty(_formData, COLLECTION_NAME, [{
|
|
71
|
+
id: ACTIVE_ID,
|
|
72
|
+
text: VALUE
|
|
73
|
+
}]), _formData)
|
|
74
|
+
};
|
|
75
|
+
var PAGE_WITH_BUTTON_ACTIONS = {
|
|
76
|
+
id: 'pageId',
|
|
77
|
+
// eslint-disable-next-line no-template-curly-in-string
|
|
78
|
+
title: '${title}',
|
|
79
|
+
collection: {
|
|
80
|
+
name: COLLECTION_NAME
|
|
81
|
+
},
|
|
82
|
+
components: [TEXT_WITH_EXPRESSION, AUTO_WITH_EXPRESSION],
|
|
83
|
+
actions: [// eslint-disable-next-line no-template-curly-in-string
|
|
84
|
+
{
|
|
85
|
+
type: 'submit',
|
|
86
|
+
validate: true,
|
|
87
|
+
label: 'Next ${wrapper.nextAction}'
|
|
88
|
+
}, // eslint-disable-next-line no-template-curly-in-string
|
|
89
|
+
{
|
|
90
|
+
type: 'navigate',
|
|
91
|
+
page: '1',
|
|
92
|
+
label: 'Go back ${wrapper.prevAction}'
|
|
93
|
+
}],
|
|
94
|
+
formData: (_formData2 = {}, _defineProperty(_formData2, "".concat(COLLECTION_NAME, "ActiveId"), ACTIVE_ID), _defineProperty(_formData2, COLLECTION_NAME, [{
|
|
95
|
+
id: ACTIVE_ID,
|
|
96
|
+
text1: "Text1 ".concat(VALUE),
|
|
97
|
+
text2: "Text2 ".concat(VALUE)
|
|
98
|
+
}]), _defineProperty(_formData2, "title", 'Order Form'), _defineProperty(_formData2, "wrapper", {
|
|
99
|
+
email: 'test@example.email',
|
|
100
|
+
nextAction: 'Payment',
|
|
101
|
+
prevAction: 'User Details'
|
|
102
|
+
}), _defineProperty(_formData2, "currentUser", {
|
|
103
|
+
givenName: 'Doe'
|
|
104
|
+
}), _formData2)
|
|
105
|
+
};
|
|
106
|
+
var PAGE_WITH_CONDITIONAL_BUTTONS = {
|
|
107
|
+
id: 'pageId',
|
|
108
|
+
// eslint-disable-next-line no-template-curly-in-string
|
|
109
|
+
title: '${title}',
|
|
110
|
+
collection: {
|
|
111
|
+
name: COLLECTION_NAME
|
|
112
|
+
},
|
|
113
|
+
components: [TEXT_WITH_EXPRESSION, AUTO_WITH_EXPRESSION],
|
|
114
|
+
actions: [{
|
|
115
|
+
type: 'submit',
|
|
116
|
+
validate: true,
|
|
117
|
+
label: 'Button 1',
|
|
118
|
+
show_when: [{
|
|
119
|
+
field: 'currentUser.givenName',
|
|
120
|
+
op: '!=',
|
|
121
|
+
value: 'Doe'
|
|
122
|
+
}]
|
|
123
|
+
}, {
|
|
124
|
+
type: 'submit',
|
|
125
|
+
validate: false,
|
|
126
|
+
label: 'Button 2',
|
|
127
|
+
show_when: [{
|
|
128
|
+
field: 'currentUser.givenName',
|
|
129
|
+
op: '=',
|
|
130
|
+
value: 'Doe'
|
|
131
|
+
}]
|
|
132
|
+
}],
|
|
133
|
+
formData: (_formData3 = {}, _defineProperty(_formData3, "".concat(COLLECTION_NAME, "ActiveId"), ACTIVE_ID), _defineProperty(_formData3, COLLECTION_NAME, [{
|
|
134
|
+
id: ACTIVE_ID,
|
|
135
|
+
text1: "Text1 ".concat(VALUE),
|
|
136
|
+
text2: "Text2 ".concat(VALUE)
|
|
137
|
+
}]), _defineProperty(_formData3, "title", 'Order Form'), _defineProperty(_formData3, "wrapper", {
|
|
138
|
+
email: 'test@example.email',
|
|
139
|
+
nextAction: 'Payment',
|
|
140
|
+
prevAction: 'User Details'
|
|
141
|
+
}), _defineProperty(_formData3, "currentUser", {
|
|
142
|
+
givenName: 'Doe'
|
|
143
|
+
}), _formData3)
|
|
144
|
+
};
|
|
145
|
+
var ON_ACTION_CALLS = [];
|
|
146
|
+
|
|
147
|
+
var checkInputField = function checkInputField(formGroup, fieldId, lbl, hnt, val) {
|
|
148
|
+
expect(formGroup.tagName).toEqual('DIV');
|
|
149
|
+
expect(formGroup.classList).toContain('govuk-form-group');
|
|
150
|
+
var label = formGroup.childNodes[0];
|
|
151
|
+
expect(label.tagName).toEqual('LABEL');
|
|
152
|
+
expect(label.classList).toContain('govuk-label');
|
|
153
|
+
expect(label.textContent).toEqual(lbl);
|
|
154
|
+
expect(label.getAttribute('for')).toEqual(fieldId);
|
|
155
|
+
var hint = formGroup.childNodes[1];
|
|
156
|
+
expect(hint.tagName).toEqual('SPAN');
|
|
157
|
+
expect(hint.classList).toContain('govuk-hint');
|
|
158
|
+
expect(hint.textContent).toEqual(hnt);
|
|
159
|
+
var input = formGroup.childNodes[2];
|
|
160
|
+
expect(input.tagName).toEqual('INPUT');
|
|
161
|
+
expect(input.classList).toContain('govuk-input');
|
|
162
|
+
expect(input.id).toEqual(fieldId);
|
|
163
|
+
expect(input.value).toEqual(val);
|
|
164
|
+
return input;
|
|
165
|
+
};
|
|
166
|
+
|
|
167
|
+
var checkAutoCompleteField = function checkAutoCompleteField(formGroup, fieldId, lbl, hnt, val) {
|
|
168
|
+
expect(formGroup.tagName).toEqual('DIV');
|
|
169
|
+
expect(formGroup.classList).toContain('govuk-form-group');
|
|
170
|
+
var label = formGroup.childNodes[0];
|
|
171
|
+
expect(label.tagName).toEqual('LABEL');
|
|
172
|
+
expect(label.classList).toContain('govuk-label');
|
|
173
|
+
expect(label.textContent).toEqual(lbl);
|
|
174
|
+
expect(label.getAttribute('for')).toEqual(fieldId);
|
|
175
|
+
var hint = formGroup.childNodes[1];
|
|
176
|
+
expect(hint.tagName).toEqual('SPAN');
|
|
177
|
+
expect(hint.classList).toContain('govuk-hint');
|
|
178
|
+
expect(hint.textContent).toEqual(hnt);
|
|
179
|
+
var outerWrapper = formGroup.childNodes[2];
|
|
180
|
+
expect(outerWrapper.classList).toContain('hods-autocomplete__outer-wrapper');
|
|
181
|
+
var autocomplete = outerWrapper.childNodes[0];
|
|
182
|
+
expect(autocomplete.classList).toContain('hods-autocomplete__wrapper');
|
|
183
|
+
var input = [].concat(autocomplete.childNodes).filter(function (e) {
|
|
184
|
+
return e.tagName === 'INPUT';
|
|
185
|
+
})[0];
|
|
186
|
+
expect(input.classList).toContain('hods-autocomplete__input');
|
|
187
|
+
expect(input.tagName).toEqual('INPUT');
|
|
188
|
+
expect(input.id).toEqual(fieldId);
|
|
189
|
+
expect(input.value).toEqual(val);
|
|
190
|
+
return input;
|
|
191
|
+
};
|
|
192
|
+
|
|
193
|
+
var checkFormButtonGroup = function checkFormButtonGroup(buttonGroup, labels) {
|
|
194
|
+
var _buttonGroup$childNod;
|
|
195
|
+
|
|
196
|
+
var buttons = [];
|
|
197
|
+
expect(buttonGroup.tagName).toEqual('DIV');
|
|
198
|
+
expect(buttonGroup.classList).toContain('hods-button-group');
|
|
199
|
+
expect((_buttonGroup$childNod = buttonGroup.childNodes) === null || _buttonGroup$childNod === void 0 ? void 0 : _buttonGroup$childNod.length).toEqual(labels.length);
|
|
200
|
+
buttonGroup.childNodes.forEach(function (button, i) {
|
|
201
|
+
expect(button.tagName).toEqual('BUTTON');
|
|
202
|
+
expect(button.classList).toContain('hods-button');
|
|
203
|
+
expect(button.textContent).toEqual(labels[i]);
|
|
204
|
+
buttons.push(button);
|
|
205
|
+
});
|
|
206
|
+
return buttons;
|
|
207
|
+
};
|
|
208
|
+
|
|
209
|
+
var ON_ACTION = function ON_ACTION(action, patch, onError) {
|
|
210
|
+
ON_ACTION_CALLS.push({
|
|
211
|
+
action: action,
|
|
212
|
+
patch: patch,
|
|
213
|
+
onError: onError
|
|
214
|
+
});
|
|
215
|
+
};
|
|
216
|
+
|
|
217
|
+
beforeEach(function () {
|
|
218
|
+
var _PAGE$formData;
|
|
219
|
+
|
|
220
|
+
PAGE.formData = (_PAGE$formData = {}, _defineProperty(_PAGE$formData, "".concat(COLLECTION_NAME, "ActiveId"), ACTIVE_ID), _defineProperty(_PAGE$formData, COLLECTION_NAME, [{
|
|
221
|
+
id: ACTIVE_ID,
|
|
222
|
+
text: VALUE
|
|
223
|
+
}]), _PAGE$formData);
|
|
224
|
+
ON_ACTION_CALLS.length = 0;
|
|
225
|
+
});
|
|
226
|
+
it('should render a submit page correctly', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
|
|
227
|
+
var _renderWithValidation, container, page, heading;
|
|
228
|
+
|
|
229
|
+
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
230
|
+
while (1) {
|
|
231
|
+
switch (_context.prev = _context.next) {
|
|
232
|
+
case 0:
|
|
233
|
+
_renderWithValidation = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
234
|
+
page: PAGE,
|
|
235
|
+
onAction: ON_ACTION
|
|
236
|
+
})), container = _renderWithValidation.container;
|
|
237
|
+
page = container.childNodes[0];
|
|
238
|
+
expect(page.tagName).toEqual('DIV');
|
|
239
|
+
expect(page.classList).toContain("".concat(_CollectionPage.DEFAULT_CLASS, "__page"));
|
|
240
|
+
heading = page.childNodes[0];
|
|
241
|
+
expect(heading.classList).toContain('govuk-heading-l');
|
|
242
|
+
expect(heading.textContent).toEqual(PAGE.title);
|
|
243
|
+
checkInputField(page.childNodes[1], TEXT.fieldId, "".concat(TEXT.label, " (optional)"), TEXT.hint, VALUE);
|
|
244
|
+
checkFormButtonGroup(page.childNodes[2], [_ActionButton.DEFAULT_LABEL]);
|
|
245
|
+
|
|
246
|
+
case 9:
|
|
247
|
+
case "end":
|
|
248
|
+
return _context.stop();
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
}, _callee);
|
|
252
|
+
})));
|
|
253
|
+
it('should render a submit page correctly and submit action button has interpolated label', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
|
|
254
|
+
var _renderWithValidation2, container, page, FORM_DATA, heading;
|
|
255
|
+
|
|
256
|
+
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
257
|
+
while (1) {
|
|
258
|
+
switch (_context2.prev = _context2.next) {
|
|
259
|
+
case 0:
|
|
260
|
+
_renderWithValidation2 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
261
|
+
page: PAGE_WITH_BUTTON_ACTIONS,
|
|
262
|
+
onAction: ON_ACTION
|
|
263
|
+
})), container = _renderWithValidation2.container;
|
|
264
|
+
page = container.childNodes[0];
|
|
265
|
+
FORM_DATA = PAGE_WITH_BUTTON_ACTIONS.formData;
|
|
266
|
+
expect(page.tagName).toEqual('DIV');
|
|
267
|
+
expect(page.classList).toContain("".concat(_CollectionPage.DEFAULT_CLASS, "__page"));
|
|
268
|
+
heading = page.childNodes[0];
|
|
269
|
+
expect(heading.classList).toContain('govuk-heading-l');
|
|
270
|
+
expect(heading.textContent).toEqual(FORM_DATA.title);
|
|
271
|
+
checkInputField(page.childNodes[1], TEXT_WITH_EXPRESSION.fieldId, 'Email to test@example.email (optional)', 'Text hint Doe', 'Text1 Text value');
|
|
272
|
+
checkAutoCompleteField(page.childNodes[2], AUTO_WITH_EXPRESSION.fieldId, "".concat(FORM_DATA[COLLECTION_NAME][0].text2, " ").concat(FORM_DATA.currentUser.givenName), FORM_DATA.wrapper.email, "Text2 ".concat(VALUE));
|
|
273
|
+
checkFormButtonGroup(page.childNodes[3], ['Next Payment', 'Go back User Details']);
|
|
274
|
+
|
|
275
|
+
case 11:
|
|
276
|
+
case "end":
|
|
277
|
+
return _context2.stop();
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
}, _callee2);
|
|
281
|
+
})));
|
|
282
|
+
it('should handle a page change appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
|
|
283
|
+
var _renderWithValidation3, container, page, input, NEW_VALUE, EVENT;
|
|
284
|
+
|
|
285
|
+
return regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
286
|
+
while (1) {
|
|
287
|
+
switch (_context3.prev = _context3.next) {
|
|
288
|
+
case 0:
|
|
289
|
+
_renderWithValidation3 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
290
|
+
page: PAGE,
|
|
291
|
+
onAction: ON_ACTION
|
|
292
|
+
})), container = _renderWithValidation3.container;
|
|
293
|
+
page = container.childNodes[0];
|
|
294
|
+
expect(page.tagName).toEqual('DIV'); // Change the input.
|
|
295
|
+
|
|
296
|
+
input = page.childNodes[1].childNodes[2];
|
|
297
|
+
NEW_VALUE = "".concat(VALUE, ".");
|
|
298
|
+
EVENT = {
|
|
299
|
+
target: {
|
|
300
|
+
name: TEXT.fieldId,
|
|
301
|
+
value: NEW_VALUE
|
|
302
|
+
}
|
|
303
|
+
};
|
|
304
|
+
|
|
305
|
+
_react.fireEvent.change(input, EVENT); // And confirm the formData has been changed.
|
|
306
|
+
|
|
307
|
+
|
|
308
|
+
expect(PAGE.formData[COLLECTION_NAME][0].text).toEqual(NEW_VALUE);
|
|
309
|
+
|
|
310
|
+
case 8:
|
|
311
|
+
case "end":
|
|
312
|
+
return _context3.stop();
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}, _callee3);
|
|
316
|
+
})));
|
|
317
|
+
it('should handle a page action appropriately, updating the active entry if there is one', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
|
|
318
|
+
var _renderWithValidation4, container, page, input, NEW_VALUE, CHANGE_EVENT, button;
|
|
319
|
+
|
|
320
|
+
return regeneratorRuntime.wrap(function _callee4$(_context4) {
|
|
321
|
+
while (1) {
|
|
322
|
+
switch (_context4.prev = _context4.next) {
|
|
323
|
+
case 0:
|
|
324
|
+
_renderWithValidation4 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
325
|
+
page: PAGE,
|
|
326
|
+
onAction: ON_ACTION
|
|
327
|
+
})), container = _renderWithValidation4.container;
|
|
328
|
+
page = container.childNodes[0]; // Change the input.
|
|
329
|
+
|
|
330
|
+
input = page.childNodes[1].childNodes[2];
|
|
331
|
+
NEW_VALUE = "".concat(VALUE, ".");
|
|
332
|
+
CHANGE_EVENT = {
|
|
333
|
+
target: {
|
|
334
|
+
name: TEXT.fieldId,
|
|
335
|
+
value: NEW_VALUE
|
|
336
|
+
}
|
|
337
|
+
};
|
|
338
|
+
|
|
339
|
+
_react.fireEvent.change(input, CHANGE_EVENT); // Then click the action button.
|
|
340
|
+
|
|
341
|
+
|
|
342
|
+
button = page.childNodes[2].childNodes[0];
|
|
343
|
+
|
|
344
|
+
_react.fireEvent.click(button, {}); // And confirm an appropriate action was received.
|
|
345
|
+
|
|
346
|
+
|
|
347
|
+
expect(ON_ACTION_CALLS.length).toEqual(1);
|
|
348
|
+
expect(PAGE.formData[COLLECTION_NAME][0].text).toEqual(NEW_VALUE);
|
|
349
|
+
expect(ON_ACTION_CALLS[0].action).toEqual(_models.PageAction.DEFAULTS.submit);
|
|
350
|
+
expect(ON_ACTION_CALLS[0].patch).toEqual(_defineProperty({}, COLLECTION_NAME, [{
|
|
351
|
+
id: ACTIVE_ID,
|
|
352
|
+
text: NEW_VALUE
|
|
353
|
+
}]));
|
|
354
|
+
|
|
355
|
+
case 12:
|
|
356
|
+
case "end":
|
|
357
|
+
return _context4.stop();
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
}, _callee4);
|
|
361
|
+
})));
|
|
362
|
+
it('should handle a page action appropriately, creating a new active entry if there isn\'t one', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
|
|
363
|
+
var _renderWithValidation5, container, page, input, NEW_VALUE, CHANGE_EVENT, button;
|
|
364
|
+
|
|
365
|
+
return regeneratorRuntime.wrap(function _callee5$(_context5) {
|
|
366
|
+
while (1) {
|
|
367
|
+
switch (_context5.prev = _context5.next) {
|
|
368
|
+
case 0:
|
|
369
|
+
// Make sure there is no active entry.
|
|
370
|
+
PAGE.formData["".concat(COLLECTION_NAME, "ActiveId")] = 'newId';
|
|
371
|
+
_renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
372
|
+
page: PAGE,
|
|
373
|
+
onAction: ON_ACTION
|
|
374
|
+
})), container = _renderWithValidation5.container;
|
|
375
|
+
page = container.childNodes[0]; // Change the input.
|
|
376
|
+
|
|
377
|
+
input = page.childNodes[1].childNodes[2];
|
|
378
|
+
NEW_VALUE = "".concat(VALUE, ".");
|
|
379
|
+
CHANGE_EVENT = {
|
|
380
|
+
target: {
|
|
381
|
+
name: TEXT.fieldId,
|
|
382
|
+
value: NEW_VALUE
|
|
383
|
+
}
|
|
384
|
+
};
|
|
385
|
+
|
|
386
|
+
_react.fireEvent.change(input, CHANGE_EVENT); // Then click the action button.
|
|
387
|
+
|
|
388
|
+
|
|
389
|
+
button = page.childNodes[2].childNodes[0];
|
|
390
|
+
|
|
391
|
+
_react.fireEvent.click(button, {}); // And confirm an appropriate action was received.
|
|
392
|
+
|
|
393
|
+
|
|
394
|
+
expect(ON_ACTION_CALLS.length).toEqual(1);
|
|
395
|
+
expect(PAGE.formData[COLLECTION_NAME][1].text).toEqual(NEW_VALUE);
|
|
396
|
+
expect(PAGE.formData[COLLECTION_NAME][1].id).toBeTruthy();
|
|
397
|
+
expect(ON_ACTION_CALLS[0].action).toEqual(_models.PageAction.DEFAULTS.submit);
|
|
398
|
+
|
|
399
|
+
case 13:
|
|
400
|
+
case "end":
|
|
401
|
+
return _context5.stop();
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
}, _callee5);
|
|
405
|
+
})));
|
|
406
|
+
it('should render only the conditionally shown button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
|
|
407
|
+
var _renderWithValidation6, container, page;
|
|
408
|
+
|
|
409
|
+
return regeneratorRuntime.wrap(function _callee6$(_context6) {
|
|
410
|
+
while (1) {
|
|
411
|
+
switch (_context6.prev = _context6.next) {
|
|
412
|
+
case 0:
|
|
413
|
+
_renderWithValidation6 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_CollectionPage.default, {
|
|
414
|
+
page: PAGE_WITH_CONDITIONAL_BUTTONS,
|
|
415
|
+
onAction: ON_ACTION
|
|
416
|
+
})), container = _renderWithValidation6.container;
|
|
417
|
+
page = container.childNodes[0];
|
|
418
|
+
checkFormButtonGroup(page.childNodes[3], ['Button 2']); // Just the second button shown
|
|
419
|
+
|
|
420
|
+
case 3:
|
|
421
|
+
case "end":
|
|
422
|
+
return _context6.stop();
|
|
423
|
+
}
|
|
424
|
+
}
|
|
425
|
+
}, _callee6);
|
|
426
|
+
})));
|
|
427
|
+
});
|
|
428
|
+
});
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = void 0;
|
|
7
|
+
|
|
8
|
+
var _CollectionPage = _interopRequireDefault(require("./CollectionPage"));
|
|
9
|
+
|
|
10
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
|
+
|
|
12
|
+
var _default = _CollectionPage.default;
|
|
13
|
+
exports.default = _default;
|
|
@@ -55,6 +55,7 @@ var FormPage = function FormPage(_ref) {
|
|
|
55
55
|
|
|
56
56
|
var page = _ref.page,
|
|
57
57
|
_onAction = _ref.onAction,
|
|
58
|
+
onWrapperChange = _ref.onWrapperChange,
|
|
58
59
|
classBlock = _ref.classBlock,
|
|
59
60
|
classModifiers = _ref.classModifiers,
|
|
60
61
|
className = _ref.className;
|
|
@@ -100,7 +101,7 @@ var FormPage = function FormPage(_ref) {
|
|
|
100
101
|
return /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
|
|
101
102
|
key: index,
|
|
102
103
|
component: component,
|
|
103
|
-
onChange: onPageChange,
|
|
104
|
+
onChange: onWrapperChange || onPageChange,
|
|
104
105
|
value: page.formData[component.fieldId] || patch[component.fieldId],
|
|
105
106
|
formData: page.formData
|
|
106
107
|
});
|
|
@@ -123,6 +124,10 @@ FormPage.propTypes = {
|
|
|
123
124
|
formData: _propTypes.default.object.isRequired
|
|
124
125
|
}).isRequired,
|
|
125
126
|
onAction: _propTypes.default.func.isRequired,
|
|
127
|
+
// If passed in, this function will override the default
|
|
128
|
+
// onPageChange functionality. Useful for anything that
|
|
129
|
+
// wants to wrap FormPage.
|
|
130
|
+
onWrapperChange: _propTypes.default.func,
|
|
126
131
|
classBlock: _propTypes.default.string,
|
|
127
132
|
classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
|
|
128
133
|
className: _propTypes.default.string
|