@newskit-render/validation 1.18.0 → 1.18.1
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/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/types.js +2 -2
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/utils.js +84 -88
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/validation.d.ts +2 -2
- package/dist/cjs/validation.js +4 -16
- package/dist/cjs/validation.js.map +1 -1
- package/dist/cjs/validations/accountDeletion.js +1 -1
- package/dist/cjs/validations/accountDeletion.js.map +1 -1
- package/dist/cjs/validations/accountInfo.js +49 -66
- package/dist/cjs/validations/accountInfo.js.map +1 -1
- package/dist/cjs/validations/address.js +60 -66
- package/dist/cjs/validations/address.js.map +1 -1
- package/dist/cjs/validations/cancellation.js +13 -16
- package/dist/cjs/validations/cancellation.js.map +1 -1
- package/dist/cjs/validations/holidayStop.js +1 -1
- package/dist/cjs/validations/holidayStop.js.map +1 -1
- package/dist/cjs/validations/payment.js +1 -1
- package/dist/cjs/validations/payment.js.map +1 -1
- package/dist/cjs/validations/phoneNumber.js +21 -27
- package/dist/cjs/validations/phoneNumber.js.map +1 -1
- package/dist/cjs/yupPhone.js +16 -20
- package/dist/cjs/yupPhone.js.map +1 -1
- package/dist/esm/__tests__/mocks.js +2 -2
- package/dist/esm/__tests__/mocks.js.map +1 -1
- package/dist/esm/utils.js +82 -86
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/validation.d.ts +2 -2
- package/dist/esm/validation.js +3 -15
- package/dist/esm/validation.js.map +1 -1
- package/dist/esm/validations/accountDeletion.js +1 -1
- package/dist/esm/validations/accountDeletion.js.map +1 -1
- package/dist/esm/validations/accountInfo.js +51 -68
- package/dist/esm/validations/accountInfo.js.map +1 -1
- package/dist/esm/validations/address.js +59 -65
- package/dist/esm/validations/address.js.map +1 -1
- package/dist/esm/validations/cancellation.js +12 -15
- package/dist/esm/validations/cancellation.js.map +1 -1
- package/dist/esm/validations/holidayStop.js +3 -3
- package/dist/esm/validations/holidayStop.js.map +1 -1
- package/dist/esm/validations/payment.js +2 -2
- package/dist/esm/validations/payment.js.map +1 -1
- package/dist/esm/validations/phoneNumber.js +19 -25
- package/dist/esm/validations/phoneNumber.js.map +1 -1
- package/dist/esm/yupPhone.js +14 -18
- package/dist/esm/yupPhone.js.map +1 -1
- package/package.json +2 -2
package/dist/esm/utils.js
CHANGED
|
@@ -2,7 +2,7 @@ import * as yup from 'yup';
|
|
|
2
2
|
import { ValidationFieldNames, ValidationSchemaNames, } from './types';
|
|
3
3
|
import { nameValidation, displayNameValidation, mobileValidation, phoneNumberValidation, holidayStopValidation, vouchersValidation, deleteUserHolidayStopValidation, addressValidation, postcodeValidation, passwordValidation, paymentMethodIdValidation, zuoraPaymentMethodValidation, emailValidation, confirmCancellation, commentingNotifications, cancellationReason, accountCreationPage, deliveryInstructions, newsletterSubscriptionValidation, removeGroupAccountMemberValidation, accountDeletionValidation, familyInviteValidation, } from './validations';
|
|
4
4
|
import './yupPhone';
|
|
5
|
-
export
|
|
5
|
+
export const defaultRequiredFields = [
|
|
6
6
|
ValidationFieldNames.firstName,
|
|
7
7
|
ValidationFieldNames.lastname,
|
|
8
8
|
ValidationFieldNames.mobile,
|
|
@@ -14,107 +14,103 @@ export var defaultRequiredFields = [
|
|
|
14
14
|
ValidationFieldNames.other,
|
|
15
15
|
ValidationFieldNames.cancellationReason,
|
|
16
16
|
];
|
|
17
|
-
export
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
return validation;
|
|
42
|
-
};
|
|
17
|
+
export const getValidation = (requiredFields) => ({ validationFieldName, requiredMessage, formatMessage, regex, isPhone, excludeEmptyString, }) => {
|
|
18
|
+
let validation = yup.string();
|
|
19
|
+
const isRequired = requiredFields.includes(validationFieldName);
|
|
20
|
+
if (isRequired) {
|
|
21
|
+
validation = validation.required(requiredMessage);
|
|
22
|
+
}
|
|
23
|
+
if (isPhone && isRequired) {
|
|
24
|
+
validation = validation.phone(undefined, true, formatMessage);
|
|
25
|
+
}
|
|
26
|
+
else if (isPhone && !isRequired) {
|
|
27
|
+
validation = validation.test('test-phone', formatMessage || '', (value) => {
|
|
28
|
+
if (value)
|
|
29
|
+
return yup.string().phone(undefined, true).isValidSync(value);
|
|
30
|
+
return true;
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
else if (regex) {
|
|
34
|
+
validation = validation.matches(regex, {
|
|
35
|
+
message: formatMessage,
|
|
36
|
+
excludeEmptyString: excludeEmptyString,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
return validation;
|
|
43
40
|
};
|
|
44
|
-
export
|
|
45
|
-
var _a;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
var requiredMessage = includesReuiredTemplate
|
|
41
|
+
export const generateDefaultSchema = (options) => {
|
|
42
|
+
var _a, _b;
|
|
43
|
+
const requiredFields = (options === null || options === void 0 ? void 0 : options.overrideRequiredFields) || defaultRequiredFields;
|
|
44
|
+
const getFieldValidation = getValidation(requiredFields);
|
|
45
|
+
const DEFAULT_REQUIRED_MESSAGE = 'Please enter your ${field}';
|
|
46
|
+
const DEFAULT_WRONG_FORMAT_MESSAGE = 'Your ${field} can’t contain special characters. Please try again.';
|
|
47
|
+
const includesReuiredTemplate = (_a = options === null || options === void 0 ? void 0 : options.requiredMessage) === null || _a === void 0 ? void 0 : _a.includes('${field}');
|
|
48
|
+
const includesWrongFormatTemplate = (_b = options === null || options === void 0 ? void 0 : options.wrongFormatMessage) === null || _b === void 0 ? void 0 : _b.includes('${field}');
|
|
49
|
+
const requiredMessage = includesReuiredTemplate
|
|
54
50
|
? options === null || options === void 0 ? void 0 : options.requiredMessage
|
|
55
51
|
: DEFAULT_REQUIRED_MESSAGE;
|
|
56
|
-
|
|
52
|
+
const wrongFormatMessage = includesWrongFormatTemplate
|
|
57
53
|
? options === null || options === void 0 ? void 0 : options.wrongFormatMessage
|
|
58
54
|
: DEFAULT_WRONG_FORMAT_MESSAGE;
|
|
59
|
-
return
|
|
60
|
-
|
|
61
|
-
getFieldValidation
|
|
62
|
-
requiredMessage
|
|
63
|
-
wrongFormatMessage
|
|
55
|
+
return {
|
|
56
|
+
[ValidationSchemaNames.name]: nameValidation({
|
|
57
|
+
getFieldValidation,
|
|
58
|
+
requiredMessage,
|
|
59
|
+
wrongFormatMessage,
|
|
64
60
|
}),
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
getFieldValidation
|
|
68
|
-
requiredMessage
|
|
61
|
+
[ValidationSchemaNames.password]: passwordValidation,
|
|
62
|
+
[ValidationSchemaNames.mobile]: mobileValidation({
|
|
63
|
+
getFieldValidation,
|
|
64
|
+
requiredMessage,
|
|
69
65
|
}),
|
|
70
|
-
|
|
71
|
-
getFieldValidation
|
|
72
|
-
requiredMessage
|
|
66
|
+
[ValidationSchemaNames.phoneNumber]: phoneNumberValidation({
|
|
67
|
+
getFieldValidation,
|
|
68
|
+
requiredMessage,
|
|
73
69
|
}),
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
70
|
+
[ValidationSchemaNames.paymentMethodId]: paymentMethodIdValidation,
|
|
71
|
+
[ValidationSchemaNames.zuoraPaymentMethod]: zuoraPaymentMethodValidation,
|
|
72
|
+
[ValidationSchemaNames.email]: emailValidation({ requiredMessage }),
|
|
77
73
|
// TO DO: remove this validation schema after HH V2 is fully implemented and deployed to production
|
|
78
|
-
|
|
74
|
+
[ValidationSchemaNames.inviteFamilyEmail]: emailValidation({
|
|
79
75
|
requiredMessage: 'Please enter a valid email address',
|
|
80
|
-
}),
|
|
81
|
-
|
|
82
|
-
getFieldValidation
|
|
76
|
+
}), // we only need to validate an email field when inviting a family member
|
|
77
|
+
[ValidationSchemaNames.inviteFamilyEmailV2]: familyInviteValidation({
|
|
78
|
+
getFieldValidation,
|
|
83
79
|
requiredMessage: requiredMessage || 'Please enter a valid email address',
|
|
84
|
-
wrongFormatMessage
|
|
80
|
+
wrongFormatMessage,
|
|
85
81
|
}),
|
|
86
|
-
|
|
87
|
-
getFieldValidation
|
|
88
|
-
requiredMessage
|
|
89
|
-
wrongFormatMessage
|
|
82
|
+
[ValidationSchemaNames.address]: addressValidation({
|
|
83
|
+
getFieldValidation,
|
|
84
|
+
requiredMessage,
|
|
85
|
+
wrongFormatMessage,
|
|
90
86
|
}),
|
|
91
|
-
|
|
92
|
-
requiredMessage
|
|
87
|
+
[ValidationSchemaNames.displayName]: displayNameValidation({
|
|
88
|
+
requiredMessage,
|
|
93
89
|
}),
|
|
94
|
-
|
|
95
|
-
getFieldValidation
|
|
90
|
+
[ValidationSchemaNames.confirmCancellation]: confirmCancellation({
|
|
91
|
+
getFieldValidation,
|
|
96
92
|
}),
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
getFieldValidation
|
|
101
|
-
requiredMessage
|
|
102
|
-
wrongFormatMessage
|
|
93
|
+
[ValidationSchemaNames.commentingNotifications]: commentingNotifications,
|
|
94
|
+
[ValidationSchemaNames.cancellationReason]: cancellationReason,
|
|
95
|
+
[ValidationSchemaNames.postcode]: postcodeValidation({
|
|
96
|
+
getFieldValidation,
|
|
97
|
+
requiredMessage,
|
|
98
|
+
wrongFormatMessage,
|
|
103
99
|
}),
|
|
104
|
-
|
|
105
|
-
getFieldValidation
|
|
106
|
-
requiredMessage
|
|
107
|
-
wrongFormatMessage
|
|
100
|
+
[ValidationSchemaNames.accountCreationPage]: accountCreationPage({
|
|
101
|
+
getFieldValidation,
|
|
102
|
+
requiredMessage,
|
|
103
|
+
wrongFormatMessage,
|
|
108
104
|
}),
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
105
|
+
[ValidationSchemaNames.deliveryInstructions]: deliveryInstructions,
|
|
106
|
+
[ValidationSchemaNames.createHolidayStop]: holidayStopValidation,
|
|
107
|
+
[ValidationSchemaNames.updateHolidayStop]: holidayStopValidation,
|
|
108
|
+
[ValidationSchemaNames.deleteHolidayStop]: deleteUserHolidayStopValidation,
|
|
109
|
+
[ValidationSchemaNames.vouchers]: vouchersValidation,
|
|
110
|
+
[ValidationSchemaNames.newsletterSubscribe]: newsletterSubscriptionValidation,
|
|
111
|
+
[ValidationSchemaNames.newsletterUnsubscribe]: newsletterSubscriptionValidation,
|
|
112
|
+
[ValidationSchemaNames.removeGroupAccountMember]: removeGroupAccountMemberValidation,
|
|
113
|
+
[ValidationSchemaNames.accountDeletion]: accountDeletionValidation,
|
|
114
|
+
};
|
|
119
115
|
};
|
|
120
116
|
//# sourceMappingURL=utils.js.map
|
package/dist/esm/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EAEL,oBAAoB,EAEpB,qBAAqB,GACtB,MAAM,SAAS,CAAA;AAChB,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,+BAA+B,EAC/B,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,4BAA4B,EAC5B,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,gCAAgC,EAChC,kCAAkC,EAClC,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,eAAe,CAAA;AACtB,OAAO,YAAY,CAAA;AAEnB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/validation.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DefaultSchemaKeysType, InitializeYupOptions, OverrideYupSchemaType } from './types';
|
|
2
2
|
export declare const initializeYupSchema: ({ overrideYupSchema, options, }: {
|
|
3
|
-
overrideYupSchema?: OverrideYupSchemaType
|
|
4
|
-
options?: InitializeYupOptions
|
|
3
|
+
overrideYupSchema?: OverrideYupSchemaType;
|
|
4
|
+
options?: InitializeYupOptions;
|
|
5
5
|
}) => DefaultSchemaKeysType | OverrideYupSchemaType;
|
package/dist/esm/validation.js
CHANGED
|
@@ -1,21 +1,9 @@
|
|
|
1
|
-
var __assign = (this && this.__assign) || function () {
|
|
2
|
-
__assign = Object.assign || function(t) {
|
|
3
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
-
s = arguments[i];
|
|
5
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
-
t[p] = s[p];
|
|
7
|
-
}
|
|
8
|
-
return t;
|
|
9
|
-
};
|
|
10
|
-
return __assign.apply(this, arguments);
|
|
11
|
-
};
|
|
12
1
|
import { generateDefaultSchema } from './utils';
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
var defaultSchema = generateDefaultSchema(options);
|
|
2
|
+
export const initializeYupSchema = ({ overrideYupSchema, options, }) => {
|
|
3
|
+
const defaultSchema = generateDefaultSchema(options);
|
|
16
4
|
if (!overrideYupSchema || Object.keys(overrideYupSchema).length === 0) {
|
|
17
5
|
return defaultSchema;
|
|
18
6
|
}
|
|
19
|
-
return
|
|
7
|
+
return Object.assign(Object.assign({}, defaultSchema), overrideYupSchema);
|
|
20
8
|
};
|
|
21
9
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,iBAAiB,EACjB,OAAO,GAIR,EAAiD,EAAE;IAClD,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IACpD,IAAI,CAAC,iBAAiB,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtE,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,uCAAY,aAAa,GAAK,iBAAiB,EAAE;AACnD,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"accountDeletion.js","sourceRoot":"","sources":["../../../src/validations/accountDeletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA"}
|
|
@@ -1,82 +1,65 @@
|
|
|
1
1
|
import { ValidationFieldNames } from '../types';
|
|
2
2
|
import * as yup from 'yup';
|
|
3
|
-
export
|
|
3
|
+
export const passwordValidation = yup.object({
|
|
4
4
|
password: yup.string(),
|
|
5
5
|
});
|
|
6
6
|
//Email cannot be not required
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
return yup.object({
|
|
16
|
-
email: emailSchema(requiredMessage),
|
|
17
|
-
});
|
|
18
|
-
};
|
|
19
|
-
export var commentingNotifications = yup.object({
|
|
7
|
+
const emailSchema = (requiredMessage) => yup
|
|
8
|
+
.string()
|
|
9
|
+
.email('That doesn’t look like a valid email address. Please try again.')
|
|
10
|
+
.required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'email address'));
|
|
11
|
+
export const emailValidation = ({ requiredMessage }) => yup.object({
|
|
12
|
+
email: emailSchema(requiredMessage),
|
|
13
|
+
});
|
|
14
|
+
export const commentingNotifications = yup.object({
|
|
20
15
|
likedYourMessage: yup.boolean(),
|
|
21
16
|
userMentioned: yup.boolean(),
|
|
22
17
|
repliedToMessage: yup.boolean(),
|
|
23
18
|
});
|
|
24
|
-
export
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
displayName: yup
|
|
59
|
-
.string() //Please enter your Display name'
|
|
60
|
-
.required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Display Name'))
|
|
61
|
-
.matches(/^[a-z\d\-\s]+$/i, {
|
|
62
|
-
message: 'Your Display name can only contain alphanumeric characters, hyphens, apostrophes and spaces',
|
|
63
|
-
}),
|
|
64
|
-
});
|
|
65
|
-
};
|
|
66
|
-
export var newsletterSubscriptionValidation = yup.object({
|
|
19
|
+
export const nameValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => yup.object().shape({
|
|
20
|
+
firstName: getFieldValidation({
|
|
21
|
+
validationFieldName: ValidationFieldNames.firstName,
|
|
22
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'First Name'),
|
|
23
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'first name'),
|
|
24
|
+
regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
|
|
25
|
+
}),
|
|
26
|
+
lastName: getFieldValidation({
|
|
27
|
+
validationFieldName: ValidationFieldNames.lastname,
|
|
28
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Last Name'),
|
|
29
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'last name'),
|
|
30
|
+
regex: /^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z])*$/,
|
|
31
|
+
}),
|
|
32
|
+
});
|
|
33
|
+
export const accountCreationPage = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => nameValidation({
|
|
34
|
+
getFieldValidation,
|
|
35
|
+
requiredMessage,
|
|
36
|
+
wrongFormatMessage,
|
|
37
|
+
}).shape({
|
|
38
|
+
title: yup.string().required('Title is required'),
|
|
39
|
+
yyyy: yup.string().required('Year is required').min(4).max(4),
|
|
40
|
+
mm: yup.string().required('Month is required').min(2).max(2),
|
|
41
|
+
dd: yup.string().required('Day is required').min(2).max(2),
|
|
42
|
+
tc: yup.string().required().oneOf(['true'], 'Required field'),
|
|
43
|
+
});
|
|
44
|
+
export const displayNameValidation = ({ requiredMessage }) => yup.object().shape({
|
|
45
|
+
displayName: yup
|
|
46
|
+
.string() //Please enter your Display name'
|
|
47
|
+
.required(requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Display Name'))
|
|
48
|
+
.matches(/^[a-z\d\-\s]+$/i, {
|
|
49
|
+
message: 'Your Display name can only contain alphanumeric characters, hyphens, apostrophes and spaces',
|
|
50
|
+
}),
|
|
51
|
+
});
|
|
52
|
+
export const newsletterSubscriptionValidation = yup.object({
|
|
67
53
|
bulletinId: yup.string(),
|
|
68
54
|
});
|
|
69
|
-
export
|
|
55
|
+
export const removeGroupAccountMemberValidation = yup.object({
|
|
70
56
|
shareId: yup.string(),
|
|
71
57
|
});
|
|
72
|
-
export
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
email: emailSchema(requiredMessage),
|
|
80
|
-
});
|
|
81
|
-
};
|
|
58
|
+
export const familyInviteValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => nameValidation({
|
|
59
|
+
getFieldValidation,
|
|
60
|
+
requiredMessage,
|
|
61
|
+
wrongFormatMessage,
|
|
62
|
+
}).shape({
|
|
63
|
+
email: emailSchema(requiredMessage),
|
|
64
|
+
});
|
|
82
65
|
//# sourceMappingURL=accountInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"accountInfo.js","sourceRoot":"","sources":["../../../src/validations/accountInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,70 +1,64 @@
|
|
|
1
1
|
import { ValidationFieldNames } from '../types';
|
|
2
2
|
import * as yup from 'yup';
|
|
3
3
|
// Reference: https://stackoverflow.com/a/70273329
|
|
4
|
-
|
|
5
|
-
export
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
requiredMessage: requiredMessage,
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
isPhone: false,
|
|
63
|
-
excludeEmptyString: true,
|
|
64
|
-
}),
|
|
65
|
-
});
|
|
66
|
-
};
|
|
67
|
-
export var deliveryInstructions = yup.object({
|
|
4
|
+
const addressRegex = /^['/&#.\d\p{Letter}\p{Mark}\s,-]+$/u;
|
|
5
|
+
export const postcodeValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => yup.object({
|
|
6
|
+
postcode: getFieldValidation({
|
|
7
|
+
validationFieldName: ValidationFieldNames.postcode,
|
|
8
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Postcode'),
|
|
9
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'postcode'),
|
|
10
|
+
addressRegex,
|
|
11
|
+
}),
|
|
12
|
+
});
|
|
13
|
+
export const addressValidation = ({ getFieldValidation, requiredMessage, wrongFormatMessage, }) => postcodeValidation({
|
|
14
|
+
getFieldValidation,
|
|
15
|
+
requiredMessage,
|
|
16
|
+
wrongFormatMessage,
|
|
17
|
+
}).shape({
|
|
18
|
+
country: getFieldValidation({
|
|
19
|
+
validationFieldName: ValidationFieldNames.country,
|
|
20
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Country'),
|
|
21
|
+
formatMessage: 'This is not a valid Country code',
|
|
22
|
+
regex: /^[A-Z]{2,3}$/,
|
|
23
|
+
}),
|
|
24
|
+
line1: getFieldValidation({
|
|
25
|
+
validationFieldName: ValidationFieldNames.line1,
|
|
26
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'first line of your address'),
|
|
27
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
28
|
+
regex: addressRegex,
|
|
29
|
+
}),
|
|
30
|
+
line2: getFieldValidation({
|
|
31
|
+
validationFieldName: ValidationFieldNames.line2,
|
|
32
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'second line of your address'),
|
|
33
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
34
|
+
regex: addressRegex,
|
|
35
|
+
isPhone: false,
|
|
36
|
+
excludeEmptyString: true,
|
|
37
|
+
}),
|
|
38
|
+
line3: getFieldValidation({
|
|
39
|
+
validationFieldName: ValidationFieldNames.line2,
|
|
40
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'third line of your address'),
|
|
41
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'address'),
|
|
42
|
+
regex: addressRegex,
|
|
43
|
+
isPhone: false,
|
|
44
|
+
excludeEmptyString: true,
|
|
45
|
+
}),
|
|
46
|
+
city: getFieldValidation({
|
|
47
|
+
validationFieldName: ValidationFieldNames.city,
|
|
48
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'Town/City'),
|
|
49
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'town/city'),
|
|
50
|
+
regex: addressRegex,
|
|
51
|
+
}),
|
|
52
|
+
county: getFieldValidation({
|
|
53
|
+
validationFieldName: ValidationFieldNames.county,
|
|
54
|
+
requiredMessage: requiredMessage === null || requiredMessage === void 0 ? void 0 : requiredMessage.replace('${field}', 'County'),
|
|
55
|
+
formatMessage: wrongFormatMessage === null || wrongFormatMessage === void 0 ? void 0 : wrongFormatMessage.replace('${field}', 'county'),
|
|
56
|
+
regex: addressRegex,
|
|
57
|
+
isPhone: false,
|
|
58
|
+
excludeEmptyString: true,
|
|
59
|
+
}),
|
|
60
|
+
});
|
|
61
|
+
export const deliveryInstructions = yup.object({
|
|
68
62
|
deliveryInformation: yup
|
|
69
63
|
.string()
|
|
70
64
|
.required('Please, select one option')
|
|
@@ -73,7 +67,7 @@ export var deliveryInstructions = yup.object({
|
|
|
73
67
|
other: yup
|
|
74
68
|
.string()
|
|
75
69
|
.when('deliveryInformation', {
|
|
76
|
-
is:
|
|
70
|
+
is: (val) => val === 'Other (Please state)',
|
|
77
71
|
then: yup.string().required('Please enter your delivery instructions.'),
|
|
78
72
|
otherwise: yup.string().notRequired(),
|
|
79
73
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../src/validations/address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,kDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../src/validations/address.ts"],"names":[],"mappings":"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"}
|