add calculation exp

src/hooks/data.ts

@@ -33,6 +33,7 @@ export enum Calculations {
   ConvertSeconds = "convertSeconds",
   ConvertMilliseconds = "convertMilliseconds",
   MsTos = "msTos",
+  Average = "average",
 }
 export enum sizeEnum {
   XS = "XS",

src/hooks/useProcessor.ts

@@ -150,9 +150,7 @@ export function useSourceProcessor(
     const c = (config.metricConfig && config.metricConfig[index]) || {};
 
     if (type === MetricQueryTypes.ReadMetricsValues) {
-      source[m] = resp.data[keys[index]].values.values.map(
+      source[m] = calculateExp(resp.data[keys[index]].values.values, c);
-        (d: { value: number }) => aggregation(d.value, c)
-      );
     }
     if (type === MetricQueryTypes.ReadLabeledMetricsValues) {
       const resVal = Object.values(resp.data)[0] || [];
@@ -166,7 +164,6 @@ export function useSourceProcessor(
         const values = item.values.values.map((d: { value: number }) =>
           aggregation(Number(d.value), c)
         );
-
         const indexNum = labelsIdx.findIndex((d: string) => d === item.label);
         if (labels[indexNum] && indexNum > -1) {
           source[labels[indexNum]] = values;
@@ -287,9 +284,7 @@ export function usePodsSource(
         d[name] = aggregation(resp.data[key], c);
       }
       if (config.metricTypes[index] === MetricQueryTypes.ReadMetricsValues) {
-        d[name] = resp.data[key].values.values.map((d: { value: number }) =>
+        d[name] = calculateExp(resp.data[key].values.values, c);
-          aggregation(d.value, c)
-        );
       }
     });
 
@@ -322,8 +317,26 @@ export function useQueryTopologyMetrics(metrics: string[], ids: string[]) {
 
   return { queryStr, conditions };
 }
+function calculateExp(
+  arr: number[],
+  config: { calculation: string }
+): (number | string)[] {
+  let data: (number | string)[] = arr;
+  switch (config.calculation) {
+    case Calculations.Average:
+      data = [arr.reduce((a, b) => a + b) / arr.length];
+      break;
+    default:
+      data = arr.map((d) => aggregation(d, config));
+      break;
+  }
+  return data;
+}
 
-export function aggregation(val: number, config: any): number | string {
+function aggregation(
+  val: number,
+  config: { calculation: string }
+): number | string {
   let data: number | string = Number(val);
 
   switch (config.calculation) {

src/views/dashboard/configuration/widget/metric/Index.vue

@@ -466,7 +466,7 @@ function setMetricConfig(index: number) {
 .chart-types {
   span {
     display: inline-block;
-    padding: 5px 10px;
+    padding: 2px 10px;
     border: 1px solid #ccc;
     background-color: #fff;
     border-right: 0;

src/views/dashboard/data.ts

@@ -266,11 +266,12 @@ export const CalculationOpts = [
   { label: "Byte to KB", value: "byteToKB" },
   { label: "Byte to MB", value: "byteToMB" },
   { label: "Byte to GB", value: "byteToGB" },
+  { label: "Average", value: "average" },
   {
-    label: "Convert milliseconds to YYYY-MM-DD HH:mm:ss",
+    label: "Milliseconds to YYYY-MM-DD HH:mm:ss",
     value: "convertMilliseconds",
   },
-  { label: "Convert seconds to YYYY-MM-DD HH:mm:ss", value: "convertSeconds" },
+  { label: "Seconds to YYYY-MM-DD HH:mm:ss", value: "convertSeconds" },
   { label: "Precision is 2", value: "precision" },
   { label: "Milliseconds to seconds", value: "msTos" },
 ];