@redneckz/wildless-cms-uni-blocks 0.14.1042 → 0.14.1044

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

@@ -1,18 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { locationNavigator } from '../../../external/locationNavigator';
-import type { OnCloseProps } from '../../../model/OnCloseProps';
+import { type OnCloseProps } from '../../../model/OnCloseProps';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
-import { Heading } from '../../../ui-kit/Heading/Heading';
-import { formatDate } from '../../../utils/formatDate';
 import { noop } from '../../../utils/noop';
 import { type Task } from '../../api/draftTasksKZO';
 import { sendMessage } from '../../api/sendMessage';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type DraftTaskType } from '../../model/DraftTaskType';
 import { checkNewMicroservice } from '../../utils/checkNewMicroservice';
-import { creditProgramCodeToProductIdMap } from './creditProgramCodes';
-import { DraftActionButton } from './DraftActionButton';
+import { creditProgramCodeToProductIdMap, getCreditProgramTaskType } from './creditProgramCodes';
+import { DraftDialogContent } from './DraftDialogContent';
 import { parseDraftTask } from './parseDraftTask';
 import { getProductData } from './utils';
 
@@ -24,10 +22,6 @@ export interface DraftDialogProps extends OnCloseProps {
   sendAspects?: (userId: number, taskId: number) => void;
 }
 
