@redneckz/wildless-cms-uni-blocks 0.14.816 → 0.14.818

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { EsiaStatuses } from './ApplicationLeadForm';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -13,20 +13,16 @@ type InitApplicationLeadProps = {
   inputs: FieldRetailDef[];
   nextStepLink: string;
   productType: ProductType;
-  setEsiaError: () => void;
-  setEsiaAuthSuccess: () => void;
+  setEsiaStatus: (status: EsiaStatuses) => void;
   esiaAuthSuccess: boolean;
 };
 
 export const useInitApplicationLead = ({
   inputs,
   productType,
-  setEsiaError,
-  setEsiaAuthSuccess,
+  setEsiaStatus,
   esiaAuthSuccess,
-}: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
-  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-
+}: InitApplicationLeadProps): LeadFormState => {
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
@@ -36,7 +32,7 @@ export const useInitApplicationLead = ({
   );
 
   const requestEsiaProfile = useCallback(async (code: string, state: string) => {
-    startLoading();
+    setEsiaStatus(EsiaStatuses.Pending);
     try {
       const data = await esiaRequestProfile({
         code,
@@ -52,12 +48,10 @@ export const useInitApplicationLead = ({
           ..._,
           ...parsedData,
         }));
-        setEsiaAuthSuccess();
+        setEsiaStatus(EsiaStatuses.Success);
       }
     } catch {
-      setEsiaError();
-    } finally {
-      endLoading();
+      setEsiaStatus(EsiaStatuses.Error);
     }
   }, []);
 
@@ -76,5 +70,5 @@ export const useInitApplicationLead = ({
     }
   }, []);
 
-  return [initialFormState, { isLoading }];
+  return initialFormState;
 };

package/mobile/src/components/GalleryLayout/GalleryLayout.tsx

@@ -33,7 +33,7 @@ const LINK_SCHEMA: Record<string, JSONSchema7Definition> = {
         },
       },
     ],
-    title: 'Ссылка',
+    title: 'Ссылка (если заполнено, то кнопка скрывается)',
     required: ['href'],
   },
 };
@@ -109,15 +109,18 @@ const blockDecoratorWrapper =
 
 const productBlockDecorator =
   (idx: number): BlockDecorator =>
-  ({ blockClassName, block, render }, i) =>
-    (
-      <LinkWrapper key={i} {...block.content?.link} className={getChildStyle(idx)}>
+  ({ blockClassName, block, render }, i) => {
+    const modifiedBlock = modifyBlock(block, idx);
+
+    return (
+      <LinkWrapper key={String(i)} {...modifiedBlock.content?.link} className={getChildStyle(idx)}>
         {render({
           blockClassName: style(blockClassName, 'h-full'),
-          block: modifyBlock(block, idx),
+          block: modifiedBlock,
         })}
       </LinkWrapper>
     );
+  };
 
 const getChildStyle = (index: number) =>
   SHORT_TILE_INDEXES.includes(index)
@@ -127,13 +130,21 @@ const getChildStyle = (index: number) =>
 const modifyBlock = (block: BlockDef, i: number) => {
   const content: ProductBlockContent & { link?: LinkProps } = { ...block.content };
 
-  if (SHORT_TILE_INDEXES.includes(i)) {
+  const isSmallTile = SHORT_TILE_INDEXES.includes(i);
+
+  if (isSmallTile) {
     delete content.description;
     delete content.benefits;
-  }
 
-  if (content.link?.href) {
-    delete content.buttons;
+    if (content.link?.href) {
+      delete content.buttons;
+    }
+
+    content.imageOptions = { ...content.imageOptions, className: 'max-w-max !h-auto' };
+  } else {
+    if ((content.buttons ?? []).length) {
+      delete content.link;
+    }
   }
 
   return { ...block, content };

package/mobile/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -19,13 +19,12 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     snils,
     armyIdFlg,
     conscription,
-    esiaAccountTypeCd,
   } = formData;
 
   return {
     maritalStatusCd: familyStatus,
     totalDependents: familyMembers,
-    incomeCertificateCd: esiaAccountTypeCd?.key ? { key: 'SFR_CERTIFICATE' } : confirmationIncome,
+    incomeCertificateCd: confirmationIncome,
     otherDependents: dependents,
     childrenDependents: children,
     militaryStatusCd: conscription,

package/mobile/src/retail/components/Fields/BeginDateField.tsx

@@ -1,11 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/components/Fields/ConfirmationIncomeField.tsx

@@ -1,18 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { InfoCard } from '../../../ui-kit/InfoCard/InfoCard';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { SelectField } from './SelectField';
 
 export const ConfirmationIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
+  const filledByEsia = input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '');
 
   return (
-    <SelectField
-      field={field}
-      source={confirmationIncome}
-      label="Способ подтверждения дохода"
-      fieldName="confirmationIncome"
-      input={input}
-    />
+    <div>
+      {filledByEsia ? (
+        <div className="mb-6">
+          <InfoCard __html="Для выбора иного способа подтверждения дохода, оформите новую заявку на кредит без авторизации на портале Госуслуги" />
+        </div>
+      ) : null}
+      <SelectField
+        field={field}
+        source={confirmationIncome}
+        label="Способ подтверждения дохода"
+        fieldName="confirmationIncome"
+        input={input}
+        disabled={filledByEsia}
+      />
+    </div>
   );
 });

