@redneckz/wildless-cms-uni-blocks 0.14.621 → 0.14.622

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

@@ -4,12 +4,28 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Доля участия в бизнесе"
-    placeholder="в %"
-    inputLength={2}
-    {...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required)}
-    {...input}
-  />
-));
+const MAX_PART = 100;
+
+export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
+  const partInBusinessField = {
+    ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
+  };
+
+  const handleChange = (value: string) =>
+    partInBusinessField?.onChange &&
+    partInBusinessField?.onChange(
+      String(Number(value) > MAX_PART ? MAX_PART : Number(value) || ''),
+    );
+
+  return (
+    <InputControl
+      label="Доля участия в бизнесе"
+      placeholder="в %"
+      inputLength={3}
+      type="number"
+      {...partInBusinessField}
+      {...input}
+      onChange={handleChange}
+    />
+  );
+});

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

@@ -183,6 +183,6 @@ export const getField =
     };
 
     return isRenderField({ input, field }) ? (
-      <div key={String(i)}>{InputsMap[input?.name]}</div>
+      <div key={String(i)}>{InputsMap[input?.name || '']}</div>
     ) : null;
   };

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

@@ -96,5 +96,5 @@ export const validatorObj: Record<string, Validator> = {
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {
   const requiredInputs = getNamesFromInput(inputs.filter((_: FieldDef) => Boolean(_?.required)));
 
-  return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_]]));
+  return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]));
 };

package/package.json

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

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -29,7 +29,7 @@ export type ConditionFieldProps = {
 export type FieldDefaultDef = Required &
   LabelProps &
   ConditionFieldProps & {
-    name: NameFieldDef;
+    name?: NameFieldDef;
     dadata?: boolean;
   };
 

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -60,7 +60,7 @@ export const getInitialFormState = (inputs: FieldDef[], typeForm = ''): FormStat
   const formState = Object.fromEntries(
     inputs.map((_) => [
       _.name,
-      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name],
+      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name || ''],
     ]),
   );
 

package/src/components/ApplicationForm/renderInputs.tsx

@@ -20,6 +20,6 @@ export const renderInputs = ({ field, typeForm = '', inputs }: GroupedConsentsPr
 };
 
 const splitInputs = (inputs?: FieldDef[]) => ({
-  consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name)) || [],
-  restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name)) || [],
+  consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name || '')) || [],
+  restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name || '')) || [],
 });

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -47,125 +47,4 @@ export default {
       <DialogManager />
     </div>
   ),
