merge latest pull request

Author: Yoon Choi

.gitignore

@@ -58,4 +58,5 @@ ehthumbs.db
 
 # proto files #
 #####################
-*.proto
+src/client/components/composer/protos
+*.proto

main.js

@@ -118,6 +118,7 @@ if (
   dev = true;
 }
 
+
 // Temporary fix broken high-dpi scale factor on Windows (125% scaling)
 // info: https://github.com/electron/electron/issues/9691
 if (process.platform === 'win32') {// if user is on windows...
@@ -269,6 +270,14 @@ autoUpdater.on('update-downloaded', info => {
 ipcMain.on('quit-and-install', () => {
   autoUpdater.quitAndInstall();
 });
+// App page reloads when user selects "Refresh" from pop-up dialog
+ipcMain.on('fatalError', () => {
+  console.log('received fatal error')
+  mainWindow.reload();
+});
+ipcMain.on('uncaughtException', () => {
+  console.log('received uncaguht fatal error')
+});
 
 app.on('activate', () => {
   // On macOS it's common to re-create a window in the app when the

src/client/components/composer/ComposerContainer.jsx

@@ -40,6 +40,7 @@ class ComposerContainer extends Component {
     // this.setState({
     //   composerDisplay: this.props.composerDisplay,
     // });
+
   }
 
   componentDidUpdate() {//keeping the redux store state in sync with this component's local state

src/client/components/composer/NewRequest/ComposerNewRequest.jsx

@@ -15,10 +15,6 @@ class ComposerNewRequest extends Component {
     this.handleSSEPayload = this.handleSSEPayload.bind(this);
   }
 
-  componentDidMount(){
-    // console.log('this.props.newRequestSSE.isSSE: ', this.props.newRequestSSE.isSSE);
-  }
-
   requestValidationCheck() {
     let validationMessage;
     //Error conditions...
@@ -39,7 +35,6 @@ class ComposerNewRequest extends Component {
         validationMessage = "Missing body.";
       }
     }
-
     return validationMessage || true;
   }
 
@@ -257,12 +252,6 @@ class ComposerNewRequest extends Component {
 
       this.props.setNewRequestStreams({
         ...this.props.newRequestStreams,
-        // streamsArr: [''],
-        // streamContent: [],
-        // selectedPackage: null,
-        // selectedService: null,
-        // selectedRequest: null,
-        // selectedStreamingType: null,
       });
 
       this.props.setNewRequestCookies({
@@ -279,45 +268,41 @@ class ComposerNewRequest extends Component {
         JSONFormatted: true,
       });
 
+      this.props.setNewRequestFields({
+        ...this.props.newRequestFields,
+        method: this.props.newRequestFields.method,
+        protocol: '',
+        url: 'http://',
+        graphQL: this.props.newRequestFields.graphQL,
+        gRPC: this.props.newRequestFields.gRPC,
+      });
+
       if (this.props.newRequestFields.gRPC) {
         this.props.setNewRequestBody({
           ...this.newRequestBody,
-          bodyContent: '',
-          bodyVariables: '',
           bodyType: 'GRPC',
           rawType: '',
-          JSONFormatted: true,
+        });
+        this.props.setNewRequestFields({
+          ...this.props.newRequestFields,
+          url: this.props.newRequestFields.url,
         });
       }
 
       if (this.props.newRequestFields.graphQL) {
         this.props.setNewRequestBody({
           ...this.newRequestBody,
-          bodyContent: '',
-          bodyVariables: '',
           bodyType: 'GQL',
           rawType: '',
-          JSONFormatted: true,
         });
       }
 
-      this.props.setNewRequestFields({
-        method: this.props.newRequestFields.method,
-        protocol: '',
-        url: '',
-        graphQL: this.props.newRequestFields.graphQL,
-        gRPC: this.props.newRequestFields.gRPC,
-      });
-
-      if(this.props.newRequestFields.protocol === 'ws://') {
-      this.props.setNewRequestFields({
-        method: this.props.newRequestFields.method,
-        protocol: 'ws://',
-        url: 'ws://',
-        graphQL: this.props.newRequestFields.graphQL,
-        gRPC: this.props.newRequestFields.gRPC,
-      });
-    }
+      if (this.props.newRequestFields.protocol === 'ws://') {
+        this.props.setNewRequestFields({
+          protocol: 'ws://',
+          url: 'ws://',
+        });
+      }
       this.props.setNewRequestSSE(false);
     }
     else {

src/client/components/composer/NewRequest/FieldEntryForm.jsx

@@ -25,20 +25,21 @@ class FieldEntryForm extends Component {
         break;
       } 
       case 'protocol': {
-        let grabbedProtocol, afterProtocol;
-        if (!!this.props.newRequestFields.url) {
-          grabbedProtocol = this.props.newRequestFields.url.match(/(https?:\/\/)|(localhost:)|(wss?:\/\/)/) !== null
-            ? this.props.newRequestFields.url.match(/(https?:\/\/)|(localhost:)|(wss?:\/\/)/)[0]
-            : ""
-          afterProtocol = this.props.newRequestFields.url.substring(grabbedProtocol.length, this.props.newRequestFields.url.length)
-        }
-        else afterProtocol = ''
+        // let grabbedProtocol, afterProtocol;
+        // if (!!this.props.newRequestFields.url) {
+        //   grabbedProtocol = this.props.newRequestFields.url.match(/(https?:\/\/)|(localhost:)|(wss?:\/\/)/) !== null
+        //     ? this.props.newRequestFields.url.match(/(https?:\/\/)|(localhost:)|(wss?:\/\/)/)[0]
+        //     : ""
+        //   afterProtocol = this.props.newRequestFields.url.substring(grabbedProtocol.length, this.props.newRequestFields.url.length)
+        // }
+        // else afterProtocol = ''
         // console.log('graphQL prop: ',graphQL)
         if (!!graphQL) { //if graphql
           this.props.setNewRequestFields({
             ...this.props.newRequestFields,
             protocol: '',
-            url: `http://${afterProtocol}`,
+            // url: `http://${afterProtocol}`,
+            url: 'http://',
             method: 'QUERY',
             graphQL: true,
             gRPC: false
@@ -56,7 +57,8 @@ class FieldEntryForm extends Component {
           this.props.setNewRequestFields({
             ...this.props.newRequestFields,
             protocol: '',
-            url: `http://${afterProtocol}`,
+            // url: `http://${afterProtocol}`,
+            url: 'http://',
             method: 'GET',
             graphQL: false,
             gRPC: false
@@ -72,7 +74,8 @@ class FieldEntryForm extends Component {
           this.props.setNewRequestFields({
             ...this.props.newRequestFields,
             protocol: '',
-            url: `${afterProtocol}`,
+            // url: `${afterProtocol}`,
+            url: '',
             method: '',
             graphQL: false,
             gRPC: true
@@ -88,7 +91,8 @@ class FieldEntryForm extends Component {
           this.props.setNewRequestFields({
             ...this.props.newRequestFields,
             protocol: value,
-            url: value + afterProtocol,
+            // url: value + afterProtocol,
+            url: 'ws://',
             method: '',
             graphQL: false,
             gRPC: false

src/client/components/composer/NewRequest/GRPCBodyEntryForm.jsx

@@ -61,6 +61,11 @@ class GRPCBodyEntryForm extends Component {
   }
   // event handler that updates state in the store when typing into the stream query body
   onChangeUpdateStream(streamID, value) {
+    // if client makes additional edits to proto file after hitting save
+    let saveProtoBtn = document.getElementById("save-proto").innerText;
+    if (saveProtoBtn === "Changes Saved") {
+      saveProtoBtn = "Save Changes";
+    }
     const streamsArr = this.props.newRequestStreams.streamsArr;
     for (let i = 0; i < streamsArr.length; i++) {
       if (streamsArr[i].id === streamID) {

src/client/components/composer/NewRequest/GRPCProtoEntryForm.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { remote } from 'electron';
 import fs from 'fs';
 import GRPCAutoInputForm from "./GRPCAutoInputForm.jsx";
-import protoParserFunc from "../protos/protoParser.js";
+import protoParserFunc from "../../../../client/protoParser.js";
 import dropDownArrow from '../../../../assets/icons/arrow_drop_down_white_192x192.png';
 
 class GRPCProtoEntryForm extends Component {
@@ -18,7 +18,7 @@ class GRPCProtoEntryForm extends Component {
     this.submitUpdatedProto = this.submitUpdatedProto.bind(this);
   }
 
-  // event handler on the arrow button that allows you to open/close the section 
+  // event handler on the arrow button that allows you to open/close the section
   toggleShow() {
     this.setState({
       show: !this.state.show
@@ -111,9 +111,9 @@ class GRPCProtoEntryForm extends Component {
       })
     }).catch((err) => console.log(err));
     // changes the button label from "Save Changes" to "Changes Saved"
-    document.getElementById("save-proto").innerText = 'Changes Saved ✓';
+    document.getElementById("save-proto").innerText = 'Changes Saved';
   }
-  
+
   render() {
     // arrow button used to collapse or open the Proto section
     const arrowClass = this.state.show ? 'composer_subtitle_arrow-open' : 'composer_subtitle_arrow-closed';

src/client/components/composer/protos/1000.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+
+package helloworld;
+
+// The greeting service definition.
+service Greeter {
+  // Sends a greeting
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
+  rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
+  rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+  string name = 1;
+}
+
+// The response message containing the greetings
+message HelloReply {
+  string message = 1;
+}
+
+// The request message containing the user's name.
+message HelloHowOldRequest {
+  int32 age = 1;
+}
+message HelloAge {
+  int32 age = 1;
+}

src/client/components/composer/protos/264.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+
+package helloworld;
+
+// The greeting service definition.
+service Greeter {
+  // Sends a greeting
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
+  rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
+  rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+  string name = 1;
+}
+
+// The response message containing the greetings
+message HelloReply {
+  string message = 1;
+}
+
+// The request message containing the user's name.
+message HelloHowOldRequest {
+  int32 age = 1;
+}
+message HelloAge {
+  int32 age = 1;
+}