Merge branch 'dev' into jeff

Author: Jeffrey Na

app/charts/HealthChart.tsx

@@ -39,29 +39,35 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
   };
 
   // pulls the current service names to be shown in the graph title from chartData
-  const serviceNamesAsString = (chartData: object): string => {
+  const serviceNamesAsString = (chartDataObject: object): string => {
     let serviceNameString = '';
-    for (const serviceName in chartData) {
+    for (const serviceName in chartDataObject) {
       serviceNameString += `${serviceName} | `;
     }
     return serviceNameString;
   };
 
   // generates an array of plotly data objects to be passed into our plotly chart's data prop
-  const generatePlotlyDataObjects = (chartData: object): object[] => {
+  const generatePlotlyDataObjects = (chartDataObj: object): object[] => {
     const arrayOfPlotlyDataObjects: PlotlyData[] = [];
     console.log('chartData:::::::: ', chartData);
     // iterate through the chartData
-    for (const serviceName in chartData) {
+    for (const serviceName in chartDataObj) {
+      console.log('SERVICENAME: ', serviceName);
       // define the metrics for this service
-      const metrics = chartData[serviceName];
+      const metrics = chartDataObj[serviceName];
+      console.log('METRICS: ', metrics);
       // loop through the list of metrics for the current service
       for (const metricName in metrics) {
+        console.log('METRICNAME: ', metricName);
         // define the value and time arrays; allow data to be reassignable in case we need to convert the bytes data into megabytes
         let dataArray = metrics[metricName].value;
+        console.log('DATAARRAY: ', dataArray);
         const timeArray = metrics[metricName].time;
+        console.log('TIMEARRAY: ', timeArray);
         // specifically for `Megabyte` types, convert the original data of bytes into a value of megabytes before graphing
-        if (dataType === 'Memory in Megabytes' || 'Cache in Megabytes') {
+        if (dataType === 'Memory in Megabytes' || dataType === 'Cache in Megabytes') {
+          console.log('DATATYPE: ', dataType);
           dataArray = dataArray.map(value => (value / 1000000).toFixed(2));
         }
         // create the plotly object
@@ -75,6 +81,7 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
             colors: ['#fc4039', '#4b54ea', '#32b44f', '#3788fc', '#9c27b0', '#febc2c'],
           },
         };
+        console.log('PLOTLYDATAOBJECT: ', plotlyDataObject)
         // push the dataObject into the arrayOfPlotlyDataObjects
         arrayOfPlotlyDataObjects.push(plotlyDataObject);
       }

app/containers/HealthContainer.tsx

@@ -133,7 +133,7 @@ const HealthContainer: React.FC<HealthContainerProps> = React.memo(props => {
         typeGroupedObject[metricType][serviceName][metric] = metrics[metric];
       }
     }
-    console.log('typeGroupedObject: ', typeGroupedObject);
+    
     return typeGroupedObject;
   };
 

electron/routes/dataHelpers.ts

@@ -37,7 +37,7 @@ const mongoFetch = async (
     result = [{ [serviceName]: result }];
     return result;
   } catch (error) {
-    console.error('Aggregation error in mongoFetch(): ', error);
+    console.log('Aggregation error in mongoFetch(): ', error);
   }
 };
 
@@ -67,7 +67,7 @@ const postgresFetch = async (
     result = [{ [serviceName]: result }];
     return result;
   } catch (error) {
-    console.error('Query error in postgresFetch(): ', error);
+    console.log('Query error in postgresFetch(): ', error);
   }
 };