Merge branch 'dev' into justin/event-metrics

Author: jcpoirier20

__tests__/charts/HealthChart.test.tsx

@@ -30,6 +30,7 @@ describe('HealthChart', () => {
   const props = {
     key: 'testKey',
     dataType: 'Memory in Megabytes',
+    serviceName: 'serviceName',
     chartData: mockData,
     categoryName: 'Test Name',
     sizing: 'all',

app/components/Occupied.tsx

@@ -86,7 +86,6 @@ const Occupied = React.memo(() => {
   // Grab services and applications whenever the user changes
   // v10: Runs once when Occupied is memoized, and subsequently when user is updated.
   useEffect(() => {
-    // console.log('Hi, inside Occupied.ts useEffect function.');
     setServicesData([]);
     getApplications();
   }, [user]);

app/containers/HealthContainer.tsx

@@ -113,7 +113,6 @@ const HealthContainer: React.FC<HealthContainerProps> = React.memo(props => {
     const typeGroupedObject = {};
     // iterate over the services in the healthData object
     for (const serviceName in filteredHealthData) {
-      console.log('service name in datatype function: ', serviceName);
       // save the filtered metrics of the current service to a variable
       // define the types of each metric in the metrics object as an array
       const metrics: object = filteredHealthData[serviceName];

app/context/ApplicationContext.tsx

@@ -60,7 +60,7 @@ const ApplicationContextProvider: React.FC<AppContextProps> = React.memo(props =
    * @params application - is the name of the card taht was clicked on
    */
   const connectToDB = useCallback((username: string, index: number, application: string, URI: string, databaseType: string) => {
-    // console.log('Hi, inside ApplicationContext, connectToDB function was invoked.');
+    console.log('Hi, inside ApplicationContext, connectToDB function was invoked.');
     ipcRenderer.removeAllListeners('databaseConnected');
     ipcRenderer.send('connect', username, index, URI, databaseType);
     ipcRenderer.on('databaseConnected', (event: Electron.Event, data: any) => {
@@ -130,4 +130,4 @@ export default ApplicationContextProvider;
 //       console.log({ error: e });
 //     }
 //     return false;
-//   }
+//   }