-  step1: (
-    <div className="container grid grid-cols-12">
-      <ApplicationLeadForm
-        className="col-span-12"
-        title="Заявка на кредит &#171;Кредит на любые цели&#187;"
-        typeForm="CORRUPTION"
-        endpoint="lead"
-        sections={[
-          { title: 'Персональные данные', inputs: [] },
-          {
-            columns: 2,
-            inputs: [
-              { fieldType: 'common', name: 'surname', required: true, dadata: true },
-              { fieldType: 'common', name: 'name', required: true, dadata: true },
-              { fieldType: 'common', name: 'middleName', dadata: true },
-              { fieldType: 'common', name: 'sex', required: true },
-              { fieldType: 'common', name: 'birthday', required: true },
-              { fieldType: 'common', name: 'birthPlace', required: true },
-              { fieldType: 'common', name: 'phone', required: true },
-              { fieldType: 'common', name: 'email', required: true, dadata: true },
-            ],
-          },
-          {
-            title: 'Паспортные данные',
-            inputs: [
-              { fieldType: 'common', name: 'dulSerie', required: true },
-              { fieldType: 'common', name: 'dulNumber', required: true },
-              { fieldType: 'common', name: 'dulIssueDateField', required: true },
-              { fieldType: 'common', name: 'dulSubdivisionCode', required: true, dadata: true },
-            ],
-          },
-          {
-            inputs: [
-              { fieldType: 'common', name: 'dulIssuedBy', required: true, dadata: true },
-              {
-                fieldType: 'common',
-                name: 'education',
-                required: true,
-              },
-            ],
-          },
-          {
-            title: 'Адрес регистрации по месту жительства',
-            inputs: [],
-          },
-          {
-            inputs: [
-              { fieldType: 'common', name: 'participantDateRegistration', required: true },
-              { fieldType: 'common', name: 'participantAddress', required: true, dadata: true },
-            ],
-          },
-        ]}
-        button={button}
-      />
-      <PopupManager />
-      <DialogManager />
-    </div>
-  ),
-  employmentData: (
-    <div className="container grid grid-cols-12">
-      <ApplicationLeadForm
-        className="col-span-12"
-        title="Заявка на кредит &#171;Кредит на любые цели&#187;"
-        typeForm="CORRUPTION"
-        endpoint="lead"
-        sections={[
-          {
-            title: 'Данные о трудоустройстве',
-            inputs: [],
-          },
-          {
-            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: 'phone', label: 'Телефон работодателя', required: true },
-              { fieldType: 'common', name: 'beginDate', required: true },
-              { fieldType: 'common', name: 'positionOrganization', required: true },
-            ],
-          },
-          {
-            title: 'Адрес работодателя',
-            inputs: [],
-          },
-          {
-            inputs: [{ fieldType: 'common', name: 'fullAddress', required: true }],
-          },
-        ]}
-        button={button}
-      />
-      <PopupManager />
-      <DialogManager />
-    </div>
-  ),
 };

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -28,7 +28,7 @@ export type FieldDefaultDef = Required &
   TextProps &
   LabelProps &
   ConditionFieldProps & {
-    name: NameFieldDef;
+    name?: NameFieldDef;
   };
 
 /**

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -18,7 +18,7 @@ const CONSENT_REQUIRED = 'Отметьте все обязательные со
 
 export const GroupedConsents = JSX<GroupedConsentsProps>(
   ({ inputs = [], typeForm = '', field, key }) => {
-    const isChecked = inputs.every((_) => Boolean(field(_.name).value));
+    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof FormState).value));
 
     const handleGeneralToggle = (value: boolean) => {
       for (const item of inputs) {
@@ -31,7 +31,14 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
       () =>
         inputs
           ?.filter((_) => _.required)
-          ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)),
+          ?.some((_) =>
+            Boolean(
+              withValidator(
+                field(_?.name as keyof FormState),
+                validatorObj[_?.name as keyof FormState],
+              ).error,
+            ),
+          ),
       [inputs],
     );
 

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -150,7 +150,7 @@ export const getInitialFormState = (
   const formState = Object.fromEntries(
     inputs.map((_) => [
       _.name,
-      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name],
+      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name || ''],
     ]),
   );
 

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -7,7 +7,7 @@ export const useInitApplicationLead = (nextStepLink: string) => {
   const [isLoading, setIsLoading] = useState(false);
   const [profileId] = useLocalStorage<string>('profileId');
   const [, setEsiaData] = useLocalStorage('esiaData');
-  const params = new URLSearchParams(decodeURIComponent(window.location.search));
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location.search));
   const esiaAuth = params.get('esiaAuth');
 
   const updateEsiaProfile = useCallback(async () => {

package/src/components/CreditForm/CreditForm.tsx

@@ -3,8 +3,10 @@ import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import {
+  type FieldDef,
+  type SectionsProps,
+} from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { type CreditFormContent } from './CreditFormContent';
 import { CreditFormProgress } from './CreditFormProgress';
 import { CreditFormStep } from './CreditFormStep';
@@ -22,12 +24,13 @@ const STEPS_TITLES = [
 interface CreditFormProps extends CreditFormContent, UniBlockProps {}
 
 export const CreditForm = JSX<CreditFormProps>(({ className, ...rest }) => {
-  const [step, setStep] = useState(1);
+  const [step, setStep] = useState(0);
   const sections = useMemo(() => stepsSectionsMap[step], [step]);
+
   const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
 
   const handleNextStep = useCallback(() => {
-    setStep((_) => Math.min(_ + 1, STEPS_COUNT));
+    setStep((_) => Math.min(_ + 1, STEPS_COUNT - 1));
   }, []);
 
   const handlePrevStep = useCallback(() => {
@@ -43,7 +46,6 @@ export const CreditForm = JSX<CreditFormProps>(({ className, ...rest }) => {
           <CreditFormStep
             inputs={inputs}
             key={String(step)}
-            totalSteps={STEPS_COUNT}
             step={step}
             sections={sections}
             onNextStep={handleNextStep}

package/src/components/CreditForm/CreditFormProgress.tsx

@@ -9,16 +9,16 @@ export interface CreditFormProgressProps {
 }
 
 export const CreditFormProgress = JSX<CreditFormProgressProps>(
-  ({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
-    const progress = useMemo(() => (step / totalSteps) * 100, [step, totalSteps]);
+  ({ step = 0, totalSteps = 5, stepsTitles = [] }) => {
+    const progress = useMemo(() => ((step + 1) / totalSteps) * 100, [step, totalSteps]);
 
     return (
       <div className="py-lg px-5xl bg-white col-span-12">
         <div>
           <span className="font-bold">
-            Шаг {step} из {totalSteps}.
-          </span>{' '}
-          {stepsTitles[step - 1] || null}
+            Шаг {step + 1} из {totalSteps}.
+          </span>
+          {stepsTitles[step] || null}
           <ProgressBar step={progress} showPercentage={false} />
         </div>
       </div>

package/src/components/CreditForm/CreditFormStep.tsx

@@ -13,12 +13,11 @@ import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditFormApi } from './useCreditFormApi';
 
 export interface StepProps {
-  sections: SectionsProps[];
+  sections?: SectionsProps[];
   field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
 }
 
 export interface CreditFormStepProps {
-  totalSteps: number;
   step: number;
   sections: SectionsProps[];
   inputs: FieldDef[];
@@ -27,7 +26,7 @@ export interface CreditFormStepProps {
 }
 
 export const CreditFormStep = JSX<CreditFormStepProps>(
-  ({ totalSteps, step, sections, onPrevStep, onNextStep, inputs }) => {
+  ({ step, sections, onPrevStep, onNextStep, inputs }) => {
     const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
     const initialState = getInitialFormState(step as keyof FormStateMap, localStorageData);
 
@@ -42,14 +41,14 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
     return (
       <form onSubmit={onSubmit} className="space-y-m">
         {renderStep({ sections, field })}
-        <StepsNavigationButtons step={step} totalSteps={totalSteps} onPrevStep={onPrevStep} />
+        <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>
     );
   },
 );
 
 const renderStep = ({ sections, field }: StepProps) => {
-  return sections.map((_, i) => (
+  return sections?.map((_, i) => (
     <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}>
       {renderInfo(_?.inputs)}
       {renderTitle(_?.title)}

package/src/components/CreditForm/StepsNavigationButtons.tsx

@@ -4,11 +4,12 @@ import { style } from '../../utils/style';
 
 export interface StepsNavigationButtonsProps {
   step: number;
-  totalSteps: number;
   onPrevStep?: () => void;
 }
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
+  const isFirstStep = step === 0;
+
   return (
     <div className={'flex justify-between'}>
       <Button
@@ -16,7 +17,7 @@ export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step,
         className={style('w-full @xl:w-auto')}
         type="button"
         version="secondary"
-        disabled={step === 1}
+        disabled={isFirstStep}
       >
         Назад
       </Button>

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -1,9 +1,10 @@
 /* eslint-disable max-lines */
 /* eslint-disable max-len */
 
