From 67d634ef771b89b04fbc4ed748086a7a1da41fd9 Mon Sep 17 00:00:00 2001
From: vichansson <vhansson@opennebula.io>
Date: Wed, 25 Oct 2023 19:44:10 +0300
Subject: [PATCH] B OpenNebula/one#6347: Fix typo + calculations (#2788)

Fixes a typo in the translation constants where Disk Write IOPS was missing. Also adds a function to the Chartists component that now calculates the delta values for the input data if the derivative=true prop is passed to it.

Signed-off-by: Victor Hansson <vhansson@opennebula.io>
---
 .../src/client/components/Charts/Chartist.js  | 22 ++++++++++++++++++-
 .../components/Tabs/Vm/Network/Graphs.js      |  2 ++
 .../components/Tabs/Vm/Storage/Graphs.js      |  2 ++
 .../src/client/constants/translates.js        |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/fireedge/src/client/components/Charts/Chartist.js b/src/fireedge/src/client/components/Charts/Chartist.js
index bfd24cd607..9bff677ff1 100644
--- a/src/fireedge/src/client/components/Charts/Chartist.js
+++ b/src/fireedge/src/client/components/Charts/Chartist.js
@@ -55,6 +55,21 @@ const useStyles = makeStyles(({ palette, typography }) => ({
   },
 }))
 
+const calculateDerivative = (data) =>
+  data
+    .map((point, i, array) => {
+      if (i === array.length - 1) {
+        return null
+      }
+      const nextPoint = array[i + 1]
+
+      return {
+        x: point.x,
+        y: (nextPoint.y - point.y) / ((nextPoint.x - point.x) / 1000),
+      }
+    })
+    .filter((point) => point)
+
 /**
  * Represents a Chartist Graph.
  *
@@ -65,6 +80,7 @@ const useStyles = makeStyles(({ palette, typography }) => ({
  * @param {string} props.x - Chartist X
  * @param {string} props.y - Chartist X
  * @param {Function} props.interpolationY - Chartist interpolation Y
+ * @param {boolean} props.derivative - Display delta values
  * @returns {JSXElementConstructor} Chartist component
  */
 const Chartist = ({
@@ -74,6 +90,7 @@ const Chartist = ({
   x = '',
   y = '',
   interpolationY = (value) => value,
+  derivative = false,
 }) => {
   const classes = useStyles()
 
@@ -93,6 +110,8 @@ const Chartist = ({
       )
     : []
 
+  const processedData = derivative ? calculateDerivative(dataChart) : dataChart
+
   return (
     <Paper variant="outlined" sx={{ height: 'fit-content' }}>
       <List className={classes.box}>
@@ -106,7 +125,7 @@ const Chartist = ({
             </Stack>
           ) : (
             <Chart
-              data={dataChart}
+              data={processedData}
               height={300}
               width={500}
               className={classes.graphStyle}
@@ -132,6 +151,7 @@ Chartist.propTypes = {
   x: PropTypes.string,
   y: PropTypes.string,
   interpolationY: PropTypes.func,
+  derivative: PropTypes.bool,
 }
 
 Chartist.displayName = 'Chartist'
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Network/Graphs.js b/src/fireedge/src/client/components/Tabs/Vm/Network/Graphs.js
index 3c57b213ff..94d34b48ef 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Network/Graphs.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Network/Graphs.js
@@ -68,6 +68,7 @@ const Graphs = ({ id }) => {
           data={monitoring}
           y="NETRX"
           x="TIMESTAMP"
+          derivative={true}
           interpolationY={interpolationBytesSeg}
         />
       </Grid>
@@ -78,6 +79,7 @@ const Graphs = ({ id }) => {
           data={monitoring}
           y="NETTX"
           x="TIMESTAMP"
+          derivative={true}
           interpolationY={interpolationBytesSeg}
         />
       </Grid>
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Storage/Graphs.js b/src/fireedge/src/client/components/Tabs/Vm/Storage/Graphs.js
index 00b7f5e302..1bab8022a7 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Storage/Graphs.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Storage/Graphs.js
@@ -65,6 +65,7 @@ const Graphs = ({ id }) => {
           data={monitoring}
           y="DISKRDIOPS"
           x="TIMESTAMP"
+          derivative={true}
           interpolationY={interpolationY}
         />
       </Grid>
@@ -75,6 +76,7 @@ const Graphs = ({ id }) => {
           data={monitoring}
           y="DISKWRIOPS"
           x="TIMESTAMP"
+          derivative={true}
           interpolationY={interpolationY}
         />
       </Grid>
diff --git a/src/fireedge/src/client/constants/translates.js b/src/fireedge/src/client/constants/translates.js
index 1ada8ff0c9..092846f70c 100644
--- a/src/fireedge/src/client/constants/translates.js
+++ b/src/fireedge/src/client/constants/translates.js
@@ -1084,7 +1084,7 @@ module.exports = {
   DiskReadBytes: 'Disk read bytes',
   DiskWriteBytes: 'Disk write bytes',
   DiskReadIOPS: 'Disk read IOPS',
-  DiskWriteIOPS: 'Disk write bytes',
+  DiskWriteIOPS: 'Disk write IOPS',
   NetRX: 'Net RX',
   NetTX: 'Net TX',
   NetDownloadSpeed: 'Net download speed',