Merge branch 'dev' into tabBugs

Author: danst3in

.gitignore

@@ -55,3 +55,7 @@ ehthumbs.db
 # Windows shortcuts #
 #####################
 *.lnk
+
+# proto files #
+#####################
+*.proto

__tests__/businessReducer.js

@@ -42,7 +42,7 @@ describe('Business reducer', () => {
       newRequestBody: {
         bodyContent: '',
         bodyVariables: '',
-        bodyType: 'none',
+        bodyType: 'raw',
         rawType: 'Text (text/plain)',
         JSONFormatted: true,
       },
@@ -346,6 +346,28 @@ describe('Business reducer', () => {
         graphQL: true
       }
     }
+    const requestStreamsAction = {
+      type: 'SET_NEW_REQUEST_STREAMS',
+      payload: {
+        
+        streamsArr: [],
+        count: 0,
+        streamContent: [],
+        selectedPackage: 'helloworld',
+        selectedRequest: 'helloRequest',
+        selectedService: 'hello',
+        selectedStreamingType: null,
+        initialQuery: null,
+        queryArr: null,
+        protoPath: null,
+        services: null,
+        
+      },
+    }
+    it('sets the newRequestStreams on SET_NEW_REQUEST_STREAMS', () => {
+      const { newRequestStreams } = reducer(state, requestStreamsAction);
+      expect(newRequestStreams).toEqual(requestStreamsAction.payload);
+    })
     it('sets the newRequestFields on POST', () => {
       const { newRequestFields } = reducer(state, postAction);
       expect(newRequestFields).toEqual(postAction.payload);

__tests__/composerTests.js

@@ -77,7 +77,7 @@ describe('GraphQL Composer', () => {
     },
     newRequestBody: {
       bodyContent: '',
-      bodyType: 'none',
+      bodyType: 'raw',
       rawType: 'Text (text/plain)',
       JSONFormatted: true,
       bodyVariables: ''

__tests__/protoParserTests.js

@@ -0,0 +1,88 @@
+import protoParser from '../src/client/components/composer/protos/protoParser';
+
+
+describe('testing protoParser', ()=> {
+
+        const protoFile = `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;
+        }`
+        describe('parser parses protos correctly', ()=> {
+            it('should get packageName', () => {
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    // console.log(d)
+                expect(data.packageName).toEqual('helloworld')
+                })
+                
+            })
+            it('should get serviceArray', () => {
+                const testArr = [{
+                    messages: [{}, {}, {}, {}], 
+                    name: 'Greeter',
+                    packageName: 'helloworld',
+                    rpcs: [{}, {}, {}, {}],
+        
+                }]
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    // console.log(d)
+                    expect(data.serviceArr[0].messages).toHaveLength(4);
+                    expect(data.serviceArr[0].rpcs).toHaveLength(4);
+                    expect(data.serviceArr[0].name).toEqual('Greeter');
+                    expect(data.serviceArr[0].packageName).toEqual('helloworld');
+                })
+               
+            })
+
+            it('should fill message content', () => {
+                const testArr = [{
+                    messages: [
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}}, 
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}}
+                ], 
+                    name: 'Greeter',
+                    packageName: 'helloworld',
+                    rpcs: [{}, {}, {}, {}],
+        
+                }]
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    expect(data.serviceArr[0].messages[0]).toEqual(testArr[0].messages[0]);
+                    expect(data.serviceArr[0].messages[0].def.name.type).toEqual("TYPE_STRING");
+                })
+               
+            })
+        
+        
+        })
+})
+

__tests__/responseTests.js

@@ -26,6 +26,7 @@ describe('ResponseContainer', () => {
     wrapper.setState({ openTab: 'Response Headers' });
     expect(wrapper.find('ResponseHeadersDisplay')).toBeTruthy();
   });
+ 
 
   it('should render Response Cookies when selected', () => {
     const wrapper = shallow(<ResponseContainer {...props} />);
@@ -47,15 +48,35 @@ describe('ResponseContainer', () => {
     const wrapper = shallow(<ResponseContainer {...props} />);
     expect(wrapper.find('ResponseEventsDisplay')).toBeTruthy();
   });
+
+  props = {
+    content: {
+      gRPC: true,
+      request: {
+        method: null
+      },
+    }
+  }
+  it('gRPC req should render Response Metadata when selected', () => {
+    const wrapper = shallow(<ResponseContainer {...props} />);
+    wrapper.setState({ openTab: 'Response Metadata' });
+    expect(wrapper.find('ResponseHeadersDisplay')).toBeTruthy();
+  });
+  
 });
 
 describe('ResponseTabs', () => {
   it('should render three tabs', () => {
-    const wrapper = shallow(<ResponseTabs />);
+    const wrapper = shallow(<ResponseTabs content={'not grpc'}/>);
     expect(wrapper.find('Tab')).toHaveLength(3);
   });
+  it('grpc should render two tabs', () => {
+    const wrapper = shallow(<ResponseTabs content={{gRPC: true}}/>);
+    expect(wrapper.find('Tab')).toHaveLength(2);
+  });
 });
 
