From 61de35d69cde11336633f9402b14d4e6dc37da69 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 29 Jun 2017 23:16:54 -0700
Subject: [PATCH] Render request bodies correctly (minus Example Value +
 editable functionality)

---
 .../plugins/oas3/components/request-body.jsx  | 27 +++++++++----------
 .../oas3/wrap-components/parameters.jsx       | 16 ++++++++---
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/core/plugins/oas3/components/request-body.jsx b/src/core/plugins/oas3/components/request-body.jsx
index d4b58cb7..578eea17 100644
--- a/src/core/plugins/oas3/components/request-body.jsx
+++ b/src/core/plugins/oas3/components/request-body.jsx
@@ -2,28 +2,25 @@ import React from "react"
 import { OrderedMap } from "immutable"
 
 
-export default ({ requestBody, getComponent, specSelectors }) => {
+export default ({ requestBody, getComponent, specSelectors, contentType }) => {
   const Markdown = getComponent("Markdown")
-  const Model = getComponent("model")
+  const ModelExample = getComponent("modelExample")
 
   const requestBodyDescription = (requestBody && requestBody.get("description")) || null
   const requestBodyContent = (requestBody && requestBody.get("content")) || new OrderedMap()
+  contentType = contentType || requestBodyContent.keySeq().first()
+
+  const mediaTypeValue = requestBodyContent.get(contentType)
 
   return <div>
     { requestBodyDescription &&
-      <p>{requestBodyDescription}</p>
-    }
-    { !requestBodyContent.count() ? <p>No content</p> :
-      requestBodyContent.map((mediaTypeValue, key) => (
-        <div>
-          <h4>{key}</h4>
-          <Model
-            getComponent={ getComponent }
-            specSelectors={ specSelectors }
-            expandDepth={1}
-            schema={mediaTypeValue.get("schema")} />
-        </div>
-      )).toArray()
+      <Markdown source={requestBodyDescription} />
     }
+    <ModelExample
+      getComponent={ getComponent }
+      specSelectors={ specSelectors }
+      expandDepth={1}
+      schema={mediaTypeValue.get("schema")}
+      example={<i>Not yet implemented</i>}/>
   </div>
 }
diff --git a/src/core/plugins/oas3/wrap-components/parameters.jsx b/src/core/plugins/oas3/wrap-components/parameters.jsx
index 46831422..3f176bf4 100644
--- a/src/core/plugins/oas3/wrap-components/parameters.jsx
+++ b/src/core/plugins/oas3/wrap-components/parameters.jsx
@@ -16,7 +16,8 @@ class Parameters extends Component {
    super(props)
    this.state = {
      callbackVisible: false,
-     parametersVisible: true
+     parametersVisible: true,
+     requestBodyContentType: ""
    }
  }
 
@@ -94,10 +95,12 @@ class Parameters extends Component {
 
     const ParameterRow = getComponent("parameterRow")
     const TryItOutButton = getComponent("TryItOutButton")
+    const ContentType = getComponent("contentType")
     const Callbacks = getComponent("Callbacks", true)
     const RequestBody = getComponent("RequestBody", true)
 
     const isExecute = tryItOutEnabled && allowTryItOut
+    const { isOAS3 } = specSelectors
 
     const requestBody = operation.get("requestBody")
     return (
@@ -153,13 +156,20 @@ class Parameters extends Component {
           <Callbacks callbacks={Map(operation.get("callbacks"))} />
         </div> : "" }
         {
-          requestBody && this.state.parametersVisible &&
+          isOAS3() && requestBody && this.state.parametersVisible &&
           <div className="opblock-section">
             <div className="opblock-section-header">
               <h4 className="opblock-title">Request body</h4>
+              <ContentType
+                value={this.state.requestBodyContentType}
+                contentTypes={ requestBody.get("content").keySeq() }
+                onChange={(val) => this.setState({ requestBodyContentType: val })}
+                className="body-param-content-type" />
             </div>
             <div className="opblock-description-wrapper">
-              <RequestBody requestBody={requestBody} />
+              <RequestBody
+                requestBody={requestBody}
+                contentType={this.state.requestBodyContentType}/>
             </div>
           </div>
         }