@redneckz/wildless-cms-uni-blocks 0.14.900 → 0.14.902
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 +19 -10
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/retail/validator/validators.d.ts +1 -0
- package/dist/components/ApplicationLeadForm/consents.js +1 -1
- package/dist/components/ApplicationLeadForm/useInitApplicationLead.js +8 -7
- package/dist/components/ApplicationLeadForm/useInitApplicationLead.js.map +1 -1
- package/dist/retail/components/Fields/EmailField.js +10 -1
- package/dist/retail/components/Fields/EmailField.js.map +1 -1
- package/dist/retail/validator/validators.d.ts +1 -0
- package/dist/retail/validator/validators.js +2 -1
- package/dist/retail/validator/validators.js.map +1 -1
- package/lib/components/ApplicationLeadForm/consents.js +1 -1
- package/lib/components/ApplicationLeadForm/useInitApplicationLead.js +8 -7
- package/lib/components/ApplicationLeadForm/useInitApplicationLead.js.map +1 -1
- package/lib/retail/components/Fields/EmailField.js +10 -1
- package/lib/retail/components/Fields/EmailField.js.map +1 -1
- package/lib/retail/validator/validators.d.ts +1 -0
- package/lib/retail/validator/validators.js +1 -0
- package/lib/retail/validator/validators.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +19 -10
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/retail/validator/validators.d.ts +1 -0
- package/mobile/dist/components/ApplicationLeadForm/consents.js +1 -1
- package/mobile/dist/components/ApplicationLeadForm/useInitApplicationLead.js +8 -7
- package/mobile/dist/components/ApplicationLeadForm/useInitApplicationLead.js.map +1 -1
- package/mobile/dist/retail/components/Fields/EmailField.js +10 -1
- package/mobile/dist/retail/components/Fields/EmailField.js.map +1 -1
- package/mobile/dist/retail/validator/validators.d.ts +1 -0
- package/mobile/dist/retail/validator/validators.js +2 -1
- package/mobile/dist/retail/validator/validators.js.map +1 -1
- package/mobile/lib/components/ApplicationLeadForm/consents.js +1 -1
- package/mobile/lib/components/ApplicationLeadForm/useInitApplicationLead.js +8 -7
- package/mobile/lib/components/ApplicationLeadForm/useInitApplicationLead.js.map +1 -1
- package/mobile/lib/retail/components/Fields/EmailField.js +10 -1
- package/mobile/lib/retail/components/Fields/EmailField.js.map +1 -1
- package/mobile/lib/retail/validator/validators.d.ts +1 -0
- package/mobile/lib/retail/validator/validators.js +1 -0
- package/mobile/lib/retail/validator/validators.js.map +1 -1
- package/mobile/src/components/ApplicationLeadForm/consents.ts +1 -1
- package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts +10 -7
- package/mobile/src/retail/components/Fields/EmailField.tsx +22 -8
- package/mobile/src/retail/validator/validators.ts +1 -0
- package/package.json +1 -1
- package/src/components/ApplicationLeadForm/consents.ts +1 -1
- package/src/components/ApplicationLeadForm/useInitApplicationLead.ts +10 -7
- package/src/retail/components/Fields/EmailField.tsx +22 -8
- package/src/retail/validator/validators.ts +1 -0
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -41,7 +41,7 @@ const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSu
|
|
|
41
41
|
}, []);
|
|
42
42
|
(0, hooks_1.useEffect)(() => {
|
|
43
43
|
leadFormStore.productType = productType;
|
|
44
|
-
const {
|
|
44
|
+
const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(queryFromStorage, sessionStore);
|
|
45
45
|
if (referalCode) {
|
|
46
46
|
sessionStore.referalData = {
|
|
47
47
|
refererCode,
|
|
@@ -50,6 +50,11 @@ const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSu
|
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
sessionStore.marketingInfo = marketingInfo;
|
|
53
|
+
}, [queryFromStorage]);
|
|
54
|
+
(0, hooks_1.useEffect)(() => {
|
|
55
|
+
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
56
|
+
const code = params.get('code');
|
|
57
|
+
const state = params.get('state');
|
|
53
58
|
if (code && state) {
|
|
54
59
|
requestEsiaProfile(code, state);
|
|
55
60
|
}
|
|
@@ -57,7 +62,7 @@ const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSu
|
|
|
57
62
|
sessionStorage.removeItem('accessToken');
|
|
58
63
|
sessionStorage.removeItem('refreshToken');
|
|
59
64
|
}
|
|
60
|
-
}, [
|
|
65
|
+
}, []);
|
|
61
66
|
return initialFormState;
|
|
62
67
|
};
|
|
63
68
|
exports.useInitApplicationLead = useInitApplicationLead;
|
|
@@ -65,9 +70,7 @@ const getLeadQueryParams = (queryFromStorage, sessionStore) => {
|
|
|
65
70
|
const referalData = sessionStore.referalData;
|
|
66
71
|
const marketingInfoFromStorage = sessionStore.marketingInfo;
|
|
67
72
|
const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
|
|
68
|
-
const
|
|
69
|
-
const code = params.get('code');
|
|
70
|
-
const state = params.get('state');
|
|
73
|
+
const code = queryStorage.get('code');
|
|
71
74
|
const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
|
|
72
75
|
const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
|
|
73
76
|
const productId = code ? referalData?.productId : queryStorage.get('productId');
|
|
@@ -83,8 +86,6 @@ const getLeadQueryParams = (queryFromStorage, sessionStore) => {
|
|
|
83
86
|
userId: queryStorage.get('userId'),
|
|
84
87
|
};
|
|
85
88
|
return {
|
|
86
|
-
code,
|
|
87
|
-
state,
|
|
88
89
|
referalCode,
|
|
89
90
|
refererCode,
|
|
90
91
|
productId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":";;AAAA,8BAA8B;AAC9B,2CAA2C;AAC3C,uDAA8E;AAC9E,iFAA8E;AAC9E,qDAAkD;AAClD,4EAAyE;AAKzE,iEAAgE;AAChE,6EAA8E;AAC9E,+DAA4D;AAC5D,yDAAsD;AACtD,yDAAsD;AAe/C,MAAM,sBAAsB,GAAG,CAAC,EACrC,MAAM,EACN,WAAW,EACX,aAAa,EACb,eAAe,GACU,EAAiB,EAAE;IAC5C,MAAM,aAAa,GAAG,IAAA,mCAAgB,GAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,qBAAS,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAwB,CAAC;IAC7D,MAAM,gBAAgB,GAAG,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,mCAAiB,CAAC,CAAC;IAE/E,MAAM,gBAAgB,GAAG,IAAA,eAAO,EAC9B,GAAG,EAAE,CAAC,IAAA,yCAAmB,EAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,EAC1E,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,IAAY,EAAE,KAAa,EAAE,EAAE;QAC3E,aAAa,CAAC,yCAAY,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,IAAA,uCAAkB,EAAC;gBACpC,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;gBACtC,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,IAAI,IAAI,EAAE;gBACR,MAAM,UAAU,GAAG,MAAM,IAAA,mCAAgB,EAAC,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC;gBAE7E,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACf,GAAG,CAAC;oBACJ,GAAG,UAAU;iBACd,CAAC,CAAC,CAAC;gBACJ,aAAa,CAAC,yCAAY,CAAC,OAAO,CAAC,CAAC;aACrC;SACF;QAAC,MAAM;YACN,aAAa,CAAC,yCAAY,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC;QAExC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
2
2
|
exports.EmailField = void 0;
|
|
3
3
|
const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
|
|
4
4
|
const uni_jsx_1 = require("@redneckz/uni-jsx");
|
|
5
|
+
const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
|
|
6
|
+
const validators_1 = require("../../validator/validators");
|
|
5
7
|
const DaDataInputControl_1 = require("../DaDataInputControl/DaDataInputControl");
|
|
6
|
-
exports.EmailField = (0, uni_jsx_1.JSX)(({ field, input }) =>
|
|
8
|
+
exports.EmailField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
9
|
+
const onChange = (0, hooks_1.useCallback)((value) => {
|
|
10
|
+
if (validators_1.retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
}, [field]);
|
|
14
|
+
return ((0, jsx_runtime_1.jsx)(DaDataInputControl_1.DaDataInputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", maxLength: 50, ...field(input?.name ?? ''), ...input, onChange: onChange }));
|
|
15
|
+
});
|
|
7
16
|
//# sourceMappingURL=EmailField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;
|
|
1
|
+
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAE1D,2DAAsE;AACtE,iFAA8E;AAEjE,QAAA,UAAU,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAC1B,CAAC,KAAa,EAAE,EAAE;QAChB,IAAI,qCAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9D,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,uBAAC,uCAAkB,IACjB,KAAK,EAAC,mGAAmB,EACzB,SAAS,EAAE,EAAE,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
|
-
exports.validateDateFromBirth = exports.dateRegistrationValidator = exports.workBeginDateValidator = exports.generalSeniorityValidator = exports.snilsValidator = exports.notLaterDateValidator = exports.deliveryDateValidator = exports.passportValidator = exports.limitedBirthdayValidator = exports.lengthStringValidator = exports.jobNumberValidator = exports.nameRetailValidator = exports.codeWordValidator = exports.addressOrganizationValidator = exports.addressDaDataValidator = exports.retailCyrillicPattern = void 0;
|
|
2
|
+
exports.validateDateFromBirth = exports.dateRegistrationValidator = exports.workBeginDateValidator = exports.generalSeniorityValidator = exports.snilsValidator = exports.notLaterDateValidator = exports.deliveryDateValidator = exports.passportValidator = exports.limitedBirthdayValidator = exports.lengthStringValidator = exports.jobNumberValidator = exports.nameRetailValidator = exports.codeWordValidator = exports.addressOrganizationValidator = exports.addressDaDataValidator = exports.retailNotCyrillicPattern = exports.retailCyrillicPattern = void 0;
|
|
3
3
|
const isCyrilic_1 = require("../../utils/isCyrilic");
|
|
4
4
|
const validator_1 = require("../../validation/validator");
|
|
5
5
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
6
6
|
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
7
7
|
exports.retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
8
|
+
exports.retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
8
9
|
const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
|
|
9
10
|
const addressDaDataValidator = () => (0, validator_1.validator)(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
10
11
|
exports.addressDaDataValidator = addressDaDataValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":";;AAAA,qDAAmD;AACnD,0DAAuD;AAGvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAQtE,QAAA,qBAAqB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esi
|
|
|
39
39
|
}, []);
|
|
40
40
|
useEffect(() => {
|
|
41
41
|
leadFormStore.productType = productType;
|
|
42
|
-
const {
|
|
42
|
+
const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(queryFromStorage, sessionStore);
|
|
43
43
|
if (referalCode) {
|
|
44
44
|
sessionStore.referalData = {
|
|
45
45
|
refererCode,
|
|
@@ -48,6 +48,11 @@ export const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esi
|
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
sessionStore.marketingInfo = marketingInfo;
|
|
51
|
+
}, [queryFromStorage]);
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
54
|
+
const code = params.get('code');
|
|
55
|
+
const state = params.get('state');
|
|
51
56
|
if (code && state) {
|
|
52
57
|
requestEsiaProfile(code, state);
|
|
53
58
|
}
|
|
@@ -55,16 +60,14 @@ export const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esi
|
|
|
55
60
|
sessionStorage.removeItem('accessToken');
|
|
56
61
|
sessionStorage.removeItem('refreshToken');
|
|
57
62
|
}
|
|
58
|
-
}, [
|
|
63
|
+
}, []);
|
|
59
64
|
return initialFormState;
|
|
60
65
|
};
|
|
61
66
|
const getLeadQueryParams = (queryFromStorage, sessionStore) => {
|
|
62
67
|
const referalData = sessionStore.referalData;
|
|
63
68
|
const marketingInfoFromStorage = sessionStore.marketingInfo;
|
|
64
69
|
const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
|
|
65
|
-
const
|
|
66
|
-
const code = params.get('code');
|
|
67
|
-
const state = params.get('state');
|
|
70
|
+
const code = queryStorage.get('code');
|
|
68
71
|
const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
|
|
69
72
|
const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
|
|
70
73
|
const productId = code ? referalData?.productId : queryStorage.get('productId');
|
|
@@ -80,8 +83,6 @@ const getLeadQueryParams = (queryFromStorage, sessionStore) => {
|
|
|
80
83
|
userId: queryStorage.get('userId'),
|
|
81
84
|
};
|
|
82
85
|
return {
|
|
83
|
-
code,
|
|
84
|
-
state,
|
|
85
86
|
referalCode,
|
|
86
87
|
refererCode,
|
|
87
88
|
productId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,2CAA2C;AAC3C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAKzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAoB,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAetD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EACrC,MAAM,EACN,WAAW,EACX,aAAa,EACb,eAAe,GACU,EAAiB,EAAE;IAC5C,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,eAAe,EAAwB,CAAC;IAC7D,MAAM,gBAAgB,GAAG,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAE/E,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,EAC1E,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAY,EAAE,KAAa,EAAE,EAAE;QAC3E,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC;gBACpC,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;gBACtC,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,IAAI,IAAI,EAAE;gBACR,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC;gBAE7E,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACf,GAAG,CAAC;oBACJ,GAAG,UAAU;iBACd,CAAC,CAAC,CAAC;gBACJ,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;aACrC;SACF;QAAC,MAAM;YACN,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC;QAExC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
|
|
2
2
|
import { JSX } from '@redneckz/uni-jsx';
|
|
3
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators.js';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl.js';
|
|
4
|
-
export const EmailField = JSX(({ field, input }) =>
|
|
6
|
+
export const EmailField = JSX(({ field, input }) => {
|
|
7
|
+
const onChange = useCallback((value) => {
|
|
8
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
9
|
+
field('email')?.onChange?.(value);
|
|
10
|
+
}
|
|
11
|
+
}, [field]);
|
|
12
|
+
return (_jsx(DaDataInputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", maxLength: 50, ...field(input?.name ?? ''), ...input, onChange: onChange }));
|
|
13
|
+
});
|
|
5
14
|
//# sourceMappingURL=EmailField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,KAAa,EAAE,EAAE;QAChB,IAAI,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9D,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,KAAC,kBAAkB,IACjB,KAAK,EAAC,mGAAmB,EACzB,SAAS,EAAE,EAAE,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -3,6 +3,7 @@ import { validator } from '../../validation/validator.js';
|
|
|
3
3
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
4
4
|
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
5
5
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
6
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
6
7
|
const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
|
|
7
8
|
export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
8
9
|
export const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAGvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAQnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ export const useInitApplicationLead = ({
|
|
|
70
70
|
useEffect(() => {
|
|
71
71
|
leadFormStore.productType = productType;
|
|
72
72
|
|
|
73
|
-
const {
|
|
73
|
+
const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(
|
|
74
74
|
queryFromStorage,
|
|
75
75
|
sessionStore,
|
|
76
76
|
);
|
|
@@ -84,6 +84,13 @@ export const useInitApplicationLead = ({
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
sessionStore.marketingInfo = marketingInfo;
|
|
87
|
+
}, [queryFromStorage]);
|
|
88
|
+
|
|
89
|
+
useEffect(() => {
|
|
90
|
+
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
91
|
+
|
|
92
|
+
const code = params.get('code');
|
|
93
|
+
const state = params.get('state');
|
|
87
94
|
|
|
88
95
|
if (code && state) {
|
|
89
96
|
requestEsiaProfile(code, state);
|
|
@@ -91,7 +98,7 @@ export const useInitApplicationLead = ({
|
|
|
91
98
|
sessionStorage.removeItem('accessToken');
|
|
92
99
|
sessionStorage.removeItem('refreshToken');
|
|
93
100
|
}
|
|
94
|
-
}, [
|
|
101
|
+
}, []);
|
|
95
102
|
|
|
96
103
|
return initialFormState;
|
|
97
104
|
};
|
|
@@ -103,10 +110,8 @@ const getLeadQueryParams = (
|
|
|
103
110
|
const referalData = sessionStore.referalData;
|
|
104
111
|
const marketingInfoFromStorage = sessionStore.marketingInfo;
|
|
105
112
|
const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
|
|
106
|
-
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
107
113
|
|
|
108
|
-
const code =
|
|
109
|
-
const state = params.get('state');
|
|
114
|
+
const code = queryStorage.get('code');
|
|
110
115
|
const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
|
|
111
116
|
const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
|
|
112
117
|
const productId = code ? referalData?.productId : queryStorage.get('productId');
|
|
@@ -123,8 +128,6 @@ const getLeadQueryParams = (
|
|
|
123
128
|
};
|
|
124
129
|
|
|
125
130
|
return {
|
|
126
|
-
code,
|
|
127
|
-
state,
|
|
128
131
|
referalCode,
|
|
129
132
|
refererCode,
|
|
130
133
|
productId,
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
2
3
|
import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
|
|
4
6
|
|
|
5
|
-
export const EmailField = JSX<CustomFieldProps>(({ field, input }) =>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
8
|
+
const onChange = useCallback(
|
|
9
|
+
(value: string) => {
|
|
10
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
},
|
|
14
|
+
[field],
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<DaDataInputControl
|
|
19
|
+
label="Электронная почта"
|
|
20
|
+
maxLength={50}
|
|
21
|
+
{...field(input?.name ?? '')}
|
|
22
|
+
{...input}
|
|
23
|
+
onChange={onChange}
|
|
24
|
+
/>
|
|
25
|
+
);
|
|
26
|
+
});
|
|
@@ -13,6 +13,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
16
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
16
17
|
|
|
17
18
|
const addressDaDataValidate = (address: Address) =>
|
|
18
19
|
Boolean(address.region && (address.city || address.locality) && address.house);
|
package/package.json
CHANGED
|
@@ -70,7 +70,7 @@ export const useInitApplicationLead = ({
|
|
|
70
70
|
useEffect(() => {
|
|
71
71
|
leadFormStore.productType = productType;
|
|
72
72
|
|
|
73
|
-
const {
|
|
73
|
+
const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(
|
|
74
74
|
queryFromStorage,
|
|
75
75
|
sessionStore,
|
|
76
76
|
);
|
|
@@ -84,6 +84,13 @@ export const useInitApplicationLead = ({
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
sessionStore.marketingInfo = marketingInfo;
|
|
87
|
+
}, [queryFromStorage]);
|
|
88
|
+
|
|
89
|
+
useEffect(() => {
|
|
90
|
+
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
91
|
+
|
|
92
|
+
const code = params.get('code');
|
|
93
|
+
const state = params.get('state');
|
|
87
94
|
|
|
88
95
|
if (code && state) {
|
|
89
96
|
requestEsiaProfile(code, state);
|
|
@@ -91,7 +98,7 @@ export const useInitApplicationLead = ({
|
|
|
91
98
|
sessionStorage.removeItem('accessToken');
|
|
92
99
|
sessionStorage.removeItem('refreshToken');
|
|
93
100
|
}
|
|
94
|
-
}, [
|
|
101
|
+
}, []);
|
|
95
102
|
|
|
96
103
|
return initialFormState;
|
|
97
104
|
};
|
|
@@ -103,10 +110,8 @@ const getLeadQueryParams = (
|
|
|
103
110
|
const referalData = sessionStore.referalData;
|
|
104
111
|
const marketingInfoFromStorage = sessionStore.marketingInfo;
|
|
105
112
|
const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
|
|
106
|
-
const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
|
|
107
113
|
|
|
108
|
-
const code =
|
|
109
|
-
const state = params.get('state');
|
|
114
|
+
const code = queryStorage.get('code');
|
|
110
115
|
const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
|
|
111
116
|
const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
|
|
112
117
|
const productId = code ? referalData?.productId : queryStorage.get('productId');
|
|
@@ -123,8 +128,6 @@ const getLeadQueryParams = (
|
|
|
123
128
|
};
|
|
124
129
|
|
|
125
130
|
return {
|
|
126
|
-
code,
|
|
127
|
-
state,
|
|
128
131
|
referalCode,
|
|
129
132
|
refererCode,
|
|
130
133
|
productId,
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
2
3
|
import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
|
|
4
6
|
|
|
5
|
-
export const EmailField = JSX<CustomFieldProps>(({ field, input }) =>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
8
|
+
const onChange = useCallback(
|
|
9
|
+
(value: string) => {
|
|
10
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
},
|
|
14
|
+
[field],
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<DaDataInputControl
|
|
19
|
+
label="Электронная почта"
|
|
20
|
+
maxLength={50}
|
|
21
|
+
{...field(input?.name ?? '')}
|
|
22
|
+
{...input}
|
|
23
|
+
onChange={onChange}
|
|
24
|
+
/>
|
|
25
|
+
);
|
|
26
|
+
});
|
|
@@ -13,6 +13,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
16
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
16
17
|
|
|
17
18
|
const addressDaDataValidate = (address: Address) =>
|
|
18
19
|
Boolean(address.region && (address.city || address.locality) && address.house);
|