@redneckz/wildless-cms-uni-blocks 0.14.698 → 0.14.699

package/mobile/src/ui-kit/FormField/Fields/OrganizationField.tsx

@@ -1,15 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data: organization } = useLeadFormData('ORGANIZATION_TYPE');
+  const { data } = useLeadFormData('ORGANIZATION_TYPE');
+
+  const store = useCreditFormStore();
+
+  useEffect(() => {
+    if (data) {
+      store.organization = data;
+    }
+  }, [data]);
 
   return (
     <SelectField
       field={field}
-      source={organization}
+      source={store.organization ?? []}
       label="Тип организации"
       fieldName="organization"
       input={input}

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

@@ -1,15 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const store = useCreditFormStore();
+
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('inn')?.onChange?.(item.data?.inn);
-    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+    updateOrganizationFields(store, field, item);
   }, []);
 
   return (

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

@@ -1,3 +1,4 @@
+import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type Option } from '../Select/Option';
@@ -6,14 +7,6 @@ import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 import { getValidation } from './getValidation';
 
-export interface LeadProps {
-  type?: string;
-  key?: string;
-  value?: string;
-  displayOrder?: number;
-  description?: string;
-}
-
 export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: LeadProps[];
   label: string;

package/mobile/src/ui-kit/FormField/updateOrganizationFields.ts

@@ -0,0 +1,40 @@
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import {
+  getEmployeesNumberOption,
+  getOrganizationActivityType,
+  getOrganizationKind,
+  getOrganizationType,
+} from '../../api/RetailAPI/utils/getOrganizationParams';
+import { type CreditFormStore } from '../../hooks/useCreditFormStore';
+import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { getAddressFromDaDataItem } from './Fields/AddressField';
+
+export const updateOrganizationFields = (
+  store: CreditFormStore,
+  field: FormFieldRegisterer<any>,
+  item: DaDataSuggestion,
+) => {
+  const inn = item.data?.inn ?? '';
+  const okopf = Number(item.data?.opf?.code);
+  const okved = item.data?.okved ?? '';
+
+  field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+
+  field?.('organizationAddress')?.onChange?.(
+    getAddressFromDaDataItem(item.data?.address as DaDataSuggestion),
+  );
+
+  field?.('amountWorkers')?.onChange?.(
+    getEmployeesNumberOption(store?.amountWorkers, item.data?.employee_count),
+  );
+
+  field?.('employerActivities')?.onChange?.(
+    getOrganizationActivityType(store?.employerActivities ?? [], okved),
+  );
+
+  field?.('organization')?.onChange?.(getOrganizationType(store?.organization ?? [], okopf, inn));
+
+  field?.('employerOrganization')?.onChange?.(
+    getOrganizationKind(store?.employerOrganization ?? [], okopf),
+  );
+};

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

@@ -1,4 +1,4 @@
-import { type Address } from '../../components/ApplicationLeadForm/getInitialFormState';
+import { type Address } from '../../components/ApplicationLeadForm/LeadFormState';
 import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';

package/mobile/src/ui-kit/RichText/RichText.tsx

@@ -1,26 +1,26 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style';
-import { getHtmlText } from './getHtmlText';
 import { type RichTextProps } from './RichTextProps';
 
-const EMPTY_HTML = '<p><br></p>';
+export const RichText = JSX<RichTextProps>(
+  ({ __html = '', richVersion = '', itemSize = 'list-m', isDotted = true, children }) => {
+    const dotStyle = isDotted ? '' : 'without-dots';
 
-export const RichText = JSX<RichTextProps>((props) => {
-  const { __html = '', richVersion = '', itemSize = 'list-m', isDotted = true } = props;
-  const dotStyle = isDotted ? '' : 'without-dots';
-
-  return __html && getHtmlText(__html) !== EMPTY_HTML ? (
-    /* Attribute [data-component] need for correct render in wcms editor. Do not remove. */
-    <div data-component="rich-text-container">
-      <div
-        className={style(
-          richVersion,
-          itemSize,
-          'md-container group-data-secondary:text-white group-data-gray:text-secondary-text',
-          dotStyle,
-        )}
-        dangerouslySetInnerHTML={{ __html }}
-      />
-    </div>
-  ) : null;
-});
+    return __html || children ? (
+      /* Attribute [data-component] need for correct render in wcms editor. Do not remove. */
+      <div data-component="rich-text-container">
+        <div
+          className={style(
+            richVersion,
+            itemSize,
+            'md-container group-data-secondary:text-white group-data-gray:text-secondary-text',
+            dotStyle,
+          )}
+          dangerouslySetInnerHTML={__html ? { __html } : undefined}
+        >
+          {children}
+        </div>
+      </div>
+    ) : null;
+  },
+);

