Merge pull request #186 from open-source-labs/james/communicationsFix

communications bug fix

Author: hann7

app/charts/RouteChart.jsx

@@ -11,6 +11,8 @@ import { CommsContext } from '../context/CommsContext';
 
 const RouteChart = React.memo(() => {
   const communicationsData = useContext(CommsContext).commsData;
+  
+  console.log('commdata before sort: ', communicationsData);
 
   const resObj = {};
   const dataId = '_id';
@@ -21,12 +23,15 @@ const RouteChart = React.memo(() => {
      * The below sorts it back into ascending order.
      */
 
+
     communicationsData.sort((a, b) => {
       if (new Date(a.time) > new Date(b.time)) return 1;
       if (new Date(a.time) < new Date(b.time)) return -1;
       return 0;
     });
 
+    console.log('commdata after sort: ', communicationsData[0], communicationsData[0].endpoint);
+
     for (let i = 0; i < communicationsData.length; i += 1) {
       const element = communicationsData[i];
       if (!resObj[element.correlatingid]) resObj[element.correlatingid] = [];
@@ -57,6 +62,8 @@ const RouteChart = React.memo(() => {
 
   const tracePoints = Object.values(resObj).filter(subArray => subArray.length > 1);
 
+  console.log('tracepoints: ', tracePoints);
+
   const useStyles = makeStyles(theme => ({
     paper: {
       height: 300,

app/context/CommsContext.tsx

@@ -33,17 +33,25 @@ const CommsContextProvider: React.SFC = React.memo(({ children }) => {
   }
 
   const fetchCommsData = useCallback((app: string, live: boolean) => {
-    if (app !== currentApp || live) {
+    // console.log("CommsContext app is:", app);
+    console.log("in the fetchCommsData");
+    console.log("CommsContext live is: ", live);
+    console.log("CommsContext current app is: ",  currentApp);
+
+    // if (app !== currentApp || live) {
       ipcRenderer.removeAllListeners('commsResponse');
+      console.log('current app in commscontext: ', app);
       setCurrentApp(app);
-      ipcRenderer.send('commsRequest', app);
+      //ipcRenderer.send('commsRequest', app);
+      ipcRenderer.send('commsRequest');
       ipcRenderer.on('commsResponse', (event: Electron.Event, data: any) => {
         let result: any;
-
+// 
         if (tryParseJSON(data)) result = JSON.parse(data);
+        console.log('result in commscontext fetch: ', result);
         setCommsData(result);
       });
-    }
+    // }
   }, []);
 
   return (

app/modals/ServicesModal.tsx

@@ -56,12 +56,6 @@ const ServicesModal: React.FC<ServicesModalProps> = React.memo(({ i, app }) => {
                 {service.microservice}
               </div>
             ))}
-            <div
-              className={services.includes('communications') ? 'link selected' : 'link'}
-              onClick={() => setServices(['communications'])}
-            >
-              communications
-            </div>
             <Link id='selectLink'
               className="router link"
               to={services.length > 0 ? `/applications/${app}/${services.join(' ')}` : '#'}

electron/routes/data.ts

@@ -113,13 +113,13 @@ ipcMain.on('commsRequest', async (message: Electron.IpcMainEvent) => {
       result = await pool.query(getCommunications);
       result = result.rows;
     }
-
+    console.log('result from database query in data.ts: ', result)
     // Async event emitter - send response
     message.sender.send('commsResponse', JSON.stringify(result));
   } catch (error) {
     // Catch errors
-    console.log('Error in "commeRequest" event', message);
-    message.sender.send('commsResponse', {});
+    console.log('Error in "commsRequest" event: ', error);
+    // message.sender.send('commsResponse', {}); //comment back in later
   }
 });