@redneckz/wildless-cms-uni-blocks 0.14.683 → 0.14.685

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 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 { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
@@ -24,25 +25,30 @@ export const CreditCardFormStatusTracker = JSX(() => {
         await sendSignalToProcess({ signalType, taskId });
       }
     })();
+  }, [taskId]);
 
-    const trackStatus = useCallback(async () => {
+  const trackStatus = useCallback(
+    async (stopInterval: () => void) => {
       const res = await getTaskStatus({ taskId });
 
       if (res && res?.statusCd !== STATUS_TYPE.process) {
-        clearInterval(pullingInterval);
+        stopInterval();
         setStatus(res.statusCd);
       }
-    }, []);
+    },
+    [taskId],
+  );
 
-    const pullingInterval = setInterval(trackStatus, 30000);
-  }, []);
+  useInterval(trackStatus, 30000);
 
-  return renderStatus(status);
+  const handleExpire = () => setStatus(STATUS_TYPE.rework);
+
+  return renderStatus(status, handleExpire);
 });
 
-const renderStatus = (status: STATUS_TYPE) => {
+const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
-    IN_PROCESS: <PendingStatusContent />,
+    IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
     APPROVED: <SuccessStatusContent />,
     REVISION: <ReworkStatusContent />,

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,13 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useRef } 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 { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
 import { getInitialFormState } from './getInitialFormState';
-import { renderStep, type CustomSubmit } from './renderStep';
+import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 
@@ -25,14 +23,8 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
     const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
     const initialState = getInitialFormState(step, localStorageData);
 
-    const customSubmit = useRef<CustomSubmit | undefined>(undefined);
-
     const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
 
-    const registerSubmit = useCallback((submit?: CustomSubmit) => {
-      customSubmit.current = submit;
-    }, []);
-
     const { handleSubmit } = useCreditCardFormAPI({
       step,
       inputs,
@@ -42,21 +34,14 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
     });
 
     const [, { field, onSubmit }] = useForm(initialState, {
-      onSubmit: (formData, ev) => {
-        handleSubmit({ ...formData, ...customSubmit.current?.(ev) } as FormState);
-      },
+      onSubmit: handleSubmit,
     });
 
     return isFormFinished ? (
       <CreditCardFormStatusTracker />
     ) : (
       <form onSubmit={onSubmit} className="space-y-m">
-        {renderStep({
-          sections,
-          field,
-          step,
-          registerSubmit,
-        })}
+        {renderStep({ sections, field, step })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>
     );

package/src/components/CreditCardForm/PendingStatusContent.tsx

@@ -2,25 +2,28 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
 
-export const PendingStatusContent = JSX(() => {
-  const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
+export const PendingStatusContent = JSX(
+  ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
+    const [leadForm] = useLocalStorage<Record<string, any>>('leadForm');
 
-  return (
-    <CreditCardFormStatus
-      interval={300}
-      title="Заявка успешно отправлена"
-      description="Не закрывайте окно, скоро сообщим результат"
-      sectionInfoTitle="Заявленные условия по кредиту"
-      sectionInfo={[
-        {
-          label: 'Название продукта',
-          description: 'Кредитная карта',
-        },
-        {
-          label: 'Категория',
-          description: leadForm?.cardCategory?.text,
-        },
-      ]}
-    />
-  );
-});
+    return (
+      <CreditCardFormStatus
+        interval={300}
+        intervalExpireAction={handleExpireTimer}
+        title="Заявка успешно отправлена"
+        description="Не закрывайте окно, скоро сообщим результат"
+        sectionInfoTitle="Заявленные условия по кредиту"
+        sectionInfo={[
+          {
+            label: 'Название продукта',
+            description: 'Кредитная карта',
+          },
+          {
+            label: 'Категория',
+            description: leadForm?.cardCategory?.text,
+          },
+        ]}
+      />
+    );
+  },
+);

package/src/components/CreditCardForm/renderInputs.tsx

@@ -6,7 +6,8 @@ import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 export interface RenderInputsProps {
   inputs: FieldDef[];
   field: FormFieldRegisterer<FormState>;
+  params?: Record<string, any>;
 }
 
-export const renderInputs = ({ field, inputs }: RenderInputsProps) =>
-  inputs.map(getField(field, ''));
+export const renderInputs = ({ field, inputs, params }: RenderInputsProps) =>
+  inputs.map(getField(field, params));

package/src/components/CreditCardForm/renderStep.tsx

@@ -9,15 +9,14 @@ import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
 export type CustomSubmit = FormOperatorProps<FormState>['onSubmit'];
-
 export interface StepProps {
   sections?: CreditCardSectionsProps[];
   field: FormFieldRegisterer<FormState>;
-  registerSubmit?: (submit: CustomSubmit) => void;
   step: number;
+  params?: Record<string, any>;
 }
 
-export const renderStep = ({ sections, field, step }: StepProps) =>
+export const renderStep = ({ sections, field, step, params }: StepProps) =>
   sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
     const inputs = calculateInputs(getValue(field))(origInputs, step);
 
@@ -27,7 +26,7 @@ export const renderStep = ({ sections, field, step }: StepProps) =>
       <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
         {renderInfo(filteredInputs)}
         {renderTitle(title)}
-        {renderInputs({ field, inputs })}
+        {renderInputs({ field, inputs, params })}
       </div>
     );
   });

