@redneckz/wildless-cms-uni-blocks 0.14.709 → 0.14.711

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('ORGANIZATION_KIND');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,7 +1,7 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -9,7 +9,7 @@ import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('ORGANIZATION_TYPE');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,7 +1,7 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -9,7 +9,7 @@ import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('inn')?.onChange?.(item.data?.inn);

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

@@ -5,12 +5,12 @@ import {
   getOrganizationKind,
   getOrganizationType,
 } from '../../api/RetailAPI/utils/getOrganizationParams';
-import { type CreditFormStore } from '../../hooks/useCreditFormStore';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
 import { getAddressFromDaDataItem } from './Fields/AddressField';
 
 export const updateOrganizationFields = (
-  store: CreditFormStore,
+  store: CreditFormDictionarySlice,
   field: FormFieldRegisterer<any>,
   item: DaDataSuggestion,
 ) => {

package/package.json

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

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -1,5 +1,4 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useSetter } from '../../hooks/useSetter';
 import { type LeadFormState } from './LeadFormState';
 import { useLeadFormStore } from './useLeadFormStore';
 
@@ -12,15 +11,14 @@ export interface UserData {
 }
 export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
-  const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const saveUserData = useCallback(
-    ({ participantId, taskId, profileId, formData, programId: programNumber }: UserData) => {
+    ({ participantId, taskId, profileId, programId: programNumber, formData }: UserData) => {
       leadFormStore.participantId = participantId;
       leadFormStore.taskId = taskId;
       leadFormStore.profileId = profileId;
       leadFormStore.programId = programNumber;
-      saveForm(formData);
+      leadFormStore.leadForm = formData;
     },
     [],
   );

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
@@ -45,7 +46,7 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
 
   const sections = useMemo(() => stepsSectionsMap[step], [step]);
 
-  const [isFormFinished, setIsFormFinished] = useState(false);
+  const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
 
   return (
     <BlockWrapper className={className} {...rest}>
@@ -58,10 +59,10 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
             key={String(step)}
             step={step}
             sections={sections}
+            isFormFinished={isFormFinished}
             onNextStep={handleNextStep}
             onPrevStep={handlePrevStep}
-            isFormFinished={isFormFinished}
-            finishForm={setIsFormFinished}
+            onFinish={handleFinish}
           />
         </div>
       </div>

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getTaskStatus, STATUS_TYPE } from '../../api/RetailAPI/getTaskStatus';
 import { sendSignalToProcess, type SignalType } from '../../api/RetailAPI/sendSignalToProcess';
 import { useInterval } from '../../hooks/useInterval';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
@@ -17,7 +17,7 @@ const SIGNAL_TYPES: SignalType[] = [
 
 export const CreditCardFormStatusTracker = JSX(() => {
   const [status, setStatus] = useState(STATUS_TYPE.process);
-  const [taskId] = useLocalStorage<number>('taskId');
+  const { taskId } = useRetailFormStore();
 
   useEffect(() => {
     (async () => {

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
-import { getInitialFormState } from './getInitialFormState';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditCardFormAPI } from './useCreditCardFormAPI';
@@ -12,35 +11,32 @@ import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 export interface CreditCardFormStepProps {
   step: number;
   sections: SectionsProps[];
+  isFormFinished: boolean;
   onNextStep: () => void;
   onPrevStep: () => void;
-  isFormFinished: boolean;
-  finishForm?: (bool: boolean) => void;
+  onFinish?: () => void;
 }
 
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
-  ({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm }) => {
-    const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const initialState = getInitialFormState(step, localStorageData);
-
-    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+  ({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
+    const inputs = useMemo(
+      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[],
+      [sections],
+    );
 
-    const { handleSubmit } = useCreditCardFormAPI({
+    const [initialState, onSubmit] = useCreditCardFormAPI({
       step,
       inputs,
       onNextStep,
-      saveStep,
-      finishForm,
+      onFinish,
     });
 
-    const [, { field, onSubmit }] = useForm(initialState, {
-      onSubmit: handleSubmit,
-    });
+    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
 
     return isFormFinished ? (
       <CreditCardFormStatusTracker />
     ) : (
-      <form onSubmit={onSubmit} className="space-y-m">
+      <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>

package/src/components/CreditCardForm/PendingStatusContent.tsx

@@ -1,11 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+    const { statusInfo } = useRetailFormStore();
 
     return (
       <CreditCardFormStatus

package/src/components/CreditCardForm/ReworkStatusContent.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const ReworkStatusContent = JSX(() => {
-  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+  const { statusInfo } = useRetailFormStore();
 
   return (
     <CreditCardFormStatus

package/src/components/CreditCardForm/SuccessStatusContent.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const SuccessStatusContent = JSX(() => {
-  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+  const { statusInfo } = useRetailFormStore();
 
   return (
     <CreditCardFormStatus

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -1,351 +1,12 @@
-/* eslint-disable max-lines */
-/* eslint-disable max-len */
-
+import {
+  COMMON_RETAIL_CONTENT,
+  CREDIT_CARD_CONTENT,
+  DELIVERY_CREDIT_CARD_CONTENT,
+} from '../../services/retail/content';
 import { type CreditCardSectionsProps } from './CreditCardFormContent';
 
 export const stepsSectionsMap: CreditCardSectionsProps[][] = [
-  [
-    {
-      title: 'Параметры карты',
-      inputs: [],
-    },
-    {
-      inputs: [
-        { fieldType: 'common', name: 'currency', required: true },
-        { fieldType: 'common', name: 'paymentSystem', required: true },
-        { fieldType: 'common', name: 'cardCategory', required: true },
-        { fieldType: 'common', name: 'codeWord', required: true },
-      ],
-    },
-  ],
-  [
-    {
-      title: 'Персональные данные',
-      columns: 2,
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'surname',
-          required: true,
-          dadata: true,
-          filledByEsia: true,
-        },
-        { fieldType: 'common', name: 'name', required: true, dadata: true, filledByEsia: true },
-        { 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, filledByEsia: true },
-        { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'email', required: true, dadata: true },
-      ],
-    },
-    {
-      title: 'Паспортные данные',
-      columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'dulSerie', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'dulNumber', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'dulIssueDateField', required: true, filledByEsia: true },
-        {
-          fieldType: 'common',
-          name: 'dulSubdivisionCode',
-          required: true,
-          dadata: true,
-          filledByEsia: true,
-        },
-      ],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'dulIssuedBy',
-          required: true,
-          dadata: true,
-          filledByEsia: true,
-        },
-        {
-          fieldType: 'common',
-          name: 'education',
-          required: true,
-        },
-      ],
-    },
-    {
-      title: 'Адрес регистрации по месту жительства',
-      columns: 1,
-      inputs: [],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'addressRegistration',
-          required: true,
-          dadata: true,
-          filledByEsia: true,
-        },
-        { fieldType: 'common', name: 'addressMatch' },
-      ],
-    },
-    {
-      columns: 2,
-      inputs: [{ fieldType: 'common', name: 'participantDateRegistration', required: true }],
-    },
-    {
-      title: 'Адрес фактического проживания (место пребывания РФ)',
-      inputs: [],
-    },
-    {
-      columns: 2,
-      inputs: [{ fieldType: 'common', name: 'housing', required: true }],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'addressFact', required: true, dadata: true }],
-    },
-  ],
-  [
-    {
-      title: 'Данные о трудоустройстве',
-      inputs: [],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'info',
-          text: 'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
-        },
-      ],
-    },
-    {
-      inputs: [
-        { fieldType: 'common', name: 'employment', required: true },
-        { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
-      ],
-    },
-    {
-      columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'inn', required: true, dadata: true },
-        { fieldType: 'common', name: 'legalForm', required: true },
-      ],
-    },
-    {
-      inputs: [
-        { fieldType: 'common', name: 'organization', required: true },
-        { fieldType: 'common', name: 'amountWorkers', required: true },
-      ],
-    },
-    {
-      columns: 2,
-      inputs: [
-        { 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 },
-        { fieldType: 'common', name: 'jobsNumber', required: true },
-      ],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'organizationPhone',
-          label: 'Телефон работодателя',
-          required: true,
-        },
-        { fieldType: 'common', name: 'beginDate', required: true },
-      ],
-    },
-    {
-      columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: true },
-        {
-          fieldType: 'common',
-          name: 'partInBusiness',
-          required: true,
-          condition: { name: 'positionOrganization', values: ['BUSINESS_OWNER'] },
-        },
-      ],
-    },
-    {
-      title: 'Адрес работодателя',
-      inputs: [],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'organizationAddress', required: true, dadata: true }],
-    },
-  ],
-  [
-    {
-      title: 'Семейное положение',
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'familyStatus', required: true }],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'dependents', required: true }],
-    },
-    {
-      columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'familyMembers' },
-        { fieldType: 'common', name: 'children', required: true },
-      ],
-    },
-    {
-      title: 'Совокупный доход',
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'info',
-          text: 'Сумма основного и дополнительных доходов после вычета налога',
-        },
-      ],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'wages', required: true }],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'snils', required: true }],
-    },
-    {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'conscription', required: true }],
-    },
-    {
-      columns: 2,
-      inputs: [{ fieldType: 'common', name: 'armyIdFlg' }],
-    },
-  ],
-  [
-    {
-      title: 'Дополнительные сведения',
-      columns: 1,
-      inputs: [],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'disablePeopleFlg' }],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'bankruptcyFlg' }],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'legalEntityName',
-        },
-      ],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],
-    },
-  ],
-  [
-    {
-      title: 'Способ получения',
-      columns: 1,
-      inputs: [],
-    },
-    {
-      inputs: [{ fieldType: 'common', name: 'methodObtain' }],
-    },
-    {
-      title: 'Адрес',
-      columns: 1,
-      inputs: [],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'addressCourier',
-          dadata: true,
-          condition: {
-            name: 'methodObtain',
-            values: ['courier'],
-          },
-          required: true,
-        },
-        {
-          fieldType: 'common',
-          name: 'deliveryDate',
-          condition: {
-            name: 'methodObtain',
-            values: ['courier'],
-          },
-          required: true,
-        },
-        {
-          fieldType: 'common',
-          name: 'comment',
-          condition: {
-            name: 'methodObtain',
-            values: ['courier'],
-          },
-        },
-      ],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'common',
-          name: 'regionRetail',
-          required: true,
-          condition: {
-            name: 'methodObtain',
-            values: ['office'],
-          },
-        },
-        {
-          fieldType: 'common',
-          name: 'addressRetail',
-          required: true,
-          condition: {
-            name: 'methodObtain',
-            values: ['office'],
-          },
-        },
-      ],
-    },
-    {
-      inputs: [
-        {
-          fieldType: 'info',
-          text: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
-          condition: {
-            name: 'methodObtain',
-            values: ['office'],
-          },
-        },
-        {
-          fieldType: 'common',
-          name: 'bankEmployeeCode',
-          condition: {
-            name: 'methodObtain',
-            values: ['office'],
-          },
-        },
-      ],
-    },
-  ],
+  CREDIT_CARD_CONTENT,
+  ...COMMON_RETAIL_CONTENT,
+  DELIVERY_CREDIT_CARD_CONTENT,
 ];

package/src/components/CreditCardForm/formStateMap.tsx

@@ -76,10 +76,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
   },
   {
     regionRetail: { key: '', text: '' },
-    addressRetail: {
-      key: '',
-      text: '',
-    },
+    addressRetail: { key: '', text: '' },
     bankEmployeeCode: undefined,
     addressCourier: {
       fullAddress: '',