@redneckz/wildless-cms-uni-blocks 0.14.821 → 0.14.822
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/bundle/bundle.umd.js +54 -15
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/bundle/retail/validator/validators.d.ts +6 -1
- package/dist/components/ApplicationLeadForm/ApplicationLeadForm.js +9 -2
- package/dist/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/dist/components/CreditCardForm/CreditCardFormStep.js +7 -1
- package/dist/components/CreditCardForm/CreditCardFormStep.js.map +1 -1
- package/dist/components/CreditForm/CreditFormStep.js +7 -1
- package/dist/components/CreditForm/CreditFormStep.js.map +1 -1
- package/dist/components/DebitForm/DebitFormStep.js +7 -1
- package/dist/components/DebitForm/DebitFormStep.js.map +1 -1
- package/dist/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/dist/retail/validator/getLimitedBirthdayValidation.js +21 -0
- package/dist/retail/validator/getLimitedBirthdayValidation.js.map +1 -0
- package/dist/retail/validator/validatorObj.js +0 -1
- package/dist/retail/validator/validatorObj.js.map +1 -1
- package/dist/retail/validator/validators.d.ts +6 -1
- package/dist/retail/validator/validators.js +10 -8
- package/dist/retail/validator/validators.js.map +1 -1
- package/lib/components/ApplicationLeadForm/ApplicationLeadForm.js +9 -2
- package/lib/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/lib/components/CreditCardForm/CreditCardFormStep.js +7 -1
- package/lib/components/CreditCardForm/CreditCardFormStep.js.map +1 -1
- package/lib/components/CreditForm/CreditFormStep.js +7 -1
- package/lib/components/CreditForm/CreditFormStep.js.map +1 -1
- package/lib/components/DebitForm/DebitFormStep.js +7 -1
- package/lib/components/DebitForm/DebitFormStep.js.map +1 -1
- package/lib/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/lib/retail/validator/getLimitedBirthdayValidation.js +18 -0
- package/lib/retail/validator/getLimitedBirthdayValidation.js.map +1 -0
- package/lib/retail/validator/validatorObj.js +1 -2
- package/lib/retail/validator/validatorObj.js.map +1 -1
- package/lib/retail/validator/validators.d.ts +6 -1
- package/lib/retail/validator/validators.js +10 -8
- package/lib/retail/validator/validators.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +48 -14
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/mobile/bundle/retail/validator/validators.d.ts +6 -1
- package/mobile/dist/components/ApplicationLeadForm/ApplicationLeadForm.js +9 -2
- package/mobile/dist/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/mobile/dist/components/CreditCardForm/CreditCardFormStep.js +7 -1
- package/mobile/dist/components/CreditCardForm/CreditCardFormStep.js.map +1 -1
- package/mobile/dist/components/CreditForm/CreditFormStep.js +7 -1
- package/mobile/dist/components/CreditForm/CreditFormStep.js.map +1 -1
- package/mobile/dist/components/DebitForm/DebitFormStep.js +7 -1
- package/mobile/dist/components/DebitForm/DebitFormStep.js.map +1 -1
- package/mobile/dist/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/mobile/dist/retail/validator/getLimitedBirthdayValidation.js +21 -0
- package/mobile/dist/retail/validator/getLimitedBirthdayValidation.js.map +1 -0
- package/mobile/dist/retail/validator/validatorObj.js +0 -1
- package/mobile/dist/retail/validator/validatorObj.js.map +1 -1
- package/mobile/dist/retail/validator/validators.d.ts +6 -1
- package/mobile/dist/retail/validator/validators.js +10 -8
- package/mobile/dist/retail/validator/validators.js.map +1 -1
- package/mobile/lib/components/ApplicationLeadForm/ApplicationLeadForm.js +9 -2
- package/mobile/lib/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/mobile/lib/components/CreditCardForm/CreditCardFormStep.js +7 -1
- package/mobile/lib/components/CreditCardForm/CreditCardFormStep.js.map +1 -1
- package/mobile/lib/components/CreditForm/CreditFormStep.js +7 -1
- package/mobile/lib/components/CreditForm/CreditFormStep.js.map +1 -1
- package/mobile/lib/components/DebitForm/DebitFormStep.js +7 -1
- package/mobile/lib/components/DebitForm/DebitFormStep.js.map +1 -1
- package/mobile/lib/retail/validator/getLimitedBirthdayValidation.d.ts +2 -0
- package/mobile/lib/retail/validator/getLimitedBirthdayValidation.js +18 -0
- package/mobile/lib/retail/validator/getLimitedBirthdayValidation.js.map +1 -0
- package/mobile/lib/retail/validator/validatorObj.js +1 -2
- package/mobile/lib/retail/validator/validatorObj.js.map +1 -1
- package/mobile/lib/retail/validator/validators.d.ts +6 -1
- package/mobile/lib/retail/validator/validators.js +10 -8
- package/mobile/lib/retail/validator/validators.js.map +1 -1
- package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx +17 -6
- package/mobile/src/components/CreditCardForm/CreditCardFormStep.tsx +9 -1
- package/mobile/src/components/CreditForm/CreditFormStep.tsx +10 -1
- package/mobile/src/components/DebitForm/DebitFormStep.tsx +9 -1
- package/mobile/src/retail/validator/getLimitedBirthdayValidation.ts +21 -0
- package/mobile/src/retail/validator/validatorObj.ts +0 -2
- package/mobile/src/retail/validator/validators.ts +24 -13
- package/package.json +1 -1
- package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx +17 -6
- package/src/components/CreditCardForm/CreditCardFormStep.tsx +9 -1
- package/src/components/CreditForm/CreditFormStep.tsx +10 -1
- package/src/components/DebitForm/DebitFormStep.tsx +9 -1
- package/src/retail/validator/getLimitedBirthdayValidation.ts +21 -0
- package/src/retail/validator/validatorObj.ts +0 -2
- package/src/retail/validator/validators.ts +24 -13
package/bundle/bundle.umd.js
CHANGED
|
@@ -2429,25 +2429,27 @@
|
|
|
2429
2429
|
|
|
2430
2430
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
2431
2431
|
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
2432
|
-
const MIN_AGE = 23;
|
|
2433
|
-
const MAX_AGE = 75;
|
|
2434
|
-
const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
|
|
2435
2432
|
const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
|
|
2436
2433
|
const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
2437
2434
|
const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
|
|
2438
2435
|
const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
|
|
2439
2436
|
const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
|
|
2440
2437
|
const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
|
|
2441
|
-
const limitedBirthdayValidate = (date) => {
|
|
2438
|
+
const limitedBirthdayValidate = ({ minAge, maxAge }) => (date) => {
|
|
2442
2439
|
const today = new Date();
|
|
2443
|
-
const minDate = new Date(today.getFullYear() -
|
|
2444
|
-
const maxDate =
|
|
2445
|
-
|
|
2440
|
+
const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
|
|
2441
|
+
const maxDate = maxAge
|
|
2442
|
+
? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
|
|
2443
|
+
: null;
|
|
2444
|
+
if (!date || date > minDate) {
|
|
2445
|
+
return false;
|
|
2446
|
+
}
|
|
2447
|
+
if (maxDate && date < maxDate) {
|
|
2446
2448
|
return false;
|
|
2447
2449
|
}
|
|
2448
2450
|
return true;
|
|
2449
2451
|
};
|
|
2450
|
-
const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(
|
|
2452
|
+
const limitedBirthdayValidator = (params) => validator(limitedBirthdayValidate(params))(params.errorMessage);
|
|
2451
2453
|
const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
|
|
2452
2454
|
const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
|
|
2453
2455
|
const snilsValidate = (snils) => {
|
|
@@ -2469,6 +2471,23 @@
|
|
|
2469
2471
|
};
|
|
2470
2472
|
const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
|
|
2471
2473
|
|
|
2474
|
+
const limitedBirthdayValidationData = {
|
|
2475
|
+
credit: {
|
|
2476
|
+
minAge: 23,
|
|
2477
|
+
maxAge: 75,
|
|
2478
|
+
errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
|
|
2479
|
+
},
|
|
2480
|
+
creditCard: {
|
|
2481
|
+
minAge: 21,
|
|
2482
|
+
errorMessage: 'Допустимый возраст заёмщика - от 21 года',
|
|
2483
|
+
},
|
|
2484
|
+
debitCard: {
|
|
2485
|
+
minAge: 18,
|
|
2486
|
+
errorMessage: 'Допустимый возраст - от 18 лет',
|
|
2487
|
+
},
|
|
2488
|
+
};
|
|
2489
|
+
const getLimitedBirthdayValidation = (productType) => limitedBirthdayValidator(limitedBirthdayValidationData[productType]);
|
|
2490
|
+
|
|
2472
2491
|
const validatorConsentsObj = {
|
|
2473
2492
|
processPersonalDataFlg: agreementValidator,
|
|
2474
2493
|
consentProviderFlg: agreementValidator,
|
|
@@ -2503,7 +2522,6 @@
|
|
|
2503
2522
|
addressRetail: defaultSelectValidator('Выберите адрес банка'),
|
|
2504
2523
|
addressMatch: defaultValidator(),
|
|
2505
2524
|
sex: defaultValidator('Укажите свой пол'),
|
|
2506
|
-
limitedBirthday: limitedBirthdayValidator(),
|
|
2507
2525
|
birthPlace: defaultValidator('Укажите место рождения'),
|
|
2508
2526
|
education: defaultSelectValidator('Выберите ваше образование'),
|
|
2509
2527
|
housing: defaultSelectValidator('Выберите тип жилья'),
|
|
@@ -6088,8 +6106,9 @@
|
|
|
6088
6106
|
const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, productType = 'credit', data, ...rest }) => {
|
|
6089
6107
|
const [esiaError, { setTrue: setEsiaError }] = useBool(false);
|
|
6090
6108
|
const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
|
|
6091
|
-
const inputs = useMemo(() => (applicationFormData
|
|
6092
|
-
const
|
|
6109
|
+
const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
|
|
6110
|
+
const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
|
|
6111
|
+
const formValidator = useMemo(() => getFormValidator(inputs, extendedValidatorObj), [inputs, extendedValidatorObj]);
|
|
6093
6112
|
const [initialFormState, { isLoading }] = useInitApplicationLead({
|
|
6094
6113
|
inputs,
|
|
6095
6114
|
nextStepLink,
|
|
@@ -6115,6 +6134,11 @@
|
|
|
6115
6134
|
}, [ok]);
|
|
6116
6135
|
return (jsx(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: jsxs("form", { onSubmit: onSubmit, className: "space-y-m relative", children: [isLoading ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, isSending), esiaError ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] }) }));
|
|
6117
6136
|
});
|
|
6137
|
+
const getInputs = (applicationFormData) => (applicationFormData?.flatMap((_) => _?.inputs) || []);
|
|
6138
|
+
const getExtendedValidatorObj = (productType) => ({
|
|
6139
|
+
...validatorObj,
|
|
6140
|
+
limitedBirthday: getLimitedBirthdayValidation(productType),
|
|
6141
|
+
});
|
|
6118
6142
|
|
|
6119
6143
|
const NotFound = JSX(({ title, description }) => {
|
|
6120
6144
|
const isMobileMode = useMobileMode();
|
|
@@ -8059,11 +8083,16 @@
|
|
|
8059
8083
|
return [initialState, handleSubmit, isSending];
|
|
8060
8084
|
};
|
|
8061
8085
|
|
|
8086
|
+
const PRODUCT_TYPE$2 = 'creditCard';
|
|
8087
|
+
const extendedValidatorObj$2 = {
|
|
8088
|
+
...validatorObj,
|
|
8089
|
+
limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$2),
|
|
8090
|
+
};
|
|
8062
8091
|
const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
|
|
8063
8092
|
const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
|
|
8064
8093
|
const formValidator = useCallback((formState) =>
|
|
8065
8094
|
// TODO Слишком сложно
|
|
8066
|
-
getFormValidator(calculateInputs((_) => formState[_])(inputs, step),
|
|
8095
|
+
getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$2)(formState), [inputs]);
|
|
8067
8096
|
const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
|
|
8068
8097
|
step,
|
|
8069
8098
|
onNextStep,
|
|
@@ -8877,13 +8906,18 @@
|
|
|
8877
8906
|
return [initialState, handleSubmit, isSending];
|
|
8878
8907
|
};
|
|
8879
8908
|
|
|
8909
|
+
const PRODUCT_TYPE$1 = 'credit';
|
|
8910
|
+
const extendedValidatorObj$1 = {
|
|
8911
|
+
...validatorObj,
|
|
8912
|
+
limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$1),
|
|
8913
|
+
};
|
|
8880
8914
|
const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
|
|
8881
8915
|
const { programId } = useRetailFormStore();
|
|
8882
8916
|
const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
|
|
8883
8917
|
const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
|
|
8884
8918
|
const formValidator = useCallback((formState) =>
|
|
8885
8919
|
// TODO Слишком сложно
|
|
8886
|
-
getFormValidator(calculateInputs((_) => formState[_])(inputs, step),
|
|
8920
|
+
getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$1)(formState), [inputs]);
|
|
8887
8921
|
const [initialState, onSubmit, isSending] = useCreditFormAPI({
|
|
8888
8922
|
step,
|
|
8889
8923
|
onNextStep,
|
|
@@ -9193,11 +9227,16 @@
|
|
|
9193
9227
|
return [initialState, handleSubmit, isSending];
|
|
9194
9228
|
};
|
|
9195
9229
|
|
|
9230
|
+
const PRODUCT_TYPE = 'debitCard';
|
|
9231
|
+
const extendedValidatorObj = {
|
|
9232
|
+
...validatorObj,
|
|
9233
|
+
limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
|
|
9234
|
+
};
|
|
9196
9235
|
const DebitFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
|
|
9197
9236
|
const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
|
|
9198
9237
|
const formValidator = useCallback((formState) =>
|
|
9199
9238
|
// TODO Слишком сложно
|
|
9200
|
-
getFormValidator(calculateInputs((_) => formState[_])(inputs, step),
|
|
9239
|
+
getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
|
|
9201
9240
|
const [initialState, onSubmit, isSending] = useDebitFormAPI({
|
|
9202
9241
|
step,
|
|
9203
9242
|
onNextStep,
|
|
@@ -11554,7 +11593,7 @@
|
|
|
11554
11593
|
slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
|
|
11555
11594
|
});
|
|
11556
11595
|
|
|
11557
|
-
const packageVersion = "0.14.
|
|
11596
|
+
const packageVersion = "0.14.821";
|
|
11558
11597
|
|
|
11559
11598
|
exports.Blocks = Blocks;
|
|
11560
11599
|
exports.ContentPage = ContentPage;
|