MTSWebServices · Zabilsya · Apr 1, 2025 · Mar 31, 2025
diff --git a/src/app/styles/antd.less b/src/app/styles/antd.less
@@ -59,3 +59,7 @@
   display: flex;
   justify-content: space-between;
 }
+
+p:last-of-type {
+  margin-bottom: 0;
+}
diff --git a/src/app/styles/variables.less b/src/app/styles/variables.less
@@ -22,4 +22,5 @@
 @picker-bg: #f1f3f5;
 @tooltip-bg: #000000;
 
+@tooltip-max-width: 300px;
 @line-height-base: 1.5;
diff --git a/src/entities/file/@x/transfer.ts b/src/entities/file/@x/transfer.ts
@@ -1,3 +1,4 @@
 /** Cross-import entities using public API in FSD https://feature-sliced.design/ru/docs/reference/public-api#public-api-for-cross-imports */
 export type { FileFormat, Json } from '../types';
+export { FileSizeUnitValue, FileSizeUnit } from '../types';
 export { FileFormatParams, FileNameTemplate } from '../ui';
diff --git a/src/entities/file/constants.ts b/src/entities/file/constants.ts
@@ -2,7 +2,7 @@ import { FileSizeUnit } from './types';
 
 export const FILE_SIZE_UNIT_DISPLAY = {
   [FileSizeUnit.B]: 'b',
-  [FileSizeUnit.KB]: 'kb',
-  [FileSizeUnit.MB]: 'mb',
-  [FileSizeUnit.GB]: 'gb',
+  [FileSizeUnit.KiB]: 'kib',
+  [FileSizeUnit.MiB]: 'mib',
+  [FileSizeUnit.GiB]: 'gib',
 } as const;
