removed redundant code

Author: mdtagg

app/charts/AwsChart.tsx

@@ -3,21 +3,20 @@ import React, { useState } from 'react';
 import Plot from 'react-plotly.js';
 import { all, solo as soloStyle } from './sizeSwitch';
 
-// interface AwsCpuChartProps {
-//   key: string;
-//   renderService: string;
-//   metric: string;
-//   timeList: any;
-//   valueList: any;
-//   sizing: string;
-//   colourGenerator: Function;
-// }
-
 interface SoloStyles {
   height: number;
   width: number;
 }
 
+interface IPlotlyData {
+  name: any;
+  x: any;
+  y: any;
+  type: any;
+  mode: any;
+  marker: { color: string };
+}
+
 /** 
  * @params props - the props object containing relevant data.
  * @desc Handles AWS Charts. Memoized component to generate an AWS chart with formatted data.
@@ -26,35 +25,31 @@ interface SoloStyles {
 const AwsChart: React.FC<any> = React.memo(props => {
   const { renderService, metric, timeList, valueList, colourGenerator, sizing } = props;
   const [solo, setSolo] = useState<SoloStyles | null>(null);
-  
+
   setInterval(() => {
     if (solo !== soloStyle) {
       setSolo(soloStyle);
     }
   }, 20);
 
-  const createChart = () => {
-    const timeArr = timeList?.map((el: any) => moment(el).format('kk:mm:ss'));
-    // const hashedColour = colourGenerator(renderService);
-    let plotlyData: {
-      name: any;
-      x: any;
-      y: any;
-      type: any;
-      mode: any;
-      marker: { color: string };
-    };
-    plotlyData = {
-      name: metric,
-      x: timeArr,
-      y: valueList,
-      type: 'scattergl',
-      mode: 'lines',
-      marker: { color: colourGenerator() },
-    };
-    const sizeSwitch = sizing === 'all' ? all : solo;
+  const timeArr = timeList?.map((el: any) => moment(el).format('kk:mm:ss'));
+
+  let plotlyData:IPlotlyData= {
+    name: metric,
+    x: timeArr,
+    y: valueList,
+    type: 'scattergl',
+    mode: 'lines',
+    marker: { color: colourGenerator() },
+  };
 
-    return (
+  const sizeSwitch = sizing === 'all' ? all : solo;
+
+  return (
+    <div 
+      className="chart" 
+      data-testid="Health Chart"
+    >
       <Plot
         data={[plotlyData]}
         config={{ displayModeBar: false }}
@@ -91,12 +86,6 @@ const AwsChart: React.FC<any> = React.memo(props => {
           },
         }}
       />
-    );
-  };
-
-  return (
-    <div className="chart" data-testid="Health Chart">
-      {createChart()}
     </div>
   );
 });

app/components/AwsEC2Graphs/AwsEC2Graphs.tsx

@@ -3,8 +3,6 @@ import AwsChart from '../../charts/AwsChart';
 import { AwsContext } from '../../context/AwsContext';
 import { stringToColor } from '../../utils';
 import './styles.scss'
-import { CircularProgress } from '@mui/material';
-
 
 const AwsEC2Graphs: React.FC = React.memo(props => {
   const { awsData, setAwsData, isLoading, setLoadingState } = useContext(AwsContext);