@redneckz/wildless-cms-uni-blocks 0.14.821 → 0.14.822

package/mobile/lib/retail/validator/validators.js

@@ -2,25 +2,27 @@ import { isCyrillic } from '../../utils/isCyrilic.js';
 import { validator } from '../../validation/validator.js';
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
 const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
 export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
 export const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
 export const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
 export const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 export const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
-const limitedBirthdayValidate = (date) => {
+const limitedBirthdayValidate = ({ minAge, maxAge }) => (date) => {
     const today = new Date();
-    const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-    const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
-    if (!date || date > minDate || date < maxDate) {
+    const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+    const maxDate = maxAge
+        ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+        : null;
+    if (!date || date > minDate) {
+        return false;
+    }
+    if (maxDate && date < maxDate) {
         return false;
     }
     return true;
 };
-export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+export const limitedBirthdayValidator = (params) => validator(limitedBirthdayValidate(params))(params.errorMessage);
 export const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
 export const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
 const snilsValidate = (snils) => {

package/mobile/lib/retail/validator/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"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"}

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -2,7 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
+import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
@@ -15,7 +17,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
-import { type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
+import { type ApplicationLeadFormContent, type ProductType } from './ApplicationLeadFormContent';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -36,12 +38,13 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   }) => {
     const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
-    const inputs = useMemo(
-      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
-      [applicationFormData],
-    );
+    const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
 
-    const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
+    const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
+    const formValidator = useMemo(
+      () => getFormValidator(inputs, extendedValidatorObj),
+      [inputs, extendedValidatorObj],
+    );
 
     const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
@@ -98,3 +101,11 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     );
   },
 );
+
+const getInputs = (applicationFormData?: SectionsRetailProps[]) =>
+  (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[];
+
+const getExtendedValidatorObj = (productType: ProductType) => ({
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(productType),
+});

package/mobile/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface CreditCardFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'creditCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/mobile/src/components/CreditForm/CreditFormStep.tsx

@@ -6,6 +6,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -21,6 +22,13 @@ export interface CreditFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'credit';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
@@ -30,12 +38,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
+
     const formValidator = useCallback(
       (formState: LeadFormState) =>
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/mobile/src/components/DebitForm/DebitFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface DebitFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'debitCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/mobile/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -0,0 +1,21 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { limitedBirthdayValidator, type LimitedBirthdayValidationParams } from './validators';
+
+const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidationParams> = {
+  credit: {
+    minAge: 23,
+    maxAge: 75,
+    errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+  },
+  creditCard: {
+    minAge: 21,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+  },
+  debitCard: {
+    minAge: 18,
+    errorMessage: 'Допустимый возраст - от 18 лет',
+  },
+};
+
+export const getLimitedBirthdayValidation = (productType: ProductType) =>
+  limitedBirthdayValidator(limitedBirthdayValidationData[productType]);

package/mobile/src/retail/validator/validatorObj.ts

@@ -11,7 +11,6 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
-  limitedBirthdayValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -53,7 +52,6 @@ const validatorRetailObj: Record<string, Validator> = {
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   sex: defaultValidator('Укажите свой пол'),
-  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),

package/mobile/src/retail/validator/validators.ts

@@ -6,9 +6,11 @@ const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
 
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+export interface LimitedBirthdayValidationParams {
+  minAge: number;
+  maxAge?: number;
+  errorMessage: string;
+}
 
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && (address.city || address.locality) && address.house);
@@ -33,20 +35,29 @@ export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
-const limitedBirthdayValidate = (date?: Date) => {
-  const today = new Date();
+const limitedBirthdayValidate =
+  ({ minAge, maxAge }: LimitedBirthdayValidationParams) =>
+  (date?: Date) => {
+    const today = new Date();
 
-  const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-  const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
+    const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+    const maxDate = maxAge
+      ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+      : null;
 
-  if (!date || date > minDate || date < maxDate) {
-    return false;
-  }
+    if (!date || date > minDate) {
+      return false;
+    }
 
-  return true;
-};
+    if (maxDate && date < maxDate) {
+      return false;
+    }
+
+    return true;
+  };
 
-export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
+  validator(limitedBirthdayValidate(params))(params.errorMessage);
 
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.821",
+  "version": "0.14.822",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -2,7 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
+import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
@@ -15,7 +17,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
-import { type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
+import { type ApplicationLeadFormContent, type ProductType } from './ApplicationLeadFormContent';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -36,12 +38,13 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   }) => {
     const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
-    const inputs = useMemo(
-      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
-      [applicationFormData],
-    );
+    const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
 
-    const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
+    const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
+    const formValidator = useMemo(
+      () => getFormValidator(inputs, extendedValidatorObj),
+      [inputs, extendedValidatorObj],
+    );
 
     const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
@@ -98,3 +101,11 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     );
   },
 );
+
+const getInputs = (applicationFormData?: SectionsRetailProps[]) =>
+  (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[];
+
+const getExtendedValidatorObj = (productType: ProductType) => ({
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(productType),
+});

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface CreditCardFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'creditCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/CreditForm/CreditFormStep.tsx

@@ -6,6 +6,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -21,6 +22,13 @@ export interface CreditFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'credit';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
@@ -30,12 +38,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
+
     const formValidator = useCallback(
       (formState: LeadFormState) =>
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/DebitForm/DebitFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface DebitFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'debitCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -0,0 +1,21 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { limitedBirthdayValidator, type LimitedBirthdayValidationParams } from './validators';
+
+const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidationParams> = {
+  credit: {
+    minAge: 23,
+    maxAge: 75,
+    errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+  },
+  creditCard: {
+    minAge: 21,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+  },
+  debitCard: {
+    minAge: 18,
+    errorMessage: 'Допустимый возраст - от 18 лет',
+  },
+};
+
+export const getLimitedBirthdayValidation = (productType: ProductType) =>
+  limitedBirthdayValidator(limitedBirthdayValidationData[productType]);

package/src/retail/validator/validatorObj.ts

@@ -11,7 +11,6 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
-  limitedBirthdayValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -53,7 +52,6 @@ const validatorRetailObj: Record<string, Validator> = {
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   sex: defaultValidator('Укажите свой пол'),
-  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),

package/src/retail/validator/validators.ts

@@ -6,9 +6,11 @@ const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
 
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+export interface LimitedBirthdayValidationParams {
+  minAge: number;
+  maxAge?: number;
+  errorMessage: string;
+}
 
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && (address.city || address.locality) && address.house);
@@ -33,20 +35,29 @@ export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
-const limitedBirthdayValidate = (date?: Date) => {
-  const today = new Date();
+const limitedBirthdayValidate =
+  ({ minAge, maxAge }: LimitedBirthdayValidationParams) =>
+  (date?: Date) => {
+    const today = new Date();
 
-  const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-  const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
+    const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+    const maxDate = maxAge
+      ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+      : null;
 
-  if (!date || date > minDate || date < maxDate) {
-    return false;
-  }
+    if (!date || date > minDate) {
+      return false;
+    }
 
-  return true;
-};
+    if (maxDate && date < maxDate) {
+      return false;
+    }
+
+    return true;
+  };
 
-export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
+  validator(limitedBirthdayValidate(params))(params.errorMessage);
 
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);