@redneckz/wildless-cms-uni-blocks 0.14.754 → 0.14.756

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

@@ -73,7 +73,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   positionOrganization?: Option;
   dulSerie?: string;
   dulNumber?: string;
-  dulIssueDateField?: Date | string;
+  dulIssueDate?: Date | string;
   dulSubdivisionCode?: string;
   dulIssuedBy?: string;
   email?: string;

package/src/services/retail/model/NameFieldDef.ts

@@ -59,7 +59,7 @@ type NameFieldRetailDef =
   | 'armyIdFlg'
   | 'dulSerie'
   | 'dulNumber'
-  | 'dulIssueDateField'
+  | 'dulIssueDate'
   | 'dulSubdivisionCode'
   | 'dulIssuedBy'
   | 'participantDateRegistration'

package/src/ui-kit/DraftDialog/DraftActionButton.tsx

@@ -1,9 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { Text } from '../../ui-kit/Text/Text';
 import { noop } from '../../utils/noop';
-import { Heading } from '../Heading/Heading';
 import { type IconName } from '../Icon/IconProps';
 import { Img } from '../Img/Img';
-import { Paragraph } from '../Paragraph/Paragraph';
 
 export interface DraftActionButtonProps {
   title: string;
@@ -15,17 +14,19 @@ export interface DraftActionButtonProps {
 export const DraftActionButton = JSX<DraftActionButtonProps>(
   ({ title, icon, description, onClick = noop }) => (
     <button
-      className="flex gap-lg items-center border border-gray rounded-md cursor-pointer p-4 hover:border-green"
+      className="flex gap-lg items-center border border-gray/30 rounded-xl cursor-pointer p-4 hover:border-green"
       type="button"
       onClick={onClick}
     >
-      <Img image={{ icon: icon, iconVersion: 'black' }} width="78" height="78" />
-      <div className="w-full md:w-auto">
-        <Heading className="text-center md:text-left" title={title} headingType="h5" />
+      <Img image={{ icon, iconVersion: 'normal' }} width="78" height="78" />
+      <div className="flex flex-col items-start gap-xs md:w-72 md:mr-lg">
+        <Text font="font-medium" size="text-s">
+          {title}
+        </Text>
         {description ? (
-          <Paragraph color="text-secondary-text" size="text-m">
+          <Text color="text-secondary-text" size="text-xs">
             {description}
-          </Paragraph>
+          </Text>
         ) : null}
       </div>
     </button>

package/src/ui-kit/DraftDialog/DraftDialog.fixture.tsx

@@ -6,6 +6,7 @@ export default {
       <DraftDialog
         task={{
           id: 1,
+          createdDate: '2024-08-12T13:06:48.607038',
           creditProgram: { code: '1', name: 'test' },
           participants: [
             {

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

@@ -3,8 +3,8 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type Task } from '../../api/RetailAPI/draftTasksKZO';
 import { locationNavigator } from '../../external/locationNavigator';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { formatDate } from '../../utils/formatDate';
 import { noop } from '../../utils/noop';
-import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Heading } from '../Heading/Heading';
 import { DraftActionButton } from './DraftActionButton';
@@ -25,13 +25,13 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
 
-  const { participants, creditProgram, id: taskId } = task;
+  const { participants, creditProgram, createdDate = '', id: taskId } = task;
 
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
   const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
   const nextStepLink = isCredit ? '/credit-lead' : '/credit-card-lead';
 
-  const { name, midname, id: participantId, profile } = participants[0];
+  const { id: participantId, profile } = participants[0];
 
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
@@ -47,42 +47,28 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     navigator.assign(isCredit ? '/natural/loans/all-goals' : '/natural/creditcards/svoya');
   }, []);
 
-  const handleGoToMainPage = useCallback(() => {
-    navigator.assign('/');
-  }, []);
-
-  const appeal = name && midname ? `${name} ${midname}, ` : '';
-
   return (
-    <Dialog
-      className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl"
-      onClose={onClose}
-    >
-      <div className="flex flex-col gap-lg mt-xs md:mt-0">
+    <Dialog className="my-6xl max-w-4xl w-full min-h-fit mx-auto rounded-xl py-0" onClose={onClose}>
+      <div className="flex flex-col gap-lg items-center mt-xs md:mt-0 mx-6xl">
         <Heading
           className="whitespace-pre-wrap text-center"
-          title={`${appeal}мы нашли черновик вашей заявки.\nПродолжите заполнение?`}
+          title="Нашли черновик вашей заявки"
           headingType="h5"
         />
-        <DraftActionButton
-          title="Перейти к черновику"
-          icon="BankIcon"
-          description="Продолжайте заполнять заявку из черновика"
-          onClick={handleGoToDraft}
-        />
-        <DraftActionButton
-          title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Заполнить новую заявку'}
-          icon="DocIcon"
-          onClick={isFromLead ? onClose : handleGoToNewTask}
-        />
-        <Button
-          type="button"
-          version="secondary"
-          className="w-full text-h5"
-          onClick={handleGoToMainPage}
-        >
-          Вернуться на главную
-        </Button>
+        <div className="flex flex-col gap-m max-w-lg">
+          <DraftActionButton
+            title="Продолжить заполнение черновика"
+            icon="BankColorIcon"
+            description={createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : ''}
+            onClick={handleGoToDraft}
+          />
+          <DraftActionButton
+            title={isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку'}
+            icon="NewLoanIcon"
+            description="На получение кредита"
+            onClick={isFromLead ? onClose : handleGoToNewTask}
+          />
+        </div>
       </div>
     </Dialog>
   );

package/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -28,7 +28,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDate: dulIssueDateField,
+    dulIssueDate: dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,
@@ -80,7 +80,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDateField,
+    dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,

package/src/ui-kit/FormField/Fields/CardCategoryField.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getCardTypes, type CardTypeData } from '../../../api/RetailAPI/getCardTypes';
 import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { InfoCard } from '../../InfoCard/InfoCard';
 import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
@@ -25,14 +26,22 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     }
   }, [selectedPaymentSystem]);
 
+  const description = useMemo(
+    () => cardTypes?.find((_) => _.key === selectedCardCategory?.key)?.description,
+    [cardTypes, selectedCardCategory],
+  );
+
   return (
-    <SelectField
-      field={field}
-      source={cardTypes}
-      label="Категория карты"
-      fieldName="cardCategory"
-      input={input}
-    />
+    <div>
+      <SelectField
+        field={field}
+        source={cardTypes}
+        label="Категория карты"
+        fieldName="cardCategory"
+        input={input}
+      />
+      {description ? <InfoCard __html={description} /> : null}
+    </div>
   );
 });
 

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -75,7 +75,7 @@ const validatorRetailObj: Record<string, Validator> = {
   armyIdFlg: agreementValidator,
   dulSerie: serieValidator('Укажите серию паспорта'),
   dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),