@redneckz/wildless-cms-uni-blocks 0.14.1028 → 0.14.1030

package/mobile/src/components/ReferalForm/ResultLink.tsx

@@ -0,0 +1,20 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { Text } from '../../ui-kit/Text/Text';
+import { renderLinkInput } from './renderLinkInput';
+
+type ResultLinkProps = {
+  link: string;
+};
+
+export const ResultLink = JSX<ResultLinkProps>(({ link }) => {
+  return (
+    <div>
+      <div className="@xl:text-center @xl:col-span-2 mb-m">
+        <Text size="text-h6">Скопируйте ссылку и отправьте другу</Text>
+      </div>
+      {renderLinkInput({
+        value: link,
+      })}
+    </div>
+  );
+});

package/mobile/src/components/ReferalForm/referalFormData.ts

@@ -0,0 +1,18 @@
+import { type SectionsProps } from '../../model/InputSectionsType';
+
+export const sections: SectionsProps[] = [
+  { title: 'Заполните ваши данные и получите персональную ссылку', inputs: [] },
+  {
+    columns: 2,
+    inputs: [
+      {
+        name: 'dadataPartyInnSelect',
+        required: true,
+      },
+      {
+        name: 'email',
+        required: true,
+      },
+    ],
+  },
+];

package/mobile/src/components/ReferalForm/renderLinkInput.tsx

@@ -0,0 +1,37 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type Picture } from '../../model/Picture';
+import { Img } from '../../ui-kit/Img/Img';
+import { type InputProps } from '../../ui-kit/Input/InputProps';
+import { defaultStyle } from '../../ui-kit/Input/styles';
+import { style } from '../../utils/style';
+
+const icon: Picture = {
+  src: 'CopyIcon.svg',
+  iconVersion: 'normal',
+  size: { width: 20 },
+};
+
+export const renderLinkInput = JSX<InputProps>(({ className, value = '' }) => {
+  const onClick = useCallback(async () => {
+    try {
+      await globalThis.navigator.clipboard.writeText(value);
+    } catch {
+      console.log('Ошибка копирования');
+    }
+  }, []);
+
+  return (
+    <div className={style('relative flex items-center max-w-lg m-auto', className)}>
+      <input
+        className={style('h-14 border-gray text-ellipsis pr-5xl', defaultStyle)}
+        type="text"
+        value={value}
+        disabled={true}
+      />
+      <div role="button" className="absolute right-3" onClick={onClick}>
+        <Img image={icon} />
+      </div>
+    </div>
+  );
+});

package/mobile/src/components/ReferalForm/renderSections.tsx

@@ -0,0 +1,18 @@
+import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
+import type { SectionsProps } from '../../model/InputSectionsType';
+import { getField } from '../../ui-kit/FormField/getField';
+import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
+import { renderTitle } from '../../ui-kit/FormField/renderTitle';
+import { style } from '../../utils/style';
+import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
+
+export const renderSections = (
+  sections: SectionsProps[],
+  field: FormFieldRegisterer<Record<string, any>>,
+) =>
+  sections.map((_, i) => (
+    <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid')}>
+      {renderTitle(_.title)}
+      {(_?.inputs || [])?.map(getField<FieldDef>(field))}
+    </div>
+  ));

package/mobile/src/hooks/useDadataParty.ts

@@ -9,7 +9,7 @@ export interface DaDataPartyHint {
 }
 
 export const useDadataParty = async (searchQuery: string): Promise<DaDataPartyHint[]> =>
