cleaned up aws fetch on frontend and backend

Author: timlee12

app/App.tsx

@@ -2,15 +2,15 @@ import React, { useState } from 'react';
 import Splash from './components/Splash';
 import DashboardContainer from './containers/DashboardContainer';
 import './stylesheets/scrollBar.scss';
-import { useQuery, QueryClient, useQueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from 'react-query';
 import { ReactQueryDevtools } from 'react-query/devtools'
 
 const queryClient = new QueryClient();
 
 const App: React.FC = React.memo(() => {
   return (
     <QueryClientProvider client={queryClient}>
-      <ReactQueryDevtools initialIsOpen={true} />
+      <ReactQueryDevtools initialIsOpen={false} />
       <Splash />
       <DashboardContainer />
     </QueryClientProvider>

app/containers/MainContainer.tsx

@@ -10,6 +10,7 @@ import { DashboardContext } from '../context/DashboardContext';
 import SignUp from '../components/SignUp';
 import Login from '../components/Login';
 import '../stylesheets/MainContainer.scss';
+import TestContainer from './TestContainer';
 
 const MainContainer = React.memo(() => {
   const { mode } = useContext(DashboardContext);

app/context/AwsContext.tsx

@@ -11,30 +11,24 @@ interface Props {
 }
 
 const AwsContextProvider: React.FC<Props> = React.memo(({ children }) => {
-  const [awsData, setAwsData] = useState<any>({ CPUUtilization: [], NetworkIn: [], NetworkOut: [], DiskReadBytes: [] })
+  const [awsData, setAwsData] = useState<any>(null)
 
-  const fetchAwsData = useCallback(() => {
-    console.log('i am here in fetchawsdata!!!')
+  const fetchAwsData = () => {
     ipcRenderer.send('awsMetricsRequest');
-    
-    console.log('i am between the send and on!!!!!!!')
-    ipcRenderer.on('awsMetricsResponse', (event: Electron.Event, data: any) => {
-      console.log('data fetched from awsContext', data);
-      setAwsData(data);
+    ipcRenderer.on('awsMetricsResponse', (event: Electron.Event, res: any) => {
+      // console.log('data fetched from awsContext', res);
+      setAwsData(res);
+      // return res;
     })
-    
-    console.log('i am after the ipcrender!!!!')
-  },[]);
+  };
 
-  const { isLoading, data, error, isFetching } = useQuery('awsMetricsResponse', fetchAwsData);
-  
-  // useEffect(() => {
-  //   console.log(data, isLoading, error, isFetching);
-  // });
+  useEffect(() => {
+    console.log('awsdata after fetch is: ', awsData)
+  });
 
   return (
     <AwsContext.Provider
-      value={{ awsData, fetchAwsData }}
+      value={{ fetchAwsData, awsData, setAwsData }}
     >
       {children}
     </AwsContext.Provider>

electron/routes/data.ts

@@ -324,9 +324,8 @@ ipcMain.on('awsMetricsRequest', async (message: Electron.IpcMainEvent) => {
     });
 
     const metricsNamesArray = ['CPUUtilization', 'NetworkIn', 'NetworkOut', 'DiskReadBytes'];
-    const awsData = {};
-    
-    metricsNamesArray.forEach(metric => {
+    // const awsData = {};
+    const paramsArray = metricsNamesArray.map(metric => {
       const params = {
         EndTime: new Date(),
         MetricName: metric,
@@ -339,39 +338,36 @@ ipcMain.on('awsMetricsRequest', async (message: Electron.IpcMainEvent) => {
           Value: 'i-0c5656a0366bc6027'
         }]
       }
-      
-      const fetchData = async () => {
-        try {
-          const data = await cloudwatch.getMetricStatistics(params).promise();
-          // console.log(data)
-          
-          const newData = data.Datapoints.map((el, i) => {
-            let transformedData = {};
+
+      return params;
+    });
+
+    const fetchData = async () => {
+      const fetched = {};
+
+      for(let i = 0; i < paramsArray.length; i++) {
+        const data = await cloudwatch.getMetricStatistics(paramsArray[i]).promise();
+        // console.log('what is the data here: ', data)
+
+        const newData = data.Datapoints.map((el, index: number) => {
+          let transformedData = {};
+        
+          transformedData['time'] = data.Datapoints[index].Timestamp,
+          transformedData['metric'] = data.Label,
+          transformedData['value'] = data.Datapoints[index].Average,
+          transformedData['unit'] = data.Datapoints[index].Unit
 
-            transformedData['time'] = data.Datapoints[i].Timestamp,
-            transformedData['metric'] = data.Label,
-            transformedData['value'] = data.Datapoints[i].Average,
-            transformedData['unit'] = data.Datapoints[i].Unit
-            
-            // console.log(transformedData);
-            // arrayTest.push(transformedData);
-            return transformedData;
-          })
-  
-          awsData[metric] = newData;
-          // console.log(awsData)
-    
-          return awsData; // final returned data
-        } catch (err) {
-          console.log(err);
-        }
+          return transformedData;
+        });
+
+        fetched[paramsArray[i].MetricName] = newData;
       }
-  
-      fetchData().then(data => {
-        console.log(data)
-  
-        message.sender.send('awsMetricsResponse', JSON.stringify(data)) // send data to frontend
-      })
+
+      return fetched;
+    };
+    
+    fetchData().then(data => {
+      message.sender.send('awsMetricsResponse', JSON.stringify(data)) // send data to frontend
     })
   } catch (err) {
     console.log('Error in "awsMetricsRequest" event', message);