@redneckz/wildless-cms-uni-blocks 0.14.813 → 0.14.815

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -3,32 +3,6 @@ import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 
-export const applicationFormData: SectionsRetailProps[] = [
-  {
-    columns: 2,
-    inputs: [
-      { name: 'surname', required: true, dadata: true },
-      { name: 'name', required: true, dadata: true },
-      { name: 'middleName', dadata: true },
-      { name: 'limitedBirthday', required: true },
-      { name: 'phone', required: true },
-      { name: 'email', required: true, dadata: true },
-    ],
-  },
-  {
-    inputs: [
-      { name: 'processPersonalDataFlg', required: true },
-      { name: 'consentProviderFlg', required: true },
-      { name: 'consentOthersFlg', required: true },
-      { name: 'consentInformFlg' },
-      { name: 'consentPfrFlg' },
-      { name: 'consentInformMaterialsFlg' },
-      { name: 'consentPhotoFlg' },
-      { name: 'consentFATCA' },
-    ],
-  },
-];
-
 export const getApplicationFormData = (productType: ProductType): SectionsRetailProps[] => {
   const currentProductConsents = productTypeToConsentsMap[productType];
   const allConsents: FieldRetailDef[] = [
@@ -46,11 +20,11 @@ export const getApplicationFormData = (productType: ProductType): SectionsRetail
     {
       columns: 2,
       inputs: [
-        { name: 'surname', required: true, dadata: true },
-        { name: 'name', required: true, dadata: true },
-        { name: 'middleName', dadata: true },
-        { name: 'limitedBirthday', required: true },
-        { name: 'phone', required: true },
+        { name: 'surname', required: true, dadata: true, filledByEsia: true },
+        { name: 'name', required: true, dadata: true, filledByEsia: true },
+        { name: 'middleName', dadata: true, filledByEsia: true },
+        { name: 'limitedBirthday', required: true, filledByEsia: true },
+        { name: 'phone', required: true, filledByEsia: true },
         { name: 'email', required: true, dadata: true },
       ],
     },

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -21,9 +21,16 @@ const initialFormState = {
 export const getInitialFormState = (
   inputs: FieldRetailDef[],
   savedForm: LeadFormState | null,
+  esiaAuthSuccess: boolean,
 ): LeadFormState => {
   if (savedForm) {
-    return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
+    return {
+      ...savedForm,
+      limitedBirthday: new Date(savedForm?.limitedBirthday || 0),
+      ...(!esiaAuthSuccess && {
+        esiaAccountTypeCd: { key: '' },
+      }),
+    };
   }
 
   const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -1,33 +1,62 @@
 /* eslint-disable max-lines */
-import { type UpdateProfileEsiaResponse } from '../../retail/api/updateProfileEsia';
+/* eslint-disable max-lines-per-function */
+import { type EsiaRequestProfileResponse } from '../../retail/api/esiaRequestProfile';
 import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
 import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
+type Document = {
+  file: string;
+  category: DocumentCategory;
+  isPDF: boolean;
+};
+
 export const parseEsiaProfile = async (
-  esiaProfile: UpdateProfileEsiaResponse,
-  taskId: string,
+  esiaProfile: EsiaRequestProfileResponse,
   isDebit: boolean,
 ): Promise<LeadFormState> => {
   isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
-  const files: File[] = [];
+  let files: File[] = [];
 
   if (!isDebit) {
-    await saveDocument({
-      document: esiaAdditionalDocument.pdfFileWorkbook,
-      taskId,
-      category: 'CONFIRMING_INCOME_DOC',
-      files,
-    });
-    await saveDocument({
-      document: esiaAdditionalDocument.pdfFilePayout,
-      taskId,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      files,
-    });
+    files = await saveDocuments([
+      {
+        file: esiaAdditionalDocument.pdfFileWorkbook,
+        category: 'CONFIRMING_INCOME_DOC',
+        isPDF: true,
+      },
+      {
+        file: esiaAdditionalDocument.pdfFilePayout,
+        category: 'CONFIRMING_EMPLOYMENT_DOC',
+        isPDF: true,
+      },
+      {
+        file: esiaAdditionalDocument.pdfFileSigPayout,
+        category: 'CONFIRMING_EMPLOYMENT_DOC',
+        isPDF: true,
+      },
+      {
+        file: esiaAdditionalDocument.xmlFilePayout,
+        category: 'CONFIRMING_EMPLOYMENT_DOC',
+        isPDF: false,
+      },
+      {
+        file: esiaAdditionalDocument.xmlFileSigPayout,
+        category: 'CONFIRMING_EMPLOYMENT_DOC',
+        isPDF: false,
+      },
+      {
+        file: esiaAdditionalDocument.xmlFileWorkbook,
+        category: 'CONFIRMING_INCOME_DOC',
+        isPDF: false,
+      },
+      //TODO: После тестирования добавить документы снизу
+      // {file: esiaAdditionalDocument.pdfFileSigWorkbook, category: 'CONFIRMING_INCOME_DOC', isPDF: true},
+      // {file: esiaAdditionalDocument.xmlFileSigWorkbook, category: 'CONFIRMING_INCOME_DOC', isPDF: false},
+    ]);
   }
 
   const mainData = {
@@ -74,7 +103,7 @@ const concatFullAddress = (address: Array<string | undefined>): string => {
   }, '');
 };
 
-const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration']): Address => {
   const {
     postcode,
     region,
@@ -110,24 +139,22 @@ const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']):
 
 const getYearFromMonth = (month: number) => Math.floor(month / 12);
 
-const saveDocument = async ({
-  document,
-  taskId,
-  category,
-  files,
-}: {
-  document: string;
-  taskId: string;
-  category: DocumentCategory;
-  files: File[];
-}) => {
-  await fetch(`data:application/pdf;base64,${document}`)
-    .then((res) => res.blob())
-    .then((value) => uploadFile(value, taskId, category))
-    .then((file) => files.push(file));
+const saveDocuments = async (documents: Document[]): Promise<File[]> => {
+  const files: File[] = [];
+
+  for (const doc of documents) {
+    const contentType = doc.isPDF ? 'data:application/pdf;base64' : 'data:application/xml;base64';
+
+    await fetch(`${contentType},${doc.file}`)
+      .then((res) => res.blob())
+      .then((value) => uploadFile(value, doc.category, doc.isPDF))
+      .then((file) => files.push(file));
+  }
+
+  return files;
 };
 
-const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
+const checkEsiaDataForCredit = (esiaProfile: EsiaRequestProfileResponse) => {
   const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
 
   const data = [
@@ -153,6 +180,13 @@ const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
     esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
     esiaAdditionalDocument.pdfFilePayout,
     esiaAdditionalDocument.pdfFileWorkbook,
+    esiaAdditionalDocument.pdfFileSigPayout,
+    esiaAdditionalDocument.xmlFilePayout,
+    esiaAdditionalDocument.xmlFileSigPayout,
+    esiaAdditionalDocument.xmlFileWorkbook,
+    //TODO: После тестирования добавить документы снизу
+    // esiaAdditionalDocument.pdfFileSigWorkbook,
+    // esiaAdditionalDocument.xmlFileSigWorkbook
   ];
 
   if (!data.every((_) => Boolean(_))) {
@@ -160,7 +194,7 @@ const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
   }
 };
 
-const checkEsiaDataForDebit = (esiaProfile: UpdateProfileEsiaResponse) => {
+const checkEsiaDataForDebit = (esiaProfile: EsiaRequestProfileResponse) => {
   const { profile, document, addressRegistration } = esiaProfile;
 
   const data = [

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -12,7 +12,6 @@ import { updateUserProfile } from '../../retail/api/updateUserProfile';
 import { updateUserTask } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
-import { useEsiaLoginDialog } from '../../retail/components/EsiaLoginDialog/useEsiaLoginDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
@@ -28,7 +27,7 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
-  esiaError: boolean;
+  esiaAuthSuccess: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -36,7 +35,6 @@ export const useApplicationLeadApi = ({
   programId,
   nextStepLink,
   productType,
-  esiaError,
   data,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
@@ -45,77 +43,72 @@ export const useApplicationLeadApi = ({
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
 
-  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+  const goToNextStep = useCallback(() => {
+    navigator.assign(nextStepLink);
+  }, []);
+
+  const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
 
-  const handleSubmit = useCallback(
-    async (formData: LeadFormState) => {
-      if (esiaError) {
-        navigator.assign(nextStepLink);
-
-        return;
-      }
-      try {
-        startSending();
-        const profileId = await createUserProfile({
-          profile: { phone: formatPhone(formData.phone as string) },
-        });
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
+    try {
+      startSending();
+      const profileId = await createUserProfile({
+        profile: { phone: formatPhone(formData.phone as string) },
+      });
 
-        if (profileId && formData?.phone) {
-          const sendCurrentTask = async () => {
-            await updateUserData({
-              programId,
-              profileId,
-              formData,
-              productType,
-              saveUserData,
-              sendAspects,
-            });
-            verifyPhoneDialog.close();
-            if (productType === 'debitCard') {
-              openEsiaLoginDialog();
+      if (profileId && formData?.phone) {
+        const sendCurrentTask = async () => {
+          await updateUserData({
+            programId,
+            profileId,
+            formData,
+            productType,
+            saveUserData,
+            sendAspects,
+          });
+          verifyPhoneDialog.close();
+          if (productType === 'debitCard') {
+            goToNextStep();
+          } else {
+            consentBkiDialog.open(formData.phone, profileId);
+          }
+        };
+        const handleSuccessVerify = async () => {
+          try {
+            const lastTaskId = await getLastTaskStatus({ profileId, programId });
+
+            if (lastTaskId) {
+              const task = await getTaskById({ taskId: lastTaskId });
+              verifyPhoneDialog.close();
+              draftDialog.open({
+                task,
+                isFromLead: true,
+                sendAspects,
+                onClose: sendCurrentTask,
+              });
             } else {
-              consentBkiDialog.open(formData.phone, profileId);
-            }
-          };
-          const handleSuccessVerify = async () => {
-            try {
-              const lastTaskId = await getLastTaskStatus({ profileId, programId });
-
-              if (lastTaskId) {
-                const task = await getTaskById({ taskId: lastTaskId });
-                verifyPhoneDialog.close();
-                draftDialog.open({
-                  task,
-                  isFromLead: true,
-                  sendAspects,
-                  onClose: sendCurrentTask,
-                });
-              } else {
-                await sendCurrentTask();
-              }
-            } catch {
-              setOK(false);
+              await sendCurrentTask();
             }
-          };
+          } catch {
+            setOK(false);
+          }
+        };
 
-          const acceptedConsents = getAcceptedConsents(formData, productType);
+        const acceptedConsents = getAcceptedConsents(formData, productType);
 
-          verifyPhoneDialog.open({
-            phone: formData?.phone,
-            consents: acceptedConsents,
-            onSuccess: handleSuccessVerify,
-          });
-          endSending();
-        }
-      } catch {
-        setOK(false);
+        verifyPhoneDialog.open({
+          phone: formData?.phone,
+          consents: acceptedConsents,
+          onSuccess: handleSuccessVerify,
+        });
+        endSending();
       }
-    },
-    [esiaError],
-  );
+    } catch {
+      setOK(false);
+    }
+  }, []);
 
   return { isSending, ok, handleSubmit };
 };

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,11 +1,9 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { locationNavigator } from '../../external/locationNavigator';
 import { useSetter } from '../../hooks/useSetter';
-import { updateProfileEsia } from '../../retail/api/updateProfileEsia';
+import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
-import { safeJsonParse } from '../../utils/safeJsonParse';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -16,70 +14,62 @@ type InitApplicationLeadProps = {
   nextStepLink: string;
   productType: ProductType;
   setEsiaError: () => void;
+  setEsiaAuthSuccess: () => void;
+  esiaAuthSuccess: boolean;
 };
 
 export const useInitApplicationLead = ({
   inputs,
-  nextStepLink,
   productType,
   setEsiaError,
+  setEsiaAuthSuccess,
+  esiaAuthSuccess,
 }: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
-  const navigator = locationNavigator();
   const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
 
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const initialFormState = useMemo(
-    () => getInitialFormState(inputs, leadFormStore.leadForm),
+    () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
     [inputs, leadFormStore.leadForm],
   );
 
-  const updateEsiaProfile = useCallback(
-    async (profileId: string, code: string, state: string) => {
-      startLoading();
-      try {
-        const data = await updateProfileEsia({
-          profileId,
-          code,
-          state,
-          redirectUri: globalThis.location?.href,
-        });
+  const requestEsiaProfile = useCallback(async (code: string, state: string) => {
+    startLoading();
+    try {
+      const data = await esiaRequestProfile({
+        code,
+        state,
+        redirectUri: globalThis.location?.href,
+        authorize: true,
+      });
 
-        if (data && leadFormStore?.taskId) {
-          const parsedData = await parseEsiaProfile(
-            data,
-            leadFormStore.taskId.toString(),
-            productType === 'debitCard',
-          );
+      if (data) {
+        const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
 
-          saveForm((_) => ({
-            ..._,
-            ...parsedData,
-          }));
-        }
-
-        navigator.assign(nextStepLink);
-      } catch {
-        setEsiaError();
-      } finally {
-        endLoading();
+        saveForm((_) => ({
+          ..._,
+          ...parsedData,
+        }));
+        setEsiaAuthSuccess();
       }
-    },
-    [nextStepLink],
-  );
+    } catch {
+      setEsiaError();
+    } finally {
+      endLoading();
+    }
+  }, []);
 
   useEffect(() => {
     leadFormStore.productType = productType;
-    const profileId: string = <string>(
-      safeJsonParse(globalThis.localStorage?.getItem('profileId') ?? '')
-    );
+
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
 
-    if (profileId && code && state) {
-      updateEsiaProfile(profileId, code, state);
+    if (code && state) {
+      requestEsiaProfile(code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');

package/src/components/Blocks.mobile.ts

@@ -26,6 +26,7 @@ import { Depository } from './Depository/Depository';
 import { ErrorBlock } from './ErrorBlock/ErrorBlock';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
+import { GalleryLayout } from './GalleryLayout/GalleryLayout';
 import { GrantSupport } from './GrantSupport/GrantSupport';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
@@ -74,6 +75,7 @@ export const Blocks: BlocksRegistry = {
   ErrorBlock,
   ExchangeRateTile,
   Footer,
+  GalleryLayout,
   GrantSupport,
   Header,
   Headline,

package/src/components/Blocks.ts

@@ -28,6 +28,7 @@ import { Depository } from './Depository/Depository';
 import { ErrorBlock } from './ErrorBlock/ErrorBlock';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
+import { GalleryLayout } from './GalleryLayout/GalleryLayout';
 import { GracePeriod } from './GracePeriod/GracePeriod';
 import { GrantSupport } from './GrantSupport/GrantSupport';
 import { Header } from './Header/Header';
@@ -81,6 +82,7 @@ export const Blocks: BlocksRegistry = {
   ErrorBlock,
   ExchangeRateTile,
   Footer,
+  GalleryLayout,
   GracePeriod,
   GrantSupport,
   Header,

package/src/components/CarouselCatalogCard/CarouselCatalogCard.tsx

@@ -45,6 +45,7 @@ export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
             headlineVersion="XS"
             isEmbedded={true}
             align={align}
+            className="min-h-24"
           />
         }
         rightImage={

package/src/components/GalleryLayout/GalleryLayout.example.json

@@ -0,0 +1,102 @@
+{
+  "content": {
+    "gap": "L",
+    "version": "primary",
+    "padding": "p-xl"
+  },
+  "blocks": [
+    {
+      "content": {
+        "version": "secondary",
+        "title": "Продукт",
+        "description": "Описание",
+        "headlineVersion": "XL",
+        "backwardButton": false,
+        "isDotted": true,
+        "buttons": [
+          {
+            "text": "Кнопка",
+            "version": "secondary"
+          }
+        ],
+        "padding": "p-xl",
+        "benefitsVersion": "normal",
+        "benefits": [
+          {
+            "label": "Преимущество №1",
+            "icon": {
+              "icon": "SmallClockIcon"
+            }
+          },
+          {
+            "label": "Преимущество №2",
+            "icon": {
+              "icon": "SignDocsIcon"
+            }
+          }
+        ],
+        "imageOptions": {
+          "imageAlign": "end"
+        }
+      },
+      "style": ["col-span-12"],
+      "type": "ProductBlock"
+    },
+    {
+      "content": {
+        "version": "secondary",
+        "title": "Продукт",
+        "headlineVersion": "S",
+        "backwardButton": false,
+        "padding": "p-xl",
+        "imageOptions": {
+          "imageAlign": "end"
+        }
+      },
+      "style": ["col-span-12"],
+      "type": "ProductBlock"
+    },
+    {
+      "content": {
+        "version": "secondary",
+        "title": "Продукт",
+        "headlineVersion": "S",
+        "backwardButton": false,
+        "padding": "p-xl",
+        "imageOptions": {
+          "imageAlign": "end"
+        }
+      },
+      "style": ["col-span-12"],
+      "type": "ProductBlock"
+    },
+    {
+      "content": {
+        "version": "secondary",
+        "title": "Продукт",
+        "headlineVersion": "S",
+        "backwardButton": false,
+        "padding": "p-xl",
+        "imageOptions": {
+          "imageAlign": "end"
+        }
+      },
+      "style": ["col-span-12"],
+      "type": "ProductBlock"
+    },
+    {
+      "content": {
+        "version": "secondary",
+        "title": "Продукт",
+        "headlineVersion": "S",
+        "backwardButton": false,
+        "padding": "p-xl",
+        "imageOptions": {
+          "imageAlign": "end"
+        }
+      },
+      "style": ["col-span-12"],
+      "type": "ProductBlock"
+    }
+  ]
+}