@redneckz/wildless-cms-uni-blocks 0.14.1006 → 0.14.1012

package/mobile/src/components/CalculatorRko/CalculatorRko.tsx

@@ -110,11 +110,10 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
                 </div>
               ))}
             </div>
-            <div className={style(CalculatorStyle.result)}>{renderFootnote(footnote)}</div>
           </section>
         </CalculatorLayout>
         <BlockWrapper
-          className={style('flex flex-col gap-4xl items-center', className)}
+          className={style('flex flex-col items-center', className)}
           defaultPadding="p-4xl pt-0"
           {...rest}
         >
@@ -128,6 +127,7 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
           ) : (
             <Loader position="static" />
           )}
+          <div className={style(CalculatorStyle.result)}>{renderFootnote(footnote)}</div>
         </BlockWrapper>
       </div>
     );
@@ -135,7 +135,7 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
 );
 
 const renderHeading = () => (
-  <Text size="text-h6" font="font-medium" align="text-center" className="block lg:mb-0 mb-m">
-    Расчеты за один месяц по введенным выше параметрам
+  <Text size="text-h6" font="font-medium" align="text-center" className="block lg:mb-xl mb-m">
+    Расчёты за один месяц по введенным выше параметрам
   </Text>
 );

package/mobile/src/components/DebitForm/DebitFormStatus.tsx

@@ -15,7 +15,7 @@ type DebitFormStatusProps = UniBlockProps &
     isDboClient?: boolean;
   };
 
