WIP: Handle oneOf variations in the UI. RE: temando#32

brendo · Jun 6, 2017 · 63b2307 · 63b2307
1 parent 1857e91
commit 63b2307
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/BodyContent/BodyContent.js b/src/components/BodyContent/BodyContent.js
@@ -72,6 +72,14 @@ export default class BodyContent extends Component {
       return null
     }
 
+    // Peek at first item of `schema` to see if it's an array of possible
+    // schemas (eg. oneOf).
+    if (Array.isArray(schema[0])) {
+      return schema.map(
+        (schemaVariation, i) => <BodySchema key={i} properties={schemaVariation} styleVariation='odd' />
+      )
+    }
+
     return (
       <BodySchema properties={schema} styleVariation='odd' />
     )

diff --git a/src/handlers/BaseHandler.js b/src/handlers/BaseHandler.js
@@ -20,10 +20,10 @@ class BaseHandler extends Component {
 
   render () {
     const { parsedDefinition: definition, location } = this.props
-    const specUrl = this.props.location.query.url
+    const specUrl = location.query.url
 
     return (
-      <DocumentTitle title='Open API v3 renderer'>
+      <DocumentTitle title={definition ? definition.title : 'Open API v3 renderer'}>
         <div className='main'>
           {!definition && "Welcome to Temando's new Open API Renderer. Watch this space!"}
           {definition && <Page definition={definition} location={location} specUrl={specUrl} />}