-  (await getDaDataHints({ url: INN_DADATA_URL, query: searchQuery })).map((_) => ({
+  (await getDaDataHints({ url: INN_DADATA_URL, query: searchQuery }))?.map((_) => ({
     fullName: _?.value,
     address: _?.data?.address?.value,
     inn: _?.data?.inn,

package/mobile/src/model/FormTypeFieldDef.ts

@@ -27,4 +27,5 @@ export type FormTypeFieldDef =
   | 'PF'
   | 'UNIVERSAL'
   | 'PRACTICE'
-  | 'CALC';
+  | 'CALC'
+  | 'REF';

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

@@ -10,7 +10,7 @@ import { getFamilyStatusAndIncomeData } from './getFamilyStatusAndIncomeData';
 import { getPersonalInfoData } from './getPersonalInfoData';
 
 type getCreditFormTaskDataProps = {
-  participantId: Nullable<number>;
+  participantId: Nullable<string | number>;
   taskId: number;
   profileId: Nullable<number>;
   formData: LeadFormState;

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

@@ -2,7 +2,7 @@ import { fetchRetailJSON } from './doRequest';
 
 export type CreateDraftTaskBody = {
   profileId?: number;
-  participantId?: number;
+  participantId?: string | number;
   programId: string;
 };
 

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

@@ -6,7 +6,8 @@ interface CreateParticipantType {
 }
 
 interface CreateParticipantResponseType {
-  participantId: number;
+  participantId: string;
+  userId?: string;
 }
 
 export const createParticipant = (body: CreateParticipantType) =>
@@ -14,4 +15,4 @@ export const createParticipant = (body: CreateParticipantType) =>
     '/public-data/createParticipant',
     'POST',
     body,
-  ).then((res) => res?.participantId || null);
+  ).then((res) => res || null);

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

@@ -24,7 +24,8 @@ export type Task = {
   office?: {
     id: string;
   };
-  participants: Participant[];
+  participants?: Participant[];
+  participant?: Participant;
   paymentTypeCd?: PaymentType;
   taskSource?: string;
 };

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

@@ -1,7 +1,8 @@
 import { fetchRetailJSON } from './doRequest';
 
 type GetLastTaskStatusBody = {
-  profileId: number;
+  profileId?: string | number;
+  userId?: string | number;
   programId: string;
 };
 

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

@@ -1,47 +1,7 @@
 import { fetchRetailJSON } from './doRequest';
+import { type GetUserTasksResponse } from './getUserTasksTypes';
 
-export enum EProductType {
-  CASH = 'CASH',
-  CARD = 'CARD',
-  DEBIT = 'DEBIT',
-}
-
-export type UserTask = {
-  classCard?: {
-    key: string;
-    value: string;
-  };
-  createdDate?: string;
-  creditPeriod?: number;
-  deliveryAddress?: string;
-  extId?: string;
-  id?: number;
-  loanAmount?: number;
-  officeAddress?: string;
-  programId?: number;
-  programName?: string;
-  statusCd?: {
-    key: string;
-    value: string;
-  };
-  statusDescription?: string;
-};
-
-type AllTasks = {
-  productTypeCd: {
-    key: EProductType;
-    value: string;
-  };
-  tasks: Array<UserTask>;
-};
-
-export type GetUserTasksResponse = {
-  allTasks?: Array<AllTasks>;
-  user?: {
-    name: string;
-    midname: string;
-  };
-};
+export { EProductType, type GetUserTasksResponse, type UserTask } from './getUserTasksTypes';
 
 export const getUserTasks = async (): Promise<GetUserTasksResponse | undefined> => {
   const res = await fetchRetailJSON<GetUserTasksResponse>('/user-data/getUserTasks', 'GET');

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

@@ -0,0 +1,6 @@
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksCard = async (): Promise<GetUserTasksResponse | undefined> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return undefined;
+};

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

@@ -0,0 +1,8 @@
+import { fetchRetailJSON } from './doRequest';
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksCredit = async (): Promise<GetUserTasksResponse | undefined> => {
+  const res = await fetchRetailJSON<GetUserTasksResponse>('/public-data/getUserTasksCredit', 'GET');
+
+  return res || undefined;
+};

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

@@ -0,0 +1,6 @@
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksDebit = async (): Promise<GetUserTasksResponse | undefined> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return undefined;
+};

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

@@ -0,0 +1,42 @@
+export enum EProductType {
+  CASH = 'CASH',
+  CARD = 'CARD',
+  DEBIT = 'DEBIT',
+}
+
+export type UserTask = {
+  classCard?: {
+    key: string;
+    value: string;
+  };
+  createdDate?: string;
+  creditPeriod?: number;
+  deliveryAddress?: string;
+  extId?: string;
+  id?: number;
+  loanAmount?: number;
+  officeAddress?: string;
+  programId?: number;
+  programName?: string;
+  statusCd?: {
+    key: string;
+    value: string;
+  };
+  statusDescription?: string;
+};
+
+export type AllTasks = {
+  productTypeCd: {
+    key: EProductType;
+    value: string;
+  };
+  tasks: Array<UserTask>;
+};
+
+export type GetUserTasksResponse = {
+  allTasks?: Array<AllTasks>;
+  user?: {
+    name: string;
+    midname: string;
+  };
+};

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

@@ -48,7 +48,7 @@ export type PaymentType = {
 
 export type Participant = {
   birthDate?: string;
-  id?: Nullable<number>;
+  id?: Nullable<string | number>;
   midname?: string;
   name?: string;
   surname?: string;

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

@@ -7,9 +7,10 @@ import { ConsentBkiDialog } from './ConsentBkiDialog';
 type SubmitBkiConsentProps = {
   phone?: string;
   profileId?: number;
+  userId?: string | number;
   onFail?: () => void;
   taskId?: number;
-  participantId?: number;
+  participantId?: string | number;
 };
 
 export const useConsentBkiDialog = (onClose: () => void) => {
@@ -17,7 +18,8 @@ export const useConsentBkiDialog = (onClose: () => void) => {
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
   const handleSuccessVerify =
-    (profileId?: number, taskId?: number, participantId?: number) => async (smsCode?: string) => {
+    (profileId?: number, taskId?: number, participantId?: string | number) =>
+    async (smsCode?: string) => {
       try {
         if (profileId) {
           await updateUserProfile({
@@ -64,11 +66,12 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     };
 
   return {
-    open: ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+    open: ({ phone, profileId, userId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
       open({
         onSubmit: handleSubmitBkiConsent({
           phone,
           profileId,
+          userId,
           onFail,
           taskId,
           participantId,

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

@@ -17,7 +17,7 @@ export interface DraftDialogProps extends OnCloseProps {
   task: Task;
   isFromLead?: boolean;
   isDebit?: boolean;
-  sendAspects?: (profileId: number, taskId: number) => void;
+  sendAspects?: (userId: number, taskId: number) => void;
 }
 
 export const DraftDialog = JSX<DraftDialogProps>(function ({
@@ -30,19 +30,21 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
 
-  const { participants, creditProgram, createdDate = '', id: taskId } = task;
+  const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
 
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
   const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
   const productData = getProductData(isDebit, isCredit);
 
-  const { id: participantId, profile } = participants[0];
+  const currentParticipant = participant || participants?.[0];
+  const { id: participantId, profile } = currentParticipant || {};
 
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
     retailFormStore.participantId = participantId ?? null;
     retailFormStore.taskId = taskId;
     retailFormStore.profileId = profile?.id ?? null;
+    retailFormStore.userId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
 

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -11,7 +11,11 @@ import {
 } from './utils';
 
 export const parseDraftTask = (task: Task): LeadFormState => {
-  const participant = task.participants[0];
+  const participant = task.participant || task.participants?.[0];
+  if (!participant) {
+    throw new Error('Task does not contain participant data');
+  }
+
   const {
     classCard: cardCategory,
     codeWord,

package/package.json

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

package/src/api/getSubmitBody.ts

@@ -73,6 +73,7 @@ export const getSubmitBody = ({ body, endpoint, router }: submitBodyProps) => {
     }),
     ...getRkoTariffName(typeForm),
     ...staticBody,
+    ...getReferalRkoData(body, typeForm),
   };
 };
 
@@ -124,3 +125,19 @@ const getRkoTariffName = (typeForm?: string) =>
         partnerComments: globalThis?.sessionStorage.getItem('rkoTariffName') ?? 'Неизвестный тариф',
       }
     : {};
+
+const getReferalRkoData = (body: LeadRequest, typeForm?: string) => {
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+
+  const partnerComments = params.get('utm_mail');
+  const partner = params.get('utm_source');
+
+  return typeForm === 'REF'
+    ? {
+        name: body.fullName,
+        fullName: undefined,
+        partnerComments,
+        partner,
+      }
+    : {};
+};

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1841,5 +1841,43 @@
         }
       }
     }
+  ],
+  [
+    "Заявка на РКО по ссылке друга",
+    {
+      "content": {
+        "version": "primary",
+        "padding": "",
+        "title": "Открыть счёт РКО",
+        "typeForm": "REF",
+        "endpoint": "sendcorporatelead",
+        "sections": [
+          {
+            "inputs": [{ "name": "fullName", "required": true, "label": "ФИО" }]
+          },
+          {
+            "columns": 2,
+            "inputs": [
+              { "name": "phone", "required": true },
+              { "name": "email", "required": true }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Открыть счет",
+          "version": "primary"
+        },
+        "link": {
+          "text": "условиями передачи данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        },
+        "additionalLink": {
+          "text": "условиями проведения акции",
+          "href": "/promo-link",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -29,6 +29,12 @@ const linkCorpAgent: LinkProps = {
   target: '_blank',
 };
 
+const linkPromo: LinkProps = {
+  text: 'условиями проведения акции',
+  href: '/promo-link',
+  target: '_blank',
+};
+
 export default {
   default: (
     <div className="container grid grid-cols-12">
@@ -1151,4 +1157,34 @@ export default {
       <DialogManager />
     </div>
   ),
+  referalRko: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Заявка на РКО по ссылке друга"
+        typeForm="REF"
+        endpoint="sendcorporatelead"
+        sections={[
+          {
+            inputs: [{ name: 'fullName', required: true, label: 'ФИО' }],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'phone', required: true },
+              { name: 'email', required: true },
+            ],
+          },
+        ]}
+        button={{
+          text: 'Открыть счет',
+          version: 'primary',
+        }}
+        link={linkCorp}
+        additionalLink={linkPromo}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -51,6 +51,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
     sections = [],
     button,
     link,
+    additionalLink,
     endpoint,
     additionalParams,
     withSnowplow,
@@ -117,6 +118,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
           {renderAgreementSubmit({
             consentDataProcessing,
             link,
+            additionalLink,
             button,
             typeForm,
           })}

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -116,6 +116,16 @@ export type ApplicationFormContent = UniBlockContent &
       /** @default "" */
       target?: Target;
     };
+    /**
+     * @title Условия проведения акции
+     * @required ["text", "href"]
+     */
+    additionalLink?: TextProps & {
+      /** @title URL (href) */
+      href?: string;
+      /** @default "" */
+      target?: Target;
+    };
     typeForm?: FormTypeFieldDef;
     endpoint?: EndpointType;
     /** @title Дополнительные параметры формы */

package/src/components/ApplicationForm/Footnote.tsx

@@ -7,9 +7,10 @@ import { Text } from '../../ui-kit/Text/Text';
 
 type FootnoteProps = TextProps & {
   link?: LinkProps;
+  additionalLink?: LinkProps;
 };
 
-export const Footnote = JSX<FootnoteProps>(({ text, link }) => (
+export const Footnote = JSX<FootnoteProps>(({ text, link, additionalLink }) => (
   <Paragraph size="text-l" font="font-light" color="text-secondary-text">
     {text ? <Text>{text}</Text> : null}
     {link ? (
@@ -17,5 +18,13 @@ export const Footnote = JSX<FootnoteProps>(({ text, link }) => (
         {link.text}
       </Link>
     ) : null}
+    {additionalLink ? (
+      <Text>
+        {' и '}
+        <Link {...additionalLink} ariaLabel="условия проведения акции">
+          {additionalLink.text}
+        </Link>
+      </Text>
+    ) : null}
   </Paragraph>
 ));

package/src/components/ApplicationForm/renderAgreementSubmit.tsx

@@ -14,11 +14,13 @@ const agreementTextPF = 'Нажимая на кнопку, вы подтверж
 export const renderAgreementSubmit = ({
   consentDataProcessing,
   link,
+  additionalLink,
   button,
   typeForm,
 }: {
   consentDataProcessing?: FieldProps<boolean>;
   link?: LinkProps;
+  additionalLink?: LinkProps;
   button?: SubmitButtonProps;
   typeForm?: string;
 }) => (
@@ -32,7 +34,11 @@ export const renderAgreementSubmit = ({
         {renderErrorText(withValidator(consentDataProcessing, agreementValidator).error)}
       </div>
     ) : (
-      <Footnote text={typeForm === 'PF' ? agreementTextPF : agreementText} link={link} />
+      <Footnote
+        text={typeForm === 'PF' ? agreementTextPF : agreementText}
+        link={link}
+        additionalLink={additionalLink}
+      />
     )}
     <SubmitButton className="w-full @xl:w-auto">
       {button?.text ? button.text : 'Отправить заявку'}

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -12,7 +12,7 @@ import { type Nullable } from '../../utils/Nullable';
 import { debitProgrammIdToCardCodesMap } from '../DebitForm/utils';
 
 type getCreditLeadFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId?: number;
   formData: LeadFormState;
@@ -28,7 +28,7 @@ type getDebitLeadFormTaskDataProps = {
 };
 
 type getParticipantProps = {
-  participantId: number;
+  participantId: number | string;
   profileId?: number;
   formData: LeadFormState;
   consents?: FormRetailConsents;