@redneckz/wildless-cms-uni-blocks 0.14.917 → 0.14.918

package/src/retail/utils/updateOrganizationFields.ts

@@ -28,6 +28,8 @@ export const updateOrganizationFields = (
     organization: getOrganizationType(store?.organization ?? [], okopf, inn),
     employerOrganization: getOrganizationKind(store?.employerOrganization ?? [], okopf),
     organizationName,
+    inn,
+    isDadataOrganization: true,
   };
 
   for (const fieldName in organizationData) {

package/src/retail/validator/getRetailFormValidator.ts

@@ -8,6 +8,8 @@ import { validatorObj } from './validatorObj';
 import {
   dateRegistrationValidator,
   generalSeniorityValidator,
+  organizationInnValidator,
+  organizationNameValidator,
   passportValidator,
   workBeginDateValidator,
 } from './validators';
@@ -32,4 +34,6 @@ export const getRetailFormValidator = ({
     generalSeniority: generalSeniorityValidator(formState.lastJobExperience as string),
     beginDate: workBeginDateValidator(formState.limitedBirthday as Date),
     participantDateRegistration: dateRegistrationValidator(formState.limitedBirthday as Date),
+    organizationName: organizationNameValidator(formState.isDadataOrganization),
+    inn: organizationInnValidator(formState.isDadataOrganization),
   })(formState);

package/src/retail/validator/validators.ts

@@ -1,3 +1,4 @@
+import { isValidInnLength } from '../../ui-kit/FormField/validators';
 import { isCyrillic } from '../../utils/isCyrilic';
 import { validator } from '../../validation/validator';
 import { type Address } from '../model/LeadFormState';
@@ -135,3 +136,11 @@ export const validateDateFromBirth = (age: number, birthDate?: Date) =>
 
     return false;
   });
+
+export const organizationNameValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => Boolean(_) && Boolean(isDadataOrganization))(
+    'Укажите наименование организации',
+  );
+
+export const organizationInnValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => isValidInnLength(_) && Boolean(isDadataOrganization))('Укажите ИНН');

package/src/ui-kit/FormField/validators.ts

@@ -43,5 +43,5 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
 
-const isValidInnLength = (value: string | undefined): boolean =>
+export const isValidInnLength = (value: string | undefined): boolean =>
   typeof value === 'string' && (value.length === 10 || value.length === 12);