From c876c7a89ed5bcae64a601ce6a8b548cb4df7a6a Mon Sep 17 00:00:00 2001
From: ktx-abhay <141122205+ktx-abhay@users.noreply.github.com>
Date: Fri, 5 Jan 2024 16:54:35 +0530
Subject: [PATCH] fix: tofixed method getting undefined (#2397)

- #2396
---
 .../dashboard/convertDataIntoUnitValue.ts     | 38 +++++++++----------
 web/src/utils/dashboard/convertPromQLData.ts  |  4 +-
 web/src/utils/dashboard/convertSQLData.ts     |  6 +--
 web/src/utils/dashboard/convertTableData.ts   | 20 ++++------
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/web/src/utils/dashboard/convertDataIntoUnitValue.ts b/web/src/utils/dashboard/convertDataIntoUnitValue.ts
index 98a230f9cb..7fff3b3f7a 100644
--- a/web/src/utils/dashboard/convertDataIntoUnitValue.ts
+++ b/web/src/utils/dashboard/convertDataIntoUnitValue.ts
@@ -26,20 +26,20 @@ export const getUnitValue = (
         const unitValue: any = value ? value / unitInfo.divisor : 0;
         if (unitValue < 1024) {
           return {
-            value: `${parseFloat(unitValue).toFixed(decimals)}`,
+            value: `${parseFloat(unitValue)?.toFixed(decimals) ?? 0}`,
             unit: unitInfo.unit,
           };
         }
       }
       const val: any = value ? value / units[units.length - 1].divisor : 0;
       return {
-        value: `${parseFloat(val).toFixed(decimals)}`,
+        value: `${parseFloat(val)?.toFixed(decimals) ?? 0}`,
         unit: "PB",
       };
     }
     case "custom": {
       return {
-        value: `${parseFloat(value).toFixed(decimals)}`,
+        value: `${parseFloat(value)?.toFixed(decimals) ?? 0}`,
         unit: `${customUnit ?? ""}`,
       };
     }
