Merge branch 'master' into issue-2936

dist/swagger-ui-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;AAu/FA;AA6+FA;;;;;;;;;;;;;;;;;;;;;;;;;;AA0dA;;;;;;AAoIA;AAk7FA;AAmtCA;;;;;AA0uIA;AA+4IA;AAs1FA;AAk3GA;AAwmFA;AAkkFA;AAq9CA;AA2jDA;AA0qCA;AA48EA;AAi3HA;;;;;;;;;;;;;;AA85HA;AAyoIA;AAiuJA;AA8kHA;AA8mGA;AAokEA;AAi3DA;AA4xDA;AAi3BA;;;;;;AAqzEA;AAm0FA;;;;;AA23CA;AA2qFA;AAw2CA;AA2kCA;AAq/CA;AAwwEA;AA48FA;;;;;;;;;AA81BA;AA2zIA;AAi4DA;AAqlDA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;AAu/FA;AA6+FA;;;;;;;;;;;;;;;;;;;;;;;;;;AA0dA;;;;;;AAoIA;AAk7FA;AAmtCA;;;;;AA0uIA;AA+4IA;AAs1FA;AAk3GA;AAuoEA;AAk+CA;AA6/CA;AA2rCA;AA24EA;AA66HA;;;;;;;;;;;;;;AA8vGA;AAyoIA;AAiuJA;AA8kHA;AA8mGA;AAokEA;AAi3DA;AA4xDA;AAg4BA;;;;;;AA82EA;;;;;;AAqrBA;AAkoHA;;;;;AAonDA;AA2qFA;AAu2CA;AA4kCA;AAg/CA;AAswEA;AAu8FA;;;;;;;;;AA02BA;AA2zIA;AAk4DA;AAolDA;AA4pHA","sourceRoot":""}

dist/swagger-ui-standalone-preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA4QA;AAitGA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA6PA;AAyiGA","sourceRoot":""}

dist/swagger-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA4wCA;AAoyHA;AAuxHA;AAy4FA;AA4rCA;AAugCA;AA4hCA;AAg5BA","sourceRoot":""}
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA4wCA;AAoyHA;AAuxHA;AAy4FA;AA0rCA;AAsgCA;AA+hCA;AA24BA","sourceRoot":""}

src/core/components/auth/api-key-auth.jsx

@@ -64,11 +64,10 @@ export default class ApiKeyAuth extends React.Component {
         </Row>
         <Row>
           <label>Value:</label>
-          <Col>
           {
-              value || <Input type="text" onChange={ this.onChange }/>
+            value ? <code> ****** </code>
+                  : <Col><Input type="text" onChange={ this.onChange }/></Col>
           }
-          </Col>
         </Row>
         {
           errors.valueSeq().map( (error, key) => {

src/core/components/param-body.jsx

@@ -55,9 +55,10 @@ export default class ParamBody extends Component {
     let isXml = /xml/i.test(consumesValue)
     let paramValue = isXml ? parameter.get("value_xml") : parameter.get("value")
 
-    if ( paramValue ) {
+    if ( paramValue !== undefined ) {
-      this.setState({ value: paramValue })
+      let val = !paramValue && !isXml ? "{}" : paramValue
-      this.onChange(paramValue, {isXml: isXml, isEditBox: isExecute})
+      this.setState({ value: val })
+      this.onChange(val, {isXml: isXml, isEditBox: isExecute})
     } else {
       if (isXml) {
         this.onChange(this.sample("xml"), {isXml: isXml, isEditBox: isExecute})

src/core/json-schema-components.js

@@ -150,9 +150,9 @@ export class JsonSchema_array extends Component {
           (errors.length ? <span style={{ color: "red", fortWeight: "bold" }}>{ errors[0] }</span> : null) :
           value.map( (item,i) => {
             let schema = Object.assign({}, itemSchema)
+            if ( errors.length ) {
               let err = errors.filter((err) => err.index === i)
-            if ( err.length ) {
+              if (err.length) schema.errors = [ err[0].error + i ]
-              schema.errors = [ err[0].error + i ]
             }
           return (
             <div key={i} className="json-schema-form-item">

src/core/oauth2-authorize.js

@@ -1,11 +1,12 @@
 import win from "core/window"
+import { btoa } from "core/utils"
 
 export default function authorize ( auth, authActions, errActions, configs ) {
   let { schema, scopes, name, clientId } = auth
 
   let redirectUrl = configs.oauth2RedirectUrl
   let scopeSeparator = " "
-  let state = name
+  let state = btoa(new Date())
   let flow = schema.get("flow")
   let url