@redneckz/wildless-cms-uni-blocks 0.14.778 → 0.14.787

package/src/components/CalculatorDeposit/renderRegistrationType.tsx

@@ -3,11 +3,18 @@ import {
   type BinaryRadioButtonGroupProps,
 } from '../../ui-kit/Calculator/renderBinaryRadioButtonGroup';
 
-export const renderRegistrationType = (props: Partial<BinaryRadioButtonGroupProps>) =>
-  renderBinaryRadioButtonGroup({
-    ...props,
-    items: [
-      { id: 'remote', text: 'Дистанционно' },
-      { id: 'office', text: 'Офис Банка' },
-    ],
-  });
+export const renderRegistrationType = (
+  props: Partial<BinaryRadioButtonGroupProps>,
+  isShow = false,
+) =>
+  isShow
+    ? renderBinaryRadioButtonGroup({
+        ...props,
+        title: 'Оформление',
+        orientation: 'vertical',
+        items: [
+          { id: 'remote', text: 'Дистанционно' },
+          { id: 'office', text: 'Офис Банка' },
+        ],
+      })
+    : null;

package/src/components/CalculatorRefinancing/CalculatorRefinancing.tsx

@@ -57,9 +57,6 @@ export const CalculatorRefinancing = UniBlock<RefinancingCalculatorProp>(
     );
 
     const paymentTypeElement = renderPaymentType({
-      title: '',
-      mobileTitle: 'Тип платежа',
-      orientation: 'vertical',
       ...field('isAnnuity'),
     });
 
@@ -114,7 +111,7 @@ export const CalculatorRefinancing = UniBlock<RefinancingCalculatorProp>(
               postfix="₽"
             />
             {calcParams.benefit > 0 ? (
-              <CalculatorValue title={'Выгода в месяц'} value={calcParams.benefit} postfix="₽" />
+              <CalculatorValue title="Выгода в месяц" value={calcParams.benefit} postfix="₽" />
             ) : null}
             <div className="hidden sm:block mb-lg">{paymentTypeElement}</div>
             {renderButtonsSection(buttons, { isVertical: true })}

package/src/components/Header/useChatBot.ts

@@ -6,6 +6,7 @@ const CHAT_NAMESPACE = 'chatbot';
 const CHAT_BUTTON_EXTERNAL_NAME = 'text-page__btn-chat';
 const CHAT_FRAME_ID = 'webchat-js-container:webchat_rshb';
 const CHAT_STORAGE_NAME = 'webchat-keep-open';
+const BUSINESS_CHAT_PREFIX = '/webchat-api';
 
 const CHATBOT_URL: Record<string, string> = {
   personal: '//chat.mes.rshb.ru/assets/js/webchat_rshb',
@@ -13,7 +14,7 @@ const CHATBOT_URL: Record<string, string> = {
 };
 
 interface WebChat {
-  render?: (id?: string, isOpen?: boolean) => void;
+  render?: (id?: string, isOpen?: boolean, prefix?: string) => void;
   chatOpen?: () => void;
   chatClose?: () => void;
 }
@@ -71,7 +72,7 @@ const renderBusinessChatBot = async (chatUrl: string) => {
   } else {
     createChatFrame();
 
-    businessChat?.render?.(CHAT_FRAME_ID, true);
+    businessChat?.render?.(CHAT_FRAME_ID, true, BUSINESS_CHAT_PREFIX);
   }
 };
 

package/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -44,4 +44,4 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
 };
 
 export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
-  Number(wages) + Number(retirementIncome);
+  Number(wages ?? 0) + Number(retirementIncome ?? 0);

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

