@redneckz/wildless-cms-uni-blocks 0.14.951 → 0.14.952

package/mobile/src/retail/api/doRequest.ts

@@ -1,4 +1,5 @@
-import { RETAIL_API_BASE_URI } from '../../api/apiBaseUrl';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
+import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from './apiBaseUrl';
 import { getTraceId } from './getTraceId';
 
 export const fetchRetailJSON = async <R>(
@@ -22,20 +23,24 @@ export async function doRequest(
   method: 'POST' | 'GET' | 'PUT',
   body?: any,
 ): Promise<Response> {
+  const isNewMicroservice = checkNewMicroservice();
   const traceId = getTraceId();
 
-  return globalThis?.fetch?.(`${RETAIL_API_BASE_URI}${url}`, {
-    method,
-    headers: {
-      'Content-Type': 'application/json',
-      'X-B3-Sampled': '1',
-      'X-B3-Spanid': traceId,
-      'X-B3-Traceid': traceId,
-      ...getAuthorizationHeaders(),
+  return globalThis?.fetch?.(
+    `${isNewMicroservice ? NEW_RETAIL_API_BASE_URI : RETAIL_API_BASE_URI}${url}`,
+    {
+      method,
+      headers: {
+        'Content-Type': 'application/json',
+        'X-B3-Sampled': '1',
+        'X-B3-Spanid': traceId,
+        'X-B3-Traceid': traceId,
+        ...getAuthorizationHeaders(),
+      },
+      credentials: 'include',
+      body: body ? JSON.stringify(body) : null,
     },
-    credentials: 'include',
-    body: body ? JSON.stringify(body) : null,
-  });
+  );
 }
 
 export const getAuthorizationHeaders = () => {

package/mobile/src/retail/api/esiaRequestProfile.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { saveToken } from '../utils/saveToken';
 import { type CheckCodeResponse } from './checkCode';
 import { fetchRetailJSON } from './doRequest';
@@ -87,8 +88,14 @@ export type EsiaRequestProfileResponse = CheckCodeResponse & {
   };
 };
 
-export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
-  fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
+export const esiaRequestProfile = async (body: EsiaRequestProfileBody) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await fetchRetailJSON<EsiaRequestProfileResponse>(
+    `${isNewMicroservice ? '/user-data' : ''}/esia/requestProfile`,
+    'POST',
+    body,
+  ).then((res) => {
     if (res?.access_token && res?.refresh_token) {
       saveToken(res);
       updateRefreshToken(true);
@@ -96,3 +103,4 @@ export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
 
     return res;
   });
+};

package/mobile/src/retail/api/getDictionaries.ts

@@ -1,17 +1,22 @@
 import { type CreditFormDictionarySlice } from '../hooks/useRetailFormStore';
 import { type DictionaryItem } from '../model/LeadFormData';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 export const getDictionaries = async (
   dictionaries: Record<string, string>,
   store: CreditFormDictionarySlice,
 ) => {
+  const isNewMicroservice = checkNewMicroservice();
+
   await Promise.all(
     Object.entries(dictionaries).map((dictionary) => {
       const [fieldName, dictionaryName] = dictionary;
 
       fetchRetailJSON<DictionaryItem[]>(
-        `/dictionary?dictionaryType=${encodeURIComponent(dictionaryName)}`,
+        `${isNewMicroservice ? '/public-data' : ''}/dictionary?dictionaryType=${encodeURIComponent(
+          dictionaryName,
+        )}`,
         'POST',
       ).then((res) => {
         store[fieldName] = res;

package/mobile/src/retail/api/getLink.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 export type GetLinkBody = {
@@ -8,5 +9,12 @@ export type GetLinkResponse = {
   link: string;
 };
 
-export const getLink = (body: GetLinkBody) =>
-  fetchRetailJSON<GetLinkResponse>('/esia/getLink', 'POST', body);
+export const getLink = async (body: GetLinkBody) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await fetchRetailJSON<GetLinkResponse>(
+    `${isNewMicroservice ? '/user-data' : ''}/esia/getLink`,
+    'POST',
+    body,
+  );
+};

package/mobile/src/retail/api/sendCode.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { doRequest } from './doRequest';
 
 export type SendCodeBody = {
@@ -7,4 +8,11 @@ export type SendCodeBody = {
   };
 };
 
-export const sendCode = (body: SendCodeBody) => doRequest('/sms/sendCode', 'POST', body);
+export const sendCode = async (body: SendCodeBody) => {
+  const isNewMicroservice = checkNewMicroservice();
+
+  return await doRequest(`${isNewMicroservice ? '/user-data' : ''}/sms/sendCode`, 'POST', {
+    phoneNumber: body.phoneNumber,
+    smsCodesSetName: isNewMicroservice ? body.smsCodesSetName.key : body.smsCodesSetName,
+  });
+};

package/mobile/src/retail/api/sendMessage.ts

@@ -0,0 +1,12 @@
+import { doRequest } from './doRequest';
+
+export type MessageName = 'CREATE_APPLICATION_SHORT_MESSAGE' | 'CREATE_APPLICATION_LOAN_MESSAGE';
+
+interface SendMessage {
+  messageName: MessageName;
+  taskId: number | null;
+}
+
+export const sendMessage = async (body: SendMessage) => {
+  await doRequest('/camunda/send/message', 'POST', body);
+};

package/mobile/src/retail/api/updateUserTask.ts

@@ -48,12 +48,13 @@ export type PaymentType = {
 
 export type Participant = {
   birthDate?: string;
-  id?: number;
+  id?: Nullable<number>;
   midname?: string;
   name?: string;
   surname?: string;
+  esiaAccountTypeCd?: Option;
   profile?: {
-    id: number;
+    id?: Nullable<number>;
     esiaAccountTypeCd?: Option;
   };
   armyIdFlg?: boolean;
@@ -118,6 +119,15 @@ export type Participant = {
   latinSurname?: string;
   latinName?: string;
   residentOtherCountry?: boolean;
+  processPersonalDataFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentPfrFlg?: boolean;
+  consentPhotoFlg?: boolean;
+  consentAssignmentClaimsFlg?: boolean;
+  consentCollectionFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentBkiFlg?: boolean;
+  smsConsentBki?: string;
 };
 
 export type MarketingInfo = {
@@ -145,7 +155,8 @@ export type UpdateUserTaskBody = {
       key: string;
     };
     authorizedAgentId?: number;
-    participants: Participant[];
+    participants?: Participant[];
+    participant?: Participant;
     esiaAccountTypeCd?: {
       key: 'VERIFIED' | 'STANDARD' | 'SIMPLIFIED';
     };
@@ -157,11 +168,5 @@ export type UpdateUserTaskBody = {
   };
 };
 
-export type CreateUserProfileResponse = {
-  profile: {
-    id: number;
-  };
-};
-
 export const updateUserTask = (body: UpdateUserTaskBody) =>
   doRequest('/user-data/updateUserTask', 'PUT', body);

package/mobile/src/retail/components/CaptchaDialog/CaptchaDialog.tsx

@@ -28,7 +28,7 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(({ phoneNumber, sendCode, o
 
   const handleCheckCaptcha = useCallback(async () => {
     startLoading();
-    const isValidCode = await checkCaptcha({ captchaText: code });
+    const isValidCode = await checkCaptcha({ captchaText: code, phoneNumber });
 
     if (isValidCode) {
       onClose?.();

package/mobile/src/retail/components/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -1,37 +1,61 @@
 import { useDialog } from '../../../ui-kit/DialogManager/useDialog';
 import { updateUserProfile } from '../../api/updateUserProfile';
+import { updateUserTask } from '../../api/updateUserTask';
 import { VerifyPhoneDialog } from '../VerifyPhoneDialog/VerifyPhoneDialog';
 import { ConsentBkiDialog } from './ConsentBkiDialog';
 
+type SubmitBkiConsentProps = {
+  phone?: string;
+  profileId?: number;
+  onFail?: () => void;
+  taskId?: number;
+  participantId?: number;
+};
+
 export const useConsentBkiDialog = (onClose: () => void) => {
   const { open } = useDialog(ConsentBkiDialog);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
-  const handleSuccessVerify = (profileId?: number) => async (smsCode?: string) => {
-    try {
-      if (profileId) {
-        await updateUserProfile({
-          profile: {
-            id: profileId,
-            consentBkiFlg: true,
-            smsConsentBki: smsCode,
-          },
-        });
-      }
+  const handleSuccessVerify =
+    (profileId?: number, taskId?: number, participantId?: number) => async (smsCode?: string) => {
+      try {
+        if (profileId) {
+          await updateUserProfile({
+            profile: {
+              id: profileId,
+              consentBkiFlg: true,
+              smsConsentBki: smsCode,
+            },
+          });
+        } else if (taskId && participantId) {
+          await updateUserTask({
+            task: {
+              id: taskId,
+              participant: {
+                id: participantId,
+                consentBkiFlg: true,
+                smsConsentBki: smsCode,
+              },
+            },
+            sendToBank: false,
+            taskKind: 'SHORT',
+          });
+        }
 
-      onClose();
-    } catch (ex) {
-      console.log(ex);
-    }
-  };
+        onClose();
+      } catch (ex) {
+        console.log(ex);
+      }
+    };
 
-  const handleSubmitBkiConstent =
-    (phone?: string, profileId?: number, onFail?: () => void) => async (confirmStatus: string) => {
+  const handleSubmitBkiConsent =
+    ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+    async (confirmStatus: string) => {
       if (confirmStatus === 'SIGNED' && phone) {
         verifyPhoneDialog.open({
           phone,
           consents: ['согласие на запрос информации в БКИ'],
-          onSuccess: handleSuccessVerify(profileId),
+          onSuccess: handleSuccessVerify(profileId, taskId, participantId),
           onFail,
         });
       } else {
@@ -40,7 +64,16 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     };
 
   return {
-    open: (phone?: string, profileId?: number, onFail?: () => void) =>
-      open({ onSubmit: handleSubmitBkiConstent(phone, profileId, onFail), onClose }),
+    open: ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+      open({
+        onSubmit: handleSubmitBkiConsent({
+          phone,
+          profileId,
+          onFail,
+          taskId,
+          participantId,
+        }),
+        onClose,
+      }),
   };
 };

package/mobile/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -37,6 +37,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   }) => {
     const [values, setValues] = useState<string[]>(Array(CODE_LENGTH).fill('') as string[]);
     const sessionStore = useSessionStore<SmsCodeStore>();
+    const phoneNumber = formatPhone(phone);
 
     const {
       handleSubmit,
@@ -49,12 +50,12 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
       setErrorText,
     } = useVerifyPhoneDialogSubmit({
       values,
+      phoneNumber,
       onSuccess,
       onFail,
     });
 
     const captchaDialog = useDialog(CaptchaDialog);
-    const phoneNumber = formatPhone(phone);
     const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
 
     const handleSendCode = useCallback(async () => {

package/mobile/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx

@@ -9,6 +9,7 @@ export const TIME_TO_RESEND = 180;
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
+  phoneNumber: string;
   onSuccess: (smsCode?: string) => void;
   onFail: () => void;
 };
@@ -22,6 +23,7 @@ export interface SmsCodeStore {
 
 export const useVerifyPhoneDialogSubmit = ({
   values,
+  phoneNumber,
   onSuccess,
   onFail,
 }: useVerifyPhoneDialogSubmitProps) => {
@@ -47,6 +49,7 @@ export const useVerifyPhoneDialogSubmit = ({
     const response = await checkCode({
       smsText: values.join(''),
       smsCodesSetName: { key: 'AUTHENTICATION' },
+      phoneNumber,
     });
 
     if (response.ok) {

package/mobile/src/retail/hooks/useLeadFormData.ts

@@ -1,15 +1,20 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON';
-import { API_BASE_URI } from '../api/apiBaseUrl';
+import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from '../api/apiBaseUrl';
 import { type DictionaryItem } from '../model/LeadFormData';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 
 type ErrorProps = {
   errorMessage?: string;
 };
 
 export const useLeadFormData = (typeField: string) => {
+  const isNewMicroservice = checkNewMicroservice();
+
   const { data, error } = useAsyncData(
-    `${API_BASE_URI}/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
+    `${
+      isNewMicroservice ? `${NEW_RETAIL_API_BASE_URI}/public-data` : RETAIL_API_BASE_URI
+    }/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );
   if (data && 'errorMessage' in data) {

package/mobile/src/retail/model/LeadFormState.ts

@@ -84,6 +84,8 @@ export type FormRetailConsents = CreditFormConsents &
   CreditCardFormConsents &
   DebitCardFormConsents & {
     consentPhotoFlg?: boolean;
+    consentAssignmentClaimsFlg?: boolean;
+    consentCollectionFlg?: boolean;
   };
 
 // TODO Какая то часть должна быть взята из RetailAPI
@@ -145,10 +147,6 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   product?: string;
   localities?: string[];
   partnerComments?: string;
-  consentDataProcessing?: boolean;
-  consentPhotoFlg?: boolean;
-  consentAssignmentClaimsFlg?: boolean;
-  consentCollectionFlg?: boolean;
   familyStatus?: Option;
   familyMembers?: string;
   children?: string;

package/mobile/src/retail/utils/checkNewMicroservice.ts

@@ -0,0 +1,5 @@
+export const checkNewMicroservice = () => {
+  const isNewMicroservice = globalThis.sessionStorage?.getItem('isNewMicroservice');
+
+  return Boolean(isNewMicroservice);
+};

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

@@ -3,14 +3,13 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type SearchHeaderProps } from '../../data/CommonData';
 import { type TopMenuItemProps } from '../../data/NavigationData';
 import { type ComponentType } from '../../model/ComponentType';
-import { type PlaceholderProps } from '../../model/PlaceholderProps';
 import { style } from '../../utils/style';
 import { CloseButton } from '../DialogManager/CloseButton';
 import { useDialog } from '../DialogManager/useDialog';
 import { SearchDialog } from '../SearchDialog/SearchDialog';
 import { SearchInput } from '../SearchDialog/SearchInput';
 
-interface SearchBarProps extends ComponentType, PlaceholderProps {
+interface SearchBarProps extends ComponentType {
   search?: SearchHeaderProps;
   navigationItems?: TopMenuItemProps[];
 }
@@ -39,7 +38,6 @@ export const SearchBar = JSX<SearchBarProps>(({ className, search, ...rest }) =>
         value={value}
         placeholder={search?.placeholder}
         onChange={handleInitialInputChange}
-        {...rest}
       />
       <CloseButton className="absolute top-0 right-0 sm:hidden" onClose={resetQueryOnDialogClose} />
     </div>

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

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import type { SearchHeaderProps } from '../../data/CommonData';
 import { type TopMenuItemProps } from '../../data/NavigationData';
 import { env } from '../../Env';
 import { type LinkProps } from '../../model/LinkProps';
@@ -16,48 +15,38 @@ import { SearchInput } from './SearchInput';
 export interface SearchDialogProps extends OnCloseProps {
   initialQuery?: string;
   navigationItems?: TopMenuItemProps[];
-  search?: SearchHeaderProps;
 }
 
 const IS_SINGLE_SEARCH_INDEX = Boolean(env.SINGLE_SEARCH_INDEX);
 
-export const SearchDialog = JSX<SearchDialogProps>(
-  ({ initialQuery, navigationItems, onClose, search }) => {
-    const basePath = getBasePath(env.SITE_URL);
-
-    const basePathList = useMemo(
-      () => (IS_SINGLE_SEARCH_INDEX ? [basePath] : navigationItems?.map((_) => _.href || '/')),
-      [navigationItems],
-    );
-
-    const [searchResult, searchInputProps] = useSearch({
-      basePathList,
-      initialQuery,
-    });
-
-    const searchItems = useMemo(
-      () => combineTopItemsAndSearchResult(navigationItems)(searchResult),
-      [navigationItems, searchResult],
-    );
-
-    return (
-      <Dialog
-        maxWidth="none"
-        head={
-          <SearchInput
-            className="mt-s"
-            autoFocus={true}
-            placeholder={search?.placeholder}
-            {...searchInputProps}
-          />
-        }
-        onClose={onClose}
-      >
-        <Sitemap navigationItems={searchItems} isSearchPanel={true} />
-      </Dialog>
-    );
-  },
-);
+export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery, navigationItems, onClose }) => {
+  const basePath = getBasePath(env.SITE_URL);
+
+  const basePathList = useMemo(
+    () => (IS_SINGLE_SEARCH_INDEX ? [basePath] : navigationItems?.map((_) => _.href || '/')),
+    [navigationItems],
+  );
+
+  const [searchResult, searchInputProps] = useSearch({
+    basePathList,
+    initialQuery,
+  });
+
+  const searchItems = useMemo(
+    () => combineTopItemsAndSearchResult(navigationItems)(searchResult),
+    [navigationItems, searchResult],
+  );
+
+  return (
+    <Dialog
+      maxWidth="none"
+      head={<SearchInput className="mt-s" autoFocus={true} {...searchInputProps} />}
+      onClose={onClose}
+    >
+      <Sitemap navigationItems={searchItems} isSearchPanel={true} />
+    </Dialog>
+  );
+});
 
 const combineTopItemsAndSearchResult =
   (topItems: TopMenuItemProps[] | undefined) =>

package/mobile/src/ui-kit/YandexMap/useYandexMaps.ts

@@ -1,13 +1,10 @@
 import type ymaps from 'yandex-maps';
 import { useExternalNS } from '../../hooks/useExternalNS';
-import { projectSettings } from '../../ProjectSettings';
 
 const YMAPS_NAMESPACE = 'ymaps';
 
 export const useYandexMaps = () => {
-  const url = `https://api-maps.yandex.ru/2.1/?apikey=${
-    projectSettings.YANDEX_MAP_API_KEY || ''
-  }&lang=ru_RU`;
+  const url = `https://api-maps.yandex.ru/2.1/?lang=ru_RU`;
 
   return useExternalNS<typeof ymaps>(YMAPS_NAMESPACE, url, false);
 };

package/mobile/src/wlc.json

@@ -1,5 +1,5 @@
 {
   "PROD_BRANCH": "master",
-  "CHAT_BOT": "personal",
-  "YANDEX_MAP_API_KEY": "93eb7343-0f82-4313-8071-72da6262f4c3"
+  "CHAT_BOT": "personal"
 }
+

package/package.json

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

package/src/api/apiBaseUrl.ts

@@ -1,2 +1 @@
 export const API_BASE_URI = '/api/v1';
-export const RETAIL_API_BASE_URI = '/light-api-cash/v1';

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

@@ -24,6 +24,21 @@ export default {
     </div>
   ),
 
+  newMicroservice: (
+    <div className="container grid grid-cols-12">
+      <ApplicationLeadForm
+        className="col-span-12"
+        title="Заявка на кредит"
+        programId="10"
+        productType="credit"
+        button={button}
+        isNewMicroservice={true}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+
   creditCard: (
     <div className="container grid grid-cols-12">
       <ApplicationLeadForm

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -43,6 +43,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     button,
     productType = 'credit',
     data,
+    isNewMicroservice = false,
     ...rest
   }) => {
     const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
@@ -69,6 +70,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       productType,
       setEsiaStatus,
       esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
+      isNewMicroservice,
     });
     const { isSending, handleSubmit } = useApplicationLeadApi({
       programId,
@@ -76,6 +78,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       productType,
       data,
       changeSubmitFormStatus,
+      isNewMicroservice,
     });
 
     const [, { field, onSubmit, reset }] = useForm(initialFormState, {

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -31,4 +31,6 @@ export type ApplicationLeadFormContent = UniBlockContent &
     nextStepLink?: string;
     /** @title тип продукта */
     productType?: ProductType;
+    /** @title включить отправку заявки на новый микросервис */
+    isNewMicroservice?: boolean;
   };