kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for #2947 - Display property names for non-object models

Browse Source
This commit is contained in:
Owen Conti
2017-06-25 22:31:14 -06:00
parent 165c1d7fcb
commit cf63f9b9dd
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/components/model.jsx
View File

@@ -117,12 +117,13 @@ class ObjectModel extends Component {
class Primitive extends Component { class Primitive extends Component {
static propTypes = { static propTypes = {
schema: PropTypes.object.isRequired, schema: PropTypes.object.isRequired,
name: PropTypes.string,
getComponent: PropTypes.func.isRequired, getComponent: PropTypes.func.isRequired,
required: PropTypes.bool required: PropTypes.bool
} }
render(){ render(){
let { schema, getComponent, required } = this.props let { schema, getComponent, name, required } = this.props
if(!schema || !schema.get) { if(!schema || !schema.get) {
// don't render if schema isn't correctly formed // don't render if schema isn't correctly formed
@@ -133,12 +134,18 @@ class Primitive extends Component {
let format = schema.get("format") let format = schema.get("format")
let xml = schema.get("xml") let xml = schema.get("xml")
let enumArray = schema.get("enum") let enumArray = schema.get("enum")
let title = schema.get("title") || name
let description = schema.get("description") let description = schema.get("description")
let properties = schema.filter( ( v, key) => ["enum", "type", "format", "description", "$$ref"].indexOf(key) === -1 ) let properties = schema.filter( ( v, key) => ["enum", "type", "format", "description", "$$ref"].indexOf(key) === -1 )
let style = required ? { fontWeight: "bold" } : {} let style = required ? { fontWeight: "bold" } : {}
const Markdown = getComponent("Markdown") const Markdown = getComponent("Markdown")
return <span className="prop"> return <span className="model">
{
title && <span className="model-title" style={{ marginRight: "2em" }}>
<span className="model-title__text">{ title }</span>
</span>
}
<span className="prop-type" style={ style }>{ type }</span> { required && <span style={{ color: "red" }}>*</span>} <span className="prop-type" style={ style }>{ type }</span> { required && <span style={{ color: "red" }}>*</span>}
{ format && <span className="prop-format">(${format})</span>} { format && <span className="prop-format">(${format})</span>}
{ {
@@ -176,17 +183,20 @@ class ArrayModel extends Component {
} }
render(){ render(){
let { required, schema, depth, expandDepth } = this.props let { required, schema, depth, name, expandDepth } = this.props
let items = schema.get("items") let items = schema.get("items")
let title = schema.get("title") || name
let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 ) let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 )
return <span className="model"> return <span className="model">
<span className="model-title"> {
<span className="model-title__text">{ schema.get("title") }</span> title && <span className="model-title">
<span className="model-title__text">{ title }</span>
</span> </span>
}
<Collapse collapsed={ depth > expandDepth } collapsedContent="[...]"> <Collapse collapsed={ depth > expandDepth } collapsedContent="[...]">
[ [
<span><Model { ...this.props } schema={ items } required={ false }/></span> <span><Model { ...this.props } name="" schema={ items } required={ false }/></span>
] ]
{ {
properties.size ? <span> properties.size ? <span>
@@ -249,13 +259,13 @@ class Model extends Component {
name={ name || modelName } name={ name || modelName }
isRef={ isRef!== undefined ? isRef : !!$$ref }/> isRef={ isRef!== undefined ? isRef : !!$$ref }/>
case "array": case "array":
return <ArrayModel className="array" { ...this.props } schema={ modelSchema } required={ required } /> return <ArrayModel className="array" { ...this.props } schema={ modelSchema } name={ name || modelName } required={ required } />
case "string": case "string":
case "number": case "number":
case "integer": case "integer":
case "boolean": case "boolean":
default: default:
return <Primitive getComponent={ getComponent } schema={ modelSchema } required={ required }/> return <Primitive { ...this.props } getComponent={ getComponent } schema={ modelSchema } name={ name || modelName } required={ required }/>
} }
} }
} }