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

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -1,12 +1,16 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { locationNavigator } from '../../external/locationNavigator';
+import { getAdditionalInfoData } from '../../services/retail/adaptors/getAdditionalInfoData';
+import { getCardOptionsData } from '../../services/retail/adaptors/getCardOptionsData';
+import { getEmploymentData } from '../../services/retail/adaptors/getEmploymentData';
+import { getFamilyStatusAndIncomeData } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData';
+import { getPersonalInfoData } from '../../services/retail/adaptors/getPersonalInfoData';
 import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
-import { getCardData } from './getCardData';
-import { getFifthStepData } from './getFifthStepData';
-import { getFourthStepData } from './getFourthStepData';
-import { getSecondStepData } from './getSecondStepData';
-import { getDeliveryData, getOfficeCode, getSixthStepData } from './getSixthStepData';
-import { getThirdStepData } from './getThirdStepData';
+import {
+  getDeliveryCreditCardData,
+  getDeliveryData,
+  getOfficeCode,
+} from './getDeliveryCreditCardData';
 
 type getCreditCardFormTaskDataProps = {
   participantId: number;
@@ -46,7 +50,7 @@ export const getCreditCardFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
-      ...getCardData(formData),
+      ...getCardOptionsData(formData),
       ...getDeliveryData(formData),
     },
   };
@@ -57,15 +61,15 @@ const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Part
     case 0:
       return {};
     case 1:
-      return getSecondStepData(formData);
+      return getPersonalInfoData(formData);
     case 2:
-      return getThirdStepData(formData);
+      return getEmploymentData(formData);
     case 3:
-      return getFourthStepData(formData);
+      return getFamilyStatusAndIncomeData(formData);
     case 4:
-      return getFifthStepData(formData);
+      return getAdditionalInfoData(formData);
     case 5:
-      return getSixthStepData(formData);
+      return getDeliveryCreditCardData(formData);
     default:
       return {};
   }

package/src/components/CreditCardForm/{getSixthStepData.ts → getDeliveryCreditCardData.ts}

@@ -28,7 +28,7 @@ export const getOfficeCode = (formData: LeadFormState) => {
     : {};
 };
 
-export const getSixthStepData = (formData: LeadFormState) => {
+export const getDeliveryCreditCardData = (formData: LeadFormState) => {
   const { addressCourier, methodObtain } = formData;
 
   const isCourierDelivery = methodObtain === 'courier';

package/src/components/CreditCardForm/getInitialFormState.tsx

@@ -3,26 +3,22 @@ import { formStateMap } from './formStateMap';
 
 export const getInitialFormState = (
   step: number,
-  localStorageData: Record<string, any> | null,
+  formState: LeadFormState | null,
 ): LeadFormState => ({
   ...formStateMap[step],
-  ...localStorageData,
-  limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),
-  dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField as string),
+  ...formState,
+  limitedBirthday: transformStringToData(formState?.limitedBirthday as string),
+  dulIssueDateField: transformStringToData(formState?.dulIssueDateField as string),
   participantDateRegistration: transformStringToData(
-    localStorageData?.participantDateRegistration as string,
+    formState?.participantDateRegistration as string,
   ),
-  beginDate: transformStringToData(localStorageData?.beginDate as string),
-  deliveryDate: transformStringToData(localStorageData?.deliveryDate as string),
+  beginDate: transformStringToData(formState?.beginDate as string),
+  deliveryDate: transformStringToData(formState?.deliveryDate as string),
 });
 
 const transformStringToData = (text?: string) => {
-  if (!text) {
-    return undefined;
-  }
-
   try {
-    return new Date(text);
+    return text ? new Date(text) : undefined;
   } catch (_) {
     return undefined;
   }

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -1,6 +1,6 @@
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
@@ -8,107 +8,88 @@ import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent
 import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, type GetValue } from './calculateInputs';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
+import { getInitialFormState } from './getInitialFormState';
 