-//TODO: DO List
-export const stepsSectionsMap = {
-  1: [
+import { type SectionsProps } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+
+export const stepsSectionsMap: SectionsProps[][] = [
+  [
     {
       title: 'Персональные данные',
       columns: 2,
@@ -58,7 +59,7 @@ export const stepsSectionsMap = {
       ],
     },
   ],
-  2: [
+  [
     {
       title: 'Данные о трудоустройстве',
       inputs: [],
@@ -122,7 +123,7 @@ export const stepsSectionsMap = {
       inputs: [{ fieldType: 'common', name: 'fullAddress', required: true }],
     },
   ],
-  3: [
+  [
     {
       title: 'Семейное положение',
     },
@@ -166,7 +167,7 @@ export const stepsSectionsMap = {
       inputs: [{ fieldType: 'common', name: 'armyIdFlg' }],
     },
   ],
-  4: [
+  [
     {
       title: 'Дополнительные сведения',
       columns: 1,
@@ -188,7 +189,7 @@ export const stepsSectionsMap = {
       inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],
     },
   ],
-  5: [
+  [
     {
       title: 'Отделение Банка',
       columns: 1,
@@ -217,4 +218,4 @@ export const stepsSectionsMap = {
       inputs: [{ fieldType: 'common', name: 'bankEmployeeCode' }],
     },
   ],
-};
+];