From 541f3e99b2828c86aa60a3dc7ed72c99e87e197d Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Fri, 16 Jun 2017 01:44:44 -0700 Subject: [PATCH] Tweak deprecated display --- src/core/components/model.jsx | 43 ++++++++++++++++++++++++----------- src/style/_models.scss | 7 ++++++ 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/core/components/model.jsx b/src/core/components/model.jsx index 113ad7d5..cea96191 100644 --- a/src/core/components/model.jsx +++ b/src/core/components/model.jsx @@ -28,11 +28,12 @@ class ObjectModel extends Component { name: PropTypes.string, isRef: PropTypes.bool, expandDepth: PropTypes.number, - depth: PropTypes.number + depth: PropTypes.number, + deprecated: PropTypes.boolean } render(){ - let { schema, name, isRef, getComponent, depth, ...props } = this.props + let { schema, name, isRef, getComponent, depth, deprecated, ...props } = this.props let { expandDepth } = this.props const JumpToPath = getComponent("JumpToPath", true) let description = schema.get("description") @@ -48,7 +49,7 @@ class ObjectModel extends Component { } ) - return + return { title && { isRef && schema.get("$$ref") && { schema.get("$$ref") } } @@ -78,7 +79,7 @@ class ObjectModel extends Component { propertyStyle.fontWeight = "bold" } - return ( + return ( { key }: ["enum", "type", "format", "$$ref"].indexOf(key) === -1 ) let style = required ? { fontWeight: "bold" } : {} - return + return { type } { required && *} { format && (${format})} { @@ -217,11 +219,13 @@ export class Model extends Component { } render () { - let { schema, required, name, isRef, getComponent } = this.props + let { schema, required, name, isRef, specSelectors } = this.props let $$ref = schema && schema.get("$$ref") let modelName = $$ref && this.getModelName( $$ref ) let modelSchema, type + const deprecated = specSelectors.isOAS3() && schema.get("deprecated") + if ( schema && (schema.get("type") || schema.get("properties")) ) { modelSchema = schema } else if ( $$ref ) { @@ -235,17 +239,30 @@ export class Model extends Component { switch(type) { case "object": - return + return case "array": - return + return case "string": case "number": case "integer": case "boolean": default: - return + return } } } diff --git a/src/style/_models.scss b/src/style/_models.scss index 9c6cb706..b98fcaa9 100644 --- a/src/style/_models.scss +++ b/src/style/_models.scss @@ -3,6 +3,13 @@ font-size: 12px; font-weight: 300; + .deprecated + { + span, td { + color: #aaa !important; + } + } + @include text_code(); &-toggle {