-type CreditCardFormApiProps = {
+interface CreditFormApiProps {
   step: number;
   inputs: FieldDef[];
   onNextStep: () => void;
-  saveStep: (value: Record<string, any>) => void;
-  finishForm?: (bool: boolean) => void;
-};
-
-export type StatusInfoState = {
-  regionRetail?: string;
-  addressRetail?: string;
-  cardCategory?: string;
-  calculator?: {
-    monthsValue?: number;
-    moneyValue?: number;
-    isAnnuity?: boolean;
-  };
-};
+  onFinish?: () => void;
+}
 
 export const useCreditCardFormAPI = ({
   step,
   inputs,
   onNextStep,
-  saveStep,
-  finishForm,
-}: CreditCardFormApiProps) => {
+  onFinish,
+}: CreditFormApiProps): [LeadFormState, (formData: LeadFormState) => void] => {
   const isFinalStep = step === 5;
-  const [taskId] = useLocalStorage<number>('taskId');
-  const [profileId] = useLocalStorage<number>('profileId');
-  const [participantId] = useLocalStorage<number>('participantId');
-  const [, setStatusInfo] = useLocalStorage('statusInfo');
-  const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
-
-  const handleSubmit = useCallback(async (formData: LeadFormState) => {
-    const feedbackValidator = objectValidator(
-      getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
-    );
-
-    if (!isValidationSuccess(feedbackValidator(formData))) {
-      return console.warn('validation fail');
-    }
 
-    saveStep(formData);
+  const retailFormStore = useRetailFormStore();
 
-    try {
-      if (taskId && profileId && participantId) {
-        const response = await updateUserTask(
-          getCreditCardFormTaskData({
-            participantId,
-            taskId,
-            profileId,
-            step,
-            formData: formData as any,
-          }),
-        );
-        resetForm({ isFinalStep, response, leadForm, setStatusInfo });
+  const initialState = useMemo(
+    () => getInitialFormState(step, retailFormStore.leadForm),
+    [step, retailFormStore.leadForm],
+  );
+  const resetForm = useCallback(
+    (response: Response) => {
+      const { leadForm } = retailFormStore;
+      if (isFinalStep && response.ok && leadForm) {
+        retailFormStore.statusInfo = {
+          regionRetail: leadForm?.regionRetail?.text,
+          addressRetail: leadForm?.addressRetail?.text,
+          cardCategory: leadForm?.cardCategory?.text,
+          calculator: {
+            monthsValue: leadForm?.calculator?.monthsValue,
+            moneyValue: leadForm?.calculator?.moneyValue,
+            isAnnuity: leadForm?.calculator?.isAnnuity,
+          },
+        };
+        retailFormStore.leadForm = initialState;
       }
-    } catch (ex) {
-      return 'Fail';
-    }
+    },
+    [isFinalStep, initialState],
+  );
 
-    onNextStep();
+  const handleSubmit = useCallback(
+    async (formData: LeadFormState) => {
+      const feedbackValidator = objectValidator(
+        getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
+      );
 
-    if (isFinalStep) {
-      finishForm?.(true);
-    }
-
-    return 'OK';
-  }, []);
+      if (!isValidationSuccess(feedbackValidator(formData))) {
+        return;
+      }
 
-  return {
-    handleSubmit,
-  };
-};
+      retailFormStore.leadForm = formData;
 
-const resetForm = ({
-  isFinalStep,
-  response,
-  leadForm,
-  setStatusInfo,
-}: {
-  isFinalStep: boolean;
-  response: Response;
-  leadForm: LeadFormState | null;
-  setStatusInfo: (statusInfo: StatusInfoState) => void;
-}) => {
-  if (isFinalStep && response.ok && leadForm) {
-    const regionRetail = leadForm?.regionRetail?.text;
-    const addressRetail = leadForm?.addressRetail?.text;
-    const cardCategory = leadForm?.cardCategory?.text;
-    const calculator = {
-      monthsValue: leadForm?.calculator?.monthsValue,
-      moneyValue: leadForm?.calculator?.moneyValue,
-      isAnnuity: leadForm?.calculator?.isAnnuity,
-    };
+      try {
+        const { taskId, profileId, participantId } = retailFormStore;
+        if (taskId && profileId && participantId) {
+          const response = await updateUserTask(
+            getCreditCardFormTaskData({
+              participantId,
+              taskId,
+              profileId,
+              step,
+              formData: formData as any,
+            }),
+          );
+          resetForm(response);
+        }
 
-    setStatusInfo({ regionRetail, addressRetail, cardCategory, calculator });
+        onNextStep();
+        if (isFinalStep) {
+          onFinish?.();
+        }
+      } catch (ex) {
+        // Do nothing
+      }
+    },
+    [isFinalStep, resetForm],
+  );
 
-    globalThis.localStorage.removeItem('leadForm');
-  }
+  return [initialState, handleSubmit];
 };
 
 const getValue =

package/src/components/CreditForm/CreditForm.tsx

@@ -1,4 +1,5 @@
 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 { type JSONRefObject } from '../../data/JSONRefObject';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -50,7 +51,7 @@ export const CreditForm = UniBlock<CreditFormProps>(({ className, programsSource
   const sections = useMemo(() => stepsSectionsMap[step], [step]);
 
   const isStartStep = step === 0;
-  const [isFormFinished, setIsFormFinished] = useState(false);
+  const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
 
   return (
     <BlockWrapper className={className} {...rest}>
@@ -63,11 +64,11 @@ export const CreditForm = UniBlock<CreditFormProps>(({ className, programsSource
             key={String(step)}
             step={step}
             sections={sections}
-            onNextStep={handleNextStep}
-            onPrevStep={handlePrevStep}
             isFormFinished={isFormFinished}
-            finishForm={setIsFormFinished}
             programsSource={programsSource as ProgramsSourceProps}
+            onNextStep={handleNextStep}
+            onPrevStep={handlePrevStep}
+            onFinish={handleFinish}
           />
         </div>
       </div>

package/src/components/CreditForm/CreditFormStatusTracker.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';
@@ -16,7 +16,7 @@ const SIGNAL_TYPES: SignalType[] = [
 
 export const CreditFormStatusTracker = JSX(() => {
   const [status, setStatus] = useState(STATUS_TYPE.process);
-  const [taskId] = useLocalStorage<number>('taskId');
+  const { taskId } = useRetailFormStore();
 
   useEffect(() => {
     (async () => {

package/src/components/CreditForm/CreditFormStep.tsx

@@ -1,10 +1,10 @@
 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 { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type SectionsProps } from '../../model/InputSectionsType';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
-import { getInitialFormState } from './getInitialFormState';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -13,40 +13,36 @@ import { useCreditFormAPI } from './useCreditFormAPI';
 export interface CreditFormStepProps {
   step: number;
   sections: SectionsProps[];
+  isFormFinished?: boolean;
+  programsSource?: ProgramsSourceProps;
   onNextStep: () => void;
   onPrevStep: () => void;
-  isFormFinished: boolean;
-  finishForm?: (bool: boolean) => void;
-  programsSource?: ProgramsSourceProps;
+  onFinish?: () => void;
 }
 
 export const CreditFormStep = JSX<CreditFormStepProps>(
-  ({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm, programsSource }) => {
-    const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const [programId] = useLocalStorage<string>('programId');
-
+  ({ step, sections, isFormFinished, programsSource, onPrevStep, onNextStep, onFinish }) => {
+    const { programId } = useRetailFormStore();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
-    const initialState = getInitialFormState(step, localStorageData);
-
-    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+    const inputs = useMemo(
+      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[],
+      [sections],
+    );
 
-    const { handleSubmit } = useCreditFormAPI({
+    const [initialState, onSubmit] = useCreditFormAPI({
       step,
       inputs,
       onNextStep,
-      saveStep,
-      finishForm,
+      onFinish,
     });
 
-    const [, { field, onSubmit }] = useForm(initialState, {
-      onSubmit: handleSubmit,
-    });
+    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
 
     return isFormFinished ? (
       <CreditFormStatusTracker />
     ) : (
-      <form onSubmit={onSubmit} className="space-y-m">
+      <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step, params: { calcData } })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>

package/src/components/CreditForm/PendingStatusContent.tsx

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

package/src/components/CreditForm/ReworkStatusContent.tsx

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

package/src/components/CreditForm/SuccessStatusContent.tsx

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