@@ -13,7 +13,7 @@ export const DocumentDialog = JSX<DocumentDialogProps>(({ src, onClose, onDocume
   const isMobileMode = useMobileMode();
 
   return (
-    <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0" onClose={onClose}>
+    <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0 z-[101]" onClose={onClose}>
       {isMobileMode ? (
         <img src={src} />
       ) : (

package/src/retail/components/EsiaLoginDialog/EsiaLoginDialog.tsx

@@ -45,11 +45,16 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
           </ul>
           <Img image={{ icon: 'GosUslugiIcon', iconVersion: 'normal' }} height="70" />
         </div>
-        <div className="flex flex-wrap gap-lg w-full">
-          <Button type="button" onClick={handleAuth}>
+        <div className="@container flex flex-wrap gap-lg w-full">
+          <Button type="button" onClick={handleAuth} className="w-full md:w-auto">
             Заполнить через Госуслуги
           </Button>
-          <Button type="button" version="secondary" onClick={handleClose}>
+          <Button
+            type="button"
+            version="secondary"
+            onClick={handleClose}
+            className="w-full md:w-auto"
+          >
             Пропустить
           </Button>
         </div>

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

@@ -0,0 +1,74 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type JSONRefObject } from '../../../data/JSONRefObject';
+import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { UniBlock } from '../../../UniBlock/UniBlock';
+import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
+import { getAddressFromDaDataItem } from './AddressField';
+
+export interface AddressCourierFieldProps extends CustomFieldProps, UniBlockProps {
+  source?: JSONRefObject & {
+    deliveryCities?: string[];
+  };
+}
+
+export const AddressCourierField = UniBlock<AddressCourierFieldProps>(
+  ({ field, input, source }) => {
+    const [errorCity, setErrorCity] = useState('');
+    const fieldValue = field('addressCourier')?.value;
+    const currentLocality = fieldValue?.locality;
+    const currentCity = fieldValue?.city;
+
+    useEffect(() => {
+      if (
+        (currentCity || currentLocality) &&
+        !source?.deliveryCities?.includes(currentCity as string)
+      ) {
+        field?.('addressCourier')?.onChange?.({
+          ...fieldValue,
+          house: '',
+        });
+        setErrorCity('Город недоступен для доставки');
+      } else {
+        setErrorCity('');
+      }
+    }, [currentCity, currentLocality, source]);
+
+    const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+      field?.('addressCourier')?.onChange?.(getAddressFromDaDataItem(item));
+    }, []);
+
+    const onChange = useCallback((value: string) => {
+      field?.('addressCourier')?.onChange?.({
+        apartment: '',
+        city: '',
+        district: '',
+        fullAddress: value,
+        fiasCode: '',
+        house: '',
+        locality: '',
+        okatoRegionCode: '',
+        postcode: '',
+        region: '',
+        regionCode: '',
+        street: '',
+        qc: '',
+        qcComplete: '',
+        qcHouse: '',
+      });
+    }, []);
+
+    return (
+      <DaDataInputControl
+        label="Адрес"
+        {...field('addressCourier')}
+        value={fieldValue?.fullAddress}
+        onChange={onChange}
+        {...input}
+        error={errorCity || field('addressCourier')?.error}
+        onDaDataChange={onDaDataChange}
+      />
+    );
+  },
+);

package/src/retail/inputs.tsx

@@ -1,4 +1,7 @@
+/* eslint-disable max-lines */
+import { type CustomFieldProps } from '../ui-kit/FormField/CustomFieldProps';
 import { PhoneField } from '../ui-kit/FormField/Fields/PhoneField';
+import { AddressCourierField } from './components/Fields/AddressCourierField';
 import { AddressFactField } from './components/Fields/AddressFactField';
 import { AddressField } from './components/Fields/AddressField';
 import { AddressMatchField } from './components/Fields/AddressMatchField';
@@ -65,6 +68,10 @@ import { SurnameField } from './components/Fields/SurnameField';
 import { TotalIncomeField } from './components/Fields/TotalIncomeField';
 import { WagesField } from './components/Fields/WagesField';
 
+const DELIVERY_CITIES_REF = {
+  $ref: '/wcms-resources/delivery-cities-data.json',
+};
+
 export const InputsApplicationLeadMap = {
   limitedBirthday: LimitedBirthdayField,
   name: NameField,
@@ -142,7 +149,9 @@ export const InputsRetailMap = {
 };
 
 export const InputRetailCardMap = {
-  addressCourier: AddressField,
+  addressCourier: (props: CustomFieldProps) => (
+    <AddressCourierField {...props} source={DELIVERY_CITIES_REF} />
+  ),
   paymentSystem: PaymentSystemField,
   currency: CurrencyField,
   cardCategory: CardCategoryField,

package/src/retail/model/LeadFormState.ts

@@ -57,7 +57,7 @@ export interface Address {
   qcHouse?: string;
 }
 
-export interface Calculator {
+export interface CalculatorProps {
   moneyValue?: number;
   monthsValue?: number;
   isAnnuity?: boolean;
@@ -164,7 +164,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;
-  calculator?: Calculator;
+  calculator?: CalculatorProps;
   addressRetail?: Option;
   loanAmount?: number;
   creditPeriod?: number;

package/src/ui-kit/Calculator/getDefaultParams.tsx

@@ -1,4 +1,5 @@
-import { type DepositCalculatorSourceBookParams } from '../../components/CalculatorDeposit/getDepositCalculatorParams';
+import { type DepositCalculatorSourceBookParams } from '../../components/CalculatorDeposit/CalculatorDepositContent';
+import { type Option } from '../Select/Option';
 import { type CalcDefaultParamsProps } from './CalculatorProps';
 
 export const getDefaultParamsMin = (rateRows?: CalcDefaultParamsProps[]) =>
@@ -9,11 +10,17 @@ export const getDefaultParamsMin = (rateRows?: CalcDefaultParamsProps[]) =>
 export const getDefaultParamsMax = (
   rateRows: DepositCalculatorSourceBookParams[] = [],
   isNewClient = false,
-) =>
-  getDefaultParams(
-    [(i: number, acc: number) => i > acc, (i, prev) => i?.minSum < prev?.minSum],
-    rateRows?.filter((_) => isNewClient === Boolean(_?.isNewClient)),
-  );
+  extraPercents: Option[] = [],
+) => {
+  return {
+    ...getDefaultParams(
+      [(i: number, acc: number) => i > acc, (i, prev) => i?.minSum < prev?.minSum],
+      rateRows?.filter((_) => isNewClient === Boolean(_?.isNewClient)),
+    ),
+    extraPercent: extraPercents.at(-1),
+    extraPercents,
+  };
+};
 
 const getDefaultParams = (
   comparators: [

package/src/ui-kit/Calculator/renderBinaryRadioButtonGroup.tsx

@@ -8,7 +8,6 @@ import { Text } from '../../ui-kit/Text/Text';
 export interface BinaryRadioButtonGroupProps {
   items: [truthy: RadioButtonItem, falsy: RadioButtonItem];
   title?: string;
-  mobileTitle?: string;
   orientation?: ListOrientation;
   value?: boolean;
   className?: string;
@@ -19,27 +18,19 @@ export interface BinaryRadioButtonGroupProps {
 export const renderBinaryRadioButtonGroup = ({
   items,
   title,
-  mobileTitle = title,
   orientation = 'horizontal',
   value,
   onChange,
   ...rest
 }: BinaryRadioButtonGroupProps) => (
-  <div className="grid gap-s whitespace-nowrap">
+  <div className="grid gap-s whitespace-nowrap lg:sm:col-span-1 col-span-2">
     {title ? (
-      <div className="hidden @5xl:block" role="radiogroup" aria-label={title}>
+      <div role="radiogroup" aria-label={title}>
         <Text color="text-secondary-text" font="font-light">
           {title}
         </Text>
       </div>
     ) : null}
-    {mobileTitle ? (
-      <div className="@5xl:hidden" role="radiogroup" aria-label={mobileTitle}>
-        <Text color="text-secondary-text" font="font-light">
-          {mobileTitle}
-        </Text>
-      </div>
-    ) : null}
 
     <RadioButtonGroup
       orientation={orientation}

package/src/ui-kit/Calculator/renderPaymentType.tsx

@@ -6,6 +6,8 @@ import {
 export const renderPaymentType = (props: Partial<BinaryRadioButtonGroupProps>) =>
   renderBinaryRadioButtonGroup({
     ...props,
+    title: 'Тип платежа',
+    orientation: 'vertical',
     className: 'sm:flex-col',
     items: [
       { id: 'annuity', text: 'Аннуитетный' },

package/src/ui-kit/Calculator/renderPayout.tsx

@@ -6,6 +6,8 @@ import {
 export const renderPayout = (props: Partial<BinaryRadioButtonGroupProps>) =>
   renderBinaryRadioButtonGroup({
     ...props,
+    title: 'Выплата процентов',
+    orientation: 'vertical',
     items: [
       { id: 'everyMonth', text: 'Ежемесячно' },
       { id: 'atEndTerm', text: 'В конце срока' },

package/src/ui-kit/Calculator/setDefaultParamsCalc.tsx

@@ -5,7 +5,7 @@ import {
 import {
   type DepositCalculatorParams,
   type DepositCalculatorSourceBookParams,
-} from '../../components/CalculatorDeposit/getDepositCalculatorParams';
+} from '../../components/CalculatorDeposit/CalculatorDepositContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { clamp } from '../../utils/clamp';