fixed merge conflicts

Author: nancyddao

__mocks__/electronMock.js

@@ -0,0 +1,3 @@
+export const ipcRenderer = {  
+    on: jest.fn()
+  };

__mocks__/styleMocks.js

@@ -1 +1 @@
-module.exports = {};
+module.exports = 'test-file-stub';

__tests__/businessReducer.js

@@ -1,4 +1,5 @@
 import reducer from '../src/client/reducers/business';
+import {remote} from "electron";
 
 describe('Business reducer', () => {
   let state;
@@ -14,12 +15,26 @@ describe('Business reducer', () => {
         protocol: '',
         url: 'http://',
         method: 'GET',
-        graphQL: false
+        graphQL: false,
+        gRPC: false
       },
       newRequestHeaders: {
         headersArr: [],
         count: 0,
       },
+      newRequestStreams: {
+        streamsArr: [],
+        count: 0,
+        streamContent: [],
+        selectedPackage: null,
+        selectedRequest: null,
+        selectedService: null,
+        selectedStreamingType: null,
+        initialQuery: null,
+        queryArr: null,
+        protoPath: null,
+        services: null,
+      },
       newRequestCookies: {
         cookiesArr: [],
         count: 0,

__tests__/composerTests.js

@@ -5,15 +5,14 @@ import React from 'react';
 import { configure, shallow } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import toJson, { mountToJson } from 'enzyme-to-json';
-
+import {remote} from "electron";
 import { JestEnvironment } from '@jest/environment';
 // Enzyme is a wrapper around React test utilities which makes it easier to
 // shallow render and traverse the shallow rendered tree.
 // import * as actions from '../src/client/actions/actions.js';
 // import httpController from '../src/client/controllers/httpController.js'
 // import historyController from '../src/client/controllers/historyController.js'
 // import reqResController from '../src/client/controllers/reqResController.js'
-
 // import ComposerNewRequest from "../src/client/components/composer/NewRequest/ComposerNewRequest.jsx"; //doesn't like png
 import ProtocolSelect from "../src/client/components/composer/NewRequest/ProtocolSelect.jsx";
 import FieldEntryForm from "../src/client/components/composer/NewRequest/FieldEntryForm.jsx";

__tests__/responseTests.js

@@ -67,6 +67,16 @@ 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: {

package.json

@@ -143,7 +143,8 @@
     "verbose": true,
     "collectCoverage": true,
     "moduleNameMapper": {
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "./__mocks__/fileMock.js"
+      "electron": "<rootDir>/__mocks__/electronMock.js",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/styleMocks.js"
     }
   },
   "license": "MIT",

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

@@ -13,7 +13,7 @@ class GRPCAutoInputForm extends Component {
     this.setService = this.setService.bind(this);
     this.setRequest = this.setRequest.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
@@ -86,9 +86,9 @@ class GRPCAutoInputForm extends Component {
       let streamingType;
       let packageName;
       /*
-      for each service obj in the services array, if its name matches the current selected service option then: 
+      for each service obj in the services array, if its name matches the current selected service option then:
       - save the package name
-      - iterate through the rpcs and if its name matches the current selected request then save its streaming type 
+      - iterate through the rpcs and if its name matches the current selected request then save its streaming type
       */
       for (const service of services) {
         if (service.name === selectedService ) {
@@ -112,7 +112,7 @@ class GRPCAutoInputForm extends Component {
         let req;
         let results = [];
         let query = '';
-        /* 
+        /*
         for each service obj in the services array, if its name matches the current selected service option then:
         - iterate through the rpcs and if its name matches the current selected request then save the name of req/rpc
         - iterate through the messages and if its name matches the saved req/rpc name,
@@ -126,15 +126,41 @@ class GRPCAutoInputForm extends Component {
               }
             }
             for (const message of service.messages) {
+              // console.log('message: ', message);
               if (message.name === req ) {
                 for (const key in message.def) {
+                  // if message type is a nested message (message.def.nested === true)
+                  // message.def = key: {dependent: dependent.message.def}
+                  // console.log('message.def.nested: ', message.def[key].nested);
+                  // console.log('key: ', key);
+                  if (message.def[key].nested) {
+                    for (const submess of service.messages) {
+                      // console.log('submess: ', submess);
+                      // console.log('submess.name: ', submess.name);
+                      // console.log('message.def[key].dependent: ', message.def[key].dependent);
+                      if (submess.name === message.def[key].dependent ) {
+                        // define obj for the submessage definition
+                        let tempObj = {};
+                        for (const subKey in submess.def) {
+                          tempObj[subKey] = submess.def[subKey].type.slice(5).toLowerCase()
+                        }
+                        // console.log('tempObj: ', tempObj);
+                        results.push(`"${key}":${JSON.stringify(tempObj)}`)
+                        break;
+                      }
+                      // break;
+                  }//after
+                } else {
+                  // console.log('message.def: ', message.def);
                   results.push(`"${key}": "${message.def[key].type.slice(5).toLowerCase()}"`)
                 }
-                break;
               }
-            }
+            break;
           }
         }
+      }
+    }
+
         const streamsArr = this.props.newRequestStreams.streamsArr;
         const streamContent = this.props.newRequestStreams.streamContent;
          // query for messages with single key:value pair
@@ -149,7 +175,7 @@ class GRPCAutoInputForm extends Component {
           }
           query = query.slice(1).trim();
         }
-        // set query in streamsArr 
+        // set query in streamsArr
         if (streamsArr[0] !== '') {
           streamsArr[0].query = `{
     ${query}

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

@@ -1,14 +1,55 @@
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 syntax = "proto3";
 
-package helloworld;
+option java_multiple_files = true;
+option java_package = "io.grpc.examples.routeguide";
+option java_outer_classname = "RouteGuideProto";
+option objc_class_prefix = "RTG";
 
-// 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) {}
+package routeguide;
+
+// Interface exported by the server.
+service RouteGuide {
+  // A simple RPC.
+  //
+  // Obtains the feature at a given position.
+  //
+  // A feature with an empty name is returned if there's no feature at the given
+  // position.
+  rpc GetFeature(Point) returns (Feature) {}
+
+  // A server-to-client streaming RPC.
+  //
+  // Obtains the Features available within the given Rectangle.  Results are
+  // streamed rather than returned at once (e.g. in a response message with a
+  // repeated field), as the rectangle may cover a large area and contain a
+  // huge number of features.
+  rpc ListFeatures(Rectangle) returns (stream Feature) {}
+
+  // A client-to-server streaming RPC.
+  //
+  // Accepts a stream of Points on a route being traversed, returning a
+  // RouteSummary when traversal is completed.
+  rpc RecordRoute(stream Point) returns (RouteSummary) {}
+
+  // A Bidirectional streaming RPC.
+  //
+  // Accepts a stream of RouteNotes sent while a route is being traversed,
+  // while receiving other RouteNotes (e.g. from other users).
+  rpc RouteChat(stream RouteNote) returns (stream RouteNote) {}
 }
 
 service Butler {
@@ -23,7 +64,13 @@ message HelloRequest {
   string name = 1;
 }
 
-// The response message containing the greetings
-message HelloReply {
-  string message = 1;
+// A feature names something at a given point.
+//
+// If a feature could not be named, the name is empty.
+message Feature {
+  // The name of the feature.
+  string name = 1;
+
+  // The point where the feature is detected.
+  Point location = 2;
 }

src/client/components/display/ResponseTabs.jsx

@@ -18,7 +18,7 @@ class ResponseTabs extends Component {
         {
           !this.props.content.gRPC &&
           <Tab onTabSelected={this.props.handleTabSelect} tabName={cookies} key="cookies" openTab={this.props.openResponseTab}/>
-        }
+        } */}
         </ul>
     );
   }

src/client/reducers/business.js

@@ -42,7 +42,6 @@ const initialState = {
     bodyType: 'none',
     rawType: 'Text (text/plain)',
     JSONFormatted: true,
-    // protoContent: null
   },
   newRequestSSE: {
     isSSE: false