Merge branch 'dev' into Nancy-ReqResDisplay

Author: danst3in

grpc_mockData/server.js

@@ -35,7 +35,7 @@ function sayHello(ctx) {
   metadata.set('indeed', 'it do')
   // Watcher creates a watch execution context for the watch
   // The execution context provides scripts and templates with access to the watch metadata
-  console.log("received metadata from client request", ctx.metadata)
+  console.log("received metadata from client request", ctx.meta)
   // console.dir(ctx.metadata, { depth: 3, colors: true });
   console.log(`got sayHello request name: ${ctx.req.name}`);
 

package.json

@@ -198,7 +198,8 @@
     "status-indicator": "^1.0.9",
     "subscriptions-transport-ws": "^0.9.16",
     "uuid": "^3.3.2",
-    "ws": "^6.1.2"
+    "ws": "^6.1.2",
+    "node-pre-gyp": "0.6.x"
   },
   "devDependencies": {
     "@babel/core": "^7.1.2",

src/client/components/containers/ResponseContainer.jsx

@@ -37,6 +37,11 @@ class ResponseContainer extends Component {
           openTab: val,
         });
         break;
+      case 'Response Metadata':
+        this.setState({
+          openTab: val,
+        });
+        break;
       case 'Response Headers':
         this.setState({
           openTab: val,
@@ -47,7 +52,7 @@ class ResponseContainer extends Component {
           openTab: val,
         });
         break;
-     
+
       default:
     }
   }
@@ -69,6 +74,7 @@ class ResponseContainer extends Component {
           && <ResponseEventsDisplay response={this.props.content.response} />
         }
         {this.state.openTab === 'Response Headers' && <ResponseHeadersDisplay responseContent={this.props.content.response} />}
+        {this.state.openTab === 'Response Metadata' && <ResponseHeadersDisplay responseContent={this.props.content.response} />}
         {this.state.openTab === 'Response Cookies' && <ResponseCookiesDisplay responseContent={this.props.content.response} />}
       </div>
     );

src/client/components/display/ResponseTabs.jsx

@@ -7,10 +7,16 @@ class ResponseTabs extends Component {
   }
 
   render() {
+    console.log('THETSHESTRKSDFKJHS', this.props.content)
     const events = 'Response Events';
     const cookies = 'Response Cookies';
     let headers = 'Response Headers';
-    console.log('this.props.responseContent: ', this.props.responseContent)
+
+
+    if (this.props.content.gRPC === true ) {
+      headers = 'Response Metadata';
+    }
+
     return (
       <ul className="tab_list-response">
         <Tab onTabSelected={this.props.handleTabSelect} tabName={events} key="events" openTab={this.props.openResponseTab}/>
@@ -25,3 +31,5 @@ class ResponseTabs extends Component {
 }
 
 export default ResponseTabs;
+
+

src/client/components/display/WebSocketMessage.jsx

@@ -10,6 +10,7 @@ class WebSocketMessage extends Component {
   render() {
     const styles = {
       display: 'flex',
+      overflow: 'hidden',
       justifyContent: this.props.source === 'server' ? 'flex-start' : 'flex-end',
     };
 
@@ -22,7 +23,7 @@ class WebSocketMessage extends Component {
 
     return (
       <div style={styles} className={webSocketMessageClassNames}>
-        <div className={'websocket_message-data'}><div>{this.props.data}</div></div>
+        <div style={styles} className={'websocket_message-data'}><div>{this.props.data}</div></div>
         <div  className={'websocket_message-time'}>{`${hours}:${minutes}`}</div>
       </div>
     );

src/client/controllers/grpcController.js

@@ -97,6 +97,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
       // create client requested metadata key and value pair for each type of streaming
       let meta = new grpc.Metadata()
       let metaArr = reqResObj.request.headers;
+      console.log("metaArr from grpcController line 100:", metaArr)
       for (let i = 0; i < metaArr.length; i+=1) {
         let currentHeader = metaArr[i];
         meta.add(currentHeader.key, currentHeader.value)
@@ -174,7 +175,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
           // request without overwrite
           reqResObj.connection = 'pending';
           reqResObj.connectionType = 'plain';
-          reqResObj.timeSent = Date.now();
+          reqResObj.timeReceived = Date.now();
           call.write(query);
           // add console log for completed write?
         }
@@ -214,6 +215,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
             let key = keys[i];
             reqResObj.response.headers[key] = metadata._internal_repr[key][0];
             // console.log('reqred headers are now', reqResObj.response.headers)
+
           }
           store.default.dispatch(actions.reqResUpdate(reqResObj))
         })
@@ -239,7 +241,9 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
             for (let i = 0; i < keys.length; i += 1) {
               let key = keys[i];
               reqResObj.response.headers[key] = metadata._internal_repr[key][0];
+
               // console.log('reqred headers are now', reqResObj.response.headers)
+
             }
             store.default.dispatch(actions.reqResUpdate(reqResObj))
           });