revert: cpm5d (#245)

src/hooks/data.ts

@@ -38,8 +38,6 @@ export enum Calculations {
   ApdexAvg = "apdexAvg",
   SecondToDay = "secondToDay",
   NanosecondToMillisecond = "nanosecondToMillisecond",
-  CPM5D = "cpm5d",
-  CPM5DAvg = "cpm5dAvg",
 }
 export enum sizeEnum {
   XS = "XS",

src/hooks/useListConfig.ts

@@ -17,7 +17,7 @@
 import { MetricQueryTypes, Calculations } from "./data";
 export function useListConfig(config: any, index: string) {
   const i = Number(index);
-  const types = [Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg, Calculations.CPM5DAvg];
+  const types = [Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg];
   const calculation = config.metricConfig && config.metricConfig[i] && config.metricConfig[i].calculation;
   const isLinear =
     [MetricQueryTypes.ReadMetricsValues, MetricQueryTypes.ReadLabeledMetricsValues].includes(config.metricTypes[i]) &&

src/hooks/useMetricsProcessor.ts

@@ -290,11 +290,7 @@ export function usePodsSource(
       }
       if (config.metricTypes[index] === MetricQueryTypes.ReadMetricsValues) {
         d[name] = {};
-        if (
+        if ([Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg].includes(c.calculation)) {
-          [Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg, Calculations.CPM5DAvg].includes(
-            c.calculation,
-          )
-        ) {
           d[name]["avg"] = calculateExp(resp.data[key].values.values, c);
         }
         d[name]["values"] = resp.data[key].values.values.map((val: { value: number }) => aggregation(val.value, c));
@@ -319,11 +315,7 @@ export function usePodsSource(
           if (!d[key]) {
             d[key] = {};
           }
-          if (
+          if ([Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg].includes(c.calculation)) {
-            [Calculations.Average, Calculations.ApdexAvg, Calculations.PercentageAvg, Calculations.CPM5DAvg].includes(
-              c.calculation,
-            )
-          ) {
             d[key]["avg"] = calculateExp(item.values.values, c);
           }
           d[key]["values"] = values;
@@ -377,13 +369,6 @@ function calculateExp(arr: { value: number }[], config: { calculation?: string }
     case Calculations.ApdexAvg:
       data = [(sum / arr.length / 10000).toFixed(2)];
       break;
-    case Calculations.CPM5DAvg:
-      data = [
-        sum / arr.length / 100000 < 1 && sum / arr.length / 100000 !== 0
-          ? (sum / arr.length / 100000).toFixed(5)
-          : (sum / arr.length / 100000).toFixed(2),
-      ];
-      break;
     default:
       data = arr.map((d) => aggregation(d.value, config));
       break;
@@ -413,9 +398,6 @@ export function aggregation(val: number, config: { calculation?: string }): numb
     case Calculations.Apdex:
       data = (val / 10000).toFixed(2);
       break;
-    case Calculations.CPM5D:
-      data = val / 100000 < 1 && val / 100000 !== 0 ? (val / 100000).toFixed(5) : (val / 100000).toFixed(2);
-      break;
     case Calculations.ConvertSeconds:
       data = dayjs(val * 1000).format("YYYY-MM-DD HH:mm:ss");
       break;
@@ -434,9 +416,6 @@ export function aggregation(val: number, config: { calculation?: string }): numb
     case Calculations.ApdexAvg:
       data = (val / 10000).toFixed(2);
       break;
-    case Calculations.CPM5DAvg:
-      data = val / 100000 < 1 && val / 100000 !== 0 ? (val / 100000).toFixed(5) : (val / 100000).toFixed(2);
-      break;
     default:
       data;
       break;

src/views/dashboard/data.ts

@@ -300,7 +300,6 @@ export const CalculationOpts = [
   { label: "Apdex", value: "apdex" },
   { label: "Avg-preview", value: "average" },
   { label: "Percentage + Avg-preview", value: "percentageAvg" },
-  { label: "CPM5D + Avg-preview", value: "cpm5dAvg" },
   { label: "Apdex + Avg-preview", value: "apdexAvg" },
   { label: "Byte to KB", value: "byteToKB" },
   { label: "Byte to MB", value: "byteToMB" },
@@ -310,7 +309,6 @@ export const CalculationOpts = [
     value: "convertMilliseconds",
   },
   { label: "Seconds to YYYY-MM-DD HH:mm:ss", value: "convertSeconds" },
-  { label: "CPM5D", value: "cpm5d" },
   { label: "Milliseconds to seconds", value: "msTos" },
   { label: "Seconds to days", value: "secondToDay" },
   { label: "Nanoseconds to milliseconds", value: "nanosecondToMillisecond" },