fix: calculate memoryUsage in one place

Author: github-actions[bot]

src/components/MemoryViewer/MemoryViewer.tsx

@@ -53,23 +53,23 @@ export function MemoryViewer({
     warningThreshold = 60,
     dangerThreshold = 80,
 }: MemoryProgressViewerProps) {
-    const value = stats.AnonRss ?? calculateAllocatedMemory(stats);
+    const memoryUsage = stats.AnonRss ?? calculateAllocatedMemory(stats);
 
     const capacity = stats.HardLimit;
 
     const theme = useTheme();
     let fillWidth =
-        Math.round((parseFloat(String(value)) / parseFloat(String(capacity))) * 100) || 0;
+        Math.round((parseFloat(String(memoryUsage)) / parseFloat(String(capacity))) * 100) || 0;
     fillWidth = fillWidth > 100 ? 100 : fillWidth;
-    let valueText: number | string | undefined = value,
+    let valueText: number | string | undefined = memoryUsage,
         capacityText: number | string | undefined = capacity,
         divider = '/';
     if (percents) {
         valueText = fillWidth + '%';
         capacityText = '';
         divider = '';
     } else if (formatValues) {
-        [valueText, capacityText] = formatValues(Number(value), Number(capacity));
+        [valueText, capacityText] = formatValues(Number(memoryUsage), Number(capacity));
     }
 
     const renderContent = () => {
@@ -81,13 +81,13 @@ export function MemoryViewer({
     };
 
     const calculateMemoryShare = (segmentSize: number) => {
-        if (!value) {
+        if (!memoryUsage) {
             return 0;
         }
         return (segmentSize / parseFloat(String(capacity))) * 100;
     };
 
-    const memorySegments = getMemorySegments(stats);
+    const memorySegments = getMemorySegments(stats, Number(memoryUsage));
 
     const status = calculateProgressStatus({
         fillWidth,

src/components/MemoryViewer/utils.ts

@@ -21,7 +21,7 @@ interface MemorySegment {
     isInfo?: boolean;
 }
 
-export function getMemorySegments(stats: TMemoryStats): MemorySegment[] {
+export function getMemorySegments(stats: TMemoryStats, memoryUsage: number): MemorySegment[] {
     const segments = [
         {
             label: i18n('text_shared-cache'),
@@ -57,18 +57,14 @@ export function getMemorySegments(stats: TMemoryStats): MemorySegment[] {
     ) as MemorySegment[];
     const sumNonInfoSegments = nonInfoSegments.reduce((acc, segment) => acc + segment.value, 0);
 
-    const memoryUsage = getMaybeNumber(stats.AnonRss ?? calculateAllocatedMemory(stats));
+    const otherMemory = Math.max(0, memoryUsage - sumNonInfoSegments);
 
-    if (memoryUsage) {
-        const otherMemory = Math.max(0, memoryUsage - sumNonInfoSegments);
-
-        segments.push({
-            label: i18n('text_other'),
-            key: 'Other',
-            value: otherMemory,
-            isInfo: false,
-        });
-    }
+    segments.push({
+        label: i18n('text_other'),
+        key: 'Other',
+        value: otherMemory,
+        isInfo: false,
+    });
 
     segments.push(
         {