-const INTERNET_BANK_LINK = 'https://online.rshb.ru/ib6/wf2/retail/ib/loginretaildefault';
+const INTERNET_BANK_LINK = 'https://online.rshb.ru/d?l=dcNqSvOE';
 
 export const DebitFormStatus = JSX<DebitFormStatusProps>(
   ({ title, description: dsc, sectionInfo, buttonText, isDboClient, ...props }) => {
@@ -50,7 +50,7 @@ export const DebitFormStatus = JSX<DebitFormStatusProps>(
             />
             <LinkButton
               href={INTERNET_BANK_LINK}
-              text="Перейти в интернет банк"
+              text="Выпустить карту в приложении"
               version="primary"
               className="w-full mt-lg"
             />

package/mobile/src/components/RkoTariffCardsTable/RkoTariffCard.tsx

@@ -57,7 +57,7 @@ export const RkoTariffCard = JSX(
       <div
         className={style(
           className,
-          'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl',
+          'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl lg:mb-m mb-xl',
           isBest
             ? 'bg-primary-main text-white relative'
             : 'bg-white text-primary-text border border-solid border-gray',

package/mobile/src/components/RkoTariffCardsTable/RkoTariffCardsTable.tsx

@@ -21,10 +21,12 @@ export const RkoTariffCardsTable = JSX(
     const commissionTypes: CommissionKey[] = getSortedCommissionTypes(items) ?? [];
     const columnsCount = commissionTypes.length + 4; // 2 на "Название тарифа" и 2 на кнопку
 
-    const tableLayoutStyle = `lg:grid lg:grid-cols-${String(columnsCount)} gap-m lg:px-xl px-3xl`;
+    const tableLayoutStyle = `lg:grid lg:grid-cols-${String(
+      columnsCount,
+    )} gap-m lg:px-xl px-3xl order-first lg:mb-m mb-xl`;
 
     return (
-      <div className="lg:space-y-m space-y-xl w-full">
+      <div className="w-full flex flex-col mt-s">
         {isMobileMode
           ? null
           : renderRkoTariffsTableHeader({
@@ -33,7 +35,7 @@ export const RkoTariffCardsTable = JSX(
             })}
 
         {items.map((item, index) => (
-          <div key={index}>
+          <div key={index} className={item?.isBest ? 'order-first' : ''}>
             <RkoTariffCard
               {...item}
               className={tableLayoutStyle}

package/mobile/src/components/RkoTariffCardsTable/constants.ts

@@ -1,6 +1,6 @@
 export const RKO_COMMISSIONS_TITLE_MAP: Record<string, string> = {
   tariffName: 'Название тарифа',
-  accountServiceFee: 'Обслуживание счета',
+  accountServiceFee: 'Обслуживание счёта',
   transferLegalCountCommission: 'Переводы Юрлицам и ИП',
   flTransferSumCommission: 'Переводы физлицам',
   cashOutSumCommission: 'Снятие наличных',

package/mobile/src/retail/api/apiBaseUrl.ts

@@ -1,2 +1,3 @@
 export const RETAIL_API_BASE_URI = '/light-api-cash/v1';
-export const NEW_RETAIL_API_BASE_URI = '/api/credit-application';
+export const NEW_RETAIL_CREDIT_API_BASE_URI = '/api/credit-application';
+export const NEW_RETAIL_CREDIT_CARD_API_BASE_URI = '/api/creditcard-application';

package/mobile/src/retail/api/doRequest.ts

@@ -1,5 +1,4 @@
-import { checkNewMicroservice } from '../utils/checkNewMicroservice';
-import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from './apiBaseUrl';
+import { getBaseUrl } from '../utils/getBaseUrl';
 import { getTraceId } from './getTraceId';
 
 export const fetchRetailJSON = async <R>(
@@ -23,24 +22,21 @@ export async function doRequest(
   method: 'POST' | 'GET' | 'PUT',
   body?: any,
 ): Promise<Response> {
-  const isNewMicroservice = checkNewMicroservice();
+  const baseUrl = getBaseUrl();
   const traceId = getTraceId();
 
-  return globalThis?.fetch?.(
-    `${isNewMicroservice ? NEW_RETAIL_API_BASE_URI : RETAIL_API_BASE_URI}${url}`,
-    {
-      method,
-      headers: {
-        'Content-Type': 'application/json',
-        'X-B3-Sampled': '1',
-        'X-B3-Spanid': traceId,
-        'X-B3-Traceid': traceId,
-        ...getAuthorizationHeaders(),
-      },
-      credentials: 'include',
-      body: body ? JSON.stringify(body) : null,
+  return globalThis?.fetch?.(`${baseUrl}${url}`, {
+    method,
+    headers: {
+      'Content-Type': 'application/json',
+      'X-B3-Sampled': '1',
+      'X-B3-Spanid': traceId,
+      'X-B3-Traceid': traceId,
+      ...getAuthorizationHeaders(),
     },
-  );
+    credentials: 'include',
+    body: body ? JSON.stringify(body) : null,
+  });
 }
 
 export const getAuthorizationHeaders = () => {

package/mobile/src/retail/components/Fields/CodeWordField.tsx

@@ -1,12 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
+import { codeWordPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Кодовое слово"
-    maxLength={20}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      const translatedValue = autoLayoutKeyboard(value);
+      if (codeWordPattern.test(translatedValue) || translatedValue.length === 0) {
+        field(input?.name ?? '')?.onChange?.(translatedValue);
+      }
+    },
+    [field, input],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Кодовое слово"
+      maxLength={20}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/mobile/src/retail/hooks/useLeadFormData.ts

@@ -1,8 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON';
-import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from '../api/apiBaseUrl';
 import { type DictionaryItem } from '../model/LeadFormData';
 import { checkNewMicroservice } from '../utils/checkNewMicroservice';
+import { getBaseUrl } from '../utils/getBaseUrl';
 
 type ErrorProps = {
   errorMessage?: string;
@@ -10,10 +10,11 @@ type ErrorProps = {
 
 export const useLeadFormData = (typeField: string) => {
   const isNewMicroservice = checkNewMicroservice();
+  const baseUrl = getBaseUrl();
 
   const { data, error } = useAsyncData(
-    `${
-      isNewMicroservice ? `${NEW_RETAIL_API_BASE_URI}/public-data` : RETAIL_API_BASE_URI
+    `${baseUrl}${
+      isNewMicroservice ? `/public-data` : ''
     }/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );

package/mobile/src/retail/utils/getBaseUrl.ts

@@ -0,0 +1,17 @@
+import {
+  NEW_RETAIL_CREDIT_API_BASE_URI,
+  NEW_RETAIL_CREDIT_CARD_API_BASE_URI,
+  RETAIL_API_BASE_URI,
+} from '../api/apiBaseUrl';
+
+export const getBaseUrl = () => {
+  const isNewMicroservice = globalThis.sessionStorage?.getItem('isNewMicroservice');
+  const productType = globalThis.localStorage?.getItem('productType');
+
+  const newRetailApi =
+    productType === '"credit"'
+      ? NEW_RETAIL_CREDIT_API_BASE_URI
+      : NEW_RETAIL_CREDIT_CARD_API_BASE_URI;
+
+  return isNewMicroservice ? newRetailApi : RETAIL_API_BASE_URI;
+};

package/mobile/src/retail/validator/validators.ts

@@ -12,7 +12,7 @@ export interface LimitedBirthdayValidationParams {
   errorMessage: string;
 }
 
-const codeWordPattern = /^[0-9а-яё]*$/i;
+export const codeWordPattern = /^[а-яёА-ЯЁ\d]+$/u;
 export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
 export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.1006",
+  "version": "0.14.1012",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1743,13 +1743,12 @@
               { "name": "university", "required": true },
               { "name": "fieldOfStudy", "required": true },
               { "name": "courseYear", "required": true },
-              { "name": "graduationYear", "required": true },
-              { "name": "averageGrade", "required": true },
-              { "name": "educationLevel", "required": true }
+              { "name": "graduationYear", "required": true }
             ]
           },
           {
             "inputs": [
+              { "name": "educationLevel", "required": true },
               {
                 "name": "skillsAndKnowledge",
                 "placeholder": "Навыки и знания. Что умеете делать?",

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -1058,12 +1058,11 @@ export default {
               { name: 'fieldOfStudy', required: true },
               { name: 'courseYear', required: true },
               { name: 'graduationYear', required: true },
-              { name: 'averageGrade', required: true },
-              { name: 'educationLevel', required: true },
             ],
           },
           {
             inputs: [
+              { name: 'educationLevel', required: true },
               {
                 name: 'skillsAndKnowledge',
                 placeholder: 'Навыки и знания. Что умеете делать?',

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -39,6 +39,21 @@ export default {
     </div>
   ),
 
+  newMicroserviceCC: (
+    <div className="container grid grid-cols-12">
+      <ApplicationLeadForm
+        className="col-span-12"
+        title="Заявка на кредит"
+        programId="13"
+        productType="creditCard"
+        button={button}
+        isNewMicroservice={true}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+
   creditCard: (
     <div className="container grid grid-cols-12">
       <ApplicationLeadForm

package/src/components/CalculatorRko/CalculatorRko.tsx

@@ -110,11 +110,10 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
                 </div>
               ))}
             </div>
-            <div className={style(CalculatorStyle.result)}>{renderFootnote(footnote)}</div>
           </section>
         </CalculatorLayout>
         <BlockWrapper
-          className={style('flex flex-col gap-4xl items-center', className)}
+          className={style('flex flex-col items-center', className)}
           defaultPadding="p-4xl pt-0"
           {...rest}
         >
@@ -128,6 +127,7 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
           ) : (
             <Loader position="static" />
           )}
+          <div className={style(CalculatorStyle.result)}>{renderFootnote(footnote)}</div>
         </BlockWrapper>
       </div>
     );
@@ -135,7 +135,7 @@ export const CalculatorRko = UniBlock<RkoCalculatorProps>(
 );
 
 const renderHeading = () => (
-  <Text size="text-h6" font="font-medium" align="text-center" className="block lg:mb-0 mb-m">
-    Расчеты за один месяц по введенным выше параметрам
+  <Text size="text-h6" font="font-medium" align="text-center" className="block lg:mb-xl mb-m">
+    Расчёты за один месяц по введенным выше параметрам
   </Text>
 );

package/src/components/DebitForm/DebitFormStatus.tsx

@@ -15,7 +15,7 @@ type DebitFormStatusProps = UniBlockProps &
     isDboClient?: boolean;
   };
 
-const INTERNET_BANK_LINK = 'https://online.rshb.ru/ib6/wf2/retail/ib/loginretaildefault';
+const INTERNET_BANK_LINK = 'https://online.rshb.ru/d?l=dcNqSvOE';
 
 export const DebitFormStatus = JSX<DebitFormStatusProps>(
   ({ title, description: dsc, sectionInfo, buttonText, isDboClient, ...props }) => {
@@ -50,7 +50,7 @@ export const DebitFormStatus = JSX<DebitFormStatusProps>(
             />
             <LinkButton
               href={INTERNET_BANK_LINK}
-              text="Перейти в интернет банк"
+              text="Выпустить карту в приложении"
               version="primary"
               className="w-full mt-lg"
             />

package/src/components/RkoTariffCardsTable/RkoTariffCard.tsx

@@ -57,7 +57,7 @@ export const RkoTariffCard = JSX(
       <div
         className={style(
           className,
-          'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl',
+          'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl lg:mb-m mb-xl',
           isBest
             ? 'bg-primary-main text-white relative'
             : 'bg-white text-primary-text border border-solid border-gray',

package/src/components/RkoTariffCardsTable/RkoTariffCardsTable.tsx

@@ -21,10 +21,12 @@ export const RkoTariffCardsTable = JSX(
     const commissionTypes: CommissionKey[] = getSortedCommissionTypes(items) ?? [];
     const columnsCount = commissionTypes.length + 4; // 2 на "Название тарифа" и 2 на кнопку
 
-    const tableLayoutStyle = `lg:grid lg:grid-cols-${String(columnsCount)} gap-m lg:px-xl px-3xl`;
+    const tableLayoutStyle = `lg:grid lg:grid-cols-${String(
+      columnsCount,
+    )} gap-m lg:px-xl px-3xl order-first lg:mb-m mb-xl`;
 
     return (
-      <div className="lg:space-y-m space-y-xl w-full">
+      <div className="w-full flex flex-col mt-s">
         {isMobileMode
           ? null
           : renderRkoTariffsTableHeader({
@@ -33,7 +35,7 @@ export const RkoTariffCardsTable = JSX(
             })}
 
         {items.map((item, index) => (
-          <div key={index}>
+          <div key={index} className={item?.isBest ? 'order-first' : ''}>
             <RkoTariffCard
               {...item}
               className={tableLayoutStyle}

package/src/components/RkoTariffCardsTable/constants.ts

@@ -1,6 +1,6 @@
 export const RKO_COMMISSIONS_TITLE_MAP: Record<string, string> = {
   tariffName: 'Название тарифа',
-  accountServiceFee: 'Обслуживание счета',
+  accountServiceFee: 'Обслуживание счёта',
   transferLegalCountCommission: 'Переводы Юрлицам и ИП',
   flTransferSumCommission: 'Переводы физлицам',
   cashOutSumCommission: 'Снятие наличных',

package/src/retail/api/apiBaseUrl.ts

@@ -1,2 +1,3 @@
 export const RETAIL_API_BASE_URI = '/light-api-cash/v1';
-export const NEW_RETAIL_API_BASE_URI = '/api/credit-application';
+export const NEW_RETAIL_CREDIT_API_BASE_URI = '/api/credit-application';
+export const NEW_RETAIL_CREDIT_CARD_API_BASE_URI = '/api/creditcard-application';

package/src/retail/api/doRequest.ts

@@ -1,5 +1,4 @@
-import { checkNewMicroservice } from '../utils/checkNewMicroservice';
-import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from './apiBaseUrl';
+import { getBaseUrl } from '../utils/getBaseUrl';
 import { getTraceId } from './getTraceId';
 
 export const fetchRetailJSON = async <R>(
@@ -23,24 +22,21 @@ export async function doRequest(
   method: 'POST' | 'GET' | 'PUT',
   body?: any,
 ): Promise<Response> {
-  const isNewMicroservice = checkNewMicroservice();
+  const baseUrl = getBaseUrl();
   const traceId = getTraceId();
 
-  return globalThis?.fetch?.(
-    `${isNewMicroservice ? NEW_RETAIL_API_BASE_URI : RETAIL_API_BASE_URI}${url}`,
-    {
-      method,
-      headers: {
-        'Content-Type': 'application/json',
-        'X-B3-Sampled': '1',
-        'X-B3-Spanid': traceId,
-        'X-B3-Traceid': traceId,
-        ...getAuthorizationHeaders(),
-      },
-      credentials: 'include',
-      body: body ? JSON.stringify(body) : null,
+  return globalThis?.fetch?.(`${baseUrl}${url}`, {
+    method,
+    headers: {
+      'Content-Type': 'application/json',
+      'X-B3-Sampled': '1',
+      'X-B3-Spanid': traceId,
+      'X-B3-Traceid': traceId,
+      ...getAuthorizationHeaders(),
     },
-  );
+    credentials: 'include',
+    body: body ? JSON.stringify(body) : null,
+  });
 }
 
 export const getAuthorizationHeaders = () => {

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

@@ -1,12 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
+import { codeWordPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Кодовое слово"
-    maxLength={20}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      const translatedValue = autoLayoutKeyboard(value);
+      if (codeWordPattern.test(translatedValue) || translatedValue.length === 0) {
+        field(input?.name ?? '')?.onChange?.(translatedValue);
+      }
+    },
+    [field, input],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Кодовое слово"
+      maxLength={20}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/hooks/useLeadFormData.ts

@@ -1,8 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON';
-import { NEW_RETAIL_API_BASE_URI, RETAIL_API_BASE_URI } from '../api/apiBaseUrl';
 import { type DictionaryItem } from '../model/LeadFormData';
 import { checkNewMicroservice } from '../utils/checkNewMicroservice';
+import { getBaseUrl } from '../utils/getBaseUrl';
 
 type ErrorProps = {
   errorMessage?: string;
@@ -10,10 +10,11 @@ type ErrorProps = {
 
 export const useLeadFormData = (typeField: string) => {
   const isNewMicroservice = checkNewMicroservice();
+  const baseUrl = getBaseUrl();
 
   const { data, error } = useAsyncData(
-    `${
-      isNewMicroservice ? `${NEW_RETAIL_API_BASE_URI}/public-data` : RETAIL_API_BASE_URI
+    `${baseUrl}${
+      isNewMicroservice ? `/public-data` : ''
     }/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );

package/src/retail/utils/getBaseUrl.ts

@@ -0,0 +1,17 @@
+import {
+  NEW_RETAIL_CREDIT_API_BASE_URI,
+  NEW_RETAIL_CREDIT_CARD_API_BASE_URI,
+  RETAIL_API_BASE_URI,
+} from '../api/apiBaseUrl';
+
+export const getBaseUrl = () => {
+  const isNewMicroservice = globalThis.sessionStorage?.getItem('isNewMicroservice');
+  const productType = globalThis.localStorage?.getItem('productType');
+
+  const newRetailApi =
+    productType === '"credit"'
+      ? NEW_RETAIL_CREDIT_API_BASE_URI
+      : NEW_RETAIL_CREDIT_CARD_API_BASE_URI;
+
+  return isNewMicroservice ? newRetailApi : RETAIL_API_BASE_URI;
+};

package/src/retail/validator/validators.ts

@@ -12,7 +12,7 @@ export interface LimitedBirthdayValidationParams {
   errorMessage: string;
 }
 
-const codeWordPattern = /^[0-9а-яё]*$/i;
+export const codeWordPattern = /^[а-яёА-ЯЁ\d]+$/u;
 export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
 export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;