@ukhomeoffice/cop-react-form-renderer 5.23.0 → 5.23.2
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.
|
@@ -29,7 +29,7 @@ _dayjs.default.extend(_customParseFormat.default);
|
|
|
29
29
|
* the date/time component can't be found.
|
|
30
30
|
*/
|
|
31
31
|
var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, container) {
|
|
32
|
-
var _container$components, _container$components2, _data$container$field, _data$container$field2;
|
|
32
|
+
var _container$components, _container$components2, _data$container$field, _data$container$field2, _data$container$field3, _data$container$field4;
|
|
33
33
|
var date = (_container$components = container.components) === null || _container$components === void 0 ? void 0 : _container$components.find(function (c) {
|
|
34
34
|
return c.fieldId === config.date;
|
|
35
35
|
});
|
|
@@ -39,6 +39,11 @@ var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, contain
|
|
|
39
39
|
if (!date || !time || !data) {
|
|
40
40
|
return false;
|
|
41
41
|
}
|
|
42
|
+
var dateFromData = (_data$container$field = data[container.fieldId]) === null || _data$container$field === void 0 ? void 0 : _data$container$field[config.date];
|
|
43
|
+
var timeFromData = (_data$container$field2 = data[container.fieldId]) === null || _data$container$field2 === void 0 ? void 0 : _data$container$field2[config.time];
|
|
44
|
+
if (!dateFromData || !timeFromData) {
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
42
47
|
// Here we return true if there are errors with the date & time components
|
|
43
48
|
// individually. This is to allow them to process their errors, and to prevent
|
|
44
49
|
// validation from stopping at the container level.
|
|
@@ -48,8 +53,8 @@ var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, contain
|
|
|
48
53
|
if ((0, _validateComponent.default)(time, data[container.fieldId], data[container.fieldId])) {
|
|
49
54
|
return true;
|
|
50
55
|
}
|
|
51
|
-
var dateStr = (0, _utils.formatString)((_data$container$
|
|
52
|
-
var timeStr = (0, _utils.formattedTime)((_data$container$
|
|
56
|
+
var dateStr = (0, _utils.formatString)((_data$container$field3 = data[container.fieldId]) === null || _data$container$field3 === void 0 ? void 0 : _data$container$field3[config.date]);
|
|
57
|
+
var timeStr = (0, _utils.formattedTime)((_data$container$field4 = data[container.fieldId]) === null || _data$container$field4 === void 0 ? void 0 : _data$container$field4[config.time]);
|
|
53
58
|
return (0, _dayjs.default)("".concat(dateStr, " ").concat(timeStr), "".concat(_utils.DATE_FORMAT, " HH:mm")).isBefore((0, _dayjs.default)());
|
|
54
59
|
};
|
|
55
60
|
var _default = mustBeEarlierDateTime;
|
|
@@ -70,6 +70,27 @@ describe('utils.Validate.additional.mustBeEarlierDateTime', function () {
|
|
|
70
70
|
var result = (0, _mustBeEarlierDateTime.default)(EDITED_DATA, CONFIG, CONTAINER);
|
|
71
71
|
expect(result).toEqual(true);
|
|
72
72
|
});
|
|
73
|
+
test('should return true if time value is missing and optional', function () {
|
|
74
|
+
var EDITED_DATA = {
|
|
75
|
+
testContainer: {
|
|
76
|
+
testDate: '01-01-2000'
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
var EDITED_CONTAINER = {
|
|
80
|
+
fieldId: 'testContainer',
|
|
81
|
+
type: 'container',
|
|
82
|
+
components: [{
|
|
83
|
+
fieldId: 'testDate',
|
|
84
|
+
type: 'date',
|
|
85
|
+
required: true
|
|
86
|
+
}, {
|
|
87
|
+
fieldId: 'testTime',
|
|
88
|
+
type: 'time'
|
|
89
|
+
}]
|
|
90
|
+
};
|
|
91
|
+
var result = (0, _mustBeEarlierDateTime.default)(EDITED_DATA, CONFIG, EDITED_CONTAINER);
|
|
92
|
+
expect(result).toEqual(true);
|
|
93
|
+
});
|
|
73
94
|
test('should return true if date has errors', function () {
|
|
74
95
|
var EDITED_DATA = {
|
|
75
96
|
testContainer: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ukhomeoffice/cop-react-form-renderer",
|
|
3
|
-
"version": "5.23.
|
|
3
|
+
"version": "5.23.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"scripts": {
|
|
6
6
|
"clean": "rimraf dist",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@babel/eslint-parser": "^7.19.1",
|
|
28
28
|
"@babel/preset-env": "^7.15.6",
|
|
29
29
|
"@babel/preset-react": "^7.14.5",
|
|
30
|
-
"@monaco-editor/react": "
|
|
30
|
+
"@monaco-editor/react": "4.4.6",
|
|
31
31
|
"@storybook/addon-a11y": "^6.3.8",
|
|
32
32
|
"@storybook/addon-actions": "^6.3.8",
|
|
33
33
|
"@storybook/addon-docs": "^6.3.8",
|