-const getTaskTypeOrDebit = (taskType?: DraftTaskType, isDebit?: boolean) => {
-  return taskType || (isDebit ? 'debit' : undefined);
-};
-
 export const DraftDialog = JSX<DraftDialogProps>(function ({
   task,
   taskType,
@@ -39,15 +33,13 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
   const isNewMicroservice = checkNewMicroservice();
-
   const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
-
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
-  const productData = getProductData(getTaskTypeOrDebit(taskType, isDebit));
-
+  const productData = getProductData(
+    taskType ?? getCreditProgramTaskType(task.creditProgram.code, isDebit),
+  );
   const currentParticipant = participant || participants?.[0];
   const { id: participantId, profile } = currentParticipant || {};
-
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
     retailFormStore.participantId = participantId ?? null;
@@ -56,13 +48,11 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     retailFormStore.userId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
-
     if (profile?.id) {
       sendAspects(profile.id, taskId);
     }
     navigator.assign(productData.nextStepLink);
   }, []);
-
   const handleGoToNewTask = useCallback(async () => {
     if (isNewMicroservice) {
       try {
@@ -79,29 +69,14 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
 
   return (
     <Dialog onClose={onClose}>
-      <div className="flex flex-col gap-lg items-center mt-xs mx-6xl">
-        <Heading
-          className="whitespace-pre-wrap text-center"
-          title="Нашли черновик вашей заявки"
-          headingType="h5"
-        />
-        <div className="flex flex-col gap-m max-w-lg">
-          <DraftActionButton
-            title="Продолжить заполнение черновика"
-            icon="BankColorIcon"
-            description={createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : ''}
-            onClick={handleGoToDraft}
-            name="go-to-draft-button"
-          />
-          <DraftActionButton
-            title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку'}
-            icon="NewLoanIcon"
-            description={productData.description}
-            onClick={isFromLead ? onClose : handleGoToNewTask}
-            name="go-to-current-task-button"
-          />
-        </div>
-      </div>
+      <DraftDialogContent
+        createdDate={createdDate}
+        productData={productData}
+        isFromLead={isFromLead}
+        handleGoToDraft={handleGoToDraft}
+        handleGoToNewTask={handleGoToNewTask}
+        onClose={onClose}
+      />
     </Dialog>
   );
 });

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

@@ -0,0 +1,49 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type OnCloseProps } from '../../../model/OnCloseProps';
+import { Heading } from '../../../ui-kit/Heading/Heading';
+import { formatDate } from '../../../utils/formatDate';
+import { DraftActionButton } from './DraftActionButton';
+import { type getProductData } from './utils';
+
+export interface DraftDialogContentProps extends OnCloseProps {
+  createdDate: string;
+  productData: ReturnType<typeof getProductData>;
+  isFromLead: boolean;
+  handleGoToDraft: () => void;
+  handleGoToNewTask: () => void;
+}
+
+export const DraftDialogContent = JSX<DraftDialogContentProps>(function ({
+  createdDate,
+  productData,
+  isFromLead,
+  handleGoToDraft,
+  handleGoToNewTask,
+  onClose,
+}) {
+  return (
+    <div className="flex flex-col gap-lg items-center mt-xs mx-6xl">
+      <Heading
+        className="whitespace-pre-wrap text-center"
+        title="Нашли черновик вашей заявки"
+        headingType="h5"
+      />
+      <div className="flex flex-col gap-m max-w-lg">
+        <DraftActionButton
+          title="Продолжить заполнение черновика"
+          icon="BankColorIcon"
+          description={createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : ''}
+          onClick={handleGoToDraft}
+          name="go-to-draft-button"
+        />
+        <DraftActionButton
+          title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку'}
+          icon="NewLoanIcon"
+          description={productData.description}
+          onClick={isFromLead ? onClose : handleGoToNewTask}
+          name="go-to-current-task-button"
+        />
+      </div>
+    </div>
+  );
+});

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

@@ -1,5 +1,7 @@
 /* eslint-disable camelcase */
 
+import { type DraftTaskType } from '../../model/DraftTaskType';
+
 export const creditCodesToProgrammIdMap = {
   credit_cash: '10',
   credit_cash_single_doc: '28',
@@ -38,3 +40,25 @@ export const creditProgramCodeToProductIdMap = {
   ...cardCodesToProgrammIdMap,
   ...debitCardCodesToProgrammIdMap,
 };
+
+export const getCreditProgramTaskType = (
+  creditProgramCode?: string,
+  isDebit?: boolean,
+): DraftTaskType | undefined => {
+  if (isDebit || (creditProgramCode && creditProgramCode in debitCardCodesToProgrammIdMap)) {
+    return 'debit';
+  }
+
+  if (!creditProgramCode) {
+    return undefined;
+  }
+
+  if (creditProgramCode in creditCodesToProgrammIdMap) {
+    return 'credit';
+  }
+  if (creditProgramCode in cardCodesToProgrammIdMap) {
+    return 'card';
+  }
+
+  return undefined;
+};

package/mobile/src/ui-kit/DatePicker/renderDatePickerForm.tsx

@@ -5,7 +5,7 @@ import { style } from '../../utils/style';
 import { DatePickerInput } from './DatePickerInput';
 
 const formStyle =
-  'flex justify-between items-center h-14 border rounded-md cursor-pointer ' +
+  'flex justify-between items-center h-14 border rounded-md cursor-pointer overflow-hidden ' +
   'hover:border-black active:border-black focus:border-black';
 
 export const renderDatePickerForm = ({

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

@@ -14,6 +14,7 @@ export const Input = JSX<InputProps>(
     id,
     name,
     type = 'text',
+    maxLength,
     label,
     placeholder,
     value = '',
@@ -64,6 +65,7 @@ export const Input = JSX<InputProps>(
               onChange={handleChange}
               onFocus={onFocus}
               onBlur={onBlur}
+              maxlength={maxLength}
             />
           ) : (
             <input

package/package.json

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

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

@@ -1883,5 +1883,55 @@
         }
       }
     }
+  ],
+  [
+    "Управляющие директора",
+    {
+      "content": {
+        "version": "primary",
+        "padding": "",
+        "title": "Заявка на открытие счёта",
+        "typeForm": "YPR",
+        "endpoint": "sendcorporatelead",
+        "sections": [
+          {
+            "columns": 2,
+            "inputs": [
+              { "name": "dadataPartyNameSelect", "required": true },
+              { "name": "dadataPartyInnSelect", "required": true }
+            ]
+          },
+          {
+            "inputs": [{ "name": "name", "required": true }]
+          },
+          {
+            "columns": 2,
+            "inputs": [
+              { "name": "region", "required": true },
+              { "name": "addressBranch", "required": true }
+            ]
+          },
+          {
+            "inputs": [
+              {
+                "name": "partnerComments",
+                "required": true,
+                "placeholder": "Комментарий для сотрудника РКМ",
+                "maxLength": 300
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Открыть счёт",
+          "version": "primary"
+        },
+        "link": {
+          "text": "условиями передачи данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]

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

@@ -974,4 +974,57 @@ export default {
       <DialogManager />
     </div>
   ),
+  directorsRKO: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Заявка на открытие счёта"
+        typeForm="YPR"
+        endpoint="sendcorporatelead"
+        sections={[
+          {
+            columns: 2,
+            inputs: [
+              { name: 'dadataPartyNameSelect', required: true, label: 'Полное наименование' },
+              { name: 'dadataPartyInnSelect', required: true, label: 'Полное наименование' },
+            ],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'phone', required: true },
+              { name: 'email', required: true },
+            ],
+          },
+          {
+            inputs: [{ name: 'name', required: true }],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'region', required: true },
+              { name: 'addressBranch', required: true },
+            ],
+          },
+          {
+            inputs: [
+              {
+                name: 'partnerComments',
+                placeholder: 'Комментарий для сотрудника РКМ',
+                required: true,
+                maxLength: 300,
+              },
+            ],
+          },
+        ]}
+        button={{
+          text: 'Открыть счёт',
+          version: 'primary',
+        }}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

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

@@ -5,6 +5,7 @@ import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { ApplicationForm } from './ApplicationForm';
 import { type SubmitButtonProps } from './ApplicationFormContent';
+import { VerifyPhoneDialog } from './VerifyPhoneDialog';
 
 const button: SubmitButtonProps = {
   text: 'Отправить заявку',
@@ -1191,4 +1192,58 @@ export default {
       <DialogManager />
     </div>
   ),
+  directorsRKO: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Заявка на открытие счёта"
+        typeForm="YPR"
+        endpoint="sendcorporatelead"
+        sections={[
+          {
+            columns: 2,
+            inputs: [
+              { name: 'dadataPartyNameSelect', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
+            ],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'phone', required: true },
+              { name: 'email', required: true },
+            ],
+          },
+          {
+            inputs: [{ name: 'name', required: true }],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'region', required: true },
+              { name: 'addressBranch', required: true },
+            ],
+          },
+          {
+            inputs: [
+              {
+                name: 'partnerComments',
+                placeholder: 'Комментарий для сотрудника РКМ',
+                required: true,
+                maxLength: 300,
+              },
+            ],
+          },
+        ]}
+        button={{
+          text: 'Открыть счёт',
+          version: 'primary',
+        }}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+  verifyPhoneDialog: <VerifyPhoneDialog phone="79999999999" />,
 };

package/src/model/FormTypeFieldDef.ts

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

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

@@ -1,18 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { locationNavigator } from '../../../external/locationNavigator';
-import type { OnCloseProps } from '../../../model/OnCloseProps';
+import { type OnCloseProps } from '../../../model/OnCloseProps';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
-import { Heading } from '../../../ui-kit/Heading/Heading';
-import { formatDate } from '../../../utils/formatDate';
 import { noop } from '../../../utils/noop';
 import { type Task } from '../../api/draftTasksKZO';
 import { sendMessage } from '../../api/sendMessage';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type DraftTaskType } from '../../model/DraftTaskType';
 import { checkNewMicroservice } from '../../utils/checkNewMicroservice';
-import { creditProgramCodeToProductIdMap } from './creditProgramCodes';
-import { DraftActionButton } from './DraftActionButton';
+import { creditProgramCodeToProductIdMap, getCreditProgramTaskType } from './creditProgramCodes';
+import { DraftDialogContent } from './DraftDialogContent';
 import { parseDraftTask } from './parseDraftTask';
 import { getProductData } from './utils';
 
@@ -24,10 +22,6 @@ export interface DraftDialogProps extends OnCloseProps {
   sendAspects?: (userId: number, taskId: number) => void;
 }
 
-const getTaskTypeOrDebit = (taskType?: DraftTaskType, isDebit?: boolean) => {
-  return taskType || (isDebit ? 'debit' : undefined);
-};
-
 export const DraftDialog = JSX<DraftDialogProps>(function ({
   task,
   taskType,
@@ -39,15 +33,13 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
   const isNewMicroservice = checkNewMicroservice();
-
   const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
-
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
-  const productData = getProductData(getTaskTypeOrDebit(taskType, isDebit));
-
+  const productData = getProductData(
+    taskType ?? getCreditProgramTaskType(task.creditProgram.code, isDebit),
+  );
   const currentParticipant = participant || participants?.[0];
   const { id: participantId, profile } = currentParticipant || {};
-
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
     retailFormStore.participantId = participantId ?? null;
@@ -56,13 +48,11 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     retailFormStore.userId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
-
     if (profile?.id) {
       sendAspects(profile.id, taskId);
     }
     navigator.assign(productData.nextStepLink);
   }, []);
-
   const handleGoToNewTask = useCallback(async () => {
     if (isNewMicroservice) {
       try {
@@ -79,29 +69,14 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
 
   return (
     <Dialog onClose={onClose}>
-      <div className="flex flex-col gap-lg items-center mt-xs mx-6xl">
-        <Heading
-          className="whitespace-pre-wrap text-center"
-          title="Нашли черновик вашей заявки"
-          headingType="h5"
-        />
-        <div className="flex flex-col gap-m max-w-lg">
-          <DraftActionButton
-            title="Продолжить заполнение черновика"
-            icon="BankColorIcon"
-            description={createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : ''}
-            onClick={handleGoToDraft}
-            name="go-to-draft-button"
-          />
-          <DraftActionButton
-            title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку'}
-            icon="NewLoanIcon"
-            description={productData.description}
-            onClick={isFromLead ? onClose : handleGoToNewTask}
-            name="go-to-current-task-button"
-          />
-        </div>
-      </div>
+      <DraftDialogContent
+        createdDate={createdDate}
+        productData={productData}
+        isFromLead={isFromLead}
+        handleGoToDraft={handleGoToDraft}
+        handleGoToNewTask={handleGoToNewTask}
+        onClose={onClose}
+      />
     </Dialog>
   );
 });

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

@@ -0,0 +1,49 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type OnCloseProps } from '../../../model/OnCloseProps';
+import { Heading } from '../../../ui-kit/Heading/Heading';
+import { formatDate } from '../../../utils/formatDate';
+import { DraftActionButton } from './DraftActionButton';
+import { type getProductData } from './utils';
+
+export interface DraftDialogContentProps extends OnCloseProps {
+  createdDate: string;
+  productData: ReturnType<typeof getProductData>;
+  isFromLead: boolean;
+  handleGoToDraft: () => void;
+  handleGoToNewTask: () => void;
+}
+
+export const DraftDialogContent = JSX<DraftDialogContentProps>(function ({
+  createdDate,
+  productData,
+  isFromLead,
+  handleGoToDraft,
+  handleGoToNewTask,
+  onClose,
+}) {
+  return (
+    <div className="flex flex-col gap-lg items-center mt-xs mx-6xl">
+      <Heading
+        className="whitespace-pre-wrap text-center"
+        title="Нашли черновик вашей заявки"
+        headingType="h5"
+      />
+      <div className="flex flex-col gap-m max-w-lg">
+        <DraftActionButton
+          title="Продолжить заполнение черновика"
+          icon="BankColorIcon"
+          description={createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : ''}
+          onClick={handleGoToDraft}
+          name="go-to-draft-button"
+        />
+        <DraftActionButton
+          title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку'}
+          icon="NewLoanIcon"
+          description={productData.description}
+          onClick={isFromLead ? onClose : handleGoToNewTask}
+          name="go-to-current-task-button"
+        />
+      </div>
+    </div>
+  );
+});

package/src/retail/components/DraftDialog/creditProgramCodes.ts

@@ -1,5 +1,7 @@
 /* eslint-disable camelcase */
 
+import { type DraftTaskType } from '../../model/DraftTaskType';
+
 export const creditCodesToProgrammIdMap = {
   credit_cash: '10',
   credit_cash_single_doc: '28',
@@ -38,3 +40,25 @@ export const creditProgramCodeToProductIdMap = {
   ...cardCodesToProgrammIdMap,
   ...debitCardCodesToProgrammIdMap,
 };
+
+export const getCreditProgramTaskType = (
+  creditProgramCode?: string,
+  isDebit?: boolean,
+): DraftTaskType | undefined => {
+  if (isDebit || (creditProgramCode && creditProgramCode in debitCardCodesToProgrammIdMap)) {
+    return 'debit';
+  }
+
+  if (!creditProgramCode) {
+    return undefined;
+  }
+
+  if (creditProgramCode in creditCodesToProgrammIdMap) {
+    return 'credit';
+  }
+  if (creditProgramCode in cardCodesToProgrammIdMap) {
+    return 'card';
+  }
+
+  return undefined;
+};

package/src/ui-kit/DatePicker/renderDatePickerForm.tsx

@@ -5,7 +5,7 @@ import { style } from '../../utils/style';
 import { DatePickerInput } from './DatePickerInput';
 
 const formStyle =
-  'flex justify-between items-center h-14 border rounded-md cursor-pointer ' +
+  'flex justify-between items-center h-14 border rounded-md cursor-pointer overflow-hidden ' +
   'hover:border-black active:border-black focus:border-black';
 
 export const renderDatePickerForm = ({

package/src/ui-kit/Input/Input.tsx

@@ -14,6 +14,7 @@ export const Input = JSX<InputProps>(
     id,
     name,
     type = 'text',
+    maxLength,
     label,
     placeholder,
     value = '',
@@ -64,6 +65,7 @@ export const Input = JSX<InputProps>(
               onChange={handleChange}
               onFocus={onFocus}
               onBlur={onBlur}
+              maxlength={maxLength}
             />
           ) : (
             <input