@redneckz/wildless-cms-uni-blocks 0.16.3-isr → 0.16.4-credit

package/mobile/src/components/TariffsTable/dataFixture.tsx

@@ -1,9 +1,8 @@
 /* eslint-disable max-lines */
 import { type Picture } from '../../model/Picture';
+import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import {
-  type InnerTableBlockDef,
-  type LabelDescriptionCellDef,
-  type RichTextDef,
+  type CellDef,
   type TariffsTableColumn,
   type TariffsTableContent,
   type TariffsTableRowHeader,
@@ -23,30 +22,25 @@ const image: Picture = {
   title: 'Платёжные системы',
 };
 
-const LABEL_BLOCK: LabelDescriptionCellDef = {
-  tableCellType: 'LabelDescription',
+const LABEL_BLOCK: CellDef = {
   label: 'Заголовок без описания',
 };
 
-const LABEL_DESCRIPTION_BLOCK: LabelDescriptionCellDef = {
+const LABEL_DESCRIPTION_BLOCK: CellDef = {
   label: 'Ячейка 1-2',
-  tableCellType: 'LabelDescription',
+
   description: 'Описание',
 };
 
-const TABLE_BLOCK: InnerTableBlockDef = {
-  tableCellType: 'Table',
+const TABLE_BLOCK: TariffsTableInnerContent = {
   tableSource: { $ref: '/wcms-resources/tariffs-inner-table-data.json' },
-  pdfUrl: '#',
 };
 
-const DESCRIPTION_BLOCK: LabelDescriptionCellDef = {
-  tableCellType: 'LabelDescription',
+const DESCRIPTION_BLOCK: CellDef = {
   description: 'Описание без заголовка',
 };
 
-const RICHTEXT_BLOCK: RichTextDef = {
-  tableCellType: 'RichText',
+const RICHTEXT_BLOCK: CellDef = {
   __html: `
     <ul>
       <li>Элемент списка 1</li>
@@ -77,29 +71,24 @@ export const columns: TariffsTableColumn[] = [
         {
           label: 'Бесплатно',
           description: 'В банкоматах и кассах Россельхозбанка и банков-партнеров',
-          tableCellType: 'LabelDescription',
         },
         {
           label: 'Бесплатно',
           description: 'В сторонних банкоматах - 1 раз в месяц, далее 1% минимум 150 руб',
-          tableCellType: 'LabelDescription',
         },
       ],
       [LABEL_BLOCK],
       [
         {
           label: 'Платёжные системы картинкой',
-          tableCellType: 'LabelDescription',
         },
         {
           image: image,
-          tableCellType: 'Img',
         },
       ],
       [
-        { label: 'Кнопки-иконки', tableCellType: 'LabelDescription' },
+        { label: 'Кнопки-иконки' },
         {
-          tableCellType: 'Buttons',
           buttons: [
             {
               icon: { icon: 'AppleIcon' },
@@ -121,7 +110,6 @@ export const columns: TariffsTableColumn[] = [
       [
         {
           label: 'Бесплатно',
-          tableCellType: 'LabelDescription',
         },
       ],
       [
@@ -135,7 +123,6 @@ export const columns: TariffsTableColumn[] = [
             },
             alt: 'Деньги',
           },
-          tableCellType: 'Img',
         },
       ],
     ],

package/mobile/src/components/TariffsTable/renderCell.tsx

@@ -0,0 +1,42 @@
+import { Img } from '../../ui-kit/Img/Img';
+import { renderButtonsSection } from '../../ui-kit/LinkButton/renderButtonsSection';
+import { RichText } from '../../ui-kit/RichText/RichText';
+import { type RichTextProps } from '../../ui-kit/RichText/RichTextProps';
+import { Text } from '../../ui-kit/Text/Text';
+import type { CellDef } from './TariffsTableContent';
+
+export const renderCell = (
+  { label, description, __html, isDotted, buttons, image }: CellDef,
+  i: number,
+) => (
+  <div className="grid gap-xs" key={String(i)}>
+    {renderLabel(label)}
+    {renderDescription(description)}
+    {renderRich({ __html, isDotted })}
+    {renderButtonsSection(buttons, {
+      buttonClassName: 'basis-0',
+    })}
+    {image?.src ? <Img image={image} /> : null}
+  </div>
+);
+
+const renderLabel = (label?: string) =>
+  label ? (
+    <div>
+      <Text size="text-h6">{label}</Text>
+    </div>
+  ) : null;
+
+const renderDescription = (description?: string) =>
+  description ? (
+    <div className="text-l font-light">
+      <Text color="text-secondary-text">{description}</Text>
+    </div>
+  ) : null;
+
+const renderRich = ({ __html, isDotted }: RichTextProps) =>
+  __html ? (
+    <div className="flex flex-col justify-between items-start text-h6">
+      <RichText __html={__html} isDotted={isDotted} itemSize="list-m" />
+    </div>
+  ) : null;

package/mobile/src/components/TariffsTable/renderHeader.tsx

@@ -0,0 +1,19 @@
+import { Img } from '../../ui-kit/Img/Img';
+import { Text } from '../../ui-kit/Text/Text';
+import { style } from '../../utils/style';
+import type { TariffsTableRowHeader } from './TariffsTableContent';
+
+const FIRST_CELL_STYLES = 'w-80 flex-shrink-0 sticky left-0 bg-white';
+
+export const renderHeader = ({ title, icon }: TariffsTableRowHeader) => (
+  <div className={style('flex gap-m items-center', FIRST_CELL_STYLES)} role="cell">
+    {icon ? (
+      <Img className="hidden lg:block max-w-6 shrink-0" image={icon} width="24" height="24" />
+    ) : null}
+    {title ? (
+      <Text size="text-m" font="font-light" color="text-primary-text">
+        {title}
+      </Text>
+    ) : null}
+  </div>
+);

package/mobile/src/data/CommonData.ts

@@ -1,13 +1,14 @@
 import { type AspectsProps } from '../model/AspectsProps';
+import { type TitleProps } from '../model/HeadlineType';
 import { type LogoType } from '../model/LogoType';
+import { type PlaceholderProps } from '../model/PlaceholderProps';
 
-export type SearchHeaderProps = AspectsProps & { placeholder: string; ariaLabel: string };
+export type SearchHeaderProps = AspectsProps & PlaceholderProps & { ariaLabel: string };
 
-export interface CommonData {
+export interface CommonData extends TitleProps {
   logo?: LogoType;
   search?: SearchHeaderProps;
   dropdownMenuAriaLabel?: string;
   chatBotAriaLabel?: string;
   backwardButton?: string;
-  title?: string;
 }

package/mobile/src/hooks/useAspects/aspects/forwardQuery.ts

@@ -4,7 +4,7 @@ import { type PreventableEventWithTarget } from '../../../ui-kit/PreventableEven
 import { adjustSessionQuery } from '../../../utils/adjustSessionQuery';
 import { isURL } from '../../../utils/url';
 
-export const forwardQuery = (ev: PreventableEventWithTarget) => {
+export const forwardQuery = async (ev: PreventableEventWithTarget) => {
   const anchor = (ev.target as Element | null)?.closest('a');
   const navigator = locationNavigator();
 

package/mobile/src/hooks/useAspects/handleAspects.ts

@@ -7,8 +7,12 @@ export type HandleAspectsProps = {
   ev: PreventableEventWithTarget;
 };
 
-export const handleAspects = ({ aspectsAttributes, aspects, ev }: HandleAspectsProps) => {
+export const handleAspects = async ({ aspectsAttributes, aspects, ev }: HandleAspectsProps) => {
   for (const { aspectName, params } of aspectsAttributes ?? []) {
-    aspects[aspectName ?? '']?.(ev, params);
+    const aspectFn = aspects[aspectName ?? ''];
+
+    if (aspectFn) {
+      await aspectFn(ev, params);
+    }
   }
 };

package/mobile/src/hooks/useAspects/useAspects.ts

@@ -14,7 +14,7 @@ export interface AspectsAttribute {
 }
 
 export interface Aspects {
-  [key: string]: (ev: PreventableEventWithTarget, data?: AspectData) => void;
+  [key: string]: (ev: PreventableEventWithTarget, data?: AspectData) => Promise<void>;
 }
 
 export function useAspects(): Aspects {

package/mobile/src/hooks/useForm/useForm.ts

@@ -1,6 +1,6 @@
 import { useCallback, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { type ControlProps } from '../../ui-kit/ControlProps';
+import { type ControlProps } from '../../model/ControlProps';
 import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { type ValidationInfo } from '../../validation/validator';
 import { type FieldOptions } from './FieldOptions';

package/mobile/src/hooks/useLink.ts

@@ -9,6 +9,8 @@ import { adjustHref } from '../utils/adjustHref';
 import { getBasePath } from '../utils/getBasePath';
 import { hasPrefix, isLocalURL } from '../utils/url';
 
+const RESERVED_PREFIX = ['/api'];
+
 export interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
@@ -40,5 +42,5 @@ export function useLink() {
 
 const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
   isLocalURL(href, target) &&
-  !env.SUB_PORTALS?.split(',')?.some(hasPrefix(href)) &&
+  ![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
   hasPrefix(href)(basePath || '/');

package/mobile/src/model/CommonInputProps.ts

@@ -0,0 +1,12 @@
+import { type ComponentType } from './ComponentType';
+import { type ControlProps } from './ControlProps';
+import { type DisabledProps } from './DisabledProps';
+import { type LabelProps, type TextProps } from './HeadlineType';
+
+export type CommonInputProps<T> = ComponentType &
+  ControlProps<T> &
+  DisabledProps &
+  LabelProps &
+  TextProps & {
+    error?: string;
+  };

package/mobile/src/model/ComponentType.ts

@@ -0,0 +1,4 @@
+export interface ComponentType {
+  /** @hidden */
+  className?: string;
+}

package/mobile/src/model/ContentPageBase.ts

@@ -1,4 +1,5 @@
 import { type JSONRefObject } from '../data/JSONRefObject';
+import { type TitleProps } from './HeadlineType';
 
 /**
  * @title Цветовая палитра
@@ -7,9 +8,7 @@ import { type JSONRefObject } from '../data/JSONRefObject';
 export type ColorPalette = 'pc' | 'bc' | 'eo' | 'pr' | 'ul';
 
 /** @title Страница */
-export interface ContentPageBase {
-  /** @title Заголовок */
-  title?: string;
+export interface ContentPageBase extends TitleProps {
   /** @title Слаг */
   slug?: string;
   /** @title Данные навигации по сайту */

package/mobile/src/model/DefaultControlType.ts

@@ -1,8 +1,13 @@
-export interface DefaultControlType {
-  className?: string;
-  label?: string;
+import { type ComponentType } from './ComponentType';
+import { type DisabledProps } from './DisabledProps';
+import { type LabelProps } from './HeadlineType';
+import { type PlaceholderProps } from './PlaceholderProps';
+
+export interface DefaultControlType
+  extends ComponentType,
+    LabelProps,
+    DisabledProps,
+    PlaceholderProps {
   error?: string;
   errors?: string[];
-  placeholder?: string;
-  disabled?: boolean;
 }

package/mobile/src/model/DisabledProps.ts

@@ -0,0 +1,3 @@
+export interface DisabledProps {
+  disabled?: boolean;
+}

package/mobile/src/model/LinkProps.ts

@@ -1,5 +1,5 @@
 import { type AspectsProps } from './AspectsProps';
-import { type TextProps } from './HeadlineType';
+import type { TextProps } from './HeadlineType';
 
 /**
  * @title Таргет (target)

package/mobile/src/model/OnClickProps.ts

@@ -0,0 +1,3 @@
+export interface OnClickProps {
+  onClick?: () => void;
+}

package/mobile/src/model/OnCloseProps.ts

@@ -0,0 +1,3 @@
+export interface OnCloseProps {
+  onClose?: () => void;
+}

package/mobile/src/model/Picture.ts

@@ -1,4 +1,5 @@
 import { type IconName } from '../icons/IconName';
+import { type ComponentType } from './ComponentType';
 import { type IconVersion } from './IconVersion';
 import { type ImageSize } from './ImageSize';
 
@@ -36,10 +37,9 @@ export interface ImgSource {
 }
 
 /** @title Изображение */
-export interface Picture extends Img, ImgSource {
+export interface Picture extends Img, ImgSource, ComponentType {
   /** @title Другие форматы */
   sources?: ImgSource[];
-  className?: string;
 }
 
 export type IconProps = {

package/mobile/src/model/PlaceholderProps.ts

@@ -0,0 +1,3 @@
+export interface PlaceholderProps {
+  placeholder?: string;
+}

package/mobile/src/model/onClick.ts

@@ -0,0 +1,3 @@
+export interface OnClickProps {
+  onClick?: () => void;
+}

package/mobile/src/model/onClose.ts

@@ -0,0 +1,3 @@
+export interface OnCloseProps {
+  onClose?: () => void;
+}

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

@@ -2,7 +2,6 @@ import { getCalcData } from '../../components/CreditForm/getCalcData';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type Participant, type UpdateUserTaskBody } from '../api/updateUserTask';
 import { type LeadFormState } from '../model/LeadFormState';
-import { getAdditionalInfoData } from './getAdditionalInfoData';
 import { getCalculatorData } from './getCalculatorData';
 import { getDeliveryCreditData } from './getDeliveryCreditData';
 import { getEmploymentData } from './getEmploymentData';
@@ -66,8 +65,6 @@ const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Part
       return getEmploymentData(formData);
     case 3:
       return getFamilyStatusAndIncomeData(formData);
-    case 4:
-      return getAdditionalInfoData(formData);
     default:
       return {};
   }

package/mobile/src/retail/adaptors/getEmploymentData.tsx

@@ -30,7 +30,7 @@ export const getEmploymentData = (formData: LeadFormState): Partial<Participant>
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,
-    organizationActivityTypeCd: employerActivities,
+    organizationActivityTypeCd: employerActivities?.key ? employerActivities : undefined,
     organizationTypeCd: organization,
     organizationKindCd: employerOrganization,
     employeesNumberCd: amountWorkers,
@@ -39,11 +39,11 @@ export const getEmploymentData = (formData: LeadFormState): Partial<Participant>
     generalSeniority: experience5Years,
     jobsNumber,
     lastWorkDuration: lastJobExperience,
-    positionCd: positionOrganization,
+    positionCd: positionOrganization?.key ? positionOrganization : undefined,
     participantContacts: getParticipantContacts({
       organizationPhone: organizationPhone && formatPhone(organizationPhone),
     }),
     participantAddresses: getParticipantAddresses({ organizationAddress }),
-    ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : '',
+    ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : undefined,
   };
 };

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

@@ -19,6 +19,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     snils,
     armyIdFlg,
     conscription,
+    initiateBankruptcyFlg,
   } = formData;
 
   return {
@@ -40,6 +41,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     }),
     snils: snils?.replace(/[-\s]/g, ''),
     armyIdFlg,
+    initiateBankruptcyFlg,
   };
 };
 

package/mobile/src/retail/adaptors/getPersonalInfoData.tsx

@@ -20,7 +20,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulSerie,
     dulSubdivisionCode,
     education,
-    participantDateRegistration = '',
+    participantDateRegistration,
     housing,
     addressRegistration,
     addressFact,
@@ -39,7 +39,9 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulSerie,
     dulSubdivisionCode,
     educationLevelCd: education,
-    registrationDate: formatDate(participantDateRegistration, true),
+    registrationDate: participantDateRegistration
+      ? formatDate(participantDateRegistration, true)
+      : undefined,
     homeMatchFlg: addressMatch,
     houseTypeCd: housing,
     participantContacts: getParticipantContacts({

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

@@ -1,11 +1,11 @@
+import type { DescriptionProps } from '../../model/HeadlineType';
 import { fetchRetailJSON } from './doRequest';
 
-export type CardTypeData = {
+export type CardTypeData = DescriptionProps & {
   type: string;
   key: string;
   value: string;
   displayOrder: number;
-  description: string;
 };
 
 export const getCardTypes = async (paymentSystemTypeCd: string, creditProgramId: string) => {

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

@@ -40,7 +40,7 @@ type ParticipantIncome = {
 };
 
 export type PaymentType = {
-  key: 'ANNUITY' | 'DIFFERENTIAL';
+  key: 'ANNUITY' | 'DIFFERENTIATED';
   value: string;
 };
 

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import type { OnCloseProps } from '../../../model/OnCloseProps';
 
 import { Button } from '../../../ui-kit/Button/Button';
 import { SubmitButton } from '../../../ui-kit/Button/SubmitButton';
@@ -12,10 +13,9 @@ import { Logo } from '../../../ui-kit/Logo/Logo';
 import { checkCaptcha } from '../../api/checkCaptcha';
 import { createCaptcha } from '../../api/createCaptcha';
 
-export interface CaptchaDialogProps {
+export interface CaptchaDialogProps extends OnCloseProps {
   phoneNumber: string;
   sendCode?: () => void;
-  onClose?: () => void;
 }
 
 export const CaptchaDialog = JSX<CaptchaDialogProps>(({ phoneNumber, sendCode, onClose }) => {
@@ -49,21 +49,21 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(({ phoneNumber, sendCode, o
       head={<Logo />}
       onClose={onClose}
     >
-      <div className="flex flex-col gap-lg items-center rounded-md">
-        <div className="flex h-36 w-72">
+      <div className="flex flex-col gap-lg items-center">
+        <div className="flex">
           <img className="grow" src={captcha}></img>
           <Button className="w-8" embedded onClick={handleCreateCaptcha}>
             <Icon iconVersion="normal" name="RefreshIcon" />
           </Button>
         </div>
         <Input
-          className="w-[300px]"
+          className="w-80"
           onChange={setCode}
           value={code}
           placeholder="Введите код с картинки"
         />
         {hasError ? <div className="text-error">Неверный код</div> : null}
-        <div className="flex w-[310px] justify-between">
+        <div className="flex w-80 justify-between">
           <Button version="secondary" onClick={close}>
             Вернуться
           </Button>

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { OnCloseProps } from '../../../model/OnCloseProps';
 
 import { Button } from '../../../ui-kit/Button/Button';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
@@ -9,9 +10,8 @@ import { RadioButtonGroup } from '../../../ui-kit/RadioButtonGroup/RadioButtonGr
 import { noop } from '../../../utils/noop';
 import { useDocumentDialog } from '../DocumentDialog/useDocumentDialog';
 
-export interface ConsentBkiDialogProps {
+export interface ConsentBkiDialogProps extends OnCloseProps {
   onSubmit?: (confirmStatus: string) => void;
-  onClose?: () => void;
 }
 
 const defaultConsentText = {

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

@@ -1,13 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
-import { Input } from '../../../ui-kit/Input/Input';
 import { type InputProps } from '../../../ui-kit/Input/InputProps';
-import { renderErrorText } from '../../../ui-kit/Input/renderErrorText';
-import { getRequiredLabel } from '../../../utils/getRequiredLabel';
+import { InputWrapper } from '../../../ui-kit/Input/InputWrapper';
 import { noop } from '../../../utils/noop';
-import { style } from '../../../utils/style';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useInputPopup } from './useInputPopup';
 
@@ -19,38 +14,15 @@ export type DaDataInputProps = InputProps & {
 
 export const DaDataInputControl = JSX<DaDataInputProps>(
   ({
-    className,
-    label,
     value = '',
-    placeholder,
-    error,
-    errors,
     onChange = noop,
     onDaDataChange,
-    onBlur,
-    isTextarea,
-    type,
     name = '',
     daDataQueryPrefix,
-    isInteger = false,
-    maxLength,
     dadata = false,
-    disabled = false,
+    ...rest
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
-    const popupRef = useOutsideClick<HTMLDivElement>(close);
-
-    const handleChange = useCallback(
-      (v: string) => {
-        dadata && !isOpen && open();
-        maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
-      },
-      [isOpen, onChange],
-    );
-
-    useEffect(() => {
-      isInteger && value && onChange(normalizeInteger(value));
-    }, [value]);
 
     const inputRef = useInputPopup({
       isOpen: isOpen && dadata,
@@ -62,33 +34,15 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
     });
 
     return (
-      <div
-        className={style('shrink-0 w-full', className)}
-        ref={popupRef}
-        onBlur={close}
-        onFocus={open}
-      >
-        <div ref={inputRef}>
-          <Input
-            disabled={disabled}
-            type={type || 'text'}
-            aria-label={label}
-            label={getRequiredLabel({ label, errors })}
-            valid={Boolean(!error)}
-            value={value}
-            onChange={handleChange}
-            onBlur={onBlur}
-            isTextarea={isTextarea}
-            placeholder={getPlaceholder(placeholder, errors, label)}
-          />
-        </div>
-        {renderErrorText(error)}
-      </div>
+      <InputWrapper
+        value={value}
+        onChange={onChange}
+        inputRef={inputRef}
+        isOpen={isOpen}
+        onOpen={open}
+        onClose={close}
+        {...rest}
+      />
     );
   },
 );
-
-const normalizeInteger = (val = '') => val.replace(/[^\d]+/g, '');
-
-const getPlaceholder = (placeholder?: string, errors?: string[], label?: string) =>
-  errors && !label ? `${placeholder}*` : placeholder;

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

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMobileMode } from '../../../hooks/useMobileMode';
+import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
 
-export interface DocumentDialogProps {
+export interface DocumentDialogProps extends OnCloseProps {
   src: string;
-  onClose?: () => void;
   onDocumentRead?: () => void;
 }