Merge branch 'master' into bug/3505-schema-title-in-array-schemes

shockey · web-flow · commit dc4e60170d62 · 2017-08-04T16:33:14.000-07:00
diff --git a/dist/swagger-ui-bundle.js b/dist/swagger-ui-bundle.js
diff --git a/dist/swagger-ui-bundle.js.map b/dist/swagger-ui-bundle.js.map
diff --git a/dist/swagger-ui-standalone-preset.js b/dist/swagger-ui-standalone-preset.js
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
diff --git a/dist/swagger-ui.js.map b/dist/swagger-ui.js.map
diff --git a/src/core/components/array-model.jsx b/src/core/components/array-model.jsx
@@ -15,7 +15,7 @@ export default class ArrayModel extends Component {
   }
 
   render(){
-    let { getComponent, required, schema, depth, expandDepth, name } = this.props
+    let { getComponent, schema, depth, expandDepth, name } = this.props
     let items = schema.get("items")
     let title = schema.get("title") || name
     let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 )
@@ -31,7 +31,7 @@ export default class ArrayModel extends Component {
     return <span className="model">
       <ModelCollapse title={titleEl} collapsed={ depth > expandDepth } collapsedContent="[...]">
         [
-          <span><Model { ...this.props } schema={ items } required={ false }/></span>
+          <span><Model { ...this.props } schema={ items } required={ false } depth={ depth + 1 } /></span>
         ]
         {
           properties.size ? <span>
@@ -41,7 +41,6 @@ export default class ArrayModel extends Component {
             : null
         }
       </ModelCollapse>
-      { required && <span style={{ color: "red" }}>*</span>}
     </span>
   }
 }
