@redneckz/wildless-cms-uni-blocks 0.14.583 → 0.14.585
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 +7 -6
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/hooks/useBranchesByRegions.d.ts +1 -1
- package/dist/components/ApplicationLeadForm/GroupedConsents.js +2 -2
- package/dist/components/ApplicationLeadForm/GroupedConsents.js.map +1 -1
- package/dist/hooks/useBranchesByRegions.d.ts +1 -1
- package/dist/hooks/useBranchesByRegions.js +3 -2
- package/dist/hooks/useBranchesByRegions.js.map +1 -1
- package/dist/ui-kit/FormField/Fields/AddressBranchField.js +1 -1
- package/dist/ui-kit/FormField/Fields/AddressBranchField.js.map +1 -1
- package/dist/ui-kit/FormField/Fields/RegionPremiumField.js +1 -1
- package/dist/ui-kit/FormField/Fields/RegionPremiumField.js.map +1 -1
- package/lib/components/ApplicationLeadForm/GroupedConsents.js +2 -2
- package/lib/components/ApplicationLeadForm/GroupedConsents.js.map +1 -1
- package/lib/hooks/useBranchesByRegions.d.ts +1 -1
- package/lib/hooks/useBranchesByRegions.js +3 -2
- package/lib/hooks/useBranchesByRegions.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/AddressBranchField.js +1 -1
- package/lib/ui-kit/FormField/Fields/AddressBranchField.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/RegionPremiumField.js +1 -1
- package/lib/ui-kit/FormField/Fields/RegionPremiumField.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +7 -6
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/hooks/useBranchesByRegions.d.ts +1 -1
- package/mobile/dist/components/ApplicationLeadForm/GroupedConsents.js +2 -2
- package/mobile/dist/components/ApplicationLeadForm/GroupedConsents.js.map +1 -1
- package/mobile/dist/hooks/useBranchesByRegions.d.ts +1 -1
- package/mobile/dist/hooks/useBranchesByRegions.js +3 -2
- package/mobile/dist/hooks/useBranchesByRegions.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/AddressBranchField.js +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/AddressBranchField.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/RegionPremiumField.js +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/RegionPremiumField.js.map +1 -1
- package/mobile/lib/components/ApplicationLeadForm/GroupedConsents.js +2 -2
- package/mobile/lib/components/ApplicationLeadForm/GroupedConsents.js.map +1 -1
- package/mobile/lib/hooks/useBranchesByRegions.d.ts +1 -1
- package/mobile/lib/hooks/useBranchesByRegions.js +3 -2
- package/mobile/lib/hooks/useBranchesByRegions.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/AddressBranchField.js +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/AddressBranchField.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/RegionPremiumField.js +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/RegionPremiumField.js.map +1 -1
- package/mobile/src/components/ApplicationLeadForm/GroupedConsents.tsx +2 -2
- package/mobile/src/hooks/useBranchesByRegions.ts +6 -2
- package/mobile/src/ui-kit/FormField/Fields/AddressBranchField.tsx +1 -1
- package/mobile/src/ui-kit/FormField/Fields/RegionPremiumField.tsx +1 -1
- package/package.json +1 -1
- package/src/components/ApplicationLeadForm/GroupedConsents.tsx +2 -2
- package/src/hooks/useBranchesByRegions.ts +6 -2
- package/src/ui-kit/FormField/Fields/AddressBranchField.tsx +1 -1
- package/src/ui-kit/FormField/Fields/RegionPremiumField.tsx +1 -1
|
@@ -8,9 +8,9 @@ const Foldable_1 = require("../../ui-kit/Foldable/Foldable");
|
|
|
8
8
|
const FoldableSection_1 = require("../../ui-kit/Foldable/FoldableSection");
|
|
9
9
|
const getField_1 = require("../../ui-kit/FormField/getField");
|
|
10
10
|
const getObjectValidator_1 = require("../../ui-kit/FormField/getObjectValidator");
|
|
11
|
-
const getValidation_1 = require("../../ui-kit/FormField/getValidation");
|
|
12
11
|
const Icon_1 = require("../../ui-kit/Icon/Icon");
|
|
13
12
|
const renderErrorText_1 = require("../../ui-kit/Input/renderErrorText");
|
|
13
|
+
const withValidator_1 = require("../../validation/withValidator");
|
|
14
14
|
const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
|
|
15
15
|
const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
|
|
16
16
|
exports.GroupedConsents = (0, uni_jsx_1.JSX)(({ inputs = [], typeForm = '', field, key }) => {
|
|
@@ -23,7 +23,7 @@ exports.GroupedConsents = (0, uni_jsx_1.JSX)(({ inputs = [], typeForm = '', fiel
|
|
|
23
23
|
};
|
|
24
24
|
const hasValidationErrors = (0, hooks_1.useMemo)(() => inputs
|
|
25
25
|
?.filter((_) => _.required)
|
|
26
|
-
?.some((_) => Boolean((0,
|
|
26
|
+
?.some((_) => Boolean((0, withValidator_1.withValidator)(field(_?.name), getObjectValidator_1.validatorObj[_?.name]).error)), [inputs]);
|
|
27
27
|
return ((0, jsx_runtime_1.jsx)("div", { className: "w-fit", children: (0, jsx_runtime_1.jsx)(Foldable_1.Foldable, { isFoldButtonOnTop: true, renderFoldableSection: ({ isUnfolded }) => ((0, jsx_runtime_1.jsx)(FoldableSection_1.FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: inputs.map((0, getField_1.getField)(field, typeForm)) })), renderFoldButton: renderGeneralCheckbox((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(Checkbox_1.Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), (0, renderErrorText_1.renderErrorText)(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
|
|
28
28
|
});
|
|
29
29
|
const renderGeneralCheckbox = (generalCheckBox) => (foldableData) => ((0, jsx_runtime_1.jsxs)("div", { className: "flex items-start", children: [generalCheckBox, (0, jsx_runtime_1.jsx)("button", { onClick: foldableData.onToggle, className: "px-m py-2xs", children: (0, jsx_runtime_1.jsx)(Icon_1.Icon, { className: "text-primary-text", name: foldableData.isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" }) })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupedConsents.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/GroupedConsents.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AAEtD,6DAA0D;AAC1D,6DAA0D;AAE1D,2EAAwE;AACxE,8DAA2D;AAC3D,kFAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"GroupedConsents.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/GroupedConsents.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AAEtD,6DAA0D;AAC1D,6DAA0D;AAE1D,2EAAwE;AACxE,8DAA2D;AAC3D,kFAAyE;AACzE,iDAA8C;AAC9C,wEAAqE;AACrE,kEAA+D;AAI/D,MAAM,qBAAqB,GAAG,2BAA2B,CAAC;AAC1D,MAAM,gBAAgB,GAAG,sCAAsC,CAAC;AAEnD,QAAA,eAAe,GAAG,IAAA,aAAG,EAChC,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;IAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAE,EAAE;QAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;YACzB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAuB,CAAC,CAAC;YACtD,SAAS,EAAE,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAClD;IACH,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAA,eAAO,EACjC,GAAG,EAAE,CACH,MAAM;QACJ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3B,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAA,6BAAa,EAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,iCAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EACtF,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,OAAO,CACL,gCAAK,SAAS,EAAC,OAAO,YACpB,uBAAC,mBAAQ,IACP,iBAAiB,QACjB,qBAAqB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CACzC,uBAAC,iCAAe,IAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAC,sBAAsB,YACtE,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,GACtB,CACnB,EACD,gBAAgB,EAAE,qBAAqB,CACrC,4CACE,uBAAC,mBAAQ,IACP,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,mBAAmB,EAC7B,IAAI,EAAE,qBAAqB,IACtB,GAAG,CACR,EACD,IAAA,iCAAe,EAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,IACzD,CACP,GACD,GACE,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,qBAAqB,GACzB,CAAC,eAAsB,EAAE,EAAE,CAC3B,CAAC,YAA+B,EAAS,EAAE,CACzC,CACE,iCAAK,SAAS,EAAC,kBAAkB,aAC9B,eAAe,EAChB,mCAAQ,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAC,aAAa,YAC7D,uBAAC,WAAI,IACH,SAAS,EAAC,mBAAmB,EAC7B,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,EAC/D,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,GACX,GACK,IACL,CACP,CAAC"}
|
|
@@ -3,8 +3,9 @@ exports.useBranchesByRegions = void 0;
|
|
|
3
3
|
const useAsyncData_1 = require("@redneckz/uni-jsx/lib/hooks/useAsyncData");
|
|
4
4
|
const fetchJSON_1 = require("../utils/fetchJSON");
|
|
5
5
|
const REGIONS_URL = '/api/v1/branchesByRegions';
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const PREMIUM_REGIONS_URL = '/api/v1/premiumBranchesByRegions';
|
|
7
|
+
function useBranchesByRegions(isPremium = false) {
|
|
8
|
+
const { data } = (0, useAsyncData_1.useAsyncData)(isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL, fetchJSON_1.fetchJSONUnsafe);
|
|
8
9
|
return Array.isArray(data) ? data : [];
|
|
9
10
|
}
|
|
10
11
|
exports.useBranchesByRegions = useBranchesByRegions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBranchesByRegions.js","sourceRoot":"","sources":["../../src/hooks/useBranchesByRegions.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AACxE,kDAA+E;AAE/E,MAAM,WAAW,GAAG,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"useBranchesByRegions.js","sourceRoot":"","sources":["../../src/hooks/useBranchesByRegions.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AACxE,kDAA+E;AAE/E,MAAM,WAAW,GAAG,2BAA2B,CAAC;AAChD,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;AAU/D,SAAgB,oBAAoB,CAAC,SAAS,GAAG,KAAK;IACpD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAC3B,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,EAC7C,2BAAgD,CACjD,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACzC,CAAC;AAPD,oDAOC"}
|
|
@@ -13,7 +13,7 @@ exports.AddressBranchField = (0, uni_jsx_1.JSX)(({ field, input, isPremium = fal
|
|
|
13
13
|
const regionKey = fieldRegion?.value?.key;
|
|
14
14
|
const regionText = fieldRegion?.value?.text;
|
|
15
15
|
const addressBranch = isPremium
|
|
16
|
-
? (0, useBranchesByRegions_1.useBranchesByRegions)()?.find((_) => _?.region === regionText)?.branches
|
|
16
|
+
? (0, useBranchesByRegions_1.useBranchesByRegions)(isPremium)?.find((_) => _?.region === regionText)?.branches
|
|
17
17
|
: (0, useBranches_1.useBranches)(regionKey)?.filter((branch) => branch?.address);
|
|
18
18
|
(0, hooks_1.useEffect)(() => {
|
|
19
19
|
if (fieldRegion?.value?.key !== '') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressBranchField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressBranchField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAwD;AACxD,4DAAyD;AACzD,8EAA2E;AAC3E,8DAA2D;AAE3D,8DAAqD;AACrD,oDAAiD;AAMpC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,GAAa,CAAC;IACpD,MAAM,UAAU,GAAG,WAAW,EAAE,KAAK,EAAE,IAAc,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,IAAA,2CAAoB,
|
|
1
|
+
{"version":3,"file":"AddressBranchField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressBranchField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAwD;AACxD,4DAAyD;AACzD,8EAA2E;AAC3E,8DAA2D;AAE3D,8DAAqD;AACrD,oDAAiD;AAMpC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,GAAa,CAAC;IACpD,MAAM,UAAU,GAAG,WAAW,EAAE,KAAK,EAAE,IAAc,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,IAAA,2CAAoB,EAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC,EAAE,QAAQ;QAClF,CAAC,CAAC,IAAA,yBAAW,EAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE;YAClC,KAAK,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;SAC1C;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEzB,OAAO,CACL,uBAAC,6BAAa,IACZ,KAAK,EAAC,wDAAW,EACjB,WAAW,EAAC,yGAAoB,EAChC,OAAO,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,OAAO;SACd,CAAC,CAAC,KACC,IAAA,6BAAa,EAAC,KAAK,CAAC,eAAe,CAAC,EAAE,iCAAY,CAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,EACtF,QAAQ,EAAE,IAAI,GACd,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -8,7 +8,7 @@ const SelectControl_1 = require("../../Select/SelectControl");
|
|
|
8
8
|
const getObjectValidator_1 = require("../getObjectValidator");
|
|
9
9
|
const getValidation_1 = require("../getValidation");
|
|
10
10
|
exports.RegionPremiumField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
11
|
-
const branchByRegions = (0, useBranchesByRegions_1.useBranchesByRegions)();
|
|
11
|
+
const branchByRegions = (0, useBranchesByRegions_1.useBranchesByRegions)(true);
|
|
12
12
|
const regions = (0, hooks_1.useMemo)(() => branchByRegions?.map(({ region }) => ({
|
|
13
13
|
key: region,
|
|
14
14
|
text: region,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionPremiumField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RegionPremiumField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AACtD,8EAA2E;AAE3E,8DAA2D;AAE3D,8DAAqD;AACrD,oDAAiD;AAEpC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,eAAe,GAAG,IAAA,2CAAoB,
|
|
1
|
+
{"version":3,"file":"RegionPremiumField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RegionPremiumField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AACtD,8EAA2E;AAE3E,8DAA2D;AAE3D,8DAAqD;AACrD,oDAAiD;AAEpC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,eAAe,GAAG,IAAA,2CAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAA,eAAO,EACrB,GAAG,EAAE,CACH,eAAe,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,MAAM;KACb,CAAC,CAAC,EACL,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,OAAO,CACL,uBAAC,6BAAa,IACZ,KAAK,EAAC,sCAAQ,EACd,WAAW,EAAC,uFAAiB,EAC7B,OAAO,EAAE,OAAmB,KACxB,IAAA,6BAAa,EAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,iCAAY,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,GACxE,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -6,9 +6,9 @@ import { Foldable } from '../../ui-kit/Foldable/Foldable.js';
|
|
|
6
6
|
import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection.js';
|
|
7
7
|
import { getField } from '../../ui-kit/FormField/getField.js';
|
|
8
8
|
import { validatorObj } from '../../ui-kit/FormField/getObjectValidator.js';
|
|
9
|
-
import { getValidation } from '../../ui-kit/FormField/getValidation.js';
|
|
10
9
|
import { Icon } from '../../ui-kit/Icon/Icon.js';
|
|
11
10
|
import { renderErrorText } from '../../ui-kit/Input/renderErrorText.js';
|
|
11
|
+
import { withValidator } from '../../validation/withValidator.js';
|
|
12
12
|
const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
|
|
13
13
|
const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
|
|
14
14
|
export const GroupedConsents = JSX(({ inputs = [], typeForm = '', field, key }) => {
|
|
@@ -21,7 +21,7 @@ export const GroupedConsents = JSX(({ inputs = [], typeForm = '', field, key })
|
|
|
21
21
|
};
|
|
22
22
|
const hasValidationErrors = useMemo(() => inputs
|
|
23
23
|
?.filter((_) => _.required)
|
|
24
|
-
?.some((_) => Boolean(
|
|
24
|
+
?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)), [inputs]);
|
|
25
25
|
return (_jsx("div", { className: "w-fit", children: _jsx(Foldable, { isFoldButtonOnTop: true, renderFoldableSection: ({ isUnfolded }) => (_jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: inputs.map(getField(field, typeForm)) })), renderFoldButton: renderGeneralCheckbox(_jsxs("div", { children: [_jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
|
|
26
26
|
});
|
|
27
27
|
const renderGeneralCheckbox = (generalCheckBox) => (foldableData) => (_jsxs("div", { className: "flex items-start", children: [generalCheckBox, _jsx("button", { onClick: foldableData.onToggle, className: "px-m py-2xs", children: _jsx(Icon, { className: "text-primary-text", name: foldableData.isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" }) })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupedConsents.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/GroupedConsents.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"GroupedConsents.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/GroupedConsents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
|
|
2
2
|
import { fetchJSONUnsafe } from '../utils/fetchJSON.js';
|
|
3
3
|
const REGIONS_URL = '/api/v1/branchesByRegions';
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const PREMIUM_REGIONS_URL = '/api/v1/premiumBranchesByRegions';
|
|
5
|
+
export function useBranchesByRegions(isPremium = false) {
|
|
6
|
+
const { data } = useAsyncData(isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL, fetchJSONUnsafe);
|
|
6
7
|
return Array.isArray(data) ? data : [];
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=useBranchesByRegions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBranchesByRegions.js","sourceRoot":"","sources":["../../src/hooks/useBranchesByRegions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAE/E,MAAM,WAAW,GAAG,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"useBranchesByRegions.js","sourceRoot":"","sources":["../../src/hooks/useBranchesByRegions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAE/E,MAAM,WAAW,GAAG,2BAA2B,CAAC;AAChD,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;AAU/D,MAAM,UAAU,oBAAoB,CAAC,SAAS,GAAG,KAAK;IACpD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,EAC7C,eAAgD,CACjD,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -11,7 +11,7 @@ export const AddressBranchField = JSX(({ field, input, isPremium = false }) => {
|
|
|
11
11
|
const regionKey = fieldRegion?.value?.key;
|
|
12
12
|
const regionText = fieldRegion?.value?.text;
|
|
13
13
|
const addressBranch = isPremium
|
|
14
|
-
? useBranchesByRegions()?.find((_) => _?.region === regionText)?.branches
|
|
14
|
+
? useBranchesByRegions(isPremium)?.find((_) => _?.region === regionText)?.branches
|
|
15
15
|
: useBranches(regionKey)?.filter((branch) => branch?.address);
|
|
16
16
|
useEffect(() => {
|
|
17
17
|
if (fieldRegion?.value?.key !== '') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressBranchField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressBranchField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,GAAa,CAAC;IACpD,MAAM,UAAU,GAAG,WAAW,EAAE,KAAK,EAAE,IAAc,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"AddressBranchField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressBranchField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,EAAE,KAAK,EAAE,GAAa,CAAC;IACpD,MAAM,UAAU,GAAG,WAAW,EAAE,KAAK,EAAE,IAAc,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC,EAAE,QAAQ;QAClF,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE;YAClC,KAAK,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;SAC1C;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEzB,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAC,wDAAW,EACjB,WAAW,EAAC,yGAAoB,EAChC,OAAO,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,OAAO;SACd,CAAC,CAAC,KACC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,EACtF,QAAQ,EAAE,IAAI,GACd,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { SelectControl } from '../../Select/SelectControl.js';
|
|
|
6
6
|
import { validatorObj } from '../getObjectValidator.js';
|
|
7
7
|
import { getValidation } from '../getValidation.js';
|
|
8
8
|
export const RegionPremiumField = JSX(({ field, input }) => {
|
|
9
|
-
const branchByRegions = useBranchesByRegions();
|
|
9
|
+
const branchByRegions = useBranchesByRegions(true);
|
|
10
10
|
const regions = useMemo(() => branchByRegions?.map(({ region }) => ({
|
|
11
11
|
key: region,
|
|
12
12
|
text: region,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionPremiumField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RegionPremiumField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,eAAe,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"RegionPremiumField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RegionPremiumField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,eAAe,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CACH,eAAe,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,MAAM;KACb,CAAC,CAAC,EACL,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAC,sCAAQ,EACd,WAAW,EAAC,uFAAiB,EAC7B,OAAO,EAAE,OAAmB,KACxB,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,GACxE,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -7,9 +7,9 @@ import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps'
|
|
|
7
7
|
import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
|
|
8
8
|
import { getField } from '../../ui-kit/FormField/getField';
|
|
9
9
|
import { validatorObj } from '../../ui-kit/FormField/getObjectValidator';
|
|
10
|
-
import { getValidation } from '../../ui-kit/FormField/getValidation';
|
|
11
10
|
import { Icon } from '../../ui-kit/Icon/Icon';
|
|
12
11
|
import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
|
|
12
|
+
import { withValidator } from '../../validation/withValidator';
|
|
13
13
|
import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
|
|
14
14
|
import { type FormState } from './getInitialFormState';
|
|
15
15
|
|
|
@@ -31,7 +31,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
|
|
|
31
31
|
() =>
|
|
32
32
|
inputs
|
|
33
33
|
?.filter((_) => _.required)
|
|
34
|
-
?.some((_) => Boolean(
|
|
34
|
+
?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)),
|
|
35
35
|
[inputs],
|
|
36
36
|
);
|
|
37
37
|
|
|
@@ -2,6 +2,7 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
|
|
|
2
2
|
import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
|
|
3
3
|
|
|
4
4
|
const REGIONS_URL = '/api/v1/branchesByRegions';
|
|
5
|
+
const PREMIUM_REGIONS_URL = '/api/v1/premiumBranchesByRegions';
|
|
5
6
|
|
|
6
7
|
export interface Region {
|
|
7
8
|
region: string;
|
|
@@ -11,8 +12,11 @@ export interface Region {
|
|
|
11
12
|
}[];
|
|
12
13
|
}
|
|
13
14
|
|
|
14
|
-
export function useBranchesByRegions(): Region[] {
|
|
15
|
-
const { data } = useAsyncData(
|
|
15
|
+
export function useBranchesByRegions(isPremium = false): Region[] {
|
|
16
|
+
const { data } = useAsyncData(
|
|
17
|
+
isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL,
|
|
18
|
+
fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>,
|
|
19
|
+
);
|
|
16
20
|
|
|
17
21
|
return Array.isArray(data) ? data : [];
|
|
18
22
|
}
|
|
@@ -16,7 +16,7 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, isPremi
|
|
|
16
16
|
const regionKey = fieldRegion?.value?.key as string;
|
|
17
17
|
const regionText = fieldRegion?.value?.text as string;
|
|
18
18
|
const addressBranch = isPremium
|
|
19
|
-
? useBranchesByRegions()?.find((_) => _?.region === regionText)?.branches
|
|
19
|
+
? useBranchesByRegions(isPremium)?.find((_) => _?.region === regionText)?.branches
|
|
20
20
|
: useBranches(regionKey)?.filter((branch) => branch?.address);
|
|
21
21
|
useEffect(() => {
|
|
22
22
|
if (fieldRegion?.value?.key !== '') {
|
|
@@ -8,7 +8,7 @@ import { validatorObj } from '../getObjectValidator';
|
|
|
8
8
|
import { getValidation } from '../getValidation';
|
|
9
9
|
|
|
10
10
|
export const RegionPremiumField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
11
|
-
const branchByRegions = useBranchesByRegions();
|
|
11
|
+
const branchByRegions = useBranchesByRegions(true);
|
|
12
12
|
const regions = useMemo(
|
|
13
13
|
() =>
|
|
14
14
|
branchByRegions?.map(({ region }) => ({
|
package/package.json
CHANGED
|
@@ -7,9 +7,9 @@ import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps'
|
|
|
7
7
|
import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
|
|
8
8
|
import { getField } from '../../ui-kit/FormField/getField';
|
|
9
9
|
import { validatorObj } from '../../ui-kit/FormField/getObjectValidator';
|
|
10
|
-
import { getValidation } from '../../ui-kit/FormField/getValidation';
|
|
11
10
|
import { Icon } from '../../ui-kit/Icon/Icon';
|
|
12
11
|
import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
|
|
12
|
+
import { withValidator } from '../../validation/withValidator';
|
|
13
13
|
import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
|
|
14
14
|
import { type FormState } from './getInitialFormState';
|
|
15
15
|
|
|
@@ -31,7 +31,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
|
|
|
31
31
|
() =>
|
|
32
32
|
inputs
|
|
33
33
|
?.filter((_) => _.required)
|
|
34
|
-
?.some((_) => Boolean(
|
|
34
|
+
?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)),
|
|
35
35
|
[inputs],
|
|
36
36
|
);
|
|
37
37
|
|
|
@@ -2,6 +2,7 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
|
|
|
2
2
|
import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
|
|
3
3
|
|
|
4
4
|
const REGIONS_URL = '/api/v1/branchesByRegions';
|
|
5
|
+
const PREMIUM_REGIONS_URL = '/api/v1/premiumBranchesByRegions';
|
|
5
6
|
|
|
6
7
|
export interface Region {
|
|
7
8
|
region: string;
|
|
@@ -11,8 +12,11 @@ export interface Region {
|
|
|
11
12
|
}[];
|
|
12
13
|
}
|
|
13
14
|
|
|
14
|
-
export function useBranchesByRegions(): Region[] {
|
|
15
|
-
const { data } = useAsyncData(
|
|
15
|
+
export function useBranchesByRegions(isPremium = false): Region[] {
|
|
16
|
+
const { data } = useAsyncData(
|
|
17
|
+
isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL,
|
|
18
|
+
fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>,
|
|
19
|
+
);
|
|
16
20
|
|
|
17
21
|
return Array.isArray(data) ? data : [];
|
|
18
22
|
}
|
|
@@ -16,7 +16,7 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, isPremi
|
|
|
16
16
|
const regionKey = fieldRegion?.value?.key as string;
|
|
17
17
|
const regionText = fieldRegion?.value?.text as string;
|
|
18
18
|
const addressBranch = isPremium
|
|
19
|
-
? useBranchesByRegions()?.find((_) => _?.region === regionText)?.branches
|
|
19
|
+
? useBranchesByRegions(isPremium)?.find((_) => _?.region === regionText)?.branches
|
|
20
20
|
: useBranches(regionKey)?.filter((branch) => branch?.address);
|
|
21
21
|
useEffect(() => {
|
|
22
22
|
if (fieldRegion?.value?.key !== '') {
|
|
@@ -8,7 +8,7 @@ import { validatorObj } from '../getObjectValidator';
|
|
|
8
8
|
import { getValidation } from '../getValidation';
|
|
9
9
|
|
|
10
10
|
export const RegionPremiumField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
11
|
-
const branchByRegions = useBranchesByRegions();
|
|
11
|
+
const branchByRegions = useBranchesByRegions(true);
|
|
12
12
|
const regions = useMemo(
|
|
13
13
|
() =>
|
|
14
14
|
branchByRegions?.map(({ region }) => ({
|