chore(FR-831): update ResourcePresetSettingModal to display exact memory value

Author: nowgnuesLee

react/src/components/ResourceNumber.tsx

@@ -1,4 +1,8 @@
-import { convertBinarySizeUnit } from '../helper';
+import {
+  convertBinarySizeUnit,
+  SizeUnit,
+  sizeUnitToBinarySizeUnit,
+} from '../helper';
 import {
   BaseResourceSlotName,
   KnownAcceleratorResourceSlotName,
@@ -53,6 +57,9 @@ const ResourceNumber: React.FC<ResourceNumberProps> = ({
         : amount;
   };
 
+  const convertedAmount = formatAmount(amount);
+  const convertedAmountByAuto = convertBinarySizeUnit(amount, 'auto', 2, true);
+
   return (
     <Flex direction="row" gap="xxs">
       {mergedResourceSlots?.[type] ? (
@@ -62,16 +69,30 @@ const ResourceNumber: React.FC<ResourceNumberProps> = ({
       )}
 
       <Typography.Text>
-        {formatAmount(amount)}
+        {convertedAmount}
         {_.isUndefined(max)
           ? null
           : max === 'Infinity'
             ? '~∞'
             : `~${formatAmount(max)}`}
       </Typography.Text>
-      <Typography.Text type="secondary">
-        {mergedResourceSlots?.[type]?.display_unit || ''}
-      </Typography.Text>
+      <div>
+        <Typography.Text type="secondary">
+          {mergedResourceSlots?.[type]?.display_unit || ''}
+          {mergedResourceSlots?.[type]?.number_format.binary &&
+          convertedAmount === '0' &&
+          amount !== '0' ? (
+            <>
+              &#40;{Number(convertedAmountByAuto?.numberFixed).toString()}&nbsp;
+              {sizeUnitToBinarySizeUnit(
+                convertedAmountByAuto?.unit as SizeUnit,
+              )}
+              &#41;
+            </>
+          ) : null}
+        </Typography.Text>
+      </div>
+
       {type === 'mem' && opts?.shmem && opts?.shmem > 0 ? (
         <Typography.Text
           type="secondary"

react/src/components/ResourcePresetList.tsx

@@ -3,6 +3,8 @@ import {
   convertBinarySizeUnit,
   localeCompare,
   filterEmptyItem,
+  sizeUnitToBinarySizeUnit,
+  SizeUnit,
 } from '../helper';
 import { useSuspendedBackendaiClient, useUpdatableState } from '../hooks';
 import Flex from './Flex';
@@ -102,8 +104,41 @@ const ResourcePresetList: React.FC<ResourcePresetListProps> = () => {
     {
       title: t('resourcePreset.SharedMemory'),
       dataIndex: 'shared_memory',
-      render: (text) =>
-        text ? convertBinarySizeUnit(text + '', 'g')?.numberFixed : '-',
+      render: (text) => {
+        if (!text) {
+          return '-';
+        }
+        const convertedValue = convertBinarySizeUnit(text + 'b', 'g', 2, true);
+        const convertedValueByAuto = convertBinarySizeUnit(
+          text + 'b',
+          'auto',
+          2,
+          true,
+        );
+        return (
+          <Flex gap="xxs">
+            <Typography.Text>
+              {Number(convertedValue?.numberFixed).toString()}
+            </Typography.Text>
+            <div>
+              <Typography.Text type="secondary">
+                {sizeUnitToBinarySizeUnit(convertedValue?.unit as SizeUnit)}
+                {Number(convertedValue?.numberFixed).toString() === '0' &&
+                text !== '0' ? (
+                  <>
+                    &#40;{Number(convertedValueByAuto?.numberFixed).toString()}
+                    &nbsp;
+                    {sizeUnitToBinarySizeUnit(
+                      convertedValueByAuto?.unit as SizeUnit,
+                    )}
+                    &#41;
+                  </>
+                ) : null}
+              </Typography.Text>
+            </div>
+          </Flex>
+        );
+      },
     },
     baiClient?.supports('resource-presets-per-resource-group') && {
       title: t('general.ResourceGroup'),

react/src/components/ResourcePresetSettingModal.tsx

@@ -236,13 +236,16 @@ const ResourcePresetSettingModal: React.FC<ResourcePresetSettingModalProps> = ({
                     JSON.parse(resourcePreset?.resource_slots || '{}'),
                     (value, key) =>
                       _.includes(key, 'mem')
-                        ? convertBinarySizeUnit(value + 'b', 'g')?.numberUnit
+                        ? convertBinarySizeUnit(
+                            value + 'b',
+                            value === '0' ? 'g' : 'auto',
+                          )?.numberUnit
                         : value,
                   ) || {},
                 shared_memory: resourcePreset?.shared_memory
                   ? convertBinarySizeUnit(
                       resourcePreset?.shared_memory + 'b',
-                      'g',
+                      resourcePreset?.shared_memory === '0' ? 'g' : 'auto',
                     )?.numberUnit
                   : null,
               }

react/src/helper/index.tsx

@@ -157,6 +157,57 @@ export type SizeUnit =
   | 'p'
   | 'e';
 
+export type BinarySizeUnit =
+  | 'Bytes'
+  | 'KiB'
+  | 'MiB'
+  | 'GiB'
+  | 'TiB'
+  | 'PiB'
+  | 'EiB';
+
+export type DecimalSizeUnit = 'Bytes' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB';
+
+export function sizeUnitToDecimalSizeUnit(unit: SizeUnit): DecimalSizeUnit {
+  const unitMap: Record<SizeUnit, DecimalSizeUnit> = {
+    B: 'Bytes',
+    K: 'KB',
+    M: 'MB',
+    G: 'GB',
+    T: 'TB',
+    P: 'PB',
+    E: 'EB',
+    b: 'Bytes',
+    k: 'KB',
+    m: 'MB',
+    g: 'GB',
+    t: 'TB',
+    p: 'PB',
+    e: 'EB',
+  };
+  return unitMap[unit] || unit;
+}
+
+export function sizeUnitToBinarySizeUnit(unit: SizeUnit): BinarySizeUnit {
+  const unitMap: Record<SizeUnit, BinarySizeUnit> = {
+    B: 'Bytes',
+    K: 'KiB',
+    M: 'MiB',
+    G: 'GiB',
+    T: 'TiB',
+    P: 'PiB',
+    E: 'EiB',
+    b: 'Bytes',
+    k: 'KiB',
+    m: 'MiB',
+    g: 'GiB',
+    t: 'TiB',
+    p: 'PiB',
+    e: 'EiB',
+  };
+  return unitMap[unit] || unit;
+}
+
 function convertSizeUnit(
   sizeWithUnit: string | undefined,
   targetSizeUnit?: SizeUnit | 'auto',

resources/i18n/de.json

@@ -1126,7 +1126,7 @@
     "ResourcePresets": "Ressourcenvoreinstellungen",
     "Resources": "Ressourcen",
     "SHMEMShouldBeSmallerThanMemory": "Gemeinsamer Speicher muss kleiner sein als der Speicher",
-    "SharedMemory": "Gemeinsamer Speicher (GB)",
+    "SharedMemory": "Gemeinsamer Speicher",
     "Updated": "Ressourcenvoreinstellung aktualisiert"
   },
   "session": {

resources/i18n/el.json

@@ -1125,7 +1125,7 @@
     "ResourcePresets": "Προεπιλογές πόρων",
     "Resources": "Πόροι",
     "SHMEMShouldBeSmallerThanMemory": "Η κοινόχρηστη μνήμη πρέπει να είναι μικρότερη από τη μνήμη",
-    "SharedMemory": "Κοινή μνήμη (GB)",
+    "SharedMemory": "Κοινόχρηστη μνήμη",
     "Updated": "Η προεπιλογή πόρων ενημερώθηκε"
   },
   "session": {

resources/i18n/en.json

@@ -1135,7 +1135,7 @@
     "ResourcePresets": "Resource Presets",
     "Resources": "Resources",
     "SHMEMShouldBeSmallerThanMemory": "Shared memory must be smaller than memory",
-    "SharedMemory": "Shared memory (GB)",
+    "SharedMemory": "Shared memory",
     "Updated": "Resource preset updated"
   },
   "session": {

resources/i18n/es.json

@@ -1129,7 +1129,7 @@
     "ResourcePresets": "Recursos preestablecidos",
     "Resources": "Recursos",
     "SHMEMShouldBeSmallerThanMemory": "La memoria compartida debe ser menor que la memoria",
-    "SharedMemory": "Memoria compartida (GB)",
+    "SharedMemory": "Memoria compartida",
     "Updated": "Preajuste de recursos actualizado"
   },
   "session": {

resources/i18n/fi.json

@@ -1127,7 +1127,7 @@
     "ResourcePresets": "Resurssien esiasetukset",
     "Resources": "Resurssit",
     "SHMEMShouldBeSmallerThanMemory": "Jaetun muistin on oltava pienempi kuin muistin",
-    "SharedMemory": "Jaettu muisti (GB)",
+    "SharedMemory": "Jaettu muisti",
     "Updated": "Resurssien esiasetus päivitetty"
   },
   "session": {

resources/i18n/fr.json

@@ -1129,7 +1129,7 @@
     "ResourcePresets": "Préréglages de ressources",
     "Resources": "Ressources",
     "SHMEMShouldBeSmallerThanMemory": "La mémoire partagée doit être plus petite que la mémoire",
-    "SharedMemory": "Mémoire partagée (Go)",
+    "SharedMemory": "Mémoire partagée",
     "Updated": "Préréglage de ressource mis à jour"
   },
   "session": {