diff --git a/src/core/components/object-model.jsx b/src/core/components/object-model.jsx
@@ -17,8 +17,9 @@ export default class ObjectModel extends Component {
   }
 
   render(){
-    let { schema, name, isRef, getComponent, depth, ...props } = this.props
-    let { expandDepth, specSelectors } = this.props
+    let { schema, name, isRef, getComponent, depth, expandDepth, specSelectors, ...props } = this.props
+    let { isOAS3 } = specSelectors
+
     let description = schema.get("description")
     let properties = schema.get("properties")
     let additionalProperties = schema.get("additionalProperties")
@@ -30,7 +31,10 @@ export default class ObjectModel extends Component {
     const Model = getComponent("Model")
     const ModelCollapse = getComponent("ModelCollapse")
 
-    const JumpToPathSection = ({ name }) => <span className="model-jump-to-path"><JumpToPath path={`definitions.${name}`} /></span>
+    const JumpToPathSection = ({ name }) => {
+      const path = isOAS3 && isOAS3() ? `components.schemas.${name}` : `definitions.${name}`
+      return <span className="model-jump-to-path"><JumpToPath path={path} /></span>
+    }
     const collapsedContent = (<span>
         <span>{ braceOpen }</span>...<span>{ braceClose }</span>
         {
@@ -55,7 +59,7 @@ export default class ObjectModel extends Component {
           }
           <span className="inner-object">
             {
-              <table className="model" style={{ marginLeft: "2em" }}><tbody>
+              <table className="model"><tbody>
               {
                 !description ? null : <tr style={{ color: "#999", fontStyle: "italic" }}>
                     <td>description:</td>
diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
@@ -186,7 +186,7 @@ export default class Operation extends PureComponent {
             }
           </div>
 
-          <Collapse isOpened={shown} animated>
+          <Collapse isOpened={shown}>
             <div className="opblock-body">
               { deprecated && <h4 className="opblock-title_normal"> Warning: Deprecated</h4>}
               { description &&
diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx
@@ -58,6 +58,8 @@ export default class ParameterRow extends Component {
   render() {
     let {param, onChange, getComponent, isExecute, fn, onChangeConsumes, specSelectors, pathMethod} = this.props
 
+    let { isOAS3 } = specSelectors
+
     // const onChangeWrapper = (value) => onChange(param, value)
     const JsonSchemaForm = getComponent("JsonSchemaForm")
     const ParamBody = getComponent("ParamBody")
@@ -95,6 +97,9 @@ export default class ParameterRow extends Component {
             { !required ? null : <span style={{color: "red"}}>&nbsp;*</span> }
           </div>
           <div className="parameter__type">{ param.get("type") } { itemType && `[${itemType}]` }</div>
+          <div className="parameter__deprecated">
+            { isOAS3 && isOAS3() && param.get("deprecated") ? "deprecated": null }
+          </div>
           <div className="parameter__in">({ param.get("in") })</div>
         </td>
 
diff --git a/src/core/components/primitive-model.jsx b/src/core/components/primitive-model.jsx
@@ -7,11 +7,12 @@ export default class Primitive extends Component {
   static propTypes = {
     schema: PropTypes.object.isRequired,
     getComponent: PropTypes.func.isRequired,
-    required: PropTypes.bool
+    name: PropTypes.string,
+    depth: PropTypes.number
   }
 
   render(){
-    let { schema, getComponent, required } = this.props
+    let { schema, getComponent, name, depth } = this.props
 
     if(!schema || !schema.get) {
       // don't render if schema isn't correctly formed
@@ -24,32 +25,34 @@ export default class Primitive extends Component {
     let enumArray = schema.get("enum")
     let description = schema.get("description")
     let properties = schema.filter( ( v, key) => ["enum", "type", "format", "description", "$$ref"].indexOf(key) === -1 )
-    let style = required ? { fontWeight: "bold" } : {}
     const Markdown = getComponent("Markdown")
     const EnumModel = getComponent("EnumModel")
 
-    return <span className="prop">
-      <span className="prop-type" style={ style }>{ type }</span> { required && <span style={{ color: "red" }}>*</span>}
-      { format && <span className="prop-format">(${format})</span>}
-      {
-        properties.size ? properties.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={ propStyle }>
-          <br />{ key }: { String(v) }</span>)
-          : null
-      }
-      {
-        !description ? null :
-          <Markdown source={ description } />
-      }
-      {
-        xml && xml.size ? (<span><br /><span style={ propStyle }>xml:</span>
-          {
-            xml.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={ propStyle }><br/>&nbsp;&nbsp;&nbsp;{key}: { String(v) }</span>).toArray()
-          }
-        </span>): null
-      }
-      {
-        enumArray && <EnumModel value={ enumArray } getComponent={ getComponent } />
-      }
+    return <span className="model">
+      <span className="prop">
+        { name && <span className={`${depth === 1 && "model-title"} prop-name`}>{ name }</span> }
+        <span className="prop-type">{ type }</span>
+        { format && <span className="prop-format">(${format})</span>}
+        {
+          properties.size ? properties.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={ propStyle }>
+            <br />{ key }: { String(v) }</span>)
+            : null
+        }
+        {
+          !description ? null :
+            <Markdown source={ description } />
+        }
+        {
+          xml && xml.size ? (<span><br /><span style={ propStyle }>xml:</span>
+            {
+              xml.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={ propStyle }><br/>&nbsp;&nbsp;&nbsp;{key}: { String(v) }</span>).toArray()
+            }
+          </span>): null
+        }
+        {
+          enumArray && <EnumModel value={ enumArray } getComponent={ getComponent } />
+        }
+      </span>
     </span>
   }
 }
diff --git a/src/core/plugins/auth/actions.js b/src/core/plugins/auth/actions.js
@@ -150,7 +150,6 @@ export const authorizeRequest = ( data ) => ( { fn, authActions, errActions, aut
 
   let _headers = Object.assign({
     "Accept":"application/json, text/plain, */*",
-    "Access-Control-Allow-Origin": "*",
     "Content-Type": "application/x-www-form-urlencoded"
   }, headers)
 
diff --git a/src/core/plugins/oas3/wrap-components/model.jsx b/src/core/plugins/oas3/wrap-components/model.jsx
@@ -3,7 +3,6 @@ import PropTypes from "prop-types"
 import { OAS3ComponentWrapFactory } from "../helpers"
 import { Model } from "core/components/model"
 
-
 class ModelComponent extends Component {
   static propTypes = {
     schema: PropTypes.object.isRequired,
diff --git a/src/style/_layout.scss b/src/style/_layout.scss
@@ -699,7 +699,6 @@ body
 .renderedMarkdown {
   p {
     @include text_body();
-    font-size: 14px;
     margin-top: 0px;
     margin-bottom: 0px;
   }
diff --git a/src/style/_models.scss b/src/style/_models.scss
@@ -227,15 +227,19 @@ span
 {
     > span.model
     {
-        padding: 0 0 0 10px;
-
         .brace-close
         {
             padding: 0 0 0 10px;
         }
     }
 }
 
+.prop-name
+{
+    display: inline-block;
+    width: 100px;
+}
+
 .prop-type
 {
     color: #55a;
diff --git a/src/style/_table.scss b/src/style/_table.scss
@@ -19,8 +19,8 @@ table
 
                     &:first-of-type
                     {
-                        width: 100px;
-                        padding: 0;
+                        width: 124px;
+                        padding: 0 0 0 2em;
                     }
                 }
             }
@@ -138,6 +138,14 @@ table
     @include text_code(#888);
 }
 
+.parameter__deprecated
+{
+    font-size: 12px;
+    font-style: italic;
+
+    @include text_code(#f00);
+}
+
 
 .table-container
 {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export default class ArrayModel extends Component {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`render(){`
`18`		`- let { getComponent, required, schema, depth, expandDepth, name } = this.props`
	`18`	`+ let { getComponent, schema, depth, expandDepth, name } = this.props`
`19`	`19`	`let items = schema.get("items")`
`20`	`20`	`let title = schema.get("title") \|\| name`
`21`	`21`	`let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 )`
`@@ -31,7 +31,7 @@ export default class ArrayModel extends Component {`
`31`	`31`	`return <span className="model">`
`32`	`32`	`<ModelCollapse title={titleEl} collapsed={ depth > expandDepth } collapsedContent="[...]">`
`33`	`33`	`[`
`34`		`- <span><Model { ...this.props } schema={ items } required={ false }/></span>`
	`34`	`+ <span><Model { ...this.props } schema={ items } required={ false } depth={ depth + 1 } /></span>`
`35`	`35`	`]`
`36`	`36`	`{`
`37`	`37`	`properties.size ? <span>`
`@@ -41,7 +41,6 @@ export default class ArrayModel extends Component {`
`41`	`41`	`: null`
`42`	`42`	`}`
`43`	`43`	`</ModelCollapse>`
`44`		`- { required && <span style={{ color: "red" }}>*</span>}`
`45`	`44`	`</span>`
`46`	`45`	`}`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ export default class ObjectModel extends Component {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`render(){`
`20`		`- let { schema, name, isRef, getComponent, depth, ...props } = this.props`
`21`		`- let { expandDepth, specSelectors } = this.props`
	`20`	`+ let { schema, name, isRef, getComponent, depth, expandDepth, specSelectors, ...props } = this.props`
	`21`	`+ let { isOAS3 } = specSelectors`
	`22`	`+`
`22`	`23`	`let description = schema.get("description")`
`23`	`24`	`let properties = schema.get("properties")`
`24`	`25`	`let additionalProperties = schema.get("additionalProperties")`
`@@ -30,7 +31,10 @@ export default class ObjectModel extends Component {`
`30`	`31`	`const Model = getComponent("Model")`
`31`	`32`	`const ModelCollapse = getComponent("ModelCollapse")`
`32`	`33`
`33`		- const JumpToPathSection = ({ name }) => <span className="model-jump-to-path"><JumpToPath path={`definitions.${name}`} /></span>
	`34`	`+ const JumpToPathSection = ({ name }) => {`
	`35`	+ const path = isOAS3 && isOAS3() ? `components.schemas.${name}` : `definitions.${name}`
	`36`	`+ return <span className="model-jump-to-path"><JumpToPath path={path} /></span>`
	`37`	`+ }`
`34`	`38`	`const collapsedContent = (<span>`
`35`	`39`	`<span>{ braceOpen }</span>...<span>{ braceClose }</span>`
`36`	`40`	`{`
`@@ -55,7 +59,7 @@ export default class ObjectModel extends Component {`
`55`	`59`	`}`
`56`	`60`	`<span className="inner-object">`
`57`	`61`	`{`
`58`		`- <table className="model" style={{ marginLeft: "2em" }}><tbody>`
	`62`	`+ <table className="model"><tbody>`
`59`	`63`	`{`
`60`	`64`	`!description ? null : <tr style={{ color: "#999", fontStyle: "italic" }}>`
`61`	`65`	`<td>description:</td>`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ export default class Operation extends PureComponent {`
`186`	`186`	`}`
`187`	`187`	`</div>`
`188`	`188`
`189`		`- <Collapse isOpened={shown} animated>`
	`189`	`+ <Collapse isOpened={shown}>`
`190`	`190`	`<div className="opblock-body">`
`191`	`191`	`{ deprecated && <h4 className="opblock-title_normal"> Warning: Deprecated</h4>}`
`192`	`192`	`{ description &&`