@redneckz/wildless-cms-uni-blocks 0.14.1039 → 0.14.1041

package/src/components/ReferalForm/ReferalForm.fixture.tsx

@@ -15,6 +15,8 @@ export default {
     <div className="container grid grid-cols-12">
       <ReferalForm
         link="https://www.rshb.ru/business/dlya-druga/rko"
+        description="Заполните ваши данные и получите персональную ссылку"
+        title="Как получить бесплатное обслуживание счёта"
         button={{ text: 'Получить ссылку' }}
         copyIcon={icon}
       />

package/src/components/ReferalForm/ReferalForm.tsx

@@ -2,7 +2,9 @@ import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { SubmitButton } from '../../ui-kit/Button/SubmitButton';
+import { getField } from '../../ui-kit/FormField/getField';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { Link } from '../../ui-kit/Link/Link';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { type Option } from '../../ui-kit/Select/Option';
@@ -11,8 +13,7 @@ import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
 import { type ReferalFormContent } from './ReferalFormContent';
-import { sections } from './referalFormData';
-import { renderSections } from './renderSections';
+import { inputs } from './referalFormData';
 import { ResultLink } from './ResultLink';
 
 export interface FormState {
@@ -23,13 +24,9 @@ export interface FormState {
 export interface ReferalFormProps extends ReferalFormContent, UniBlockProps {}
 
 export const ReferalForm = UniBlock<ReferalFormProps>(
-  ({ link = '', button, copyIcon, ...rest }) => {
+  ({ title, description, link = '', button, copyIcon, ...rest }) => {
     const [isShowResultLink, setIsShowResultLink] = useState(false);
     const [referalLink, setReferalLink] = useState('');
-    const inputs = useMemo(
-      () => (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[],
-      [sections],
-    );
 
     const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
 
@@ -52,14 +49,17 @@ export const ReferalForm = UniBlock<ReferalFormProps>(
     return (
       <ApplicationFormLayout
         className="container space-y-m col-span-12"
-        title={getTitle(isShowResultLink)}
+        title={getTitle(title, isShowResultLink)}
         {...rest}
       >
         {isShowResultLink ? (
           <ResultLink link={referalLink} copyIcon={copyIcon} />
         ) : (
           <form onSubmit={onSubmit}>
-            {renderSections(sections, field)}
+            <div className="grid @xl:grid-cols-2 gap-x-m">
+              {renderTitle(description)}
+              {inputs.map(getField<FieldDef>(field))}
+            </div>
             <Paragraph size="text-l" font="font-light" color="text-secondary-text">
               <Text>Нажимая кнопку, вы подтверждаете согласие с </Text>
               <Link href="/privacy-policy" target="_blank" ariaLabel="условия передачи данных">
@@ -76,5 +76,5 @@ export const ReferalForm = UniBlock<ReferalFormProps>(
   },
 );
 
-const getTitle = (isShowResultLink = false) =>
-  isShowResultLink ? 'Ваша личная ссылка' : 'Как получить бесплатное обслуживание счёта';
+const getTitle = (title = '', isShowResultLink = false) =>
+  isShowResultLink ? 'Ваша личная ссылка' : title;

package/src/components/ReferalForm/ReferalFormContent.ts

@@ -1,15 +1,17 @@
-import { type TextProps } from '../../model/HeadlineType';
+import { type DescriptionProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type Picture } from '../../model/Picture';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Форма для создания реферальной ссылки
  */
-export type ReferalFormContent = UniBlockContent & {
-  /** @title Адрес страницы с заявкой для реферала */
-  link?: string;
-  /** @title Кнопка */
-  button?: TextProps;
-  /** @title Иконка кнопки копирования */
-  copyIcon?: Picture;
-};
+export type ReferalFormContent = UniBlockContent &
+  TitleProps &
+  DescriptionProps & {
+    /** @title Адрес страницы с заявкой для реферала */
+    link?: string;
+    /** @title Кнопка */
+    button?: TextProps;
+    /** @title Иконка кнопки копирования */
+    copyIcon?: Picture;
+  };

package/src/components/ReferalForm/referalFormData.ts

@@ -1,18 +1,12 @@
-import { type SectionsProps } from '../../model/InputSectionsType';
+import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
 
-export const sections: SectionsProps[] = [
-  { title: 'Заполните ваши данные и получите персональную ссылку', inputs: [] },
+export const inputs: FieldDef[] = [
   {
-    columns: 2,
-    inputs: [
-      {
-        name: 'dadataPartyInnSelect',
-        required: true,
-      },
-      {
-        name: 'email',
-        required: true,
-      },
-    ],
+    name: 'dadataPartyInnSelect',
+    required: true,
+  },
+  {
+    name: 'email',
+    required: true,
   },
 ];

package/src/components/ReferalForm/renderLinkInput.tsx

@@ -10,6 +10,10 @@ type renderLinkInputProps = InputProps & {
   copyIcon?: Picture;
 };
 
+const defaultIcon: Picture = {
+  icon: 'CopyIcon',
+};
+
 export const renderLinkInput = JSX<renderLinkInputProps>(({ className, value = '', copyIcon }) => {
   const onClick = useCallback(async () => {
     try {
@@ -28,7 +32,7 @@ export const renderLinkInput = JSX<renderLinkInputProps>(({ className, value = '
         disabled={true}
       />
       <div role="button" className="absolute right-3" onClick={onClick}>
-        <Img image={copyIcon} />
+        <Img image={copyIcon ?? defaultIcon} width="20px" />
       </div>
     </div>
   );

package/src/retail/api/getTaskById.ts

@@ -1,12 +1,17 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 import { type Task } from './draftTasksKZO';
 
 type GetTaskByIdBody = {
-  taskId: number;
+  taskId: string | number;
 };
 
 export const getTaskById = async (body: GetTaskByIdBody): Promise<Task | undefined> => {
-  const res = await fetchRetailJSON<Task>('/user-data/getTaskById', 'POST', body);
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice ? '/public-data/getTaskById' : '/user-data/getTaskById';
+
+  const res = await fetchRetailJSON<Task>(endpoint, 'POST', body);
 
   return res || undefined;
 };

package/src/retail/components/DraftDialog/utils.ts

@@ -130,23 +130,25 @@ export const getSelectValue = (
 };
 
 export const getProductData = (taskType?: DraftTaskType) => {
-  if (taskType === 'debit') {
-    return {
-      nextStepLink: '/debit-card-lead',
-      newTaskLink: '/natural/debetcards',
-      description: 'На дебетовую карту',
-    };
-  } else if (taskType === 'credit') {
-    return {
-      nextStepLink: '/credit-lead',
-      newTaskLink: '/natural/loans/all-goals',
-      description: 'На получение кредита',
-    };
+  switch (taskType) {
+    case 'debit':
+      return {
+        nextStepLink: '/debit-card-lead',
+        newTaskLink: '/natural/debetcards',
+        description: 'На дебетовую карту',
+      };
+    case 'credit':
+      return {
+        nextStepLink: '/credit-lead',
+        newTaskLink: '/natural/loans/all-goals',
+        description: 'На получение кредита',
+      };
+    case 'card':
+    default:
+      return {
+        nextStepLink: '/credit-card-lead',
+        newTaskLink: '/natural/creditcards/svoya',
+        description: 'На получение кредитной карты',
+      };
   }
-
-  return {
-    nextStepLink: '/credit-card-lead',
-    newTaskLink: '/natural/creditcards/svoya',
-    description: 'На получение кредитной карты',
-  };
 };

package/src/retail/utils/productTypeToTaskType.ts

@@ -0,0 +1,13 @@
+import { type ProductType } from '../model/ApplicationLeadFormTypes';
+import { type DraftTaskType } from '../model/DraftTaskType';
+
+export const productTypeToTaskType = (productType: ProductType): DraftTaskType => {
+  if (productType === 'debitCard') {
+    return 'debit';
+  }
+  if (productType === 'creditCard') {
+    return 'card';
+  }
+
+  return 'credit';
+};

package/bundle/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/dist/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/dist/components/ReferalForm/renderSections.js

@@ -1,10 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSections = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const getField_1 = require("../../ui-kit/FormField/getField");
-const inputColumnStyle_1 = require("../../ui-kit/FormField/inputColumnStyle");
-const renderTitle_1 = require("../../ui-kit/FormField/renderTitle");
-const style_1 = require("../../utils/style");
-const renderSections = (sections, field) => sections.map((_, i) => ((0, jsx_runtime_1.jsxs)("div", { className: (0, style_1.style)((0, inputColumnStyle_1.inputColumnStyles)(_.columns), 'grid'), children: [(0, renderTitle_1.renderTitle)(_.title), (_?.inputs || [])?.map((0, getField_1.getField)(field))] }, `section-${i}`)));
-exports.renderSections = renderSections;
-//# sourceMappingURL=renderSections.js.map

package/dist/components/ReferalForm/renderSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderSections.js","sourceRoot":"","sources":["../../../src/components/ReferalForm/renderSections.tsx"],"names":[],"mappings":";;;AAEA,8DAA2D;AAC3D,8EAA4E;AAC5E,oEAAiE;AACjE,6CAA0C;AAGnC,MAAM,cAAc,GAAG,CAC5B,QAAyB,EACzB,KAA+C,EAC/C,EAAE,CACF,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,iCAA0B,SAAS,EAAE,IAAA,aAAK,EAAC,IAAA,oCAAiB,EAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAC7E,IAAA,yBAAW,EAAC,CAAC,CAAC,KAAK,CAAC,EACpB,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAA,mBAAQ,EAAW,KAAK,CAAC,CAAC,KAF1C,WAAW,CAAC,EAAE,CAGlB,CACP,CAAC,CAAC;AATQ,QAAA,cAAc,kBAStB"}

package/lib/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/lib/components/ReferalForm/renderSections.js

@@ -1,7 +0,0 @@
-import { jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
-import { getField } from '../../ui-kit/FormField/getField.js';
-import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle.js';
-import { renderTitle } from '../../ui-kit/FormField/renderTitle.js';
-import { style } from '../../utils/style.js';
-export const renderSections = (sections, field) => sections.map((_, i) => (_jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field))] }, `section-${i}`)));
-//# sourceMappingURL=renderSections.js.map

package/lib/components/ReferalForm/renderSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderSections.js","sourceRoot":"","sources":["../../../src/components/ReferalForm/renderSections.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAyB,EACzB,KAA+C,EAC/C,EAAE,CACF,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,eAA0B,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAC7E,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,EACpB,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAW,KAAK,CAAC,CAAC,KAF1C,WAAW,CAAC,EAAE,CAGlB,CACP,CAAC,CAAC"}

package/mobile/bundle/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/mobile/dist/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/mobile/dist/components/ReferalForm/renderSections.js

@@ -1,10 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSections = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const getField_1 = require("../../ui-kit/FormField/getField");
-const inputColumnStyle_1 = require("../../ui-kit/FormField/inputColumnStyle");
-const renderTitle_1 = require("../../ui-kit/FormField/renderTitle");
-const style_1 = require("../../utils/style");
-const renderSections = (sections, field) => sections.map((_, i) => ((0, jsx_runtime_1.jsxs)("div", { className: (0, style_1.style)((0, inputColumnStyle_1.inputColumnStyles)(_.columns), 'grid'), children: [(0, renderTitle_1.renderTitle)(_.title), (_?.inputs || [])?.map((0, getField_1.getField)(field))] }, `section-${i}`)));
-exports.renderSections = renderSections;
-//# sourceMappingURL=renderSections.js.map

package/mobile/dist/components/ReferalForm/renderSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderSections.js","sourceRoot":"","sources":["../../../src/components/ReferalForm/renderSections.tsx"],"names":[],"mappings":";;;AAEA,8DAA2D;AAC3D,8EAA4E;AAC5E,oEAAiE;AACjE,6CAA0C;AAGnC,MAAM,cAAc,GAAG,CAC5B,QAAyB,EACzB,KAA+C,EAC/C,EAAE,CACF,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,iCAA0B,SAAS,EAAE,IAAA,aAAK,EAAC,IAAA,oCAAiB,EAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAC7E,IAAA,yBAAW,EAAC,CAAC,CAAC,KAAK,CAAC,EACpB,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAA,mBAAQ,EAAW,KAAK,CAAC,CAAC,KAF1C,WAAW,CAAC,EAAE,CAGlB,CACP,CAAC,CAAC;AATQ,QAAA,cAAc,kBAStB"}

package/mobile/lib/components/ReferalForm/renderSections.d.ts

@@ -1,3 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-export declare const renderSections: (sections: SectionsProps[], field: FormFieldRegisterer<Record<string, any>>) => any[];

package/mobile/lib/components/ReferalForm/renderSections.js

@@ -1,7 +0,0 @@
-import { jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
-import { getField } from '../../ui-kit/FormField/getField.js';
-import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle.js';
-import { renderTitle } from '../../ui-kit/FormField/renderTitle.js';
-import { style } from '../../utils/style.js';
-export const renderSections = (sections, field) => sections.map((_, i) => (_jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field))] }, `section-${i}`)));
-//# sourceMappingURL=renderSections.js.map

package/mobile/lib/components/ReferalForm/renderSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderSections.js","sourceRoot":"","sources":["../../../src/components/ReferalForm/renderSections.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAyB,EACzB,KAA+C,EAC/C,EAAE,CACF,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,eAA0B,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAC7E,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,EACpB,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAW,KAAK,CAAC,CAAC,KAF1C,WAAW,CAAC,EAAE,CAGlB,CACP,CAAC,CAAC"}

package/mobile/src/components/ReferalForm/renderSections.tsx

@@ -1,18 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-import { getField } from '../../ui-kit/FormField/getField';
-import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
-import { renderTitle } from '../../ui-kit/FormField/renderTitle';
-import { style } from '../../utils/style';
-import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
-
-export const renderSections = (
-  sections: SectionsProps[],
-  field: FormFieldRegisterer<Record<string, any>>,
-) =>
-  sections.map((_, i) => (
-    <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid')}>
-      {renderTitle(_.title)}
-      {(_?.inputs || [])?.map(getField<FieldDef>(field))}
-    </div>
-  ));

package/src/components/ReferalForm/renderSections.tsx

@@ -1,18 +0,0 @@
-import type { FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import type { SectionsProps } from '../../model/InputSectionsType';
-import { getField } from '../../ui-kit/FormField/getField';
-import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
-import { renderTitle } from '../../ui-kit/FormField/renderTitle';
-import { style } from '../../utils/style';
-import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
-
-export const renderSections = (
-  sections: SectionsProps[],
-  field: FormFieldRegisterer<Record<string, any>>,
-) =>
-  sections.map((_, i) => (
-    <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid')}>
-      {renderTitle(_.title)}
-      {(_?.inputs || [])?.map(getField<FieldDef>(field))}
-    </div>
-  ));