@redneckz/wildless-cms-uni-blocks 0.14.689 → 0.14.690

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -34,8 +34,8 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'sex', required: true },
         { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'birthPlace', required: true },
-        { fieldType: 'common', name: 'phone', required: true },
+        { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
+        { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'email', required: true, dadata: true },
       ],
     },
@@ -119,7 +119,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'employment' },
+        { fieldType: 'common', name: 'employment', required: true },
         { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
       ],
     },
@@ -132,15 +132,15 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'organization', required: false },
-        { fieldType: 'common', name: 'amountWorkers', required: false },
+        { fieldType: 'common', name: 'organization', required: true },
+        { fieldType: 'common', name: 'amountWorkers', required: true },
       ],
     },
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'employerActivities', required: false },
-        { fieldType: 'common', name: 'employerOrganization', required: false },
+        { fieldType: 'common', name: 'employerActivities', required: true },
+        { fieldType: 'common', name: 'employerOrganization', required: true },
         { fieldType: 'common', name: 'generalSeniority', required: true },
         { fieldType: 'common', name: 'lastJobExperience', required: true },
         { fieldType: 'common', name: 'experience5Years', required: true },
@@ -161,7 +161,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: false },
+        { fieldType: 'common', name: 'positionOrganization', required: true },
         {
           fieldType: 'common',
           name: 'partInBusiness',
@@ -208,6 +208,10 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         },
       ],
     },
+    {
+      columns: 1,
+      inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
+    },
     {
       columns: 1,
       inputs: [{ fieldType: 'common', name: 'wages', required: true }],
@@ -245,7 +249,12 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'legalEntityName' }],
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'legalEntityName',
+        },
+      ],
     },
     {
       inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],

package/src/components/CreditCardForm/{getFirstStepData.tsx → getCardData.tsx}

@@ -1,7 +1,7 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
-export const getFirstStepData = (formData: FormState): Partial<Participant> => {
+export const getCardData = (formData: FormState): Partial<Participant> => {
   const { currency, paymentSystem, cardCategory, codeWord } = formData;
 
   return {

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -1,8 +1,8 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getCardData } from './getCardData';
 import { getFifthStepData } from './getFifthStepData';
-import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
 import { getDeliveryData, getOfficeCode, getSixthStepData } from './getSixthStepData';
@@ -46,6 +46,7 @@ export const getCreditCardFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
+      ...getCardData(formData),
       ...getDeliveryData(formData),
     },
   };
@@ -54,7 +55,7 @@ export const getCreditCardFormTaskData = ({
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
     case 0:
-      return getFirstStepData(formData);
+      return {};
     case 1:
       return getSecondStepData(formData);
     case 2:

package/src/components/CreditForm/calculateInputs.ts

@@ -30,9 +30,6 @@ const checkIsRetiree = (step: number, getValue: GetValue) =>
 const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
-const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
-  name === 'snils' && isSnilsRequired(getValue);
-
 const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
 
@@ -47,5 +44,8 @@ export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
 
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && isSnilsRequired(getValue);
+
 const isSnilsRequired = (getValue: GetValue) =>
   getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -116,7 +116,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'employment' },
+        { fieldType: 'common', name: 'employment', required: true },
         { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
       ],
     },
@@ -129,15 +129,15 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'organization', required: false },
-        { fieldType: 'common', name: 'amountWorkers', required: false },
+        { fieldType: 'common', name: 'organization', required: true },
+        { fieldType: 'common', name: 'amountWorkers', required: true },
       ],
     },
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'employerActivities', required: false },
-        { fieldType: 'common', name: 'employerOrganization', required: false },
+        { fieldType: 'common', name: 'employerActivities', required: true },
+        { fieldType: 'common', name: 'employerOrganization', required: true },
         { fieldType: 'common', name: 'generalSeniority', required: true },
         { fieldType: 'common', name: 'lastJobExperience', required: true },
         { fieldType: 'common', name: 'experience5Years', required: true },