package/mobile/src/retail/components/Fields/DaDataInnField.tsx

@@ -4,6 +4,7 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -41,6 +42,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

package/mobile/src/retail/components/Fields/Experience5YearsField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { clamp } from '../../../utils/clamp';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const MAX_YEARS = 5;
@@ -22,6 +23,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

package/mobile/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/components/Fields/JobsNumberField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/components/Fields/LastJobExperienceField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/components/Fields/OrganizationNameField.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -19,6 +20,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/retail/components/Fields/WagesField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -9,5 +10,6 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/mobile/src/retail/content.tsx

@@ -139,7 +139,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label: 'Телефон работодателя',
         required: true,
       },
-      { name: 'beginDate', required: true },
+      { name: 'beginDate', required: true, filledByEsia: true },
     ],
   },
   {
@@ -181,23 +181,20 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
     title: 'Совокупный доход',
   },
   {
+    columns: 1,
     inputs: [
       {
-        name: 'infoCard',
-        label: 'Сумма основного и дополнительных доходов после вычета налога',
+        name: 'confirmationIncome',
+        required: true,
+        filledByEsia: true,
       },
     ],
   },
   {
-    columns: 1,
     inputs: [
       {
-        name: 'confirmationIncome',
-        required: true,
-        condition: {
-          name: 'esiaAccountTypeCd',
-          values: [''],
-        },
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
       },
     ],
   },

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

@@ -54,12 +54,13 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
       directionRight = true,
       isImageAlwaysOnRight,
       isImageSecondary = false,
+      className: imageClassName,
     } = {},
     backwardButton,
     children,
     ...rest
   }) => {
-    const img = image?.src ? <Img image={image} /> : null;
+    const img = image?.src ? <Img image={image} imageClassName={imageClassName} /> : null;
     const headline = (
       <Headline
         title={title}

package/mobile/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -19,6 +19,8 @@ export interface TileImageOptions {
   isImageSecondary?: boolean;
   /** @title Изображение всегда справа */
   isImageAlwaysOnRight?: boolean;
+  /** @hidden */
+  className?: string;
 }
 
 /** @title Цены */

package/package.json

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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { validatorObj } from '../../retail/validator/validatorObj';
@@ -25,6 +24,12 @@ import { useInitApplicationLead } from './useInitApplicationLead';
 
 interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockProps {}
 
+export enum EsiaStatuses {
+  Success = 'SUCCESS',
+  Error = 'ERROR',
+  Pending = 'PENDING',
+}
+
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({
     className,
@@ -36,8 +41,8 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     data,
     ...rest
   }) => {
-    const [esiaError, { setTrue: setEsiaError }] = useBool(false);
-    const [esiaAuthSuccess, { setTrue: setEsiaAuthSuccess }] = useBool(false);
+    const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
+    const leadForm = useRef<HTMLFormElement | null>(null);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
     const inputs = useMemo(
       () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
@@ -46,19 +51,17 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
 
     const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
 
-    const [initialFormState, { isLoading }] = useInitApplicationLead({
+    const initialFormState = useInitApplicationLead({
       inputs,
       nextStepLink,
       productType,
-      setEsiaError,
-      setEsiaAuthSuccess,
-      esiaAuthSuccess,
+      setEsiaStatus,
+      esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
     });
     const { isSending, ok, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
       productType,
-      esiaAuthSuccess,
       data,
     });
 
@@ -75,10 +78,16 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     }, [ok]);
 
     useEffect(() => {
-      if (initialFormState?.esiaAccountTypeCd) {
+      if (esiaStatus && leadForm?.current) {
+        leadForm.current.scrollIntoView({
+          block: 'start',
+        });
+      }
+
+      if (esiaStatus === EsiaStatuses.Success) {
         reset();
       }
-    }, [initialFormState]);
+    }, [leadForm?.current, esiaStatus]);
 
     return (
       <ApplicationFormLayout
@@ -86,9 +95,9 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
         title={title}
         {...rest}
       >
-        {!esiaAuthSuccess && !esiaError ? <EsiaLoginBanner /> : null}
-        <form onSubmit={onSubmit} className="space-y-m relative">
-          {isLoading ? <Loader blur={false} /> : null}
+        {!esiaStatus ? <EsiaLoginBanner /> : null}
+        <form onSubmit={onSubmit} className="space-y-m relative" ref={leadForm}>
+          {esiaStatus === EsiaStatuses.Pending ? <Loader blur={false} /> : null}
           {applicationFormData.map((_, i) => (
             <div
               key={`section-${i}`}
@@ -99,7 +108,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
             </div>
           ))}
           {renderSubmitButton(button, isSending)}
-          {esiaError ? (
+          {esiaStatus === EsiaStatuses.Error ? (
             <Text size="text-m" font="font-medium" color="text-error">
               Использовать Госуслуги для оформления заявки невозможно, необходимо заполнить поля
               вручную.

package/src/components/ApplicationLeadForm/EsiaLoginBanner.tsx

@@ -19,7 +19,6 @@ export const EsiaLoginBanner = JSX<EsiaLoginBannerProps>(() => {
 
     if (resp?.link) {
       navigator.assign(resp.link);
-      globalThis.location.href = resp.link;
     }
   }, []);