fixed merge conflict

Author: egrobar

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

@@ -171,11 +171,13 @@ class ComposerNewRequest extends Component {
       // grpc requests
       else if (this.props.newRequestFields.gRPC) {
 
+
         // saves all stream body queries to history & reqres request body
         let streamQueries = '';
         for (let i = 0; i < this.props.newRequestStreams.streamContent.length; i++) {
           streamQueries += `${this.props.newRequestStreams.streamContent[i]}`
         }      
+
         // define array to hold client query strings
         let queryArrStr = this.props.newRequestStreams.streamContent;
         let queryArr = [];
@@ -193,10 +195,13 @@ class ComposerNewRequest extends Component {
         const grpcStream = document.getElementById('stream').innerText;
 
         // create reqres obj to be passed to controller for further actions/tasks
+
         reqRes = {
           id: uuid(),
           created_at: new Date(),
+
           protocol: '',
+
           url: this.props.newRequestFields.url,
           graphQL: this.props.newRequestFields.graphQL,
           gRPC: this.props.newRequestFields.gRPC,
@@ -291,13 +296,48 @@ class ComposerNewRequest extends Component {
         JSONFormatted: true,
       });
 
+      if (this.props.newRequestFields.gRPC) {
+        this.props.setNewRequestBody({
+          ...this.newRequestBody,
+          bodyContent: '',
+          bodyVariables: '',
+          bodyType: 'GRPC',
+          rawType: '',
+          JSONFormatted: true,
+        });
+      }
+
+      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,
+      });
+    }
+
+      
       this.props.setNewRequestSSE(false);
     }
     else {

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

@@ -172,8 +172,6 @@ class FieldEntryForm extends Component {
   // }
 
   render() {
-    // console.log('what is this field entry form', this.props.newRequestFields)
-
 
     return (
       <div>

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

@@ -24,6 +24,7 @@ class HeaderEntryForm extends Component {
       this.addHeader(headersDeepCopy);
     }
     this.checkContentTypeHeaderUpdate();
+
   }
 
   checkContentTypeHeaderUpdate() {

src/client/components/display/History.jsx

@@ -12,14 +12,13 @@ class History extends Component {
   }
 
   addHistoryToNewRequest() {
-    console.log('this is the content', this.props.content)
 
     const requestFieldObj = {
       method: this.props.content.request.method ? this.props.content.request.method : 'GET',
       protocol: this.props.content.protocol ? this.props.content.protocol : 'http://',
       url: this.props.content.url ? this.props.content.url : 'http://',
       graphQL: this.props.content.graphQL ? this.props.content.graphQL : false,
-      gRPC: this.props.content.protocol === '' ? true : null
+      gRPC: this.props.content.gRPC ? this.props.content.gRPC : false
     }