From 9b8a939e623ac35bb0aac93da66ba6a18afe3d3e Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Wed, 30 Mar 2022 11:24:40 +0800
Subject: [PATCH] add calculations

---
 src/hooks/data.ts           | 2 ++
 src/hooks/useProcessor.ts   | 6 ++++++
 src/locales/lang/en.ts      | 4 ++--
 src/views/dashboard/data.ts | 4 +++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/hooks/data.ts b/src/hooks/data.ts
index 5f1fdd88..4bc394fd 100644
--- a/src/hooks/data.ts
+++ b/src/hooks/data.ts
@@ -26,6 +26,8 @@ export enum MetricQueryTypes {
 export enum Calculations {
   Percentage = "percentage",
   ByteToKB = "byteToKB",
+  ByteToMB = "ByteToMB",
+  ByteToGB = "ByteToGB",
   Apdex = "apdex",
   Precision = "precision",
   ConvertSeconds = "convertSeconds",
diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts
index e928b300..b3eeea4b 100644
--- a/src/hooks/useProcessor.ts
+++ b/src/hooks/useProcessor.ts
@@ -324,6 +324,12 @@ export function aggregation(val: number, config: any): number | string {
     case Calculations.ByteToKB:
       data = val / 1024;
       break;
+    case Calculations.ByteToMB:
+      data = val / 1024 / 1024;
+      break;
+    case Calculations.ByteToGB:
+      data = val / 1024 / 1024 / 1024;
+      break;
     case Calculations.Apdex:
       data = val / 10000;
       break;
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 609c05ea..321062a2 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -38,8 +38,8 @@ const msg = {
   health: "Health",
   groupName: "Group Name",
   topologies: "Topologies",
-  dataPanel: "Data Panel",
-  controlPanel: "Control Panel",
+  dataPanel: "Data Plane",
+  controlPanel: "Control Plane",
   eventList: "Event List",
   databasePanel: "Database Panel",
   meshServicePanel: "Service Panel",
diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts
index 9c579027..e1b0d4f5 100644
--- a/src/views/dashboard/data.ts
+++ b/src/views/dashboard/data.ts
@@ -269,8 +269,10 @@ export const TextColors: { [key: string]: string } = {
 
 export const CalculationOpts = [
   { label: "Percentage", value: "percentage" },
-  { label: "Byte to KB", value: "byteToKB" },
   { label: "Apdex", value: "apdex" },
+  { label: "Byte to KB", value: "byteToKB" },
+  { label: "Byte to MB", value: "byteToMB" },
+  { label: "Byte to GB", value: "byteToGB" },
   {
     label: "Convert milliseconds to YYYY-MM-DD HH:mm:ss",
     value: "convertMilliseconds",