+
 describe('ResponseEventsDisplay', () => {
   it('if SSE, should render event rows', () => {
     const props = {
@@ -67,16 +88,7 @@ describe('ResponseEventsDisplay', () => {
     const wrapper = shallow(<ResponseEventsDisplay {...props} />);
     expect(wrapper.find('SSERow')).toHaveLength(2);
   });
-  // it('if gRPC, should render all events', () => {
-  //   const props = {
-  //     response: {
-  //       headers: { 'content-type': 'text/event-stream' },
-  //       events: ['event 1', 'event 2'],
-  //     }
-  //   };
-  //   const wrapper = shallow(<ResponseEventsDisplay {...props} />);
-  //   expect(wrapper.find('JSONPretty').props.data).toHaveLength(2);
-  // });
+
   it('if not SSE, should render single event', () => {
     const props = {
       response: {

grpc_mockData/protos/hw2.proto

@@ -5,7 +5,8 @@ package helloworld;
 // The greeting service definition.
 service Greeter {
   // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHello (HelloRequest) returns (HelloReply) {} // single unary stream
+  rpc SayHelloNested (HelloNestedRequest) returns (HelloNestedReply) {} // nested unary stream
   rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
   rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
   rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
@@ -21,6 +22,16 @@ message HelloReply {
   string message = 1;
 }
 
+message HelloNestedRequest {
+  HelloRequest firstPerson = 1;
+  HelloRequest secondPerson = 2; 
+}
+
+message HelloNestedReply {
+  // create array of nested server response
+  repeated HelloReply serverMessage = 1;
+  
+}
 // The request message containing the user's name.
 message HelloHowOldRequest {
   int32 age = 1;

grpc_mockData/server.js

@@ -35,10 +35,10 @@ 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.meta)
-  // console.dir(ctx.metadata, { depth: 3, colors: true });
+  console.log("received metadata from client request", ctx.metadata)
+  console.dir(ctx.metadata, { depth: 3, colors: true });
   console.log(`got sayHello request name: ${ctx.req.name}`);
-  
+
   // an alias to ctx.response.res
   // This is set only in case of DUPLEX calls, to the the gRPC call reference itself
   ctx.res = { message: "Hello " + ctx.req.name };
@@ -49,7 +49,28 @@ function sayHello(ctx) {
 
   console.log(`set sayHello response: ${ctx.res.message}`);
 }
+// nested Unary stream
+
+function sayHelloNested(ctx) {
+  // create new metadata
+  let metadata = new grpc.Metadata();
+  metadata.set('it', 'works?')
+  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.dir(ctx.metadata, { depth: 3, colors: true });
+  // console.log("ctx line 64 from server.js", ctx)
+
+  // nested unary response call
+  let firstPerson = ctx.req.firstPerson.name;
+  let secondPerson = ctx.req.secondPerson.name;
+  console.log("firstPerson line 68 from server.js:", firstPerson)
+  ctx.res = {"serverMessage": [{message: "Hello! " + firstPerson}, {message: 'Hello! ' + secondPerson}]}
 
+  // send response header metadata object directly as an argument and that is set and sent
+  ctx.sendMetadata(metadata)
+}
 // Server-Side Stream
 // used highland library to manage asynchronous data
 async function sayHellos(ctx) {
@@ -64,7 +85,9 @@ async function sayHellos(ctx) {
 
   // alias for ctx.request.req
   // In case of UNARY and RESPONSE_STREAM calls it is simply the gRPC call's request
+  
   let reqMessages = {"message": 'hello!!! ' + ctx.req.name}
+
   dataStream.push(reqMessages)
   reqMessages = dataStream
   let streamData = await hl(reqMessages)
@@ -80,6 +103,7 @@ async function sayHellos(ctx) {
   ctx.res.end()
 }
 
+
 // Client-Side stream
 function sayHelloCs (ctx) {
   // create new metadata
@@ -146,7 +170,7 @@ function sayHelloBidi(ctx) {
  */
 function main() {
   const app = new Mali(PROTO_PATH, "Greeter");
-  app.use({ sayHello, sayHellos, sayHelloCs, sayHelloBidi });
+  app.use({ sayHello, sayHelloNested, sayHellos, sayHelloCs, sayHelloBidi });
   app.start(HOSTPORT);
   console.log(`Greeter service running @ ${HOSTPORT}`);
 }

src/assets/style/colors.scss

@@ -39,6 +39,6 @@ $graytwo: #C4CED4;
 $graythree: #A9B0BE;
 
 $gqlpink: #E00198;
-$gqlpinktwo: rgb(190, 62, 158);
+$gqlpinktwo: #BE3E9E;
 
 $grpcorange: #E6781E;

src/assets/style/sidebar.scss

@@ -171,9 +171,7 @@
 	padding: 0px auto;
 	text-align-last: center;
   width: 200px;
-  &:focus {
-		outline: 0 none;
-  }
+	outline: 0 none;
   &.http {
     background: $bluetwo;
     &:hover {
@@ -348,6 +346,11 @@
 	text-align-last: center;
   width: 100%;
   outline: none;
+  &:hover {
+    color: $medbluegray;
+    background: $huntergreen;
+    border: 2px solid $litebluegray;
+  }
 }
 .composer_textarea {
 	background-color: $liteblack;

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

@@ -66,7 +66,6 @@ class BodyEntryForm extends Component {
     })()
 
     const arrowClass = this.state.show ? 'composer_subtitle_arrow-open' : 'composer_subtitle_arrow-closed';
-
     const bodyContainerClass = this.state.show ? 'composer_bodyform_container-open' : 'composer_bodyform_container-closed';
 
     return (