Fix Resource Quota Rendering (#624)

* add parsing of quota values which are non-numeric in the general case

* add unit tests

Signed-off-by: Sebastian Malton <smalton@mirantis.com>

Co-authored-by: Sebastian Malton <smalton@mirantis.com>

src/renderer/utils/convertCpu.ts

@@ -1,10 +1,13 @@
 // Helper to convert CPU K8S units to numbers
 
+const thousand = 1000;
+const million = thousand * thousand;
+const shortBillion = thousand * million;
+
 export function cpuUnitsToNumber(cpu: string) {
   const cpuNum = parseInt(cpu)
-  const billion = 1000000 * 1000
-  if (cpu.includes("m")) return cpuNum / 1000
-  if (cpu.includes("u")) return cpuNum / 1000000
-  if (cpu.includes("n")) return cpuNum / billion
+  if (cpu.includes("m")) return cpuNum / thousand
+  if (cpu.includes("u")) return cpuNum / million
+  if (cpu.includes("n")) return cpuNum / shortBillion
   return parseFloat(cpu)
-}
+}

src/renderer/utils/convertMemory.ts

@@ -7,9 +7,9 @@ export function unitsToBytes(value: string) {
   if (!suffixes.some(suffix => value.includes(suffix))) {
     return parseFloat(value)
   }
-  const index = suffixes.findIndex(suffix =>
-    suffix == value.replace(/[0-9]|i|\./g, '')
-  )
+ 
+  const suffix = value.replace(/[0-9]|i|\./g, '');
+  const index = suffixes.indexOf(suffix);
   return parseInt(
     (parseFloat(value) * Math.pow(base, index + 1)).toFixed(1)
   )
@@ -21,8 +21,10 @@ export function bytesToUnits(bytes: number, precision = 1) {
   if (!bytes) {
     return "N/A"
   }
+
   if (index === 0) {
     return `${bytes}${sizes[index]}`
   }
+
   return `${(bytes / (1024 ** index)).toFixed(precision)}${sizes[index]}i`
-}
+}

src/renderer/utils/index.ts

@@ -20,3 +20,4 @@ export * from './formatDuration'
 export * from './isReactNode'
 export * from './convertMemory'
 export * from './convertCpu'
+export * from './metricUnitsToNumber'

src/renderer/utils/metricUnitsToNumber.ts

@@ -0,0 +1,10 @@
+const base = 1000;
+const suffixes = ["k", "m", "g", "t", "q"];
+
+export function metricUnitsToNumber(value: string): number {
+  const suffix = value.toLowerCase().slice(-1);
+  const index = suffixes.indexOf(suffix);
+  return parseInt(
+    (parseFloat(value) * Math.pow(base, index + 1)).toFixed(1)
+  )
+}

src/renderer/utils/metricUnitsToNumber_test.ts

@@ -0,0 +1,15 @@
+import { metricUnitsToNumber } from "./metricUnitsToNumber";
+
+describe("metricUnitsToNumber tests", () => {
+  test("plain number", () => {
+    expect(metricUnitsToNumber("124")).toStrictEqual(124);
+  });
+
+  test("with k suffix", () => {
+    expect(metricUnitsToNumber("124k")).toStrictEqual(124000);
+  });
+
+  test("with m suffix", () => {
+    expect(metricUnitsToNumber("124m")).toStrictEqual(124000000);
+  });
+});