@redneckz/wildless-cms-uni-blocks 0.14.1069 → 0.14.1071

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -152,26 +152,11 @@ export const useApplicationLeadApi = ({
     try {
       startSending();
       const transformedFormData = transformFormData(formData);
-      const participantData = await createParticipant({
-        phone: formatPhone(transformedFormData.phone as string),
-        email: transformedFormData.email as string,
-      });
-
       const referalData = leadFormStore.referalData;
       const marketingInfo = sessionStore.marketingInfo;
 
-      if (!participantData) {
-        throw new Error();
-      }
-
-      const { participantId, userId } = participantData;
-
-      if (!participantId) {
-        throw new Error();
-      }
       const common: CommonLeadProps = {
         programId,
-        userId,
         productType,
         sendAspects,
         verifyPhoneDialog,
@@ -179,23 +164,17 @@ export const useApplicationLeadApi = ({
       };
 
       const taskData: TaskDataProps = {
-        participantId,
         formData: transformedFormData,
         referalData,
         marketingInfo,
         saveUserData,
       };
 
-      const sendCurrentTask = createSendCurrentTaskNew({
-        common,
-        taskData,
-        consentBkiDialog,
-      });
-
       const handleSuccessVerify = createHandleSuccessVerifyNew({
         common,
+        taskData,
         draftDialog,
-        sendCurrentTask,
+        consentBkiDialog,
       });
 
       const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
@@ -233,6 +212,11 @@ const createSendCurrentTaskNew =
     const { programId, userId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } =
       common;
     const { participantId, formData, referalData, marketingInfo, saveUserData } = taskData;
+
+    if (!participantId) {
+      throw new Error();
+    }
+
     const taskId = await updateUserDataNewMicroservice({
       programId,
       participantId,
@@ -257,17 +241,51 @@ const createSendCurrentTaskNew =
 const createHandleSuccessVerifyNew =
   ({
     common,
+    taskData,
     draftDialog,
-    sendCurrentTask,
+    consentBkiDialog,
   }: {
     common: CommonLeadProps;
+    taskData: TaskDataProps;
     draftDialog: any;
-    sendCurrentTask: () => Promise<void>;
+    consentBkiDialog: ReturnType<typeof useConsentBkiDialog>;
   }) =>
   async () => {
-    const { verifyPhoneDialog, sendAspects, handleFailSendForm, userId, programId, productType } =
-      common;
+    const { programId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } = common;
+    const { formData } = taskData;
+
     try {
+      const participantData = await createParticipant({
+        phone: formatPhone(formData.phone as string),
+        email: formData.email as string,
+      });
+
+      if (!participantData) {
+        throw new Error();
+      }
+
+      const { participantId, userId } = participantData;
+
+      if (!participantId) {
+        throw new Error();
+      }
+
+      const updatedCommon: CommonLeadProps = {
+        ...common,
+        userId,
+      };
+
+      const updatedTaskData: TaskDataProps = {
+        ...taskData,
+        participantId,
+      };
+
+      const sendCurrentTask = createSendCurrentTaskNew({
+        common: updatedCommon,
+        taskData: updatedTaskData,
+        consentBkiDialog,
+      });
+
       const lastTaskId = await getLastTaskStatus({ userId, programId });
 
       if (lastTaskId) {
@@ -283,7 +301,8 @@ const createHandleSuccessVerifyNew =
       } else {
         await sendCurrentTask();
       }
-    } catch {
+    } catch (error) {
+      console.error('Error in handleSuccessVerify:', error);
       handleFailSendForm();
     }
   };

package/mobile/src/components/CashbackCalculator/CashbackCalculator.tsx

@@ -1,16 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
 import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
-import { type LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
+import type { LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
+import { RichText } from '../../ui-kit/RichText/RichText';
+import { type Option } from '../../ui-kit/Select/Option';
+import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { Headline } from '../Headline/Headline';
-import { type Cashback, type CashbackCalculatorContent } from './CashbackCalculatorContent';
+import {
+  type CalculatorParams,
+  type CashbackCalculatorLayoutContent,
+} from '../CashbackCalculatorLayout/CashbackCalculatorLayoutContent';
 import { CashbackCalculatorResult } from './CashbackCalculatorResult';
 import { CashbackCategory } from './CashbackCategory';
+import { INFO_BLOCK_HTML, MAIN_CASHBACK_KEY, MAX_MONTH_CASHBACK } from './constants';
+import { renderButtons } from './renderButtons';
 import { useCashbackCalculator } from './useCashbackCalculator';
 
 const defaultButton: LinkButtonContent = {
@@ -19,22 +27,25 @@ const defaultButton: LinkButtonContent = {
   target: '_self',
 };
 
-const INCREASED_PERCENTS = ['5', '10', '15'];
+interface CashbackCalculatorProps
+  extends CalculatorParams,
+    CashbackCalculatorLayoutContent,
+    UniBlockProps {}
 
-const MAX_CATEGORIES = 5;
-
-const INFO_BLOCK_HTML = `<p>Полученные баллы можно конвертировать в рубли и компенсировать покупки у партнеров. Подробнее в <a href='#docs'>документах</a></p>`;
-
-interface CashbackCalculatorProps extends CashbackCalculatorContent, UniBlockProps {}
+export type SelectedCategory = {
+  id: number;
+  category: Option;
+};
 
 export const CashbackCalculator = JSX<CashbackCalculatorProps>(
+  // eslint-disable-next-line max-lines-per-function
   ({
     maxInputRange = 300000,
-    image,
-    deleteImage,
-    infoImage,
-    className = '',
+    maxCategories,
+    calculatorType = 'standard',
+    maxMonthCashback = MAX_MONTH_CASHBACK[calculatorType],
     button = defaultButton,
+    className = '',
     ...rest
   }) => {
     const {
@@ -44,41 +55,53 @@ export const CashbackCalculator = JSX<CashbackCalculatorProps>(
       onChangeCashback,
       onDeleteCashback,
       onResetCashback,
-    } = useCashbackCalculator();
+      onChangeCategory,
+    } = useCashbackCalculator(calculatorType);
+
+    const { deleteImage, infoImage, image } = rest;
+    const [isMainCashbackAdded, setIsMainCashbackAdded] = useState(false);
 
-    const img = image?.src ? (
-      <Img image={image} className="hidden w-full @xl:block" imageClassName="justify-self-center" />
-    ) : null;
+    useEffect(() => {
+      setIsMainCashbackAdded(
+        Boolean(cashbacks.find((item) => item.percent.key === MAIN_CASHBACK_KEY[calculatorType])),
+      );
+    }, [cashbacks]);
 
     return (
       <BlockWrapper
         className={style('flex flex-col justify-center items-center gap-lg', className)}
-        defaultPadding={style('p-6xl')}
+        defaultPadding={style('p-0')}
         {...rest}
       >
-        <Headline
-          title="Калькулятор расчета баллов"
-          description="Можно выбрать не более 5 категорий, одна из них из повышенной категории"
-          headlineVersion="XL"
-          isEmbedded={true}
-        />
-        <div className="flex flex-row items-start gap-lg">
+        <div className="flex flex-row items-start gap-lg mt-5">
           <div className="w-full flex flex-col justify-center items-center gap-lg">
-            {cashbacks.map((_) => (
-              <CashbackCategory
-                key={String(_.id)}
-                categories={categories}
-                cashback={_}
-                showIncreasedPercents={showIncreasedPercents(_, cashbacks)}
-                maxInputRange={maxInputRange}
-                deleteImage={deleteImage}
-                onDelete={onDeleteCashback}
-                onChange={onChangeCashback}
-              />
-            ))}
-            {renderButtons(cashbacks.length, onAddNewCashback, onResetCashback)}
-            <CashbackCalculatorResult cashbacks={cashbacks} />
+            {cashbacks.length
+              ? cashbacks.map((_, index) => (
+                  <CashbackCategory
+                    key={String(_.id)}
+                    categories={categories}
+                    cashback={_}
+                    maxInputRange={maxInputRange}
+                    deleteImage={deleteImage}
+                    onDelete={onDeleteCashback}
+                    onChange={onChangeCashback}
+                    isMainCashbackAdded={isMainCashbackAdded}
+                    calculatorType={calculatorType}
+                    isShowDisclaimer={index === 0}
+                    onChangeCategory={onChangeCategory}
+                  />
+                ))
+              : renderNoCategoryText()}
+            {renderButtons({
+              cashbacksLength: cashbacks.length,
+              onAddNewCashback: onAddNewCashback,
+              onResetCashback: onResetCashback,
+              calculatorType: calculatorType,
+              maxCategories,
+            })}
+            <CashbackCalculatorResult cashbacks={cashbacks} maxMonthCashback={maxMonthCashback} />
             <InfoCard __html={INFO_BLOCK_HTML} image={infoImage} />
+            <RichText __html='* Подробнее по условиям и начислениям можно узнать во вкладке <a href="#docs">документы</a>' />
             <LinkButton
               className="w-full @lg:w-auto self-start"
               href={button.href}
@@ -87,39 +110,20 @@ export const CashbackCalculator = JSX<CashbackCalculatorProps>(
               version="primary"
             />
           </div>
-          {img}
+          {renderImage(image)}
         </div>
       </BlockWrapper>
     );
   },
 );
 
-const renderButtons = (
-  cashbacksLength: number,
-  onAddNewCashback: () => void,
-  onResetCashback: () => void,
-) => {
-  return (
-    <div className="w-full flex flex-col gap-lg">
-      {cashbacksLength < MAX_CATEGORIES ? (
-        <Button
-          className="self-start text-primary-main"
-          embedded
-          version="secondary"
-          onClick={onAddNewCashback}
-        >
-          Добавить еще
-        </Button>
-      ) : null}
-      {cashbacksLength > 2 ? (
-        <Button className="self-start" version="secondary" onClick={onResetCashback}>
-          Сбросить все категории
-        </Button>
-      ) : null}
-    </div>
-  );
-};
+const renderNoCategoryText = () => (
+  <Text align="text-left" className="w-full">
+    Категория не выбрана
+  </Text>
+);
 
-const showIncreasedPercents = (currentCashback: Cashback, cashback: Cashback[]) =>
-  INCREASED_PERCENTS.includes(currentCashback.percent.key) ||
-  !cashback.some((_) => INCREASED_PERCENTS.includes(_.percent.key));
+const renderImage = (image: Picture = {}) =>
+  image?.src ? (
+    <Img image={image} className="hidden w-full @xl:block" imageClassName="justify-self-center" />
+  ) : null;

package/mobile/src/components/CashbackCalculator/CashbackCalculatorContent.ts

@@ -1,28 +0,0 @@
-import { type TitleProps } from '../../model/HeadlineType';
-import { type Picture } from '../../model/Picture';
-import { type LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
-import { type Option } from '../../ui-kit/Select/Option';
-import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
-
-export type Cashback = {
-  id: number;
-  percent: Option;
-  sum: number;
-};
-
-/**
- * @title Блок калькулятора кэшбека
- */
-export type CashbackCalculatorContent = UniBlockContent &
-  TitleProps & {
-    /** @title Кнопка */
-    button?: LinkButtonContent;
-    /** @title Максимальное значение поля 'Сумма покупок в категории' */
-    maxInputRange?: number;
-    /** @title Изображение */
-    image?: Picture;
-    /** @title Иконка кнопки удаления категории */
-    deleteImage?: Picture;
-    /** @title Иконка информационного блока */
-    infoImage?: Picture;
-  };

package/mobile/src/components/CashbackCalculator/CashbackCalculatorResult.tsx

@@ -1,16 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { RichText } from '../../ui-kit/RichText/RichText';
 import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
-import { type Cashback } from './CashbackCalculatorContent';
-
-const MAX_MONTH_CASHBACK = 5000;
-const MAX_YEAR_CASHBACK = 60000;
+import { type Cashback } from '../CashbackCalculatorLayout/CashbackCalculatorLayoutContent';
 
 export type CashbackCalculatorResultProps = UniBlockProps & {
   cashbacks: Cashback[];
+  maxMonthCashback: number;
 };
 
 type ResultTextProps = {
@@ -29,34 +26,37 @@ const ResultText = JSX<ResultTextProps>(({ text, value }) => (
   </div>
 ));
 
-export const CashbackCalculatorResult = JSX<CashbackCalculatorResultProps>(({ cashbacks }) => {
-  const { mounth, year } = getResult(cashbacks);
-
-  return (
-    <div className="w-full flex flex-col gap-lg">
-      <Heading className="text-left" headingType="h5" as="h2" title="Результат расчета" />
-      <RichText __html='Категории покупок для расчета баллов предварительные.<br />Подробнее по условиям и начислениям можно узнать во вкладке <a href="#docs">документы</a>' />
-      <div className="flex flex-col @xs:flex-row gap-lg">
-        <ResultText text="Баллов в месяц" value={mounth} />
-        <ResultText text="Баллов в год" value={year} />
+export const CashbackCalculatorResult = JSX<CashbackCalculatorResultProps>(
+  ({ cashbacks, maxMonthCashback }) => {
+    const { month, year } = getResult(cashbacks, maxMonthCashback);
+
+    return (
+      <div className="w-full flex flex-col gap-lg">
+        <Heading className="text-left" headingType="h5" as="h2" title="Результат расчета" />
+        <div className="flex flex-col @xs:flex-row gap-lg">
+          <ResultText text="Баллов в месяц" value={month} />
+          <ResultText text="Баллов в год" value={year} />
+        </div>
       </div>
-    </div>
-  );
-});
+    );
+  },
+);
 
-const getResult = (cashbacks: Cashback[]) => {
+const getResult = (cashbacks: Cashback[], maxMonthCashback: number) => {
   return cashbacks.reduce(
     (acc, val) => {
-      const mounthSum = (Number(val.percent.key) / 100) * val.sum;
+      const mounthSum = (formatKey(val.percent.key) / 100) * val.sum;
 
       return {
-        mounth: Math.min(acc.mounth + mounthSum, MAX_MONTH_CASHBACK),
-        year: Math.min(acc.year + mounthSum * 12, MAX_YEAR_CASHBACK),
+        month: Math.min(acc.month + mounthSum, maxMonthCashback),
+        year: Math.min(acc.year + mounthSum * 12, maxMonthCashback * 12),
       };
     },
     {
-      mounth: 0,
+      month: 0,
       year: 0,
     },
   );
 };
+
+const formatKey = (key: string) => Number(key.replace('-main', ''));

package/mobile/src/components/CashbackCalculator/CashbackCategory.tsx

@@ -4,107 +4,88 @@ import { type Picture } from '../../model/Picture';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { type Option } from '../../ui-kit/Select/Option';
 import { Select } from '../../ui-kit/Select/Select';
 import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
-import { type Cashback } from './CashbackCalculatorContent';
-
-const AllPercentCategories: Option[] = [
-  {
-    text: 'Категория 1,5%',
-    key: '1.5',
-  },
-  {
-    text: 'Категория 3%',
-    key: '3',
-  },
-  {
-    text: 'Категория 5%',
-    key: '5',
-  },
-  {
-    text: 'Категория 10%',
-    key: '10',
-  },
-  {
-    text: 'Категория 15%',
-    key: '15',
-  },
-];
-
-const PercentCategoriesWithoutIncreased: Option[] = [
-  {
-    text: 'Категория 1,5%',
-    key: '1.5',
-  },
-  {
-    text: 'Категория 3%',
-    key: '3',
-  },
-];
+import { noop } from '../../utils/noop';
+import { type Cashback } from '../CashbackCalculatorLayout/CashbackCalculatorLayoutContent';
+import { type SelectedCategory } from './CashbackCalculator';
+import { MAIN_CASHBACK_KEY } from './constants';
+import { getPercentCategories } from './getPercentCategories';
 
 export interface CashbackCategoryProps extends UniBlockProps {
   categories?: Option[];
   cashback: Cashback;
-  showIncreasedPercents: boolean;
   maxInputRange: number;
   deleteImage?: Picture;
   onDelete: (id: number) => void;
   onChange: (item: Cashback) => void;
+  isMainCashbackAdded?: boolean;
+  calculatorType?: string;
+  isShowDisclaimer?: boolean;
+  onChangeCategory: (item: (prev: SelectedCategory[]) => any) => void;
 }
 
+const defaultDeleteImage: Picture = {
+  src: 'IconDelete.svg',
+  format: 'webp',
+  alt: 'Иконка кнопки удаления блока кэшбека',
+};
+
 export const CashbackCategory = JSX<CashbackCategoryProps>(
   ({
     categories,
     cashback,
-    showIncreasedPercents,
     maxInputRange,
-    deleteImage,
+    deleteImage = defaultDeleteImage,
+    isMainCashbackAdded = false,
+    calculatorType = 'standard',
     onDelete,
     onChange,
+    isShowDisclaimer = false,
+    onChangeCategory = noop,
   }) => {
     const [currentCategory, setCurrentCategory] = useState(getRandomElement(categories));
-    const isMainCashback = cashback.id === 0;
-    const onChangePercent = (value: Option) => {
-      onChange({
-        ...cashback,
-        percent: value,
-      });
-    };
+    const isMainCashback = cashback.percent.key === MAIN_CASHBACK_KEY[calculatorType];
+
+    const onChangePercent = createChangeHandler(cashback, 'percent', onChange);
+    const onChangeSum = createChangeHandler(cashback, 'sum', onChange);
 
-    const onChangeSum = (value: number) => {
-      onChange({
-        ...cashback,
-        sum: value,
-      });
+    const onChangeCashbackCategory = (value: Option) => {
+      setCurrentCategory(value);
+      onChangeCategory((prev) => updateSelectedCategories(prev, cashback, value));
     };
 
     return (
       <div className="w-full space-y-m">
         <div className="space-y-xs">
-          <Text size="text-m" color="text-primary-text" font="font-light">
+          <Paragraph size="text-m" color="text-primary-text" font="font-light">
             Выберите категорию
-          </Text>
+          </Paragraph>
+          {isShowDisclaimer ? (
+            <Text size="text-s" color="text-primary-text" font="font-light" className="italic">
+              Категории покупок для расчёта баллов предварительные
+            </Text>
+          ) : null}
           <div className="flex gap-m">
             <Select
               className="w-full"
               isManualInput={isMainCashback}
               placeholder="Выберите категорию"
-              options={getPercentCategories(isMainCashback, showIncreasedPercents)}
+              options={getPercentCategories(isMainCashbackAdded, calculatorType)}
               value={cashback.percent}
               onChange={onChangePercent}
             />
-            {!isMainCashback ? (
-              <Button
-                version="secondary"
-                onClick={() => onDelete(cashback.id)}
-                shape="round"
-                className="px-4 rounded-md"
-              >
-                <Img image={deleteImage} />
-              </Button>
-            ) : null}
+            <Button
+              version="secondary"
+              onClick={() => onDelete(cashback.id)}
+              shape="round"
+              className="px-4 rounded-md"
+            >
+              <Img image={deleteImage} />
+            </Button>
           </div>
         </div>
         {categories?.length && !isMainCashback ? (
@@ -113,7 +94,7 @@ export const CashbackCategory = JSX<CashbackCategoryProps>(
             placeholder="Выберите категорию покупок"
             options={categories}
             value={currentCategory}
-            onChange={setCurrentCategory}
+            onChange={onChangeCashbackCategory}
           />
         ) : null}
         <InputRange
@@ -132,12 +113,29 @@ export const CashbackCategory = JSX<CashbackCategoryProps>(
 const getRandomElement = <T,>(arr?: T[]): T | undefined =>
   arr?.[new Date().getTime().toString().slice(-1)];
 
-const getPercentCategories = (isMainCashback: boolean, showIncreasedPercents: boolean) => {
-  if (isMainCashback) {
-    return [];
-  } else if (showIncreasedPercents) {
-    return AllPercentCategories;
-  } else {
-    return PercentCategoriesWithoutIncreased;
+const createChangeHandler =
+  <T, K extends keyof T>(obj: T, field: K, onChange: (value: T) => void) =>
+  (value: T[K]) => {
+    onChange({
+      ...obj,
+      [field]: value,
+    });
+  };
+
+const updateSelectedCategories = (prev: SelectedCategory[], cashback: Cashback, value: Option) => {
+  const newItem = { id: cashback.id, category: value };
+
+  if (prev.length === 0) {
+    return [newItem];
   }
+  const index = prev.findIndex((item) => item.id === cashback.id);
+
+  if (index !== -1) {
+    const updated = [...prev];
+    updated[index] = newItem;
+
+    return updated;
+  }
+
+  return [...prev, newItem];
 };