changes

Author: xkiso

app/context/ApplicationContext.tsx

@@ -19,8 +19,20 @@ const ApplicationContextProvider: React.FC = ({ children }) => {
   /**
    * Connect to database provided by user at 'index'
    */
-  const connectToDB = async (index: number) => {
+  const connectToDB = async (index: number, application: string) => {
     await ipcRenderer.send('connect', index);
+    console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ** between connect & servicesRequest`);
+    
+    // Response
+    ipcRenderer.on('databaseConnected', (event: Electron.Event, data: any) => {
+      // Parse JSON response
+      const result = data;
+      if (result.length)
+        console.log(`${__dirname}/ApplicationContext.tsx/connectToDB: ${result}`);
+
+      fetchServicesNames(application);
+    });
+    
   };
 
   /**

app/modals/ServicesModal.tsx

@@ -19,8 +19,8 @@ const ServicesModal: React.SFC<ServicesModalProps> = ({ i, app }) => {
   );
 
   useEffect(() => {
-    connectToDB(i);
-    fetchServicesNames(app);
+    connectToDB(i, app);
+    // fetchServicesNames(app);
 
     return () => {
       setServicesData([]);

electron/databases/mongo.ts

@@ -2,14 +2,21 @@ import mongoose from 'mongoose';
 import { MongoError } from 'mongodb';
 
 // 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: number, URI: string) => {
-  return mongoose.connect(
-    URI,
-    { useNewUrlParser: true, useUnifiedTopology: true },
-    (err: MongoError) => {
-      if (err) console.log(err);
-      console.log('Connected to Mongo database!');
-    }
-  );
+const connectMongoose = async (i: number, URI: string) => {
+  try {
+    const db = await mongoose.connect(
+      URI,
+      { useNewUrlParser: true, useUnifiedTopology: true }
+      // ,
+      // (err: MongoError) => {
+      //   if (err) console.log(err);
+      //   console.log('Connected to Mongo database!');
+      // }
+    );
+    console.log(`${__dirname}/mongo.ts/connectMongoose: connected!`);
+    return db;
+  } catch(err) {
+    console.log(`${__dirname}/mongo.ts/connectMongoose: ${err}`);
+  }
 };
 export default connectMongoose;

electron/routes/data.ts

@@ -21,7 +21,7 @@ let currentDatabaseType: string;
  */
 ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
   try {
-    console.log('Attempting to connect to DB');
+    console.log('electron/routes/data.ts, ipcMain.on(connect): 1 Attempting to connect to DB');
     // Extract databaseType and URI from settings.json at particular index
     // get index from application context
     const fileContents = fs.readFileSync(path.resolve(__dirname, '../user/settings.json'), 'utf8');
@@ -30,14 +30,18 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
     // We get index from sidebar container: which is the mapplication (DEMO)
     const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
 
+    console.log('electron/routes/data.ts, ipcMain.on(connect): 2 pre-connect');
+
     // Connect to the proper database
     if (databaseType === 'MongoDB') await connectMongo(index, URI);
     if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
 
-    console.log('connected?');
+    console.log('electron/routes/data.ts, ipcMain.on(connect): 3 connected');
 
     // Currently set to a global variable
     currentDatabaseType = databaseType;
+
+    message.sender.send('databaseConnected', 'connected!');
   } catch ({ message }) {
     console.log('Error in "connect" event', message);
   }
@@ -49,7 +53,7 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
  */
 ipcMain.on('servicesRequest', async (message: Electron.IpcMainEvent) => {
   try {
-    console.log('Requesting application microservices');
+    console.log('electron/routes/data.ts, ipcMain.on(servicesRequest): 4 Requesting application microservices');
     let result: any;
 
     // Mongo Database

electron/user/settings.json

@@ -1,26 +1,19 @@
 {
   "setupRequired": false,
   "services": [
-    [
-      "myPostgres",
-      "SQL",
-      "postgres://zwezmnqm:8onRNKC9MzktDeL3NpI_8Q62UfLLM3UK@ruby.db.elephantsql.com:5432/zwezmnqm",
-      "Online bookstore with that keeps track of orders and customers",
-      "Jun 28, 2020 4:58 PM"
-    ],
-    [
-      "myMongo",
-      "MongoDB",
-      "mongodb+srv://chronos:pass123@cluster0-xluio.mongodb.net/chronos?retryWrites=true&w=majority",
-      "E-commerce website for buying and selling clothes",
-      "Jul 01, 2020 10:33 PM"
-    ],
     [
       "ToddDB",
       "MongoDB",
       "mongodb+srv://tdwolf6:password16@cluster0-0xvd7.gcp.mongodb.net/Chronos?retryWrites=true&w=majority",
       "Web app deployed on AWS",
       "Jul 3, 2020 7:12AM"
+    ],
+    [
+      "myPostgres",
+      "SQL",
+      "postgres://zwezmnqm:8onRNKC9MzktDeL3NpI_8Q62UfLLM3UK@ruby.db.elephantsql.com:5432/zwezmnqm",
+      "Online bookstore with that keeps track of orders and customers",
+      "Jun 28, 2020 4:58 PM"
     ]
   ],
   "splash": true