@redneckz/wildless-cms-uni-blocks 0.8.19 → 0.8.21

package/src/components/Calculator/rangeHelpers.ts

@@ -21,4 +21,4 @@ export const checkRangeByKeys = <
   value: number,
   [minKey, maxKey]: [MinKey, MaxKey],
   sourceBookRow: T,
-): boolean => value >= sourceBookRow[minKey] && value < sourceBookRow[maxKey];
+): boolean => value >= sourceBookRow[minKey] && value <= sourceBookRow[maxKey];

package/src/components/Calculator/renderInterestPayment.tsx

@@ -1,3 +1,4 @@
+import { ListOrientation } from '../../model/ListOrientation';
 import { RadioButtonGroup } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
 import { Text } from '../../ui-kit/Text/Text';
 
@@ -15,21 +16,32 @@ const depositTypeItems = [
   },
 ];
 
-export function renderInterestPayment(
-  isMonthlyInterestPayment: boolean,
-  callback?: (value: boolean) => void,
-  title?: string,
-) {
+interface InterestPaymentProps {
+  isMonthlyInterestPayment: boolean;
+  callback?: (value: boolean) => void;
+  title?: string;
+  orientation?: ListOrientation;
+}
+
+export function renderInterestPayment({
+  isMonthlyInterestPayment,
+  callback,
+  title,
+  orientation = 'horizontal',
+}: InterestPaymentProps) {
   return (
     <div>
       {title ? (
-        <Text color="text-secondary-text" font="font-light">
-          {title}
-        </Text>
+        <div className="mb-3">
+          <Text color="text-secondary-text" font="font-light">
+            {title}
+          </Text>
+        </div>
       ) : null}
 
-      <div className="mt-3">
+      <div>
         <RadioButtonGroup
+          orientation={orientation}
           items={depositTypeItems}
           checkedItem={isMonthlyInterestPayment ? EVERY_MONTH : AT_END_TERM}
           onChange={(text: string) => callback && callback(text === EVERY_MONTH)}

package/src/components/Calculator/renderPaymentType.tsx

@@ -0,0 +1,49 @@
+import { ListOrientation } from '../../model/ListOrientation';
+import { RadioButtonGroup } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import { Text } from '../../ui-kit/Text/Text';
+
+export const ANNUITY = 'annuity';
+export const DIFFERENTIAL = 'differential';
+
+const paymentTypeItems = [
+  {
+    id: ANNUITY,
+    text: 'Аннуитетный',
+  },
+  {
+    id: DIFFERENTIAL,
+    text: 'Дифференцированный',
+  },
+];
+
+interface PaymentTypeProps {
+  isAnnuity: boolean;
+  callback?: (value: boolean) => void;
+  title?: string;
+  orientation?: ListOrientation;
+}
+
+export function renderPaymentType({
+  isAnnuity,
+  callback,
+  title,
+  orientation = 'horizontal',
+}: PaymentTypeProps) {
+  return (
+    <div>
+      {title ? (
+        <div className="mb-3">
+          <Text color="text-secondary-text" font="font-light">
+            {title}
+          </Text>
+        </div>
+      ) : null}
+      <RadioButtonGroup
+        orientation={orientation}
+        items={paymentTypeItems}
+        checkedItem={isAnnuity ? ANNUITY : DIFFERENTIAL}
+        onChange={(text: string) => callback && callback(text === ANNUITY)}
+      />
+    </div>
+  );
+}

package/src/components/Calculator/renderRegistrationType.tsx

@@ -0,0 +1,51 @@
+import { ListOrientation } from '../../model/ListOrientation';
+import { RadioButtonGroup } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import { Text } from '../../ui-kit/Text/Text';
+
+const REMOTE_REGISTRATION = 'remote';
+const OFFICE_REGISTRATION = 'office';
+
+const registrationTypeItems = [
+  {
+    id: OFFICE_REGISTRATION,
+    text: 'Офис Банка',
+  },
+  {
+    id: REMOTE_REGISTRATION,
+    text: 'Дистанционно',
+  },
+];
+
+interface RegistrationTypeProps {
+  isRemoteRegistration: boolean;
+  callback?: (value: boolean) => void;
+  title?: string;
+  orientation?: ListOrientation;
+}
+
+export function renderRegistrationType({
+  isRemoteRegistration,
+  callback,
+  title,
+  orientation = 'horizontal',
+}: RegistrationTypeProps) {
+  return (
+    <div>
+      {title ? (
+        <div className="mb-3">
+          <Text color="text-secondary-text" font="font-light">
+            {title}
+          </Text>
+        </div>
+      ) : null}
+      <div>
+        <RadioButtonGroup
+          orientation={orientation}
+          items={registrationTypeItems}
+          checkedItem={isRemoteRegistration ? REMOTE_REGISTRATION : OFFICE_REGISTRATION}
+          onChange={(text: string) => callback && callback(text === REMOTE_REGISTRATION)}
+        />
+      </div>
+    </div>
+  );
+}

package/src/components/Calculator/useBusinessDepositCalculatorParams.ts

@@ -7,9 +7,9 @@ import {
 } from './constants';
 import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
-import type { CommonDepositParams } from './useDepositCalculatorParams';
 
-export interface BusinessCommonDepositParams extends CommonDepositParams {
+export interface BusinessCommonDepositParams {
+  isMonthlyInterestPayment: boolean;
   isReplenished: boolean;
   isPartialWithdrawal: boolean;
   isSmallBusiness: boolean;
@@ -34,6 +34,7 @@ export interface BusinessDepositCalculatorParams
   income?: number;
   finalSum?: number;
   isDisabledOperatingDeposit?: boolean;
+  isShowUnknownRate?: boolean;
 }
 
 export type BusinessDepositCalculatorData = {
@@ -65,7 +66,7 @@ export const useBusinessDepositCalculatorParams = (
       ...DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS,
       ...userInputParams,
       isDisabledOperatingDeposit,
-      rate: 0,
+      isShowUnknownRate: true,
     };
   }
   const businessDepositCalculatorSourceBookParams =

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -13,9 +13,7 @@ export interface CreditCalculatorSourceBookParams extends CommonCreditParams {
   maxSum: number;
   minMonths: number;
   maxMonths: number;
-  rateBottomRange: number;
-  rateTopRange: number;
-  sumBorder: number;
+  rate: number;
 }
 
 export interface CreditCalculatorUserInputParams extends CommonCreditParams {
@@ -28,7 +26,6 @@ export interface CreditCalculatorParams
   extends CreditCalculatorSourceBookParams,
     CreditCalculatorUserInputParams {
   monthlyPayment: number;
-  finalRate: number;
 }
 
 export type CreditCalculatorData = {
@@ -53,9 +50,8 @@ export const useCreditCalculatorParams = (
       );
     }) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
-  const { rateBottomRange, rateTopRange, sumBorder } = creditCalculatorSourceBookParams;
-  const finalRate = moneyValue <= sumBorder ? rateBottomRange : rateTopRange;
-  const monthlyPayment = getMonthlyPayment(finalRate, userInputParams);
+  const { rate } = creditCalculatorSourceBookParams;
+  const monthlyPayment = getMonthlyPayment(rate, userInputParams);
   const sourceBookRows = data?.rows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
 
   return {
@@ -63,7 +59,6 @@ export const useCreditCalculatorParams = (
     ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
     ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
     ...userInputParams,
-    finalRate,
     monthlyPayment,
   };
 };

package/src/components/Calculator/useDepositCalculatorParams.ts

@@ -4,6 +4,7 @@ import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonDepositParams {
   isMonthlyInterestPayment: boolean;
+  isRemoteRegistration: boolean;
 }
 
 export interface DepositCalculatorSourceBookParams extends CommonDepositParams {
@@ -34,7 +35,8 @@ export const useDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
   sourceBookDir?: string,
 ): DepositCalculatorParams => {
-  const { isMonthlyInterestPayment, moneyValue, monthsValue } = userInputParams;
+  const { isMonthlyInterestPayment, isRemoteRegistration, moneyValue, monthsValue } =
+    userInputParams;
 
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
@@ -44,12 +46,12 @@ export const useDepositCalculatorParams = (
     data?.rows?.find(
       (_) =>
         isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
+        isRemoteRegistration === _.isRemoteRegistration &&
         checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
         checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _),
     ) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
 
   const { rate } = depositCalculatorSourceBookParams;
-
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
   const sourceBookRows = data?.rows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];

package/src/components/Footer/Contacts.tsx

@@ -15,7 +15,7 @@ export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton }
       <Button
         version="primary"
         className="mb-6 w-full"
-        href="/"
+        href="https://www.rshb.ru/feedback/question/"
         target="_blank"
         ariaLabel="Обратная связь"
         text="Обратная связь"

package/src/components/Footer/Sitemap.tsx

@@ -5,6 +5,7 @@ import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
 import type { SitemapDataProps, TopMenuItem } from '../../services/sitemap/SitemapProps';
 import { useSWRResource } from '../../services/sitemap/useSWRResource';
+import { joinPath } from '../../utils/url';
 
 export interface SitemapProps {
   className?: string;
@@ -12,7 +13,7 @@ export interface SitemapProps {
 }
 
 export const Sitemap = JSX<SitemapProps>(({ className = '', fallback }) => {
-  const link = useLink();
+  const link = useLink(true);
   const sitemap = useSWRResource<SitemapDataProps>(projectSettings.SITEMAP || 'sitemap', fallback);
 
   return (
@@ -36,24 +37,28 @@ const renderColumn = (menuItem: TopMenuItem & { onClick: () => void }, index: nu
         {text || `Раздел ${index}`}
       </a>
       {items?.map((_, i) => (
-        <ColumnItem key={String(i)} {..._} index={i} />
+        <ColumnItem key={String(i)} {..._} basePath={href} index={i} />
       ))}
     </div>
   );
 };
 
 interface ColumnItemProps extends LinkProps {
+  basePath?: string;
   index?: number;
 }
 
-const ColumnItem = JSX<ColumnItemProps>(({ text, index, ...rest }) => {
-  const link = useLink();
+const ColumnItem = JSX<ColumnItemProps>(({ text, index, basePath, ...rest }) => {
+  const isAnotherPortal =
+    projectSettings.BASE_PATH && basePath ? !projectSettings.BASE_PATH.startsWith(basePath) : false;
+
+  const link = useLink(isAnotherPortal);
   const { href, target, onClick } = link(rest);
 
   return (
     <a
       className="block text-l-light text-secondary-text hover:text-primary-main no-underline"
-      href={href}
+      href={isAnotherPortal ? joinPath(basePath, href) : href}
       target={target || '_self'}
       onClick={onClick}
     >

package/src/ui-kit/RadioButtonGroup/RadioButtonGroup.fixture.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+import { Text } from '../Text/Text';
 import { RadioButtonGroup } from './RadioButtonGroup';
 
 const items = [
@@ -15,11 +16,27 @@ const items = [
 export default {
   default: (
     <div>
-      <RadioButtonGroup
-        items={items}
-        checkedItem={'Аннуитетный'}
-        onChange={(text) => console.log('Выбран пункт меню: ', text)}
-      />
+      <div className="mb-5">
+        <Text color="text-secondary-text" font="font-light">
+          Горизонтальный
+        </Text>
+        <RadioButtonGroup
+          items={items}
+          checkedItem={'Аннуитетный'}
+          onChange={(text) => console.log('Выбран пункт меню: ', text)}
+        />
+      </div>
+      <div>
+        <Text color="text-secondary-text" font="font-light">
+          Вертикальный
+        </Text>
+        <RadioButtonGroup
+          items={items}
+          orientation="vertical"
+          checkedItem={'Аннуитетный'}
+          onChange={(text) => console.log('Выбран пункт меню: ', text)}
+        />
+      </div>
     </div>
   ),
 };

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { ListOrientation } from '../../model/ListOrientation';
 import { Checkbox } from '../Checkbox/Checkbox';
 
 export interface RadioButtonItem {
@@ -10,11 +11,17 @@ interface RadioButtonGroupProps {
   items?: RadioButtonItem[];
   checkedItem?: string;
   onChange?: (id: string) => void;
+  orientation?: ListOrientation;
 }
 
+const orientationStyleMap: Record<ListOrientation, string> = {
+  horizontal: 'gap-10',
+  vertical: 'flex-col gap-3',
+};
+
 export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
-  ({ items, checkedItem, onChange: onChangeCheckedItem }) => (
-    <div className="flex flex-col gap-3">
+  ({ items, checkedItem, onChange: onChangeCheckedItem, orientation = 'horizontal' }) => (
+    <div className={`flex ${orientationStyleMap[orientation]}`}>
       {items?.map(({ id, text }) => (
         <Checkbox
           key={String(id)}