diff --git a/src/entities/file/types.ts b/src/entities/file/types.ts
@@ -1,15 +1,15 @@
 export enum FileSizeUnit {
   B = 'B',
-  KB = 'KB',
-  MB = 'MB',
-  GB = 'GB',
+  KiB = 'KiB',
+  MiB = 'MiB',
+  GiB = 'GiB',
 }
 
 export enum FileSizeUnitValue {
   B = 1,
-  KB = 1000,
-  MB = 1000 * 1000,
-  GB = 1000 * 1000 * 1000,
+  KiB = 1024,
+  MiB = 1024 * 1024,
+  GiB = 1024 * 1024 * 1024,
 }
 
 export enum FileCompression {

diff --git a/src/entities/file/utils/parseFileSize/index.ts b/src/entities/file/utils/parseFileSize/index.ts
@@ -4,14 +4,14 @@ import { ParseFileSizeReturn } from './types';
 
 /** Util for parsing file size in bytes to appropriate unit and value */
 export const parseFileSize = (bytes: number): ParseFileSizeReturn => {
-  if (bytes >= FileSizeUnitValue.GB) {
-    return { value: bytes / FileSizeUnitValue.GB, unit: FileSizeUnit.GB };
+  if (bytes >= FileSizeUnitValue.GiB) {
+    return { value: bytes / FileSizeUnitValue.GiB, unit: FileSizeUnit.GiB };
   }
-  if (bytes >= FileSizeUnitValue.MB) {
-    return { value: bytes / FileSizeUnitValue.MB, unit: FileSizeUnit.MB };
+  if (bytes >= FileSizeUnitValue.MiB) {
+    return { value: bytes / FileSizeUnitValue.MiB, unit: FileSizeUnit.MiB };
   }
-  if (bytes >= FileSizeUnitValue.KB) {
-    return { value: bytes / FileSizeUnitValue.KB, unit: FileSizeUnit.KB };
+  if (bytes >= FileSizeUnitValue.KiB) {
+    return { value: bytes / FileSizeUnitValue.KiB, unit: FileSizeUnit.KiB };
   }
   return { value: bytes, unit: FileSizeUnit.B };
 };
diff --git a/src/entities/transfer/api/types.ts b/src/entities/transfer/api/types.ts
@@ -15,6 +15,7 @@ export interface Transfer {
   strategy_params: TransferStrategyParams;
   is_scheduled: boolean;
   schedule: string;
+  resources: TransferResources;
   transformations: Transformations;
 }
 
@@ -35,6 +36,12 @@ export interface TransferStrategyParams {
   increment_by?: TransferConnectionFileIncrementBy | string;
 }
 
+export interface TransferResources {
+  max_parallel_tasks: number;
+  cpu_cores_per_task: number;
+  ram_bytes_per_task: number | string;
+}
+
 export interface TransferSourceConnectionFileType {
   type:
     | ConnectionType.FTP

diff --git a/src/entities/transfer/index.ts b/src/entities/transfer/index.ts
@@ -1,2 +1,3 @@
 export * from './api';
 export * from './ui';
+export * from './utils';
diff --git a/src/entities/transfer/utils/index.ts b/src/entities/transfer/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './prepareTransferResourcesForm';
+export * from './prepareTransferResourcesRequest';
diff --git a/src/entities/transfer/utils/prepareTransferResourcesForm/index.ts b/src/entities/transfer/utils/prepareTransferResourcesForm/index.ts
@@ -0,0 +1,10 @@
+import { FileSizeUnitValue } from '@entities/file/@x/transfer';
+import { TransferResources } from '@entities/transfer';
+
+/** Util for mapping of transfer resources data from backend to appropriate form value  */
+export const prepareTransferResourcesForm = (data: TransferResources): TransferResources => {
+  return {
+    ...data,
+    ram_bytes_per_task: +data.ram_bytes_per_task / FileSizeUnitValue.GiB,
+  };
+};
diff --git a/src/entities/transfer/utils/prepareTransferResourcesRequest/index.ts b/src/entities/transfer/utils/prepareTransferResourcesRequest/index.ts
@@ -0,0 +1,10 @@
+import { FileSizeUnit } from '@entities/file/@x/transfer';
+import { TransferResources } from '@entities/transfer';
+
+/** Util for mapping of transfer resources data from form value to appropriate value for backend  */
+export const prepareTransferResourcesRequest = (data: TransferResources): TransferResources => {
+  return {
+    ...data,
+    ram_bytes_per_task: `${data.ram_bytes_per_task}${FileSizeUnit.GiB}`,
+  };
+};
diff --git a/src/features/transfer/MutateTransferForm/MutateTransferForm.tsx b/src/features/transfer/MutateTransferForm/MutateTransferForm.tsx
@@ -5,7 +5,7 @@ import { Form, Input } from 'antd';
 import { useTranslation } from 'react-i18next';
 
 import { MutateTransferFormProps } from './types';
-import { StrategyParams, TransferConnections, TransferSchedule } from './components';
+import { StrategyParams, TransferConnections, TransferResources, TransferSchedule } from './components';
 
 export const MutateTransferForm = ({ group, onCancel }: MutateTransferFormProps) => {
   const { t } = useTranslation();
@@ -39,6 +39,8 @@ export const MutateTransferForm = ({ group, onCancel }: MutateTransferFormProps)
 
       <StrategyParams />
 
+      <TransferResources />
+
       <TransferSchedule />
 
       <ControlButtons onCancel={onCancel} />

diff --git a/...transfer/MutateTransferForm/components/TransferResources/components/TooltipText/index.tsx b/...transfer/MutateTransferForm/components/TransferResources/components/TooltipText/index.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { TooltipTextProps } from './types';
+
+export const TooltipText = ({ minValue, maxValue }: TooltipTextProps) => {
+  const { t } = useTranslation('transfer');
+
+  return (
+    <>
+      <p>
+        {t('minValue')} = {minValue}
+      </p>
+      <p>
+        {t('maxValue')} = {maxValue}
+      </p>
+    </>
+  );
+};
diff --git a/.../transfer/MutateTransferForm/components/TransferResources/components/TooltipText/types.ts b/.../transfer/MutateTransferForm/components/TransferResources/components/TooltipText/types.ts
@@ -0,0 +1,4 @@
+export interface TooltipTextProps {
+  minValue: string | number;
+  maxValue: string | number;
+}
diff --git a/src/features/transfer/MutateTransferForm/components/TransferResources/components/index.ts b/src/features/transfer/MutateTransferForm/components/TransferResources/components/index.ts
@@ -0,0 +1 @@
+export * from './TooltipText';
diff --git a/src/features/transfer/MutateTransferForm/components/TransferResources/constants.ts b/src/features/transfer/MutateTransferForm/components/TransferResources/constants.ts
@@ -0,0 +1,8 @@
+export const MIN_PARALLEL_TASKS = 1;
+export const MAX_PARALLEL_TASKS = 100;
+
+export const MIN_CPU_CORES_PER_TASKS = 1;
+export const MAX_CPU_CORES_PER_TASKS = 32;
+
+export const MIN_RAM_PER_TASK = 0.5;
+export const MAX_RAM_PER_TASK = 64;
diff --git a/src/features/transfer/MutateTransferForm/components/TransferResources/index.tsx b/src/features/transfer/MutateTransferForm/components/TransferResources/index.tsx
@@ -0,0 +1,68 @@
+import { Fieldset } from '@shared/ui';
+import { Form, InputNumber } from 'antd';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { validateFormFieldByPattern } from '@shared/utils';
+import { INTEGER_ERROR_DISPLAY, INTEGER_REGEXP } from '@shared/constants';
+
+import {
+  MAX_PARALLEL_TASKS,
+  MAX_CPU_CORES_PER_TASKS,
+  MIN_PARALLEL_TASKS,
+  MIN_CPU_CORES_PER_TASKS,
+  MIN_RAM_PER_TASK,
+  MAX_RAM_PER_TASK,
+} from './constants';
+import { TooltipText } from './components';
+
+export const TransferResources = () => {
+  const { t } = useTranslation('error');
+
+  return (
+    <Fieldset title={t('resources', { ns: 'transfer' })}>
+      <Form.Item
+        label={t('maxParallelTasks', { ns: 'transfer' })}
+        name={['resources', 'max_parallel_tasks']}
+        rules={[
+          {
+            required: true,
+            pattern: INTEGER_REGEXP,
+            message: t(INTEGER_ERROR_DISPLAY),
+            validator: (rule, value) => validateFormFieldByPattern(rule, value, t),
+          },
+        ]}
+        tooltip={<TooltipText minValue={MIN_PARALLEL_TASKS} maxValue={MAX_PARALLEL_TASKS} />}
+      >
+        <InputNumber size="large" min={MIN_PARALLEL_TASKS} max={MAX_PARALLEL_TASKS} />
+      </Form.Item>
+      <Form.Item
+        label={t('cpuCoresPerTask', { ns: 'transfer' })}
+        name={['resources', 'cpu_cores_per_task']}
+        rules={[
+          {
+            required: true,
+            pattern: INTEGER_REGEXP,
+            message: t(INTEGER_ERROR_DISPLAY),
+            validator: (rule, value) => validateFormFieldByPattern(rule, value, t),
+          },
+        ]}
+        tooltip={<TooltipText minValue={MIN_CPU_CORES_PER_TASKS} maxValue={MAX_CPU_CORES_PER_TASKS} />}
+      >
+        <InputNumber size="large" min={MIN_CPU_CORES_PER_TASKS} max={MAX_CPU_CORES_PER_TASKS} />
+      </Form.Item>
+      <Form.Item
+        label={t('ramPerTask', { ns: 'transfer' })}
+        name={['resources', 'ram_bytes_per_task']}
+        rules={[{ required: true }]}
+        tooltip={
+          <TooltipText
+            minValue={`${MIN_RAM_PER_TASK} ${t('gib', { ns: 'file' })}`}
+            maxValue={`${MAX_RAM_PER_TASK} ${t('gib', { ns: 'file' })}`}
+          />
+        }
+      >
+        <InputNumber size="large" min={MIN_RAM_PER_TASK} max={MAX_RAM_PER_TASK} />
+      </Form.Item>
+    </Fieldset>
+  );
+};
diff --git a/src/features/transfer/MutateTransferForm/components/index.ts b/src/features/transfer/MutateTransferForm/components/index.ts
@@ -4,3 +4,4 @@ export * from './TransferSchedule';
 export * from './TransferConnections';
 export * from './StrategyParams';
 export * from './TransferConnectionsCanvas';
+export * from './TransferResources';
diff --git a/src/features/transfer/TransferDetailInfo/components/TransferResources/index.tsx b/src/features/transfer/TransferDetailInfo/components/TransferResources/index.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Descriptions } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { FileSizeUnitValue } from '@entities/file';
+
+import { TransferResourcesProps } from './types';
+
+export const TransferResources = ({ data, ...props }: TransferResourcesProps) => {
+  const { t } = useTranslation('transfer');
+
+  return (
+    <Descriptions {...props}>
+      <Descriptions.Item label={t('maxParallelTasks')} span={3}>
+        {data.max_parallel_tasks}
+      </Descriptions.Item>
+      <Descriptions.Item label={t('cpuCoresPerTask')} span={3}>
+        {data.cpu_cores_per_task}
+      </Descriptions.Item>
+      <Descriptions.Item label={t('ramPerTask')} span={3}>
+        {+data.ram_bytes_per_task / FileSizeUnitValue.GiB} {t('gib', { ns: 'file' })}
+      </Descriptions.Item>
+    </Descriptions>
+  );
+};
diff --git a/src/features/transfer/TransferDetailInfo/components/TransferResources/types.ts b/src/features/transfer/TransferDetailInfo/components/TransferResources/types.ts
@@ -0,0 +1,6 @@
+import { Transfer } from '@entities/transfer';
+import { DescriptionsProps } from 'antd';
+
+export interface TransferResourcesProps extends DescriptionsProps {
+  data: Transfer['resources'];
+}
diff --git a/src/features/transfer/TransferDetailInfo/components/index.ts b/src/features/transfer/TransferDetailInfo/components/index.ts
@@ -1,3 +1,4 @@
 export * from './TransferParams';
 export * from './TransferFileFormatData';
 export * from './TransferStrategyParams';
+export * from './TransferResources';
diff --git a/src/features/transfer/TransferDetailInfo/index.tsx b/src/features/transfer/TransferDetailInfo/index.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 
 import { TransferDetailInfoProps } from './types';
 import classes from './styles.module.less';
-import { TransferParams, TransferStrategyParams } from './components';
+import { TransferParams, TransferResources, TransferStrategyParams } from './components';
 
 export const TransferDetailInfo = ({
   transfer,
@@ -45,6 +45,9 @@ export const TransferDetailInfo = ({
         <Descriptions.Item className={classes.subDescription} label={t('strategyParams', { ns: 'transfer' })} span={3}>
           <TransferStrategyParams data={transfer.strategy_params} />
         </Descriptions.Item>
+        <Descriptions.Item className={classes.subDescription} label={t('resources', { ns: 'transfer' })} span={3}>
+          <TransferResources data={transfer.resources} />
+        </Descriptions.Item>
         <Descriptions.Item label={t('sourceConnection', { ns: 'connection' })} span={3}>
           <Link to={`/connections/${connectionSource.id}`}>{connectionSource.name}</Link>
         </Descriptions.Item>

diff --git a/src/shared/config/i18n/translations/en.json b/src/shared/config/i18n/translations/en.json
@@ -9,7 +9,8 @@
       "formErrorHasOccurred": "Form error has occurred",
       "fieldIsRequired": "Field is required",
       "fieldPatternInvalid": "Field value does not match the pattern",
-      "invalidRegularExpression": "Invalid regular expressions"
+      "invalidRegularExpression": "Invalid regular expressions",
+      "integerError": "Field value must be integer"
     },
     "auth": {
       "auth": "Authorization",
@@ -83,9 +84,9 @@
     },
     "file": {
       "b": "B",
-      "kb": "KB",
-      "mb": "MB",
-      "gb": "GB",
+      "kib": "KiB",
+      "mib": "MiB",
+      "gib": "GiB",
       "fileFormat": "File format",
       "selectFileFormat": "Select file format",
       "compression": "Compression",
@@ -179,7 +180,13 @@
       "incremental": "incremental",
       "target": "Target",
       "basic": "Basic",
-      "advanced": "Advanced"
+      "advanced": "Advanced",
+      "resources": "Resources",
+      "minValue": "Min. value",
+      "maxValue": "Max. value",
+      "maxParallelTasks": "Max parallel tasks",
+      "cpuCoresPerTask": "CPU cores per task",
+      "ramPerTask": "RAM per task (GiB)"
     },
     "transformation": {
       "transformations": "Transformations:",

diff --git a/src/shared/config/i18n/translations/ru.json b/src/shared/config/i18n/translations/ru.json
@@ -9,7 +9,8 @@
       "formErrorHasOccurred": "Произошла ошибка формы",
       "fieldIsRequired": "Поле обязательно",
       "fieldPatternInvalid": "Значение поля не соответствует шаблону",
-      "invalidRegularExpression": "Некорректное регулярное выражение"
+      "invalidRegularExpression": "Некорректное регулярное выражение",
+      "integerError": "Значение поля должно быть целым числом"
     },
     "auth": {
       "auth": "Авторизация",
@@ -83,9 +84,9 @@
     },
     "file": {
       "b": "Б",
-      "kb": "КБ",
-      "mb": "МБ",
-      "gb": "ГБ",
+      "kib": "КиБ",
+      "mib": "МиБ",
+      "gib": "ГиБ",
       "fileFormat": "Формат файла",
       "selectFileFormat": "Выбрать формат файла",
       "compression": "Сжатие",
@@ -179,7 +180,13 @@
       "incremental": "инкрементальная",
       "target": "Цель",
       "basic": "Обычный",
-      "advanced": "Продвинутый"
+      "advanced": "Продвинутый",
+      "resources": "Ресурсы",
+      "minValue": "Мин. значение",
+      "maxValue": "Макс. значение",
+      "maxParallelTasks": "Макс. количество параллельных задач",
+      "cpuCoresPerTask": "Количество процессорных ядер на задачу",
+      "ramPerTask": "Количество оперативной памяти на задачу (ГиБ)"
     },
     "transformation": {
       "transformations": "Трансформации:",

diff --git a/src/shared/constants/errorMessage.ts b/src/shared/constants/errorMessage.ts
@@ -0,0 +1 @@
+export const INTEGER_ERROR_DISPLAY = 'integerError';
diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts
@@ -2,3 +2,4 @@ export * from './storage';
 export * from './antd';
 export * from './regexp';
 export * from './role';
+export * from './errorMessage';
diff --git a/src/shared/constants/regexp.ts b/src/shared/constants/regexp.ts
@@ -3,3 +3,6 @@ export const ABSOLUTE_PATH_REGEXP = /^(?:[a-zA-Z]:\\|\/)/;
 
 /** Regexp to input only digits and digits with fractional part (e.g. 123.22) */
 export const NUMBER_REGEXP = /\d*\.?\d+$/;
+
+/** Regexp to input only digits and (e.g. 354) */
+export const INTEGER_REGEXP = /^\d+$/;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './prepareTransferResourcesForm';
		export * from './prepareTransferResourcesRequest';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const INTEGER_ERROR_DISPLAY = 'integerError';