Skip to content

Commit 7c4f217

Browse files
authored
Merge pull request #52 from oslabs-beta/tabBugs
response headers now displays as response metadata in tab updated collection of sent times to be in a timesArr that will be passed to the graph in further updates for gRPC graph behavior
2 parents 3d0411c + a8bdc07 commit 7c4f217

File tree

8 files changed

+267
-9
lines changed

8 files changed

+267
-9
lines changed

package-lock.json

Lines changed: 248 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package helloworld;
55
// The greeting service definition.
66
service Greeter {
77
// Sends a greeting
8+
89
// rpc SayHello (HelloRequest) returns (HelloReply) {}
910
rpc SayHello (HelloNestedRequest) returns (HelloNestedReply) {}
1011
rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
@@ -22,6 +23,7 @@ message HelloReply {
2223
string message = 1;
2324
}
2425

26+
2527
message HelloNestedRequest {
2628
HelloRequest firstPerson = 1;
2729
HelloRequest secondPerson = 2;

src/client/components/containers/ResponseContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class ResponseContainer extends Component {
7373
{(this.state.openTab === 'Response Events' && this.props.content.request.method !== 'SUBSCRIPTION')
7474
&& <ResponseEventsDisplay response={this.props.content.response} />
7575
}
76-
{this.state.openTab === 'Response Headers' && <ResponseHeadersDisplay responseContent={this.props.content.response} />}
77-
{this.state.openTab === 'Response Metadata' && <ResponseHeadersDisplay responseContent={this.props.content.response} />}
76+
{this.state.openTab === 'Response Headers' && <ResponseHeadersDisplay tabName={this.state.openTab} responseContent={this.props.content.response} />}
77+
{this.state.openTab === 'Response Metadata' && <ResponseHeadersDisplay tabName={this.state.openTab} responseContent={this.props.content.response} />}
7878
{this.state.openTab === 'Response Cookies' && <ResponseCookiesDisplay responseContent={this.props.content.response} />}
7979
</div>
8080
);

src/client/components/display/Graph.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Graph extends Component {
2929
}
3030

3131
componentDidMount() {
32+
3233
// set up lineChart
3334
const context = document.querySelector('#line-chart');
3435
const ctx = document.querySelector('canvas').getContext('2d');
@@ -72,6 +73,8 @@ class Graph extends Component {
7273
}
7374

7475
componentDidUpdate() {
76+
console.log('req res array in graph',this.props.reqResArray);
77+
7578
let openRequestCount = 0;
7679
this.props.reqResArray.forEach((reqRes) => {
7780
if (reqRes.connection === 'open' || reqRes.connection === 'pending') {

0 commit comments

Comments
 (0)