package/mobile/src/ui-kit/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { sendCode } from '../../api/RetailAPI/sendCode';
 import { Headline } from '../../components/Headline/Headline';
+import { formatPhone } from '../../utils/formatPhone';
 import { noop } from '../../utils/noop';
 import { CaptchaDialog } from '../CaptchaDialog/CaptchaDialog';
 import { Dialog } from '../DialogManager/Dialog';
@@ -15,29 +16,16 @@ import { SubmitButton } from './SubmitButton';
 import { useVerifyPhoneDialogSubmit } from './useVerifyPhoneDialogSubmit';
 
 export interface VerifyPhoneDialogProps {
-  title?: string;
-  description?: string;
+  phone: string;
   code?: boolean;
-  __html?: string;
   codeLength?: number;
-  textButton?: string;
-  phoneNumber?: string;
+  consents?: string[];
   onSuccess?: (smsCode?: string) => void;
   onClose?: () => void;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({
-    title,
-    description,
-    __html,
-    code = true,
-    codeLength = 4,
-    textButton = 'Далее',
-    phoneNumber = '+79999999999',
-    onSuccess = noop,
-    onClose = noop,
-  }) => {
+  ({ phone, code = true, codeLength = 4, consents, onSuccess = noop, onClose = noop }) => {
     const [values, setValues] = useState(Array(codeLength).fill(''));
 
     const {
@@ -54,6 +42,8 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
 
     const captchaDialog = useDialog(CaptchaDialog);
 
+    const phoneNumber = formatPhone(phone);
+
     const handleSendCode = useCallback(async () => {
       const isSuccessSendCode = await sendCode({
         phoneNumber,
@@ -81,8 +71,8 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
         <div className="flex flex-col gap-xl items-center rounded-md">
           <Headline
             className="w-full"
-            title={title}
-            description={description}
+            title="Подтвердите номер телефона"
+            description={`Мы отправили код на ${phone}`}
             headlineVersion="XS"
             isEmbedded={true}
             as="h6"
@@ -97,10 +87,16 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
           ) : null}
           {renderText(timeNextReq, setTimeNextReq, handleSendCode)}
 
-          <RichText itemSize="list-s" __html={__html} />
-
-          {renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit)}
+          <RichText itemSize="list-s">
+            <span>Вводя код, я подтверждаю, что ознакомлен и подписываю: </span>
+            <ul>
+              {consents?.map((_, i) => (
+                <li key={`${_}-${i}`}>{_}</li>
+              ))}
+            </ul>
+          </RichText>
 
+          {renderNextButton(isSubmitButtonDisabled, handleSubmit)}
           {isLoading ? <Loader blur={false} /> : null}
         </div>
       </Dialog>
@@ -108,10 +104,9 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   },
 );
 
-const renderTextButton = (textButton: string, isDisabled: boolean, handleSubmit: () => void) =>
-  textButton ? (
-    <SubmitButton isDisabled={isDisabled} onClick={handleSubmit} text={textButton} />
-  ) : null;
+const renderNextButton = (isDisabled: boolean, onClick: () => void) => (
+  <SubmitButton text="Далее" isDisabled={isDisabled} onClick={onClick} />
+);
 
 const renderText = (
   timeNextReq: number,

package/package.json

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

package/src/api/RetailAPI/model/EOrganizationActivityTypes.ts

@@ -0,0 +1,23 @@
+export const enum EOrganizationActivityTypes {
+  FINANCIAL_INSTITUTIONS = 'FINANCIAL_INSTITUTIONS',
+  BANK = 'BANK',
+  INSURER = 'INSURER',
+  CONSULTING_SERVICE = 'CONSULTING_SERVICE',
+  TRADE = 'TRADE',
+  ARMY = 'ARMY',
+  INDUSTRY = 'INDUSTRY',
+  CONSTRUCTION = 'CONSTRUCTION',
+  FUEL_AND_ENERGY = 'FUEL_AND_ENERGY',
+  TRANSPORT = 'TRANSPORT',
+  TOURISM = 'TOURISM',
+  SECURITY = 'SECURITY',
+  SERVICE = 'SERVICE',
+  EDUCATION = 'EDUCATION',
+  HEALTHCARE = 'HEALTHCARE',
+  GOVERNANCE = 'GOVERNANCE',
+  SOCIAL_SPHERE = 'SOCIAL_SPHERE',
+  TECHNOLOGY = 'TECHNOLOGY',
+  AGRICULTURE = 'AGRICULTURE',
+  SCIENCE = 'SCIENCE',
+  OTHER_SECTORS = 'OTHER_SECTORS',
+}

package/src/api/RetailAPI/model/LeadFormData.ts

@@ -0,0 +1,7 @@
+export interface LeadProps {
+  type?: string;
+  key?: string;
+  value?: string;
+  displayOrder?: number;
+  description?: string;
+}

package/src/api/RetailAPI/utils/getOrganizationParams.ts

@@ -0,0 +1,126 @@
+/* eslint-disable complexity */
+import { EOrganizationActivityTypes } from '../model/EOrganizationActivityTypes';
+import { type LeadProps } from '../model/LeadFormData';
+
+export const getOrganizationActivityType = (
+  options: LeadProps[],
+  okved: string,
+): { key: string; text: string } | null => {
+  if (!okved) {
+    return null;
+  }
+  const getOptionByKey = getOptionOp(options);
+  const okvedType = +okved?.split('.')[0];
+  const secondOkvedType = +okved?.split('.')[1];
+
+  switch (okvedType) {
+    case 1:
+      return getOptionByKey(EOrganizationActivityTypes.AGRICULTURE);
+    case 35:
+      return getOptionByKey(EOrganizationActivityTypes.FUEL_AND_ENERGY);
+    case 41:
+    case 42:
+    case 43:
+      return getOptionByKey(EOrganizationActivityTypes.CONSTRUCTION);
+    case 46:
+    case 47:
+      return getOptionByKey(EOrganizationActivityTypes.TRADE);
+    case 55:
+    case 79:
+      return getOptionByKey(EOrganizationActivityTypes.TOURISM);
+    case 62:
+      return getOptionByKey(EOrganizationActivityTypes.TECHNOLOGY);
+    case 63:
+      return getOptionByKey(EOrganizationActivityTypes.CONSULTING_SERVICE);
+    case 64:
+      return getOptionByKey(EOrganizationActivityTypes.BANK);
+    case 65:
+      return getOptionByKey(EOrganizationActivityTypes.INSURER);
+    case 66:
+      return getOptionByKey(EOrganizationActivityTypes.FINANCIAL_INSTITUTIONS);
+    case 72:
+    case 74:
+      return getOptionByKey(EOrganizationActivityTypes.SCIENCE);
+    case 80:
+      return getOptionByKey(EOrganizationActivityTypes.SECURITY);
+    case 84: {
+      if (secondOkvedType < 22) {
+        return getOptionByKey(EOrganizationActivityTypes.GOVERNANCE);
+      }
+      if (secondOkvedType === 22) {
+        return getOptionByKey(EOrganizationActivityTypes.ARMY);
+      }
+
+      return getOptionByKey(EOrganizationActivityTypes.OTHER_SECTORS);
+    }
+    case 85:
+      return getOptionByKey(EOrganizationActivityTypes.EDUCATION);
+    case 86:
+      return getOptionByKey(EOrganizationActivityTypes.HEALTHCARE);
+    case 87:
+      return getOptionByKey(EOrganizationActivityTypes.SOCIAL_SPHERE);
+    default: {
+      if (okvedType >= 10 && okvedType <= 33) {
+        return getOptionByKey(EOrganizationActivityTypes.INDUSTRY);
+      }
+      if (okvedType >= 5 && okvedType <= 9) {
+        return getOptionByKey(EOrganizationActivityTypes.FUEL_AND_ENERGY);
+      }
+      if (okvedType >= 49 && okvedType <= 53) {
+        return getOptionByKey(EOrganizationActivityTypes.TRANSPORT);
+      }
+
+      return getOptionByKey(EOrganizationActivityTypes.OTHER_SECTORS);
+    }
+  }
+};
+
+export const getEmployeesNumberOption = (
+  options: LeadProps[] | null,
+  count?: number,
+): { key: string; text: string } => {
+  const [option] = [options?.find((_) => Number(count) <= Number(_.description))].map((_) => ({
+    key: _?.key ?? '',
+    text: _?.value ?? '',
+  }));
+
+  return option;
+};
+
+export const getOrganizationKind = (
+  options: LeadProps[],
+  okopf: number,
+): { key: string; text: string } | null => {
+  const getOptionByKey = getOptionOp(options);
+
+  if ([40001, 40002, 71610].includes(okopf)) {
+    return getOptionByKey('FOREIGN');
+  }
+
+  return getOptionByKey('RUSSIAN');
+};
+
+export const getOrganizationType = (
+  options: LeadProps[],
+  okopf: number,
+  inn: string,
+): { key: string; text: string } | null => {
+  const getOptionByKey = getOptionOp(options);
+
+  if (inn === '7725114488') {
+    return getOptionByKey('RSHB');
+  }
+
+  if (okopf === 50102) {
+    return getOptionByKey('SOLE_TRADER');
+  }
+
+  if (okopf >= 75000 && okopf <= 75505 && okopf !== 75500) {
+    return getOptionByKey('BUDGETARY');
+  }
+
+  return getOptionByKey('COMMERCIAL');
+};
+
+const getOptionOp = (options: LeadProps[]) => (key: string) =>
+  options.map((_) => ({ key, text: _.value || '' })).find((_) => _.key === key) ?? null;

package/src/api/RetailAPI/utils/getUpdateUserProfile.ts

@@ -1,11 +1,13 @@
-import { type FormState } from '../../../components/ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../../../components/ApplicationLeadForm/LeadFormState';
 import { formatDate } from '../../../utils/formatDate';
 import { formatPhone } from '../../../utils/formatPhone';
 import { type UpdateUserProfileBody } from '../updateUserProfile';
 
+// TODO Не должно быть импортов из бизнес-слоя в API слой. Только наоборот.
+
 export const getUpdateUserProfileData = (
   profileId: number,
-  formData: FormState,
+  formData: LeadFormState,
 ): UpdateUserProfileBody => {
   const {
     name = '',

package/src/api/dadataHints/dadataHintsType.ts

@@ -37,12 +37,15 @@ interface DaDataOrganization {
     value: string;
   };
   inn: string;
+  employee_count: number;
   name: {
     short_with_opf: string;
   };
   opf: {
     short: string;
+    code: string;
   };
+  okved: string;
 }
 
 export interface DaDataAddress {

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
@@ -13,7 +12,6 @@ import { style } from '../../utils/style';
 import { renderInputs } from '../ApplicationForm/renderInputs';
 import { applicationFormData } from './applicationFormData';
 import { type ApplicationLeadFormContent, type FieldDef } from './ApplicationLeadFormContent';
-import { getInitialFormState, type FormState } from './getInitialFormState';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
 import { useInitApplicationLead } from './useInitApplicationLead';
@@ -22,16 +20,16 @@ interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockP
 
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
-    const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[];
+    const inputs = useMemo(
+      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[],
+      [applicationFormData],
+    );
 
-    const { isLoading } = useInitApplicationLead(nextStepLink);
-    const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
-    const initialFormState = getInitialFormState(inputs, leadForm);
+    const [initialFormState, { isLoading }] = useInitApplicationLead(inputs, nextStepLink);
     const { handleSubmit, responseStatus } = useApplicationLeadApi({
       inputs,
       programId,
       nextStepLink,
-      saveForm: setLeadForm,
     });
 
     const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -5,7 +5,7 @@ import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 import { type TypeFormFieldDef } from '../ApplicationForm/ApplicationFormContent';
-import { type FormState } from './getInitialFormState';
+import { type LeadFormState } from './LeadFormState';
 
 interface Required {
   /** @title Обязательно для заполнения */
@@ -97,5 +97,5 @@ export type ApplicationLeadFormContent = UniBlockContent &
 export interface GroupedConsentsProps {
   inputs?: FieldDef[];
   typeForm?: TypeFormFieldDef;
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
 }

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -11,18 +11,18 @@ import { Icon } from '../../ui-kit/Icon/Icon';
 import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
 import { withValidator } from '../../validation/withValidator';
 import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
-import { type FormState } from './getInitialFormState';
+import { type LeadFormState } from './LeadFormState';
 
 const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
 const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
 
 export const GroupedConsents = JSX<GroupedConsentsProps>(
   ({ inputs = [], typeForm = '', field, key }) => {
-    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof FormState).value));
+    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof LeadFormState).value));
 
     const handleGeneralToggle = (value: boolean) => {
       for (const item of inputs) {
-        const itemField = field(item.name as keyof FormState);
+        const itemField = field(item.name as keyof LeadFormState);
         itemField?.onChange && itemField.onChange(value);
       }
     };
@@ -34,8 +34,8 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
           ?.some((_) =>
             Boolean(
               withValidator(
-                field(_?.name as keyof FormState),
-                validatorObj[_?.name as keyof FormState],
+                field(_?.name as keyof LeadFormState),
+                validatorObj[_?.name as keyof LeadFormState],
               ).error,
             ),
           ),