Merge branch 'dev' into danCrash

Author: danst3in

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

@@ -111,7 +111,7 @@ 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() {

src/client/components/display/ResponseEventsDisplay.jsx

@@ -9,6 +9,7 @@ const ResponseEventsDisplay = ({ response }) => {
   const { events, headers } = response;
   const displayContents = [];
   // console.log('what is events' , events)
+
   // If it's an SSE, render event rows
 
   if (headers && headers['content-type'] && headers['content-type'].includes('text/event-stream')) {

src/client/controllers/grpcController.js

@@ -119,7 +119,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
         reqResObj.timeSent = Date.now();
         // make Unary call
         client[rpc](query, meta, (err, data)=> {
-          console.log("query from line 122 in grpcController", query)
+          // console.log("query from line 122 in grpcController", query)
           if (err) {
             console.log('unary error' , err);
           }