@redneckz/wildless-cms-uni-blocks 0.14.641 → 0.14.643

package/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -16,7 +17,11 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      {...getValidation(
+        field('organizationName'),
+        validatorObj.organizationName,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

package/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ const MAX_PART = 100;
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
   const partInBusinessField = {
-    ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
+    ...getValidation(
+      field('partInBusiness'),
+      validatorObj.partInBusiness,
+      calculateIsRequired(field, input?.required),
+    ),
   };
 
   const handleChange = (value: string) =>

package/src/ui-kit/FormField/Fields/PhoneField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -7,7 +8,13 @@ import { getValidation } from '../getValidation';
 export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputPhoneControl
     label="Телефон"
-    {...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.required)}
+    {...getValidation(
+      field(input?.name || 'phone'),
+      validatorObj.phone,
+      input?.name === 'organizationPhone'
+        ? calculateIsRequired(field, input?.required)
+        : input?.required,
+    )}
     {...input}
   />
 ));

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

@@ -0,0 +1,6 @@
+import { type FieldProps } from '../../hooks/useForm';
+
+export const calculateIsRequired = (
+  field: (fieldName: string) => FieldProps<any>,
+  initialRequired?: boolean,
+) => (field?.('employment')?.value?.key === 'RETIREE' ? false : initialRequired);

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -2,6 +2,7 @@ import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormC
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {
+  addressDaDataValidator,
   agreementValidator,
   defaultSelectValidator,
   defaultValidator,
@@ -51,7 +52,7 @@ export const validatorObj: Record<string, Validator> = {
   experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
   jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
   beginDate: defaultValidator('Укажите дату заключения трудового договора'),
-  addressFact: defaultValidator(),
+  addressFact: addressDaDataValidator(),
   partnerComments: defaultValidator(),
   collectionCount: defaultValidator(),
   comment: defaultValidator(),
@@ -80,8 +81,8 @@ export const validatorObj: Record<string, Validator> = {
   conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
   sex: defaultValidator('Укажите свой пол'),
-  addressRegistration: defaultValidator('Необходимо выбрать адрес'),
-  organizationAddress: defaultValidator('Необходимо выбрать адрес'),
+  addressRegistration: addressDaDataValidator(),
+  organizationAddress: addressDaDataValidator(),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),

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

@@ -1,3 +1,4 @@
+import { type Address } from '../../components/ApplicationLeadForm/getInitialFormState';
 import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
@@ -64,3 +65,9 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
+
+const addressDaDataValidate = (address: Address) =>
+  Boolean(address.qc === '0' && address.qcComplete === '0' && address.qcHouse === '2');
+
+export const addressDaDataValidator = () =>
+  validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');

package/src/ui-kit/ResponseTypeDialog/useResponseTypeDialog.tsx

@@ -6,11 +6,12 @@ export interface ResponseTypeDialogProps {
   typeForm?: string;
 }
 
-export const useResponseTypeDialog = (props: ResponseTypeDialogProps) => {
+export const useResponseTypeDialog = (initialProps: ResponseTypeDialogProps) => {
   const { open, close } = useDialogManager();
 
   return {
-    open: (options: DialogOptions = {}) => open(<ResponseTypeDialog {...props} />, options),
+    open: (props?: ResponseTypeDialogProps, options: DialogOptions = {}) =>
+      open(<ResponseTypeDialog {...initialProps} {...props} />, options),
     close,
   };
 };