Merge pull request #33 from gspletzer/preload

GraphQL Controller refactor

Author: StephWood

package-lock.json

@@ -8,6 +8,9 @@ contextBridge.exposeInMainWorld("api", {
       "confirm-clear-history",
       "import-proto",
       "quit-and-install",
+      "open-gql",
+      "import-collection",
+      "export-collection",
       'open-http',
     ];
     if (allowedChannels.includes(channel)) {
@@ -23,6 +26,7 @@ contextBridge.exposeInMainWorld("api", {
       "clear-history-response",
       "proto-info",
       "message",
+      "reply-gql",
       'reqResUpdate'
     ];
     if (allowedChannels.includes(channel)) {

preload.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component } from "react";
 
 // import GraphContainer from './GraphContainer.jsx';
 import ReqResContainer from './ReqResContainer.jsx';

src/client/components/containers/ContentsContainer.jsx

@@ -40,7 +40,7 @@ class UpdatePopUpContainer extends Component {
         <p>{this.state.message}</p>
         {this.state.message === "Update downloaded." && (
           <>
-            <p class="updateMessage">
+            <p className="updateMessage">
               Do you want to restart and install now? <br /> (If not, will
               auto-install on restart.)
             </p>

src/client/components/containers/UpdatePopUpContainer.jsx

@@ -4,13 +4,12 @@ import db from "../db";
 import * as store from "../store";
 import * as actions from "../actions/actions";
 
-const { api } = window; 
+const { api } = window;
 
-
-api.receive('add-collection', (...args) => {
-    console.log('received data: ', JSON.parse(args.data));
-    collectionsController.addCollectionToIndexedDb(JSON.parse(args.data));
-    collectionsController.getCollections();
+api.receive("add-collection", (...args) => {
+  console.log("received data: ", JSON.parse(args.data));
+  collectionsController.addCollectionToIndexedDb(JSON.parse(args.data));
+  collectionsController.getCollections();
 });
 
 const collectionsController = {
@@ -63,7 +62,7 @@ const collectionsController = {
         foundCollection.name += " import";
         foundCollection.id = uuid();
 
-        ipcRenderer.send("export-collection", { collection: foundCollection });
+        api.send("export-collection", { collection: foundCollection });
       })
       .catch((error) => {
         console.error(error.stack || error);
@@ -72,7 +71,7 @@ const collectionsController = {
   },
 
   importCollection(collection) {
-    ipcRenderer.send("import-collection", collection);
+    api.send("import-collection", collection);
   },
 };
 

src/client/controllers/collectionsController.js

@@ -4,7 +4,7 @@ import { InMemoryCache } from "apollo-cache-inmemory";
 import { WebSocketLink } from "apollo-link-ws";
 import { SubscriptionClient } from "subscriptions-transport-ws";
 //const { session } = require('electron').remote
-const { ipcRenderer } = require("electron");
+const { api } = window;
 
 import * as store from "../store";
 import * as actions from "../actions/actions";
@@ -26,17 +26,19 @@ const graphQLController = {
     });
   },
 
-  // handles graphQL queries and mutations
+  // handles graphQL queries and mutationsnp
   sendGqlToMain(args) {
     return new Promise((resolve) => {
-      ipcRenderer.send("open-gql", args);
-      ipcRenderer.on("reply-gql", (event, result) => {
+      api.receive("reply-gql", (result) => {
+        console.log("This is result:", result);
         // needs formatting because component reads them in a particular order
         result.reqResObj.response.cookies = this.cookieFormatter(
           result.reqResObj.response.cookies
         );
+        console.log(result);
         resolve(result);
       });
+      api.send("open-gql", args);
     });
   },