@redneckz/wildless-cms-uni-blocks 0.14.903 → 0.14.905

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -62,12 +62,9 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
       [inputs, typeForm],
     );
     const router = useRouter();
-
+    const aspects = useAspects();
     const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
-
     const responseTypeDialog = useDialog(ResponseTypeDialog);
-    const aspects = useAspects();
-
     const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
     const handleSubmit = useCallback(
@@ -114,6 +111,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
       onSubmit: handleSubmit,
     });
     const fieldName = getConsentDataProcessing(inputs)?.name;
+    const consentDataProcessing = fieldName ? field('consentDataProcessing') : undefined;
 
     return (
       <ApplicationFormLayout
@@ -124,7 +122,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
         <form onSubmit={onSubmit}>
           {renderSections(sections, field, { typeForm, additionalParams })}
           {renderAgreementSubmit({
-            consentDataProcessing: fieldName ? field('consentDataProcessing') : undefined,
+            consentDataProcessing,
             link,
             button,
             typeForm,

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -5,6 +5,7 @@ import { type LabelProps, type TextProps, type TitleProps } from '../../model/He
 import { type InputSectionsType } from '../../model/InputSectionsType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type Target } from '../../model/LinkProps';
+import { type PlaceholderProps } from '../../model/PlaceholderProps';
 import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
@@ -34,11 +35,11 @@ export type FilledByEsiaProps = {
 export type FieldDef = Required &
   LabelProps &
   ConditionFieldProps &
-  FilledByEsiaProps & {
+  FilledByEsiaProps &
+  PlaceholderProps & {
     name?: NameFieldDef;
     dadata?: boolean;
     defaultValue?: string;
-    placeholder?: string;
   };
 
 /** @hidden */

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -1,5 +1,4 @@
 /* eslint-disable max-lines */
-/* eslint-disable max-lines-per-function */
 import { type EsiaRequestProfileResponse } from '../../retail/api/esiaRequestProfile';
 import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
 import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,5 +1,4 @@
 /* eslint-disable camelcase */
-/* eslint-disable max-lines-per-function */
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { useSetter } from '../../hooks/useSetter';

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -22,7 +22,10 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
     const currentLocation = useLocation();
     const exchangeRates = useFetchExchangeRateData(currentLocation);
 
-    const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
+    const filteredCurrencyRates = exchangeRates?.exchangeRate?.currencies?.filter(
+      (_) => _.buyExchangeRate !== 0 || _.saleExchangeRate !== 0,
+    );
+    const currencyRates = getCurrencyRates(filteredCurrencyRates);
 
     const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
     currencyRatesBuy.unshift({ currency: { currency: Currency.RUB } });

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

@@ -3,6 +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 { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
+import { getAddressFromDaDataItem } from './AddressField';
 
 export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
   const fieldName = 'addressFact';
@@ -16,23 +17,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
   }, [value, field('addressRegistration').value]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.(fieldName)?.onChange?.({
-      apartment: item?.data?.flat,
-      city: item?.data?.city,
-      district: item?.data?.area_with_type,
-      fullAddress: item?.value,
-      fiasCode: item?.data?.fias_id,
-      house: item?.data?.house,
-      locality: item?.data?.settlement_with_type,
-      okatoRegionCode: item?.data?.okato,
-      postcode: item?.data?.postal_code,
-      region: item?.data?.region,
-      regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
-      street: item?.data?.house,
-      qc: item?.data?.qc,
-      qcComplete: item?.data?.qc_complete,
-      qcHouse: item?.data?.qc_house,
-    });
+    field?.(fieldName)?.onChange?.(getAddressFromDaDataItem(item));
   }, []);
 
   const onChange = useCallback((val: string) => {

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

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
@@ -38,6 +37,7 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
+  // eslint-disable-next-line max-lines-per-function
   ({
     phone,
     withDescription = true,
@@ -70,9 +70,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     });
 
     const captchaDialog = useDialog(CaptchaDialog);
-
     const phoneNumber = formatPhone(phone);
-
     const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
 
     const handleSendCode = useCallback(async () => {
@@ -110,14 +108,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     return (
       <Dialog maxWidth="lg" onClose={onClose}>
         <div className="flex flex-col gap-xl items-center rounded-md">
-          <Headline
-            className="w-full"
-            title="Подтвердите номер телефона"
-            description={`Мы отправили код на ${phone}`}
-            headlineVersion="XS"
-            isEmbedded={true}
-            as="h6"
-          />
+          {renderHeadline(phone)}
           <InputCode
             values={values}
             setValues={setValues}
@@ -125,18 +116,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
             hasError={hasError}
           />
           {renderText(timeNextReq, handleSendCode)}
-
-          {withDescription ? (
-            <RichText itemSize="list-s">
-              <span>Вводя код, я подтверждаю, что ознакомлен и подписываю: </span>
-              <ul>
-                {consents?.map((_, i) => (
-                  <li key={`${_}-${i}`}>{_}</li>
-                ))}
-              </ul>
-            </RichText>
-          ) : null}
-
+          {renderDescription(consents, withDescription)}
           {renderNextButton(isSubmitButtonDisabled, handleSubmit)}
           {isLoading ? <Loader blur={false} /> : null}
         </div>
@@ -145,6 +125,29 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   },
 );
 
+const renderHeadline = (phone: string) => (
+  <Headline
+    className="w-full"
+    title="Подтвердите номер телефона"
+    description={`Мы отправили код на ${phone}`}
+    headlineVersion="XS"
+    isEmbedded={true}
+    as="h6"
+  />
+);
+
+const renderDescription = (consents?: string[], isRender = false) =>
+  isRender ? (
+    <RichText itemSize="list-s">
+      <span>Вводя код, я подтверждаю, что ознакомлен и подписываю: </span>
+      <ul>
+        {consents?.map((_, i) => (
+          <li key={`${_}-${i}`}>{_}</li>
+        ))}
+      </ul>
+    </RichText>
+  ) : null;
+
 const renderNextButton = (disabled: boolean, onClick: () => void) => (
   <SubmitButton text="Далее" disabled={disabled} onClick={onClick} />
 );

package/src/retail/utils/latinFieldsUtils.ts

@@ -2,82 +2,80 @@ const latinPattern = /^[\u0041-\u005A\u0061-\u007A\s]+$/u;
 
 export const isLatin = (_ = '') => latinPattern.test(_);
 
-// eslint-disable-next-line max-lines-per-function
-export const autoTranslateToLatin = (str: string): string => {
-  const replacer = {
-    А: 'A',
-    Б: 'B',
-    В: 'V',
-    Г: 'G',
-    Д: 'D',
-    Е: 'E',
-    Ё: 'E',
-    Ж: 'ZH',
-    З: 'Z',
-    И: 'I',
-    Й: 'I',
-    К: 'K',
-    Л: 'L',
-    М: 'M',
-    Н: 'N',
-    О: 'O',
-    П: 'P',
-    Р: 'R',
-    С: 'S',
-    Т: 'T',
-    У: 'U',
-    Ф: 'F',
-    Х: 'KH',
-    Ц: 'TS',
-    Ч: 'CH',
-    Ш: 'SH',
-    Щ: 'SHCH',
-    Ъ: 'IE',
-    Ы: 'Y',
-    Ь: '',
-    Э: 'E',
-    Ю: 'YU',
-    Я: 'YA',
-    '': '',
-    // Lower case
-    а: 'A',
-    б: 'B',
-    в: 'V',
-    г: 'G',
-    д: 'D',
-    е: 'E',
-    ё: 'E',
-    ж: 'ZH',
-    з: 'Z',
-    и: 'I',
-    й: 'I',
-    к: 'K',
-    л: 'L',
-    м: 'M',
-    н: 'N',
-    о: 'O',
-    п: 'P',
-    р: 'R',
-    с: 'S',
-    т: 'T',
-    у: 'U',
-    ф: 'F',
-    х: 'KH',
-    ц: 'TS',
-    ч: 'CH',
-    ш: 'SH',
-    щ: 'SHCH',
-    ъ: 'IE',
-    ы: 'Y',
-    ь: '',
-    э: 'E',
-    ю: 'YU',
-    я: 'YA',
-    '.': '.',
-    ',': ',',
-    '-': '-',
-    ' ': ' ',
-  };
-
-  return str.replace(/[А-ЯЁа-яё,. -]/g, (_) => replacer[_.toLowerCase()].toUpperCase() || '');
+const REPLACER = {
+  А: 'A',
+  Б: 'B',
+  В: 'V',
+  Г: 'G',
+  Д: 'D',
+  Е: 'E',
+  Ё: 'E',
+  Ж: 'ZH',
+  З: 'Z',
+  И: 'I',
+  Й: 'I',
+  К: 'K',
+  Л: 'L',
+  М: 'M',
+  Н: 'N',
+  О: 'O',
+  П: 'P',
+  Р: 'R',
+  С: 'S',
+  Т: 'T',
+  У: 'U',
+  Ф: 'F',
+  Х: 'KH',
+  Ц: 'TS',
+  Ч: 'CH',
+  Ш: 'SH',
+  Щ: 'SHCH',
+  Ъ: 'IE',
+  Ы: 'Y',
+  Ь: '',
+  Э: 'E',
+  Ю: 'YU',
+  Я: 'YA',
+  '': '',
+  // Lower case
+  а: 'A',
+  б: 'B',
+  в: 'V',
+  г: 'G',
+  д: 'D',
+  е: 'E',
+  ё: 'E',
+  ж: 'ZH',
+  з: 'Z',
+  и: 'I',
+  й: 'I',
+  к: 'K',
+  л: 'L',
+  м: 'M',
+  н: 'N',
+  о: 'O',
+  п: 'P',
+  р: 'R',
+  с: 'S',
+  т: 'T',
+  у: 'U',
+  ф: 'F',
+  х: 'KH',
+  ц: 'TS',
+  ч: 'CH',
+  ш: 'SH',
+  щ: 'SHCH',
+  ъ: 'IE',
+  ы: 'Y',
+  ь: '',
+  э: 'E',
+  ю: 'YU',
+  я: 'YA',
+  '.': '.',
+  ',': ',',
+  '-': '-',
+  ' ': ' ',
 };
+
+export const autoTranslateToLatin = (str: string): string =>
+  str.replace(/[А-ЯЁа-яё,. -]/g, (_) => REPLACER[_.toLowerCase()].toUpperCase() || '');

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

@@ -44,7 +44,6 @@ export const Input = JSX<InputProps>(
 
     const paddingStyle = children ? 'pr-3xl' : '';
     const validStyle = getValidStyle(valid);
-
     const ariaLabel = label ?? name ?? id;
 
     return (

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

@@ -4,6 +4,7 @@ import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { type ControlProps } from '../../model/ControlProps';
 import { type DefaultControlType } from '../../model/DefaultControlType';
 import { type IconVersion } from '../../model/IconVersion';
+import { type PlaceholderProps } from '../../model/PlaceholderProps';
 import { debounce } from '../../utils/debounce';
 import { style } from '../../utils/style';
 import { Icon } from '../Icon/Icon';
@@ -23,11 +24,10 @@ export interface SelectProps extends DefaultControlType, ControlProps<Option> {
   onSearchQuery?: (value: string) => void;
 }
 
-type renderOptionTextProps = {
+type renderOptionTextProps = PlaceholderProps & {
   isManualInput?: boolean;
   query?: string;
   value?: Option;
-  placeholder?: string;
 };
 
 export const Select = JSX<SelectProps>(

package/src/ui-kit/Select/SelectPopup.tsx

@@ -59,7 +59,7 @@ export const SelectPopup = JSX<SelectPopupProps>(
               width="16"
               height="16"
               iconVersion={iconVersion}
-              className={style('absolute right-4 pt-3xs', {
+              className={style('absolute right-4 pt-3xs sm:pt-2xs sm:right-2', {
                 hidden: option.key !== value?.key,
               })}
             />