package/src/components/CreditForm/CreditForm.fixture.tsx

@@ -17,7 +17,12 @@ const taskId = globalThis.localStorage.getItem('taskId');
 export default {
   default: (
     <div>
-      <CreditForm className="col-span-12" />
+      <CreditForm
+        className="col-span-12"
+        programsSource={{
+          $ref: '/wcms-resources/products-credit-calc-data.json',
+        }}
+      />
       <PopupManager />
       <DialogManager />
     </div>

package/src/components/CreditForm/CreditForm.tsx

@@ -1,20 +1,23 @@
-import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
+import { type JSONRefObject } from '../../data/JSONRefObject';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { CalculatorCredit } from '../CalculatorCredit/CalculatorCredit';
 import { type CreditFormContent } from './CreditFormContent';
 import { CreditFormProgress } from './CreditFormProgress';
 import { CreditFormStep } from './CreditFormStep';
 import { stepsSectionsMap } from './creditFormStepsData';
+import { type ProgramsSourceProps } from './ProgramsSourceProps';
 
-interface CreditFormWizardProps extends CreditFormContent, UniBlockProps {}
+interface CreditFormProps extends CreditFormContent, UniBlockProps {
+  programsSource?: ProgramsSourceProps | JSONRefObject;
+}
 
-const WIZARD_STEPS = 5;
+const STEPS = 5;
 
-const WIZARD_TITLES = [
+const STEP_TITLES = [
   '',
   'Персональные данные',
   'Данные о трудоустройстве',
@@ -23,7 +26,7 @@ const WIZARD_TITLES = [
   'Отделение Банка',
 ];
 
-export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) => {
+export const CreditForm = UniBlock<CreditFormProps>(({ className, programsSource, ...rest }) => {
   const [step, setStep] = useState(0);
 
   const formContainerRef = useRef<HTMLDivElement | null>(null);
@@ -35,7 +38,7 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
   useEffect(updateRefreshToken, []);
 
   const handleNextStep = useCallback(() => {
-    setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
+    setStep((_) => Math.min(_ + 1, STEPS));
     scrollToTop();
   }, []);
 
@@ -54,7 +57,7 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
     <BlockWrapper className={style('bg-transparent', className)} defaultPadding="p-0" {...rest}>
       <div ref={formContainerRef} className="container grid grid-cols-12">
         {isStartStep || isFormFinished ? null : (
-          <CreditFormProgress stepsTitles={WIZARD_TITLES} step={step} totalSteps={WIZARD_STEPS} />
+          <CreditFormProgress stepsTitles={STEP_TITLES} step={step} totalSteps={STEPS} />
         )}
         <div className="py-lg px-5xl mt-2xs bg-white col-span-12">
           <CreditFormStep
@@ -65,28 +68,7 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
             onPrevStep={handlePrevStep}
             isFormFinished={isFormFinished}
             finishForm={setIsFormFinished}
-            renderStep={
-              isStartStep
-                ? ({ registerSubmit, field }) => (
-                    <CalculatorCredit
-                      {...{
-                        defaultParams: {
-                          sum: field('moneyValue').value,
-                          period: field('monthsValue').value,
-                          isAnnuity: field('isAnnuity').value,
-                        },
-                        title: 'Калькулятор кредита',
-                        footnote:
-                          'Расчёт является предварительным. Точные условия будут предоставлены в отделении Банка.',
-                        calcSource: {
-                          $ref: '/wcms-resources/credit-calculator-data.json',
-                        },
-                      }}
-                      registerSubmit={registerSubmit}
-                    />
-                  )
-                : undefined
-            }
+            programsSource={programsSource as ProgramsSourceProps}
           />
         </div>
       </div>

package/src/components/CreditForm/CreditFormContent.ts

@@ -1,13 +1,10 @@
-import { type TitleProps } from '../../model/HeadlineType';
-import { type InputSectionsType } from '../../model/InputSectionsType';
+import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Форма заявки на потребительский кредит настраиваемая
  */
-export type CreditFormContent = UniBlockContent &
-  TitleProps &
-  InputSectionsType & {
-    /** @title Номер кредитной программы */
-    programId?: string;
-  };
+export type CreditFormContent = UniBlockContent & {
+  /** @title Данные по кредитным программам */
+  programsSource?: JSONRefObject;
+};

package/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -1,14 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+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 { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
 import { ReworkStatusContent } from './ReworkStatusContent';
 import { SuccessStatusContent } from './SuccessStatusContent';
-
 const SIGNAL_TYPES: SignalType[] = [
   'CREATE_APPLICATION_SHORT_SIGNAL',
   'CREATE_APPLICATION_LOAN_V3_SIGNAL',
@@ -24,20 +24,21 @@ export const CreditFormStatusTracker = JSX(() => {
         await sendSignalToProcess({ signalType, taskId });
       }
     })();
+  }, [taskId]);
 
-    const trackStatus = () =>
-      taskId &&
-      getTaskStatus({ taskId }).then((res) => {
-        if (res?.statusCd && res.statusCd !== STATUS_TYPE.process) {
-          clearInterval(pullingInterval);
-          setStatus(res.statusCd);
-        }
-      });
+  const trackStatus = useCallback(
+    async (stopInterval: () => void) => {
+      const res = await getTaskStatus({ taskId });
 
-    const pullingInterval = setInterval(trackStatus, 30000);
+      if (res && res?.statusCd !== STATUS_TYPE.process) {
+        stopInterval();
+        setStatus(res.statusCd);
+      }
+    },
+    [taskId],
+  );
 
-    return () => clearInterval(pullingInterval);
-  }, []);
+  useInterval(trackStatus, 30000);
 
   const handleExpire = () => setStatus(STATUS_TYPE.rework);
 

package/src/components/CreditForm/CreditFormStep.tsx

@@ -1,14 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../../model/InputSectionsType';
-import { type VNode } from '../../model/VNode';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { getInitialFormState } from './getInitialFormState';
-import { renderStep as defaultRenderStep, type CustomSubmit, type StepProps } from './renderStep';
+import { type ProgramsSourceProps } from './ProgramsSourceProps';
+import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditFormAPI } from './useCreditFormAPI';
 
@@ -17,31 +15,21 @@ export interface CreditFormStepProps {
   sections: SectionsProps[];
   onNextStep: () => void;
   onPrevStep: () => void;
-  renderStep?: (props: StepProps) => VNode | VNode[] | undefined;
   isFormFinished: boolean;
   finishForm?: (bool: boolean) => void;
+  programsSource?: ProgramsSourceProps;
 }
 
 export const CreditFormStep = JSX<CreditFormStepProps>(
-  ({
-    step,
-    sections,
-    onPrevStep,
-    onNextStep,
-    renderStep = defaultRenderStep,
-    isFormFinished,
-    finishForm,
-  }) => {
+  ({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm, programsSource }) => {
     const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const initialState = getInitialFormState(step, localStorageData);
+    const [programId] = useLocalStorage<string>('programId');
 
-    const customSubmit = useRef<CustomSubmit | undefined>(undefined);
+    const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
-    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+    const initialState = getInitialFormState(step, localStorageData);
 
-    const registerSubmit = useCallback((submit?: CustomSubmit) => {
-      customSubmit.current = submit;
-    }, []);
+    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
 
     const { handleSubmit } = useCreditFormAPI({
       step,
@@ -52,16 +40,14 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
     });
 
     const [, { field, onSubmit }] = useForm(initialState, {
-      onSubmit: (formData, ev) => {
-        handleSubmit({ ...formData, ...customSubmit.current?.(ev) } as FormState);
-      },
+      onSubmit: handleSubmit,
     });
 
     return isFormFinished ? (
       <CreditFormStatusTracker />
     ) : (
       <form onSubmit={onSubmit} className="space-y-m">
-        {renderStep({ sections, field, step, registerSubmit })}
+        {renderStep({ sections, field, step, params: { calcData } })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>
     );

package/src/components/CreditForm/ProgramsSourceProps.tsx

@@ -0,0 +1,20 @@
+import { type JSONRefObject } from '../../data/JSONRefObject';
+import {
+  type CreditCalculatorData,
+  type CreditCalculatorUserInputParams,
+} from '../CalculatorCredit/CalculatorCreditContent';
+
+export type ProgramsSourceProps = {
+  [programId: string]: {
+    title?: string;
+    footnote?: string;
+    paramsViewSettings: {
+      isShowSalaryClient?: boolean;
+      isShowInsurance?: boolean;
+      isShowStateEmployee?: boolean;
+      isShowPensionClient?: boolean;
+    };
+    defaultParams?: CreditCalculatorUserInputParams;
+    calcSource?: CreditCalculatorData & JSONRefObject;
+  };
+};

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -5,7 +5,15 @@ import { type SectionsProps } from '../../model/InputSectionsType';
 
 export const stepsSectionsMap: SectionsProps[][] = [
   [
-    // zero step for calculator
+    {
+      columns: 1,
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'calculator',
+        },
+      ],
+    },
   ],
   [
     {

package/src/components/CreditForm/formStateMap.tsx

@@ -2,13 +2,15 @@ import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
 export const formStateMap: Partial<FormState>[] = [
   {
-    moneyValue: 0,
-    monthsValue: 0,
-    isAnnuity: false,
-    isInsurance: false,
-    isSalaryClient: false,
-    isPensionClient: false,
-    isStateEmployee: false,
+    calculator: {
+      moneyValue: 0,
+      monthsValue: 0,
+      isAnnuity: false,
+      isInsurance: false,
+      isSalaryClient: false,
+      isPensionClient: false,
+      isStateEmployee: false,
+    },
   },
   {
     surname: '',

package/src/components/CreditForm/getCalcData.ts

@@ -0,0 +1,19 @@
+import { type PaymentType, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
+  annuity: { key: 'ANNUITY', value: 'Аннуитетный' },
+  differential: { key: 'DIFFERENTIAL', value: 'Дифференцированный ' },
+};
+
+export const getCalcData = (
+  formData: FormState,
+): Pick<UpdateUserTaskBody['task'], 'loanAmount' | 'creditPeriod' | 'paymentTypeCd'> => {
+  const { moneyValue, monthsValue, isAnnuity } = formData?.calculator ?? {};
+
+  return {
+    loanAmount: moneyValue,
+    creditPeriod: monthsValue,
+    paymentTypeCd: PAYMENT_TYPE_DATA[isAnnuity ? 'annuity' : 'differential'],
+  };
+};

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,6 +1,7 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getCalcData } from './getCalcData';
 import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
@@ -45,7 +46,7 @@ export const getCreditFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
-      ...getZeroStepData(formData), // moved from participants
+      ...getCalcData(formData),
       ...getFifthStepData(formData),
       esiaAccountTypeCd: {
         key: formData?.esiaAccountTypeCd?.key,
@@ -57,7 +58,7 @@ export const getCreditFormTaskData = ({
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
     case 0:
-      return {};
+      return getZeroStepData(formData);
     case 1:
       return getFirstStepData(formData);
     case 2:

package/src/components/CreditForm/getSecondStepData.tsx

@@ -38,7 +38,6 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
     generalSeniority: experience5Years,
     jobsNumber,
     lastWorkDuration: lastJobExperience,
-    payrollCardRshbFlg: true, // TODO: Remove hardcode
     positionCd: positionOrganization,
     participantContacts: getParticipantContacts({
       organizationPhone: organizationPhone && formatPhone(organizationPhone),

package/src/components/CreditForm/getZeroStepData.ts

@@ -1,17 +1,13 @@
-import { type Participant, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
-const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
-  annuity: { key: 'ANNUITY', value: 'Аннуитетный' },
-  differential: { key: 'DIFFERENTIAL', value: 'Дифференцированный ' },
-};
-
-export const getZeroStepData = (formData: FormState): Partial<Participant> => {
-  const { moneyValue, monthsValue, isAnnuity } = formData;
+export const getZeroStepData = (
+  formData: FormState,
+): Pick<Participant, 'payrollCardRshbFlg' | 'consentInsuranceFlg'> => {
+  const { isInsurance, isSalaryClient } = formData?.calculator ?? {};
 
   return {
-    loanAmount: moneyValue,
-    creditPeriod: monthsValue,
-    paymentTypeCd: PAYMENT_TYPE_DATA[isAnnuity ? 'annuity' : 'differential'],
+    payrollCardRshbFlg: isInsurance,
+    consentInsuranceFlg: isSalaryClient,
   };
 };

package/src/components/CreditForm/renderInputs.tsx

@@ -6,7 +6,8 @@ import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 export interface RenderInputsProps {
   inputs: FieldDef[];
   field: FormFieldRegisterer<FormState>;
+  params?: Record<string, any>;
 }
 
-export const renderInputs = ({ field, inputs }: RenderInputsProps) =>
-  inputs.map(getField(field, ''));
+export const renderInputs = ({ field, inputs, params }: RenderInputsProps) =>
+  inputs.map(getField(field, params));

package/src/components/CreditForm/renderStep.tsx

@@ -13,11 +13,11 @@ export type CustomSubmit = FormOperatorProps<FormState>['onSubmit'];
 export interface StepProps {
   sections?: SectionsProps[];
   field: FormFieldRegisterer<FormState>;
-  registerSubmit?: (submit: CustomSubmit) => void;
   step: number;
+  params?: Record<string, any>;
 }
 
-export const renderStep = ({ sections, field, step }: StepProps) =>
+export const renderStep = ({ sections, field, step, params }: StepProps) =>
   sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
     const inputs = calculateInputs(getValue(field))(origInputs, step);
 
@@ -25,7 +25,7 @@ export const renderStep = ({ sections, field, step }: StepProps) =>
       <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
         {renderInfo(inputs)}
         {renderTitle(title)}
-        {renderInputs({ field, inputs })}
+        {renderInputs({ field, inputs, params })}
       </div>
     );
   });

package/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -96,15 +96,6 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   },
 );
 
-export const filterItems = (
-  data: (Branch | RemoteWorkplace)[],
-  filtrationState: Record<string, boolean>,
-) => {
-  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
-
-  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
-};
-
 export const getFiltersWithNonEmptyData = (data: (Branch | Atm | RemoteWorkplace)[]) =>
   Object.keys(INITIAL_FILTRATION_STATE).filter(
     (_) => data.filter((item) => FILTRATION_PREDICATES[_](item)).length,

package/src/components/OfficesAtmsMap/filterItems.tsx

@@ -0,0 +1,11 @@
+import { FILTRATION_PREDICATES } from './filters';
+import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
+
+export const filterItems = (
+  data: (Branch | RemoteWorkplace)[],
+  filtrationState: Record<string, boolean>,
+) => {
+  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
+
+  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
+};