final dev changes

Author: jenaepen

Main.js

@@ -140,7 +140,6 @@ ipcMain.on('overviewRequest', (message, index) => {
         // Asynchronous event emitter used to transmit query results back to the render process.
         message.sender.send('overviewResponse', queryResults);
 
-
     });
   }
 
@@ -180,7 +179,6 @@ ipcMain.on('detailsRequest', (message, index) => {
   ).services[index][1];
 
   if (databaseType === 'MongoDB') {
-    connectMongoose(index);
     HealthInfoSchema.find({}, (err, data) => {
       if (err) {
         message.sender.send('detailsResponse', JSON.stringify(err));
@@ -192,7 +190,6 @@ ipcMain.on('detailsRequest', (message, index) => {
   }
 
   if (databaseType === 'SQL') {
-    const pool = connectSQL(index);
     const getHealth = 'SELECT * FROM healthInfo';
     pool.query(getHealth, (err, result) => {
       if (err) {

app/components/Modal.jsx

@@ -6,6 +6,7 @@ import ProcessesChart from '../charts/processes-chart.jsx';
 import TemperatureChart from '../charts/temperature-chart.jsx';
 import LatencyChart from '../charts/latency-chart.jsx';
 import MemoryChart from '../charts/memory-chart.jsx';
+import RouteTrace from '../charts/route-trace.jsx';
 
 const Modal = (props) => {
   // Destructuring props to make linter happy
@@ -15,6 +16,7 @@ const Modal = (props) => {
   //  Dictionary used to render proper data chart within Modal component upon rendering
   const dict = {
     request: <RequestTypesChart service={service} />,
+    routes: <RouteTrace service={service} />,
     response: <ResponseCodesChart service={service} />,
     speed: <SpeedChart service={service} />,
     processes: <ProcessesChart service={service} />,

app/components/ServiceDetails.jsx

@@ -31,6 +31,7 @@ const ServiceDetails = (props) => {
   const buttonProperties = [
     { id: 'request', alt: 'Request Data', src: pieChart },
     { id: 'response', alt: 'Response Data', src: 'https://st2.depositphotos.com/3894705/9581/i/950/depositphotos_95816620-stock-photo-round-button-shows-speedometer.jpg' },
+    { id: 'routes', alt: 'Route Trace', src: 'https://st2.depositphotos.com/3894705/9581/i/950/depositphotos_95816620-stock-photo-round-button-shows-speedometer.jpg' },
     { id: 'speed', alt: 'Speed Data', src: 'https://st2.depositphotos.com/3894705/9581/i/950/depositphotos_95816620-stock-photo-round-button-shows-speedometer.jpg' },
     { id: 'processes', alt: 'Processes Data', src: 'https://st2.depositphotos.com/3894705/9581/i/950/depositphotos_95816620-stock-photo-round-button-shows-speedometer.jpg' },
     { id: 'latency', alt: 'Latency Data', src: 'https://st2.depositphotos.com/3894705/9581/i/950/depositphotos_95816620-stock-photo-round-button-shows-speedometer.jpg' },
@@ -86,38 +87,6 @@ const ServiceDetails = (props) => {
       <div id="healthGrid">
         {healthInfoButtons}
        </div>
-      <div>
-        <h3>Request Types</h3>
-        <RequestTypesChart service={props.service} />
-      </div>
-      <div>
-        <h3>Response Codes </h3>
-        <ResponseCodesChart service={props.service} />
-      </div>
-      <div>
-        <h3>Route Trace</h3>
-         <RouteTrace service={props.service} />
-      </div>
-      <div>
-        <h3>Speed Chart</h3>
-        <SpeedChart service={props.service} />
-      </div>
-      <div>
-        <h3>Processes Chart</h3>
-        <ProcessesChart service={props.service} />
-      </div>
-      <div>
-        <h3>Latency</h3>
-        <LatencyChart service={props.service} />
-      </div>
-      <div>
-        <h3>Temperature Chart</h3>
-        <TemperatureChart service={props.service} />
-      </div>
-      <div>
-        <h3>Memory Chart</h3>
-        <MemoryChart service={props.service} />
-      </div>
     </div>
   );
 };

model/mongoose-connect.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
 
 // Mongoose connection wrapped in function that takes the index of the selected database as the parameter. This index is used to target the correct database for querying.
-const connectMongoose = (i, URI) => {
+const connectMongoose = (i,URI) => {
   return mongoose.connect(URI, { useNewUrlParser: true, useUnifiedTopology: true }, (err) => {
     if (err) console.log(err);
     console.log('Connected to Mongo database!');

user/settings.json

@@ -1 +1 @@
-{"setupRequired":true, "services":["hard","coded","in"]}
+{"setupRequired":false,"services":[["micro1","MongoDB","mongodb+srv://jenaepen:pen1321!@jenae-6dyj0.mongodb.net/test?retryWrites=true&w=majority"],["micro2","SQL","postgres://heilucpy:7kaQsZKI-1Pe-Vuu_4TSbezjJvCBJ5ft@rajje.db.elephantsql.com:5432/heilucpy"]]}