Skip to content

Commit ded6556

Browse files
lu0713lu0713
committed
commented out console.logs, incorporated RouteChart removal of doubled edges
1 parent b2663b9 commit ded6556

File tree

9 files changed

+27
-29
lines changed

9 files changed

+27
-29
lines changed

‎app/charts/RouteChart.jsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ const RouteChart = React.memo(() => {
157157

158158
const events = {
159159
select: function (event) {
160-
var { nodes, edges } = event;
161-
console.log('Selected nodes:');
162-
console.log(nodes);
163-
console.log('Selected edges:');
164-
console.log(edges);
160+
let { nodes, edges } = event;
165161
},
166162
};
167163

‎app/components/Applications.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ const Applications: React.FC = React.memo((props) => {
8383
}));
8484

8585
const classes = useStyles();
86-
87-
console.log('Applications.tsx: applications', applications)
8886

8987
return (
9088
<>

‎app/context/ApplicationContext.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,13 @@ const ApplicationContextProvider: React.FC = React.memo(({ children }) => {
3838
const connectToDB = useCallback((index: number, application: string) => {
3939
ipcRenderer.removeAllListeners('databaseConnected');
4040
ipcRenderer.send('connect', index);
41-
console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ** between connect & servicesRequest`);
41+
// console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ** between connect & servicesRequest`);
4242

4343
// Response
4444
ipcRenderer.on('databaseConnected', (event: Electron.Event, data: any) => {
4545
// Parse JSON response
4646
const result = data;
47-
if (result.length)
48-
console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ${result}`);
47+
// if (result) console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ${result}`);
4948

5049
fetchServicesNames(application);
5150
});
@@ -64,7 +63,7 @@ const ApplicationContextProvider: React.FC = React.memo(({ children }) => {
6463
let result: any;
6564
// Parse JSON response
6665
if (tryParseJSON(data)) result = JSON.parse(data);
67-
if (result.length) console.log('Number of data points (service):', result.length);
66+
// if (result.length) console.log('Number of data points (service):', result.length);
6867

6968
// Set local state
7069
setServicesData(result);

‎app/context/CommsContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const CommsContextProvider: React.SFC = React.memo(({ children }) => {
4747
let result: any;
4848
// Store resulting data in local state
4949
if (tryParseJSON(data)) result = JSON.parse(data);
50-
if (result.length) console.log('Number of data points (comms):', result.length);
50+
// if (result.length) console.log('Number of data points (comms):', result.length);
5151
setCommsData(result);
5252
});
5353
}

‎app/context/DockerContext.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const DockerContextProvider: React.FC = React.memo(({ children }) => {
4343

4444
// Parse result
4545
if (tryParseJSON(data)) result = JSON.parse(data);
46-
47-
if (result.length) console.log('Number of data points (docker):', result.length);
46+
// if (result.length) console.log('Number of data points (docker):', result.length);
47+
4848
// Display single data point
4949
const newDockerData = result[0] || {};
5050
setDockerData(newDockerData);

‎app/context/HealthContext.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ const HealthContextProvider: React.FC = React.memo(({ children }) => {
3636
let result: any;
3737
// Parse result
3838
if (tryParseJSON(data)) result = JSON.parse(data); // doesn't need to be parsed?
39-
if (result) console.log('HealthContext.tsx: JSON.parse(data): ', result);
40-
if (result !== undefined) {
41-
if (result.length !== undefined)
42-
console.log('Number of data points (health):', result.length);
43-
}
39+
// if (result) console.log('HealthContext.tsx: JSON.parse(data): ', result);
40+
// if (result !== undefined) {
41+
// if (result.length !== undefined) console.log('Number of data points (health):', result.length);
42+
// }
43+
4444
// Update context local state
4545
if (result && result.length) setHealthData(parseHealthData(result));
4646
});

‎electron/databases/mongo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const connectMongoose = async (i: number, URI: string) => {
1313
// console.log('Connected to Mongo database!');
1414
// }
1515
);
16-
console.log(`${__dirname}/mongo.ts/connectMongoose: connected!`);
16+
// console.log(`${__dirname}/mongo.ts/connectMongoose: connected!`);
1717
return db;
1818
} catch(err) {
1919
console.log(`${__dirname}/mongo.ts/connectMongoose: ${err}`);

‎electron/routes/data.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ let currentDatabaseType: string;
2121
*/
2222
ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
2323
try {
24-
console.log('electron/routes/data.ts, ipcMain.on(connect): 1 Attempting to connect to DB');
24+
// console.log('electron/routes/data.ts, ipcMain.on(connect): 1 Attempting to connect to DB');
25+
2526
// Extract databaseType and URI from settings.json at particular index
2627
// get index from application context
2728
const fileContents = fs.readFileSync(path.resolve(__dirname, '../user/settings.json'), 'utf8');
@@ -30,13 +31,13 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
3031
// We get index from sidebar container: which is the mapplication (DEMO)
3132
const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
3233

33-
console.log('electron/routes/data.ts, ipcMain.on(connect): 2 pre-connect');
34+
// console.log('electron/routes/data.ts, ipcMain.on(connect): 2 pre-connect');
3435

3536
// Connect to the proper database
3637
if (databaseType === 'MongoDB') await connectMongo(index, URI);
3738
if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
3839

39-
console.log('electron/routes/data.ts, ipcMain.on(connect): 3 connected');
40+
// console.log('electron/routes/data.ts, ipcMain.on(connect): 3 connected');
4041

4142
// Currently set to a global variable
4243
currentDatabaseType = databaseType;
@@ -53,7 +54,8 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
5354
*/
5455
ipcMain.on('servicesRequest', async (message: Electron.IpcMainEvent) => {
5556
try {
56-
console.log('electron/routes/data.ts, ipcMain.on(servicesRequest): 4 Requesting application microservices');
57+
// console.log('electron/routes/data.ts, ipcMain.on(servicesRequest): 4 Requesting application microservices');
58+
5759
let result: any;
5860

5961
// Mongo Database
@@ -83,7 +85,8 @@ ipcMain.on('servicesRequest', async (message: Electron.IpcMainEvent) => {
8385
*/
8486
ipcMain.on('commsRequest', async (message: Electron.IpcMainEvent) => {
8587
try {
86-
console.log(`Requesting communication data`)
88+
// console.log(`Requesting communication data`)
89+
8790
let result: any;
8891

8992
// Mongo Database
@@ -115,7 +118,8 @@ ipcMain.on('commsRequest', async (message: Electron.IpcMainEvent) => {
115118
*/
116119
ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: string) => {
117120
try {
118-
console.log(`Requesting microservice health for "${service}"`)
121+
// console.log(`Requesting microservice health for "${service}"`)
122+
119123
let result: any;
120124

121125
// Mongo Database
@@ -158,7 +162,8 @@ ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: stri
158162
*/
159163
ipcMain.on('dockerRequest', async (message, service) => {
160164
try {
161-
console.log(`Requesting container information for "${service}"`)
165+
// console.log(`Requesting container information for "${service}"`)
166+
162167
let result: any;
163168
// Mongo Database
164169
if (currentDatabaseType === 'MongoDB') {

‎examples/docker/books/BookController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BookController.getBooks = (req, res, next) => {
3535
return res.status(404).json(err);
3636
}
3737
res.locals.getBooks = result;
38-
console.log('Book retrieval was successful', res.locals.getBooks);
38+
// console.log('Book retrieval was successful', res.locals.getBooks);
3939
return next();
4040
});
4141
};
@@ -55,7 +55,7 @@ BookController.deleteBook = (req, res, next) => {
5555

5656
// This controller gets order info from the order application
5757
BookController.getorderinfo = (req, res, next) => {
58-
console.log('req.headers (in bookController.js):', req.headers);
58+
// console.log('req.headers (in bookController.js):', req.headers);
5959
fetch(`http://orders:7777/orders/getorders`, {
6060
method: 'GET',
6161
headers: {

0 commit comments

Comments
 (0)