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

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/calculateInputs.ts

@@ -4,14 +4,12 @@ import { type FieldRetailDef } from '../model/RetailFormContent';
 
 export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
-export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[]) =>
   inputs
     .filter((_) => _)
     .map((_) => {
       if (
         [
-          checkIsRetiree(step, getValue),
-          checkIsUnemployedRetiree(_, getValue),
           checkBusinessOwner(_, getValue),
           checkConsentPfrFlg(_, getValue),
           checkAddressFillFromESIA(_, getValue),
@@ -25,12 +23,6 @@ export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[]
       return _;
     });
 
-const checkIsRetiree = (step: number, getValue: GetValue) =>
-  step === 2 && getValue('employment')?.key === 'RETIREE';
-
-const checkIsUnemployedRetiree = ({ name }: FieldRetailDef, getValue: GetValue) =>
-  name === 'wages' && getValue('employment')?.key === 'RETIREE' && !getValue('inn');
-
 const checkBusinessOwner = ({ name }: FieldRetailDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
@@ -42,7 +34,7 @@ const checkAddressFact = ({ name }: FieldRetailDef, getValue: GetValue) =>
 
 export const checkCondition = ({ condition }: FieldRetailDef, getValue: GetValue) =>
   condition?.name &&
-  condition?.values?.some((_) => {
+  condition?.values?.every((_) => {
     const dataValue = getValue(condition?.name);
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);

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/retail/utils/renderStep.tsx

@@ -10,18 +10,16 @@ import { renderInputs } from './renderInputs';
 export interface StepProps<SectionsProps extends SectionsRetailProps> {
   sections?: SectionsProps[];
   field: FormFieldRegisterer<LeadFormState>;
-  step: number;
   params?: Record<string, any>;
 }
 
 export const renderStep = <SectionsProps extends SectionsRetailProps>({
   sections,
   field,
-  step,
   params,
 }: StepProps<SectionsProps>) =>
   sections?.map(({ inputs: origInputs = [], columns, title, condition }, i) => {
-    const inputs = calculateInputs(getValue(field))(origInputs, step);
+    const inputs = calculateInputs(getValue(field))(origInputs);
     const cleanElements = [
       !checkCondition({ condition }, getValue(field)) ? renderTitle(title) : null,
       ...renderInputs({ field, inputs, params }),

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -17,17 +17,15 @@ import {
 type getRetailFormValidatorProps = {
   formState: LeadFormState;
   inputs: FieldRetailDef[];
-  step: number;
   productType: ProductType;
 };
 
 export const getRetailFormValidator = ({
   formState,
   inputs,
-  step,
   productType,
 }: getRetailFormValidatorProps) =>
-  getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+  getFormValidator(calculateInputs((_) => formState[_])(inputs), {
     ...validatorObj,
     limitedBirthday: getLimitedBirthdayValidation(productType),
     dulIssueDate: passportValidator(formState.limitedBirthday as Date),

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.953",
   "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;
   };

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -1,8 +1,11 @@
-/* eslint-disable camelcase */
 import { getParticipantContacts } from '../../retail/adaptors/utils';
 import { type CreateUserTaskDebitBody } from '../../retail/api/createUserTaskDebit';
-import { type MarketingInfo, type UpdateUserTaskBody } from '../../retail/api/updateUserTask';
-import { type LeadFormState } from '../../retail/model/LeadFormState';
+import {
+  type MarketingInfo,
+  type Participant,
+  type UpdateUserTaskBody,
+} from '../../retail/api/updateUserTask';
+import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type Nullable } from '../../utils/Nullable';
@@ -11,9 +14,10 @@ import { debitProgrammIdToCardCodesMap } from '../DebitForm/utils';
 type getLeadFormTaskDataProps = {
   participantId: number;
   taskId: number;
-  profileId: number;
+  profileId?: number;
   formData: LeadFormState;
   marketingInfo: MarketingInfo | null;
+  consents?: FormRetailConsents;
 };
 
 export const getCreditLeadFormTaskData = ({
@@ -22,9 +26,10 @@ export const getCreditLeadFormTaskData = ({
   profileId,
   formData,
   marketingInfo,
+  consents,
 }: getLeadFormTaskDataProps): UpdateUserTaskBody => {
-  const { name, surname, middleName, limitedBirthday, phone, email } = formData;
   const taskSource = getTaskSource(marketingInfo?.utm_source);
+  const participantInfo = getParticipant({ participantId, profileId, formData, consents });
 
   return {
     sendToBank: true,
@@ -32,31 +37,52 @@ export const getCreditLeadFormTaskData = ({
     task: {
       taskSource,
       id: taskId,
-      participants: [
-        {
-          birthDate: limitedBirthday && formatDate(limitedBirthday, true),
-          id: participantId,
-          midname: middleName,
-          name,
-          surname,
-          profile: {
-            id: profileId,
-          },
-          participantContacts: getParticipantContacts({
-            phone: phone && formatPhone(phone),
-            email,
+      ...(profileId
+        ? {
+            participants: [participantInfo],
+          }
+        : {
+            participant: participantInfo,
           }),
-          roleCd: {
-            key: 'BORROWER',
-            value: 'Заемщик',
-          },
-        },
-      ],
       marketingInfo,
     },
   };
 };
 
+export const getParticipant = ({
+  participantId,
+  profileId,
+  formData,
+  consents,
+}: Pick<
+  getLeadFormTaskDataProps,
+  'profileId' | 'participantId' | 'formData' | 'consents'
+>): Participant => {
+  const { name, surname, middleName, limitedBirthday, phone, email } = formData;
+
+  return {
+    birthDate: limitedBirthday && formatDate(limitedBirthday, true),
+    id: participantId,
+    midname: middleName,
+    name,
+    surname,
+    ...(profileId && {
+      profile: {
+        id: profileId,
+      },
+    }),
+    participantContacts: getParticipantContacts({
+      phone: phone && formatPhone(phone),
+      email,
+    }),
+    roleCd: {
+      key: 'BORROWER',
+      value: 'Заемщик',
+    },
+    ...consents,
+  };
+};
+
 export const getDebitLeadFormTaskData = (
   formData: LeadFormState,
   programId: string,

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -6,16 +6,17 @@ import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = async (
   esiaProfile: EsiaRequestProfileResponse,
-  isDebit: boolean,
+  isDebit = false,
+  isNewMicroservice = false,
 ): Promise<LeadFormState> => {
   checkEsiaData(esiaProfile);
-  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
+  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile, isNewMicroservice);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
   let files: File[] = [];
 
-  if (isFullEsiaData) {
+  if (isFullEsiaData && !isNewMicroservice) {
     files = await saveDocuments(esiaAdditionalDocument);
   }
 
@@ -176,8 +177,19 @@ const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
   }
 };
 
-const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) => {
+const checkEsiaAdditionalDocument = (
+  esiaProfile: EsiaRequestProfileResponse,
+  isNewMicroservice: boolean,
+) => {
   const { esiaAdditionalDocument } = esiaProfile;
+  const documents = [
+    esiaAdditionalDocument?.pdfFilePayout,
+    esiaAdditionalDocument?.pdfFileWorkbook,
+    esiaAdditionalDocument?.pdfFileSigPayout,
+    esiaAdditionalDocument?.xmlFilePayout,
+    esiaAdditionalDocument?.xmlFileSigPayout,
+    esiaAdditionalDocument?.xmlFileWorkbook,
+  ];
 
   const data = [
     esiaAdditionalDocument?.inn,
@@ -187,13 +199,7 @@ const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) =>
     esiaAdditionalDocument?.workLength?.toString(),
     esiaAdditionalDocument?.workLengthLastJob?.toString(),
     esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
-    esiaAdditionalDocument?.pdfFilePayout,
-    esiaAdditionalDocument?.pdfFileWorkbook,
-    esiaAdditionalDocument?.pdfFileSigPayout,
-    esiaAdditionalDocument?.xmlFilePayout,
-    esiaAdditionalDocument?.xmlFileSigPayout,
-    esiaAdditionalDocument?.xmlFileWorkbook,
   ];
 
-  return data.every(Boolean);
+  return data.every(Boolean) && (isNewMicroservice || documents.every(Boolean));
 };