Merge pull request #91 from tdwolf6/test

Updated DockerData

Author: ronellecaguioa

__tests__/app/containers/GraphsContainer.test.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { configure, shallow, render } from 'enzyme';
 
 import GraphsContainer from '../../../app/containers/GraphsContainer'
-// import SpeedChart from '../../../app/charts/speed-chart'
+ import SpeedChart from '../../../app/charts/SpeedChart'
 
-xdescribe('<GraphsContainer />', () => {
-  it('should render graphs')
-})
+// xdescribe('<GraphsContainer />', () => {
+//   it('should render graphs')
+// })
 
 // xdescribe('<GraphsContainer />', () => {
 //   it('should', () => {

app/charts/DockerChart.tsx

@@ -24,6 +24,7 @@ interface IContainer {
  */
 const DockerStatsChart = () => {
   const { dockerData } = useContext(DockerContext);
+
   const {
     containername,
     containerid,

app/context/DockerContext.tsx

@@ -25,12 +25,13 @@ const DockerContextProvider: React.FC = ({ children }) => {
   }
 
   // Fetches all data related to a particular app
-  const fetchDockerData = (service: string) => {
+  const fetchDockerData = (service: string) => { 
     ipcRenderer.send('dockerRequest', service);
 
     ipcRenderer.on('dockerResponse', (event: Electron.Event, data: any) => {
       // Parse result
       const result: IContainer[] = JSON.parse(data);
+
       console.log('Number of data points (docker):', result.length);
       // Display single data point
       const newDockerData = result[0] || {};

electron/models/DockerModel.ts

@@ -1,19 +1,5 @@
-import mongoose, { Schema, Document } from 'mongoose';
-
-export interface IDock extends Document {
-  containername: string;
-  containerid: string;
-  platform: string;
-  starttime: string;
-  memoryusage: number;
-  memorylimit: number;
-  memorypercent: number;
-  cpupercent: number;
-  networkreceived: number;
-  networksent: number;
-  processcount: number;
-  restartcount: number;
-}
+import mongoose from 'mongoose';
+const { Schema } = mongoose;
 
 const DockerSchema = new Schema({
   containername: {
@@ -66,4 +52,7 @@ const DockerSchema = new Schema({
   },
 });
 
-export default mongoose.model<IDock>('containerinfos', DockerSchema);
+
+const DockerModelFunc = (serviceName: any) => mongoose.model<any>(`${serviceName}-containerinfos`, DockerSchema);
+
+export default DockerModelFunc;

electron/routes/data.ts

@@ -159,11 +159,11 @@ ipcMain.on('dockerRequest', async (message, service) => {
     // Mongo Database
     if (currentDatabaseType === 'MongoDB') {
       // Get document count
-      let num = await DockerModelFunc.countDocuments();
+      let num = await DockerModelFunc(service).countDocuments();
 
       //Get last 50 documents. If less than 50 documents, get all
       num = Math.max(num, 50);
-      result = await DockerModelFunc.find().skip(num - 50);
+      result = await DockerModelFunc(service).find().skip(num - 50);
     }
 
     // SQL Database