@@ -158,7 +158,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: false },
+        { fieldType: 'common', name: 'positionOrganization', required: true },
         {
           fieldType: 'common',
           name: 'partInBusiness',

package/src/ui-kit/ConsentBkiDialog/ConsentBkiDialog.tsx

@@ -39,7 +39,6 @@ export const ConsentBkiDialog = JSX<ConsentBkiDialogProps>(
 
     const handleSubmit = useCallback(() => {
       onSubmit(confirmStatus);
-      onClose();
     }, [onSubmit, confirmStatus]);
 
     const handleConfirmChange = useCallback((value: string) => {

package/src/ui-kit/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -31,7 +31,7 @@ export const useConsentBkiDialog = (onClose: () => void) => {
       if (confirmStatus === 'SIGNED' && phone) {
         verifyPhoneDialog.open({
           ...verifyPhoneContent(phone),
-          onClose: handleSuccessVerify(profileId),
+          onSuccess: handleSuccessVerify(profileId),
         });
       } else {
         onClose();

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

@@ -3,8 +3,8 @@ import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
-const LABEL_TEXT = `Имеет ли юридическое лицо, акционером / участником / членом / пайщиком / 
-    вкладчиком с долей участия более 20% уставного капитала руководителем, 
+const LABEL_TEXT = `Имеет ли юридическое лицо, акционером / участником / членом / пайщиком /
+    вкладчиком с долей участия более 20% уставного капитала руководителем,
     которого Вы являетесь, кредит в АО «Россельхозбанк»`;
 
 export const CreditInRshbCdField = JSX<CustomFieldProps>(({ field, input }) => {
@@ -17,6 +17,7 @@ export const CreditInRshbCdField = JSX<CustomFieldProps>(({ field, input }) => {
       label={LABEL_TEXT}
       fieldName="creditInRshbCd"
       input={input}
+      disabled={!field?.('shareholderFlg')?.value}
     />
   );
 });

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

@@ -10,6 +10,7 @@ export const LegalEntityNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование юридического лица"
       {...input}
       {...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required)}
+      disabled={!field?.('shareholderFlg')?.value}
     />
   );
 });

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

@@ -20,17 +20,19 @@ export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   fieldName: string;
   placeholder?: string;
   isSearch?: boolean;
+  disabled?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
   ({
     field,
     source,
-    label,
     fieldName,
     input,
     placeholder = 'Выберите из списка',
-    isSearch = false,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options,
+    ...rest
   }) => {
     const leadOptions: Option[] =
       source?.map((_: LeadProps) => ({
@@ -41,10 +43,9 @@ export const SelectField = UniBlock<SelectFieldProps>(
     return (
       <SelectControl
         placeholder={placeholder}
-        label={label}
         options={leadOptions}
-        isSearch={isSearch}
         {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+        {...rest}
       />
     );
   },

package/dist/components/CreditCardForm/getFirstStepData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getFirstStepData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getFirstStepData.tsx"],"names":[],"mappings":";;AAGO,MAAM,gBAAgB,GAAG,CAAC,QAAmB,EAAwB,EAAE;IAC5E,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAErE,OAAO;QACL,YAAY,EAAE,QAAQ;QACtB,mBAAmB,EAAE,aAAa;QAClC,SAAS,EAAE,YAAY;QACvB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B"}

package/lib/components/CreditCardForm/getFirstStepData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getFirstStepData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getFirstStepData.tsx"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAmB,EAAwB,EAAE;IAC5E,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAErE,OAAO;QACL,YAAY,EAAE,QAAQ;QACtB,mBAAmB,EAAE,aAAa;QAClC,SAAS,EAAE,YAAY;QACvB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC,CAAC"}

package/mobile/dist/components/CreditCardForm/getFirstStepData.d.ts

@@ -1,3 +0,0 @@
-import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
-export declare const getFirstStepData: (formData: FormState) => Partial<Participant>;

package/mobile/dist/components/CreditCardForm/getFirstStepData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getFirstStepData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getFirstStepData.tsx"],"names":[],"mappings":";;AAGO,MAAM,gBAAgB,GAAG,CAAC,QAAmB,EAAwB,EAAE;IAC5E,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAErE,OAAO;QACL,YAAY,EAAE,QAAQ;QACtB,mBAAmB,EAAE,aAAa;QAClC,SAAS,EAAE,YAAY;QACvB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B"}

package/mobile/lib/components/CreditCardForm/getFirstStepData.d.ts

@@ -1,3 +0,0 @@
-import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
-export declare const getFirstStepData: (formData: FormState) => Partial<Participant>;

package/mobile/lib/components/CreditCardForm/getFirstStepData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getFirstStepData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getFirstStepData.tsx"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAmB,EAAwB,EAAE;IAC5E,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAErE,OAAO;QACL,YAAY,EAAE,QAAQ;QACtB,mBAAmB,EAAE,aAAa;QAClC,SAAS,EAAE,YAAY;QACvB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC,CAAC"}