@@ -59,7 +59,7 @@ export const getUnitValue = (
         const unitValue = value / unitInfo.divisor;
         if (unitValue >= 1) {
           return {
-            value: parseFloat(unitValue.toFixed(decimals)),
+            value: parseFloat(unitValue?.toFixed(decimals) ?? 0),
             unit: unitInfo.unit,
           };
         }
@@ -67,7 +67,7 @@ export const getUnitValue = (
 
       // If the value is too small to fit in any unit, return in microseconds
       return {
-        value: parseFloat((value / units[0].divisor).toFixed(decimals)),
+        value: parseFloat((value / units[0].divisor)?.toFixed(decimals) ?? 0),
         unit: units[0].unit,
       };
     }
@@ -88,7 +88,7 @@ export const getUnitValue = (
         const unitValue = value / unitInfo.divisor;
         if (unitValue >= 1) {
           return {
-            value: parseFloat(unitValue.toFixed(decimals)),
+            value: parseFloat(unitValue?.toFixed(decimals) ?? 0),
             unit: unitInfo.unit,
           };
         }
@@ -96,7 +96,7 @@ export const getUnitValue = (
 
       // If the value is too small to fit in any unit, return in microseconds
       return {
-        value: parseFloat((value / units[0].divisor).toFixed(decimals)),
+        value: parseFloat((value / units[0].divisor)?.toFixed(decimals) ?? 0),
         unit: units[0].unit,
       };
     }
@@ -117,7 +117,7 @@ export const getUnitValue = (
         const unitValue = value / unitInfo.divisor;
         if (unitValue >= 1) {
           return {
-            value: parseFloat(unitValue.toFixed(decimals)),
+            value: parseFloat(unitValue?.toFixed(decimals) ?? 0),
             unit: unitInfo.unit,
           };
         }
@@ -125,7 +125,7 @@ export const getUnitValue = (
 
       // If the value is too small to fit in any unit, return in microseconds
       return {
-        value: parseFloat((value / units[0].divisor).toFixed(decimals)),
+        value: parseFloat((value / units[0].divisor)?.toFixed(decimals) ?? 0),
         unit: units[0].unit,
       };
     }
@@ -134,27 +134,27 @@ export const getUnitValue = (
       for (let unit of units) {
         if (value < 1024) {
           return {
-            value: `${parseFloat(value).toFixed(decimals)}`,
+            value: `${parseFloat(value)?.toFixed(decimals) ?? 0}`,
             unit: `${unit}/s`,
           };
         }
         value /= 1024;
       }
       return {
-        value: `${parseFloat(value).toFixed(decimals)}`,
+        value: `${parseFloat(value)?.toFixed(decimals) ?? 0}`,
         unit: "PB/s",
       };
     }
     case "percent-1": {
       return {
-        value: `${(parseFloat(value) * 100).toFixed(decimals)}`,
+        value: `${(parseFloat(value) * 100)?.toFixed(decimals) ?? 0}`,
         unit: "%",
       };
       // `${parseFloat(value) * 100}`;
     }
     case "percent": {
       return {
-        value: `${parseFloat(value).toFixed(decimals)}`,
+        value: `${parseFloat(value)?.toFixed(decimals) ?? 0}`,
         unit: "%",
       };
       // ${parseFloat(value)}`;
@@ -173,14 +173,14 @@ export const getUnitValue = (
 
         if (unitValue < 1024) {
           return {
-            value: `${parseFloat(unitValue).toFixed(decimals)}`,
+            value: `${parseFloat(unitValue)?.toFixed(decimals) ?? 0}`,
             unit: unitInfo.unit,
           };
         }
       }
       const val: any = value ? value / units[units.length - 1].divisor : 0;
       return {
-        value: `${parseFloat(val).toFixed(decimals)}`,
+        value: `${parseFloat(val)?.toFixed(decimals) ?? 0}`,
         unit: "PB",
       };
     }
@@ -197,14 +197,14 @@ export const getUnitValue = (
         const unitValue: any = value ? value / unitInfo.divisor : 0;
         if (unitValue < 1024) {
           return {
-            value: `${parseFloat(unitValue).toFixed(decimals)}`,
+            value: `${parseFloat(unitValue)?.toFixed(decimals) ?? 0}`,
             unit: unitInfo.unit,
           };
         }
       }
       const val: any = value ? value / units[units.length - 1].divisor : 0;
       return {
-        value: `${parseFloat(val).toFixed(decimals)}`,
+        value: `${parseFloat(val)?.toFixed(decimals) ?? 0}`,
         unit: "PB",
       };
     }
@@ -212,7 +212,7 @@ export const getUnitValue = (
       return {
         value: isNaN(value)
           ? value
-          : (+value).toFixed(decimals),
+          : (+value)?.toFixed(decimals) ?? 0,
         unit: "",
       };
     }
@@ -220,7 +220,7 @@ export const getUnitValue = (
       return {
         value: isNaN(value)
           ? value
-          : (+value).toFixed(decimals),
+          : (+value)?.toFixed(decimals) ?? 0,
         unit: "",
       };
     }
diff --git a/web/src/utils/dashboard/convertPromQLData.ts b/web/src/utils/dashboard/convertPromQLData.ts
index ade904e5cd..d87465a33f 100644
--- a/web/src/utils/dashboard/convertPromQLData.ts
+++ b/web/src/utils/dashboard/convertPromQLData.ts
@@ -467,9 +467,9 @@ export const convertPromQLData = (
                     type: "text",
                     style: {
                       text:
-                        parseFloat(unitValue.value).toFixed(
+                        (parseFloat(unitValue?.value)?.toFixed(
                           panelSchema.config.decimals ?? 2
-                        ) + unitValue.unit,
+                        ) ?? 0) + unitValue.unit,
                       fontSize: Math.min(params.coordSys.cx / 2, 90), //coordSys is relative. so that we can use it to calculate the dynamic size
                       fontWeight: 500,
                       align: "center",
diff --git a/web/src/utils/dashboard/convertSQLData.ts b/web/src/utils/dashboard/convertSQLData.ts
index aafb9d6aa5..8aedaecf29 100644
--- a/web/src/utils/dashboard/convertSQLData.ts
+++ b/web/src/utils/dashboard/convertSQLData.ts
@@ -1013,9 +1013,9 @@ export const convertSQLData = (
               type: "text",
               style: {
                 text:
-                  parseFloat(unitValue.value).toFixed(
-                    panelSchema.config.decimals ?? 2
-                  ) + unitValue.unit,
+                  (parseFloat(unitValue?.value)?.toFixed(
+                    panelSchema?.config?.decimals ?? 2
+                  ) ?? 0) + unitValue?.unit,
                 fontSize: Math.min(params.coordSys.cx / 2, 90), //coordSys is relative. so that we can use it to calculate the dynamic size
                 fontWeight: 500,
                 align: "center",
diff --git a/web/src/utils/dashboard/convertTableData.ts b/web/src/utils/dashboard/convertTableData.ts
index 476a7473b2..9c7ffddecc 100644
--- a/web/src/utils/dashboard/convertTableData.ts
+++ b/web/src/utils/dashboard/convertTableData.ts
@@ -36,23 +36,19 @@ export const convertTableData = (panelSchema: any, searchQueryData: any) => {
 
   const columns = columnData.map((it: any) => {
     let obj: any = {};
+    const isNumber = isSampleValuesNumbers(searchQueryData[0], it.alias, 20);
     obj["name"] = it.label;
     obj["field"] = it.alias;
     obj["label"] = it.label;
-    obj["align"] = !isSampleValuesNumbers(searchQueryData[0], it.alias, 20)
-      ? "left"
-      : "right";
+    obj["align"] = !isNumber ? "left" : "right";
     obj["sortable"] = true;
-    return obj;
-  });
-
-  // map on each columns, if align is right then need to use decimals config option in toFixed method
-  columns.map((col: any) => {
-    if (col.align === "right") {
-      const oldField = col["field"];
-      col["field"] = (row: any) =>
-        +row[oldField].toFixed(panelSchema.config.decimals ?? 2);
+    // if number then sort by number and use decimal point config option in format
+    if (isNumber) {
+      obj["sort"] = (a: any, b: any) => parseFloat(a) - parseFloat(b);
+      obj["format"] = (val: any) =>
+        val ? val?.toFixed(panelSchema?.config?.decimals ?? 2) ?? 0 : val;
     }
+    return obj;
   });
 
   return {