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

package/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/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/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/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;
 }
 

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

@@ -1,15 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type IconName } from '../../../icons/IconName';
+import { type DescriptionProps, type TitleProps } from '../../../model/HeadlineType';
+import type { OnClickProps } from '../../../model/OnClickProps';
 import { Img } from '../../../ui-kit/Img/Img';
 import { Text } from '../../../ui-kit/Text/Text';
 import { noop } from '../../../utils/noop';
 
-export interface DraftActionButtonProps {
-  title: string;
-  icon: IconName;
-  description?: string;
-  onClick?: () => void;
-}
+export type DraftActionButtonProps = TitleProps &
+  DescriptionProps &
+  OnClickProps & {
+    icon: IconName;
+  };
 
 export const DraftActionButton = JSX<DraftActionButtonProps>(
   ({ title, icon, description, onClick = noop }) => (
@@ -20,9 +21,11 @@ export const DraftActionButton = JSX<DraftActionButtonProps>(
     >
       <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>
+        {title ? (
+          <Text font="font-medium" size="text-s">
+            {title}
+          </Text>
+        ) : null}
         {description ? (
           <Text color="text-secondary-text" size="text-xs">
             {description}

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

@@ -1,6 +1,7 @@
 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 { Dialog } from '../../../ui-kit/DialogManager/Dialog';
 import { Heading } from '../../../ui-kit/Heading/Heading';
 import { formatDate } from '../../../utils/formatDate';
@@ -11,11 +12,10 @@ import { DraftActionButton } from './DraftActionButton';
 import { parseDraftTask } from './parseDraftTask';
 import { creditCodesToProgrammIdMap, creditProgramCodeToProductIdMap } from './utils';
 
-export interface DraftDialogProps {
+export interface DraftDialogProps extends OnCloseProps {
   task: Task;
   isFromLead?: boolean;
   sendAspects?: (profileId: number, taskId: number) => void;
-  onClose?: () => void;
 }
 
 export const DraftDialog = JSX<DraftDialogProps>(function ({
@@ -54,7 +54,7 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
 
   return (
     <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">
+      <div className="flex flex-col gap-lg items-center mt-xs mx-6xl">
         <Heading
           className="whitespace-pre-wrap text-center"
           title="Нашли черновик вашей заявки"

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

@@ -1,17 +1,14 @@
 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 { Button } from '../../../ui-kit/Button/Button';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
 import { Heading } from '../../../ui-kit/Heading/Heading';
 import { Paragraph } from '../../../ui-kit/Paragraph/Paragraph';
 import { noop } from '../../../utils/noop';
 
-export interface EmptyDraftDialogProps {
-  onClose?: () => void;
-}
-
-export const EmptyDraftDialog = JSX<EmptyDraftDialogProps>(function ({ onClose = noop }) {
+export const EmptyDraftDialog = JSX<OnCloseProps>(function ({ onClose = noop }) {
   const navigator = locationNavigator();
 
   const handleGoNewTask = useCallback(() => {

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

@@ -1,13 +1,13 @@
+import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { useDialog } from '../../../ui-kit/DialogManager/useDialog';
 import { type Task } from '../../api/draftTasksKZO';
 import { DraftDialog } from './DraftDialog';
 import { EmptyDraftDialog } from './EmptyDraftDialog';
 
-type useDraftDialogOpenProps = {
+type useDraftDialogOpenProps = OnCloseProps & {
   task?: Task;
   isFromLead?: boolean;
   sendAspects?: (profileId: number, taskId: number) => void;
-  onClose?: () => void;
 };
 
 export const useDraftDialog = () => {

package/src/retail/components/Fields/BeginDateField.tsx

@@ -9,5 +9,6 @@ export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
     {...field(input?.name ?? '')}
     {...input}
     disabled={isEsiaAuthorize(field, input)}
+    maxDate={new Date()}
   />
 ));

package/src/retail/components/Fields/DaDataInnField.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
-import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { useRetailFormStore, type CreditFormStoreSlice } from '../../hooks/useRetailFormStore';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -19,11 +19,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   useEffect(() => {
-    if (
-      !esiaAccountTypeCd ||
-      !inn ||
-      !(employerActivities && employerOrganization && organization && amountWorkers)
-    ) {
+    if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store as CreditFormStoreSlice)) {
       return;
     }
     (async () => {
@@ -46,3 +42,15 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isDictionariesAlreadyLoad = (store: CreditFormStoreSlice) => {
+  const { employerActivities, employerOrganization, organization, amountWorkers, productType } =
+    store;
+
+  return [
+    employerOrganization,
+    organization,
+    amountWorkers,
+    productType === 'creditCard' ? employerActivities : true,
+  ].every(Boolean);
+};

package/src/retail/components/Fields/InitiateBankruptcyFlgField.tsx

@@ -0,0 +1,10 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxWithError } from '../../../ui-kit/Checkbox/CheckboxWithError';
+import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+
+export const InitiateBankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
+  <CheckboxWithError
+    text="Я планирую в ближайшее время инициировать дело о банкротстве в отношении себя"
+    {...field(input?.name ?? '')}
+  />
+));

package/src/retail/components/Fields/ParticipantDateRegistrationField.tsx

@@ -3,5 +3,9 @@ import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl'
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 export const ParticipantDateRegistrationField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата регистрации по месту жительства" {...field(input?.name ?? '')} />
+  <DatePickerControl
+    label="Дата регистрации по месту жительства"
+    {...field(input?.name ?? '')}
+    maxDate={new Date()}
+  />
 ));

package/src/retail/components/Fields/RegionRetailField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { type ProductType } from '../../../components/ApplicationLeadForm/ApplicationLeadFormContent';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { SelectControl } from '../../../ui-kit/Select/SelectControl';
@@ -9,12 +10,15 @@ import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
 export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { programId, productType } = useRetailFormStore();
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
-  const { programId } = useRetailFormStore();
+  const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
 
   const isSalaryCard = programId === '38';
   const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
+  const isDeliveryActive =
+    productSettings?.find((_) => _?.key === 'DELIVERY_ACTIVE')?.value === 'true';
 
   const handleChangeRegion = field('regionRetail')?.onChange;
   const handleChangeRegionHasDelivery = field('regionHasDelivery')?.onChange;
@@ -23,12 +27,14 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: Option) => {
       const regionHasDelivery =
-        regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg && !isSalaryCard;
+        isDeliveryActive &&
+        regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg &&
+        !isSalaryCard;
       handleChangeRegionHasDelivery?.(regionHasDelivery);
       handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
       handleChangeRegion?.(value);
     },
-    [regionsDelivery],
+    [regionsDelivery, isDeliveryActive],
   );
 
   return (
@@ -42,3 +48,6 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const getCurrentProductSettings = (productType: ProductType | null) =>
+  productType === 'debitCard' ? 'DEBIT_CARD_LEAD_PROCESS_SETTINGS' : 'CREDIT_LEAD_PROCESS_SETTINGS';

package/src/retail/components/Fields/SelectField.tsx

@@ -1,3 +1,6 @@
+import { type DisabledProps } from '../../../model/DisabledProps';
+import { type LabelProps } from '../../../model/HeadlineType';
+import { type PlaceholderProps } from '../../../model/PlaceholderProps';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { SelectControl } from '../../../ui-kit/Select/SelectControl';
@@ -5,13 +8,15 @@ import { UniBlock } from '../../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
 import { type DictionaryItem } from '../../model/LeadFormData';
 
-export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
+export interface SelectFieldProps
+  extends CustomFieldProps,
+    UniBlockProps,
+    LabelProps,
+    DisabledProps,
+    PlaceholderProps {
   source?: DictionaryItem[];
-  label: string;
   fieldName: string;
-  placeholder?: string;
   isSearch?: boolean;
-  disabled?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(

package/src/retail/components/FormStatus/FormStatus.tsx

@@ -1,7 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Headline } from '../../../components/Headline/Headline';
 import { useMobileMode } from '../../../hooks/useMobileMode';
-import { type DescriptionProps, type LabelProps } from '../../../model/HeadlineType';
+import {
+  type DescriptionProps,
+  type LabelProps,
+  type TitleProps,
+} from '../../../model/HeadlineType';
 import { BlockWrapper } from '../../../ui-kit/BlockWrapper';
 import { inputColumnStyles } from '../../../ui-kit/FormField/inputColumnStyle';
 import { Link } from '../../../ui-kit/Link/Link';
@@ -11,17 +15,17 @@ import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
 import { noop } from '../../../utils/noop';
 import { style } from '../../../utils/style';
 
-type CreditCardFormStatusProps = UniBlockProps & {
-  title?: string;
-  description?: string;
-  interval?: number;
-  sectionInfoTitle?: string;
-  sectionInfo?: (LabelProps & DescriptionProps)[];
-  sectionAdditionalTitle?: string;
-  sectionInfoAdditional?: (LabelProps & DescriptionProps)[];
-  buttonText?: string;
-  onExpire?: () => void;
-};
+type CreditCardFormStatusProps = UniBlockProps &
+  TitleProps &
+  DescriptionProps & {
+    interval?: number;
+    sectionInfoTitle?: string;
+    sectionInfo?: (LabelProps & DescriptionProps)[];
+    sectionAdditionalTitle?: string;
+    sectionInfoAdditional?: (LabelProps & DescriptionProps)[];
+    buttonText?: string;
+    onExpire?: () => void;
+  };
 
 export const FormStatus = JSX<CreditCardFormStatusProps>(
   ({
@@ -61,8 +65,7 @@ const SectionInfo = ({
   title,
   items,
   countColumns = false,
-}: {
-  title?: string;
+}: TitleProps & {
   items?: (LabelProps & DescriptionProps)[];
   countColumns?: boolean;
 }) => {

package/src/retail/components/VerifyPhoneDialog/SubmitButton.tsx

@@ -1,17 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type DisabledProps } from '../../../model/DisabledProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Text } from '../../../ui-kit/Text/Text';
 
-interface SubmitButtonProps {
-  isDisabled: boolean;
+interface SubmitButtonProps extends DisabledProps {
   onClick: () => void;
   text?: string;
 }
 
-export const SubmitButton = JSX<SubmitButtonProps>(({ isDisabled, onClick, text }) => {
-  return (
-    <Button type="button" onClick={onClick} disabled={isDisabled}>
-      <Text font="font-normal">{text}</Text>
-    </Button>
-  );
-});
+export const SubmitButton = JSX<SubmitButtonProps>(({ disabled = false, onClick, text }) => (
+  <Button type="button" onClick={onClick} disabled={disabled}>
+    <Text font="font-normal">{text}</Text>
+  </Button>
+));

package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -3,6 +3,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 
 import { Headline } from '../../../components/Headline/Headline';
+import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { ButtonTitle } from '../../../ui-kit/Button/ButtonTitle';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
@@ -19,14 +20,13 @@ import { InputCode } from './InputCode';
 import { SubmitButton } from './SubmitButton';
 import { useVerifyPhoneDialogSubmit } from './useVerifyPhoneDialogSubmit';
 
-export interface VerifyPhoneDialogProps {
+export interface VerifyPhoneDialogProps extends OnCloseProps {
   phone: string;
   code?: boolean;
   withDescription?: boolean;
   codeLength?: number;
   consents?: string[];
   onSuccess?: (smsCode?: string) => void;
-  onClose?: () => void;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
@@ -122,15 +122,15 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   },
 );
 
-const renderNextButton = (isDisabled: boolean, onClick: () => void) => (
-  <SubmitButton text="Далее" isDisabled={isDisabled} onClick={onClick} />
+const renderNextButton = (disabled: boolean, onClick: () => void) => (
+  <SubmitButton text="Далее" disabled={disabled} onClick={onClick} />
 );
 
 const renderText = (timeNextReq: number, handleSendCode: () => void) =>
   timeNextReq ? (
     <div className="flex flex-row text-l font-light text-base">
       Получить новый код можно через
-      <Timer className="ml-1" seconds={timeNextReq} />
+      <Timer className="pl-2xs" seconds={timeNextReq} />
     </div>
   ) : (
     <Button embedded onClick={handleSendCode}>