temando · quangkhoa · Jul 16, 2017 · Jul 14, 2017 · Jul 14, 2017 · Jul 14, 2017
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
-- Lincoln can now display `additionalProperties`
+### Added
+
+- [#91](https://github.com/temando/open-api-renderer/issues/91) Lincoln learnt how to display `additionalProperties`.
+- [#157](https://github.com/temando/open-api-renderer/issues/157) Lincoln learnt how to display `servers` and path information.
+- [#112](https://github.com/temando/open-api-renderer/issues/112) Lincoln learnt how to display `externalDocs`.
 
 ## [v0.0.6] - 2017-07-07
 

diff --git a/docs/demo/demo.81f8cdaf8e92e7c02fcc.js b/docs/demo/demo.81f8cdaf8e92e7c02fcc.js
diff --git a/docs/demo/demo.d73ff4397f0035ac6394.js b/docs/demo/demo.d73ff4397f0035ac6394.js
diff --git a/docs/demo/index.html b/docs/demo/index.html
@@ -5,5 +5,5 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
-  <body><script type="text/javascript" src="manifest.64e52d4be3e1405eba34.js"></script><script type="text/javascript" src="vendor.cda98230d6573ec02868.js"></script><script type="text/javascript" src="demo.81f8cdaf8e92e7c02fcc.js"></script></body>
+  <body><script type="text/javascript" src="manifest.81c1f8c28d950ee22175.js"></script><script type="text/javascript" src="vendor.5e42313e188f293e0550.js"></script><script type="text/javascript" src="demo.d73ff4397f0035ac6394.js"></script></body>
 </html>
diff --git a/docs/demo/manifest.64e52d4be3e1405eba34.js → docs/demo/manifest.81c1f8c28d950ee22175.js b/docs/demo/manifest.64e52d4be3e1405eba34.js → docs/demo/manifest.81c1f8c28d950ee22175.js
diff --git a/docs/demo/vendor.cda98230d6573ec02868.js → docs/demo/vendor.5e42313e188f293e0550.js b/docs/demo/vendor.cda98230d6573ec02868.js → docs/demo/vendor.5e42313e188f293e0550.js
diff --git a/docs/open-api-v3-support.md b/docs/open-api-v3-support.md
@@ -31,7 +31,7 @@ This document outlines this project's support for visualising the [Open API V3][
 - [ ] [components](#components-object)
 - [x] [security](#security-requirement-object)
 - [x] [tags](#tag-object)
-- [ ] [externalDocs](#external-documentation-object)
+- [x] [externalDocs](#external-documentation-object)
 
 ### [Info](https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#info-object) object
 
@@ -104,7 +104,7 @@ This is supported by default as all `$ref` are dereferenced before the definitio
 - [x] tags
 - [x] summary
 - [x] description
-- [ ] [externalDocs](#external-documentation-object)
+- [x] [externalDocs](#external-documentation-object)
 - [ ] operationId
 - [x] [parameters](#parameter-object)
 - [x] [requestBody](#request-body-object)
@@ -116,8 +116,8 @@ This is supported by default as all `$ref` are dereferenced before the definitio
 
 ### [External Documentation](https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#external-documentation-object) object
 
-- [ ] description
-- [ ] url
+- [x] description
+- [x] url
 
 ### [Parameter](https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#parameter-object) object
 
@@ -209,7 +209,7 @@ See [parameter](#parameter-object) object.
 
 - [x] name
 - [x] description
-- [ ] [externalDocs](#external-documentation-object)
+- [x] [externalDocs](#external-documentation-object)
 
 ### [Reference](https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#reference-object) object
 
@@ -263,7 +263,7 @@ The OpenAPI specification also supports several additional properties from JSON
 - [ ] readOnly
 - [ ] writeOnly
 - [ ] [xml](#xml-object)
-- [ ] [externalDocs](#external-documentation-object)
+- [x] [externalDocs](#external-documentation-object)
 - [ ] example
 - [ ] deprecated
 

diff --git a/src/components/BodyContent/BodyContent.styles.js b/src/components/BodyContent/BodyContent.styles.js
@@ -5,14 +5,14 @@ export const styles = createSheet(({ text, backgrounds, sizes }) => ({
   'bodyContent': {
     display: 'table',
     width: '100%',
-    padding: '10px',
+    padding: '1rem 0',
     boxSizing: 'border-box'
   },
 
   'tabs': {
     '& > div': {
       display: 'inline-block',
-      padding: '10px 20px',
+      padding: '1rem 2rem',
       cursor: 'pointer',
 
       '&:not($active)': {
@@ -23,12 +23,6 @@ export const styles = createSheet(({ text, backgrounds, sizes }) => ({
 
   'active': {
     backgroundColor: `${backgrounds.schema}`,
-    borderRadius: '10px 10px 0 0'
-  },
-
-  [`@media (max-width: ${sizes.breakpoint})`]: {
-    'bodyContent': {
-      padding: '10px 0'
-    }
+    borderRadius: '1rem 1rem 0 0'
   }
 }))
diff --git a/src/components/BodySchema/BodySchema.js b/src/components/BodySchema/BodySchema.js
@@ -77,6 +77,7 @@ export default class BodySchema extends Component {
         defaultValue={property.defaultValue}
         constraints={property.constraints}
         attributes={property.attributes}
+        docs={property.docs}
         onClick={hasSubset ? this.onClick : undefined}
         isRequired={property.required}
         isOpen={isOpen}

diff --git a/src/components/ContentContainer/ContentContainer.styles.js b/src/components/ContentContainer/ContentContainer.styles.js
@@ -2,19 +2,13 @@ import { createSheet } from '../../theme'
 
 export const styles = createSheet(({ sizes }) => ({
   'contentContainer': {
-    padding: '20px 0',
-
-    '& h2': {
-      paddingLeft: '2rem'
-    }
+    padding: '0.5rem 2rem',
+    margin: '1rem 0'
   },
 
   [`@media (max-width: ${sizes.breakpoint})`]: {
     'contentContainer': {
-      padding: '10px 0',
-
       '& h2': {
-        paddingLeft: '1rem',
         margin: 0
       }
     }

diff --git a/src/components/Description/Description.styles.js b/src/components/Description/Description.styles.js
@@ -3,10 +3,8 @@ import { createSheet } from '../../theme'
 
 export const styles = createSheet(({ text }) => ({
   'description': {
-    '&:not($inline)': {
-      color: `${c(text.default).lighten(0.3)}`,
-      fontSize: '0.9em'
-    },
+    color: `${c(text.default).lighten(0.3)}`,
+    fontSize: '1rem',
 
     '&$inline': {
       '&, & p': {
@@ -17,5 +15,7 @@ export const styles = createSheet(({ text }) => ({
       margin: '.5rem 0'
     }
   },
-  'inline': {}
+  'inline': {
+    paddingRight: '.2rem'
+  }
 }))
diff --git a/src/components/Docs/Docs.js b/src/components/Docs/Docs.js
@@ -0,0 +1,27 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import classNames from 'classnames'
+
+import Description from '../Description/Description'
+import ExternalLink from '../ExternalLink/ExternalLink'
+import { styles } from './Docs.styles'
+
+@styles
+export default class Docs extends PureComponent {
+  render () {
+    const { url, description, classes } = this.props
+
+    return (
+      <div className={classNames(classes.docs)}>
+        {description && <Description description={description} />}
+        <ExternalLink href={url}>More information »</ExternalLink>
+      </div>
+    )
+  }
+}
+
+Docs.propTypes = {
+  description: PropTypes.string,
+  url: PropTypes.string.isRequired,
+  classes: PropTypes.object
+}
diff --git a/src/components/Docs/Docs.styles.js b/src/components/Docs/Docs.styles.js
@@ -0,0 +1,7 @@
+import { createSheet } from '../../theme'
+
+export const styles = createSheet(() => ({
+  'docs': {
+    margin: '0.5rem 0'
+  }
+}))
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
 
+import Docs from '../Docs/Docs'
 import Description from '../Description/Description'
 import ExternalLink from '../ExternalLink/ExternalLink'
 import { styles } from './Header.styles'
@@ -28,6 +29,8 @@ export default class Header extends PureComponent {
           {info && info.termsOfService &&
           <ExternalLink href={info.termsOfService}>Terms of Service</ExternalLink>}
         </nav>
+
+        {info && info.docs && <Docs {...info.docs} />}
       </header>
     )
   }
@@ -88,7 +91,11 @@ Header.propTypes = {
   info: PropTypes.shape({
     contact: PropTypes.object,
     license: PropTypes.object,
-    termsOfService: PropTypes.string
+    termsOfService: PropTypes.string,
+    docs: PropTypes.shape({
+      description: PropTypes.string,
+      url: PropTypes.string.isRequired
+    })
   }),
   definitionUrl: PropTypes.string,
   classes: PropTypes.object

diff --git a/src/components/Header/Header.styles.js b/src/components/Header/Header.styles.js
@@ -2,7 +2,7 @@ import { createSheet } from '../../theme'
 
 export const styles = createSheet(({ borders, sizes }) => ({
   'header': {
-    padding: '0 20px',
+    padding: '0 2rem',
 
     '& h1': {
       marginBottom: '.5rem'

diff --git a/src/components/Method/Method.styles.js b/src/components/Method/Method.styles.js
@@ -5,7 +5,7 @@ export const styles = createSheet(({ borders, text, sizes }) => ({
   method: {
     borderBottom: `1px solid ${borders.default}`,
     margin: '0 1rem 2rem 0',
-    padding: '1rem 2rem',
+    padding: '1rem 0',
 
     '& > h3': {
       display: 'inline-block',

diff --git a/src/components/Page/Page.js b/src/components/Page/Page.js
@@ -48,9 +48,17 @@ export default class Page extends Component {
           />
           {security && this.renderSecurity(security)}
           <ContentContainer>
-            {services && services.map(
-              (service) => <ServiceContainer key={service.title} service={service} initialSchemaTreeDepth={initialSchemaTreeDepth} />
-            )}
+            {services && services.map((service) => {
+              const serviceWithDocs = Object.assign({}, service, this.findTagDocs(service.title, navigation))
+
+              return (
+                <ServiceContainer
+                  key={service.title}
+                  service={serviceWithDocs}
+                  initialSchemaTreeDepth={initialSchemaTreeDepth}
+                />
+              )
+            })}
           </ContentContainer>
         </div>
       </div>
@@ -68,6 +76,21 @@ export default class Page extends Component {
     )
   }
 
+  findTagDocs (tagHandle, navigation) {
+    // Find navigation tag that matches given `tagHandle`, and if has docs.
+    // Note: tag.methods is a way to determine if the navigation has tags at all.
+    const navigationTag = navigation.find((tag) => (tag.methods && tag.handle === tagHandle && tag.docs))
+
+    // No tag, no additional docs.
+    if (!navigationTag) {
+      return {}
+    }
+
+    return {
+      docs: navigationTag.docs
+    }
+  }
+
   onToggleNavigation () {
     const { isNavOpen } = this.state
     if (isNavOpen) {

diff --git a/src/components/Property/Property.js b/src/components/Property/Property.js
@@ -1,6 +1,8 @@
 import React, { PureComponent } from 'react'
 import classNames from 'classnames'
 import PropTypes from 'prop-types'
+
+import Docs from '../Docs/Docs'
 import Description from '../Description/Description'
 import Indicator from '../Indicator/Indicator'
 import PropertyConstraints from './PropertyConstraints/PropertyConstraints'
@@ -47,9 +49,8 @@ export default class Property extends PureComponent {
 
   render () {
     const {
-      type, title, description, constraints, isRequired,
-      defaultValue, onClick, isOpen, isLast, attributes,
-      classes
+      type, title, description, constraints, docs, defaultValue, attributes,
+      isRequired, isOpen, isLast, onClick, classes
     } = this.props
 
     const {name, isEnumTrimmed} = this.state
@@ -99,11 +100,12 @@ export default class Property extends PureComponent {
             <span className={classes.format}>&lt;{constraints.format}&gt;</span>}
           </span>
           <PropertyConstraints constraints={constraints} type={type} isRequired={isRequired} />
-          {((enumValues && enumValues.length) || defaultValue || description) &&
+          {((enumValues && enumValues.length) || defaultValue || description || docs) &&
           <div className={classes.additionalInfo}>
             {enumValues && this.renderEnumValues(enumValues, isEnumTrimmed)}
             {defaultValue !== undefined && this.renderDefaultValue(defaultValue)}
             {description && <div><Description isInline description={description} /></div>}
+            {docs && <Docs {...docs} />}
           </div>
           }
         </td>
@@ -184,6 +186,10 @@ Property.propTypes = {
     pattern: PropTypes.string,
     uniqueItems: PropTypes.bool
   }),
+  docs: PropTypes.shape({
+    description: PropTypes.string,
+    url: PropTypes.string.isRequired
+  }),
   enumValues: PropTypes.array,
   defaultValue: PropTypes.any,
   isRequired: PropTypes.bool,

diff --git a/src/components/SecurityContainer/SecurityContainer.styles.js b/src/components/SecurityContainer/SecurityContainer.styles.js
@@ -2,7 +2,7 @@ import { createSheet } from '../../theme'
 
 export const styles = createSheet(({ backgrounds, borders, sizes }) => ({
   'securityContainer': {
-    padding: '1rem 2rem',
+    padding: '1rem 0',
     borderBottom: `1px solid ${borders.default}`
 
   },
@@ -26,11 +26,5 @@ export const styles = createSheet(({ backgrounds, borders, sizes }) => ({
     '& > li > span': {
       fontWeight: 600
     }
-  },
-
-  [`@media (max-width: ${sizes.breakpoint})`]: {
-    'securityContainer': {
-      padding: '1rem'
-    }
   }
 }))
diff --git a/src/components/ServiceContainer/ServiceContainer.js b/src/components/ServiceContainer/ServiceContainer.js
@@ -1,17 +1,20 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
+
+import Docs from '../Docs/Docs'
 import Method from '../Method/Method'
 import { styles } from './ServiceContainer.styles'
 
 @styles
 export default class ServiceContainer extends PureComponent {
   render () {
     const { service, classes, initialSchemaTreeDepth } = this.props
-    const { title, methods } = service
+    const { title, docs, methods } = service
 
     return (
       <div className={classes.serviceContainer} id={title}>
         <h2>{title}</h2>
+        {docs && <Docs {...docs} />}
         {methods.map(
           (method) => <Method key={method.link} method={method} initialSchemaTreeDepth={initialSchemaTreeDepth} />
         )}

diff --git a/src/parser/open-api/schemaParser.js b/src/parser/open-api/schemaParser.js
@@ -55,6 +55,10 @@ function getPropertyNode (nodeName, propertyNode, required = false) {
     outputNode.defaultValue = propertyNode.default
   }
 
+  if (propertyNode.externalDocs) {
+    outputNode.docs = propertyNode.externalDocs
+  }
+
   if (propertyNode.additionalProperties === false) {
     outputNode.additionalProperties = false
   }

diff --git a/src/parser/open-api/v3/navigationParser.js b/src/parser/open-api/v3/navigationParser.js
@@ -54,6 +54,10 @@ export function getServicesMethod ({path, servers, method, request, params, resp
     servicesMethod.description = method.description
   }
 
+  if (method.externalDocs) {
+    servicesMethod.docs = method.externalDocs
+  }
+
   if (params) {
     servicesMethod.parameters = params
   }