Merge branch 'master' of github.com:swagger-api/swagger-ui

This commit is contained in:
Kyle Shockey
2017-08-08 20:15:17 -07:00
5 changed files with 25 additions and 5 deletions

View File

@@ -122,10 +122,10 @@ export default class Response extends React.Component {
</td> </td>
{specSelectors.isOAS3() ? <td> {specSelectors.isOAS3() ? <td className="col response-col_links">
{ links ? { links ?
links.toSeq().map((link, key) => { links.toSeq().map((link, key) => {
return <OperationLink key={key} name={key} link={ link }/> return <OperationLink key={key} name={key} link={ link } getComponent={getComponent}/>
}) })
: <i>No links</i>} : <i>No links</i>}
</td> : null} </td> : null}

View File

@@ -68,7 +68,7 @@ export default class Responses extends React.Component {
<tr className="responses-header"> <tr className="responses-header">
<td className="col col_header response-col_status">Code</td> <td className="col col_header response-col_status">Code</td>
<td className="col col_header response-col_description">Description</td> <td className="col col_header response-col_description">Description</td>
{ specSelectors.isOAS3() ? <td className="col col_header response-col_description">Links</td> : null } { specSelectors.isOAS3() ? <td className="col col_header response-col_links">Links</td> : null }
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View File

@@ -4,7 +4,9 @@ import ImPropTypes from "react-immutable-proptypes"
class OperationLink extends Component { class OperationLink extends Component {
render() { render() {
const { link, name } = this.props const { link, name, getComponent } = this.props
const Markdown = getComponent("Markdown")
let targetOp = link.get("operationId") || link.get("operationRef") let targetOp = link.get("operationId") || link.get("operationRef")
let parameters = link.get("parameters") && link.get("parameters").toJS() let parameters = link.get("parameters") && link.get("parameters").toJS()
@@ -33,6 +35,7 @@ function padString(n, string) {
} }
OperationLink.propTypes = { OperationLink.propTypes = {
getComponent: PropTypes.func.isRequired,
link: ImPropTypes.orderedMap.isRequired, link: ImPropTypes.orderedMap.isRequired,
name: PropTypes.String name: PropTypes.String
} }

View File

@@ -522,6 +522,22 @@
} }
} }
.response-col_links
{
padding-left: 2em;
max-width: 40em;
font-size: 14px;
@include text_body();
.response-undocumented
{
font-size: 11px;
@include text_code(#999);
}
}
.response-col_description__inner .response-col_description__inner
{ {
span span

View File

@@ -52,7 +52,8 @@ table
&:first-of-type &:first-of-type
{ {
width: 20%; max-width: 20%;
min-width: 6em;
padding: 10px 0; padding: 10px 0;
} }
} }