Grab schema for response schema table

readmeio · Oct 17, 2017 · 42a89e6 · 42a89e6
1 parent 1a651af
commit 42a89e6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/packages/api-explorer-ui/src/CodeSampleResponse.jsx b/packages/api-explorer-ui/src/CodeSampleResponse.jsx
@@ -29,9 +29,7 @@ class CodeSampleResponse extends React.Component {
     let allSecurities;
     try {
       allSecurities = operation.prepareSecurity();
-    } catch (e) {
-      console.log('No security endpoint here');
-    }
+    } catch (e) {} // eslint-disable-line no-empty
 
     return (
       <div
@@ -116,7 +114,7 @@ class CodeSampleResponse extends React.Component {
 
                   {result.statusCode[0] === 401 && (
                     <div className="text-center hub-expired-token">
-                      {allSecurities.OAuth2[0] &&
+                      {allSecurities &&
                         (allSecurities.OAuth2[0].flows.implicit.authorizationUrl &&
                           <div>
                             <p>Your OAuth2 token has expired</p>

diff --git a/packages/api-explorer-ui/src/Doc.jsx b/packages/api-explorer-ui/src/Doc.jsx
@@ -73,7 +73,6 @@ class Doc extends React.Component {
         });
       })
       .then(({ responseBody, res }) => {
-        console.log(res);
         this.setState({
           loading: false,
           result: result(res, responseBody, req),

diff --git a/packages/api-explorer-ui/src/Response.jsx b/packages/api-explorer-ui/src/Response.jsx
@@ -27,6 +27,31 @@ class ResponseSchema extends React.Component {
     const { operation } = this.props;
     const keys = Object.keys(operation.responses);
 
+    let schema;
+
+    try {
+      if (operation.responses[this.state.selectedStatus].content) {
+        if (
+          operation.responses[this.state.selectedStatus].content['application/json'].schema.type ===
+            'object' &&
+          operation.responses[this.state.selectedStatus].content['application/json'].schema
+            .properties
+        ) {
+          schema =
+            operation.responses[this.state.selectedStatus].content['application/json'].schema
+              .properties;
+        }
+      } else if (
+        operation.responses[this.state.selectedStatus].content['application/xml'].schema.type ===
+          'object' &&
+        operation.responses[this.state.selectedStatus].content['application/xml'].schema.properties
+      ) {
+        schema =
+          operation.responses[this.state.selectedStatus].content['application/xml'].schema
+            .properties;
+      }
+    } catch (e) {} // eslint-disable-line no-empty
+
     return (
       <div className="hub-reference-response-definitions">
         <h3>
@@ -49,21 +74,19 @@ class ResponseSchema extends React.Component {
           {operation.responses[this.state.selectedStatus].description && (
             <p className="desc">{operation.responses[this.state.selectedStatus].description}</p>
           )}
-          {/* {operation.responses[this.state.selectedStatus].content.schema &&
-          operation.responses.schema.type === 'object' &&
-          operation.responses.schema.properties && (
+          {schema && (
             <table>
-              {swaggerUtils.convertToParams([response], 'response').forEach(param => {
+              {/* {swaggerUtils.convertToParams([response], 'response').forEach(param => {
                 <tr>
                   <th>param.name</th>
                   <td>
                     param.type
                     {param.description && marked(param.description)}
                   </td>
                 </tr>;
-              })}
+              })} */}
             </table>
-          )} */}
+          )}
         </div>
       </div>
     );