use Object.assign to always ensure setState receives a new value object

tests: add failing e2e test case
Merge branch 'master' into patch-7
2018-04-20 15:59:46 -07:00 · 2018-04-20 15:59:32 -07:00 · 2018-04-15 17:28:08 -04:00 · 2018-04-13 18:38:21 -07:00 · 2018-04-13 17:02:36 -07:00 · 2018-04-13 16:57:32 -07:00
31 changed files with 455 additions and 219 deletions
@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20

 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 ------------------ | ------------ | -------------------------- | -----
-3.13.3 | 2018-03-23 | 2.0, 3.0 | [tag v3.13.3](https://github.com/swagger-api/swagger-ui/tree/v3.13.3)
+3.13.4 | 2018-04-15 | 2.0, 3.0 | [tag v3.13.4](https://github.com/swagger-api/swagger-ui/tree/v3.13.4)
 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)
@@ -16,13 +16,16 @@
      overflow: -moz-scrollbars-vertical;
      overflow-y: scroll;
    }
+
    *,
    *:before,
    *:after
    {
      box-sizing: inherit;
    }
-    body {
+
+    body
+    {
      margin:0;
      background: #fafafa;
    }
@@ -30,75 +33,40 @@
 </head>

 <body>
+  <div id="swagger-ui"></div>

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
-  <defs>
-    <symbol viewBox="0 0 20 20" id="unlocked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
-    </symbol>
+  <script src="./swagger-ui-bundle.js"> </script>
+  <script src="./swagger-ui-standalone-preset.js"> </script>
+  <script>
+    window.onload = function() {
+      window["SwaggerUIBundle"] = window["swagger-ui-bundle"]
+      window["SwaggerUIStandalonePreset"] = window["swagger-ui-standalone-preset"]
+      // Build a system
+      const ui = SwaggerUIBundle({
+        url: "http://petstore.swagger.io/v2/swagger.json",
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIStandalonePreset
+        ],
+        plugins: [
+          SwaggerUIBundle.plugins.DownloadUrl
+        ],
+        layout: "StandaloneLayout"
+      })

-    <symbol viewBox="0 0 20 20" id="locked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
-    </symbol>
+      window.ui = ui

-    <symbol viewBox="0 0 20 20" id="close">
-      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow">
-      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow-down">
-      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
-    </symbol>
-
-
-    <symbol viewBox="0 0 24 24" id="jump-to">
-      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 24 24" id="expand">
-      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
-    </symbol>
-
-  </defs>
-</svg>
-
-<div id="swagger-ui"></div>
-
-<script src="./swagger-ui-bundle.js"> </script>
-<script src="./swagger-ui-standalone-preset.js"> </script>
-<script>
-  window.onload = function() {
-    window["SwaggerUIBundle"] = window["swagger-ui-bundle"]
-    window["SwaggerUIStandalonePreset"] = window["swagger-ui-standalone-preset"]
-    // Build a system
-    const ui = SwaggerUIBundle({
-      url: "http://petstore.swagger.io/v2/swagger.json",
-      dom_id: '#swagger-ui',
-      presets: [
-        SwaggerUIBundle.presets.apis,
-        SwaggerUIStandalonePreset
-      ],
-      plugins: [
-        SwaggerUIBundle.plugins.DownloadUrl
-      ],
-      layout: "StandaloneLayout"
-    })
-
-    window.ui = ui
-
-    ui.initOAuth({
-      clientId: "your-client-id",
-      clientSecret: "your-client-secret-if-required",
-      realm: "your-realms",
-      appName: "your-app-name",
-      scopeSeparator: " ",
-      additionalQueryStringParams: {}
-    })
-  }
-</script>
+      ui.initOAuth({
+        clientId: "your-client-id",
+        clientSecret: "your-client-secret-if-required",
+        realm: "your-realms",
+        appName: "your-app-name",
+        scopeSeparator: " ",
+        additionalQueryStringParams: {}
+      })
+    }
+  </script>
 </body>

 </html>
@@ -1,95 +1,61 @@
 <!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Swagger UI</title>
-  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
-  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-  <style>
-    html
-    {
-      box-sizing: border-box;
-      overflow: -moz-scrollbars-vertical;
-      overflow-y: scroll;
+  <head>
+    <meta charset="UTF-8">
+    <title>Swagger UI</title>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+    <style>
+      html
+      {
+        box-sizing: border-box;
+        overflow: -moz-scrollbars-vertical;
+        overflow-y: scroll;
+      }
+
+      *,
+      *:before,
+      *:after
+      {
+        box-sizing: inherit;
+      }
+
+      body
+      {
+        margin:0;
+        background: #fafafa;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="swagger-ui"></div>
+
+    <script src="./swagger-ui-bundle.js"> </script>
+    <script src="./swagger-ui-standalone-preset.js"> </script>
+    <script>
+    window.onload = function() {
+
+      // Build a system
+      const ui = SwaggerUIBundle({
+        url: "http://petstore.swagger.io/v2/swagger.json",
+        dom_id: '#swagger-ui',
+        deepLinking: true,
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIStandalonePreset
+        ],
+        plugins: [
+          SwaggerUIBundle.plugins.DownloadUrl
+        ],
+        layout: "StandaloneLayout"
+      })
+
+      window.ui = ui
    }
-    *,
-    *:before,
-    *:after
-    {
-      box-sizing: inherit;
-    }
-
-    body {
-      margin:0;
-      background: #fafafa;
-    }
-  </style>
-</head>
-
-<body>
-
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
-  <defs>
-    <symbol viewBox="0 0 20 20" id="unlocked">
-          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="locked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="close">
-      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow">
-      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow-down">
-      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
-    </symbol>
-
-
-    <symbol viewBox="0 0 24 24" id="jump-to">
-      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 24 24" id="expand">
-      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
-    </symbol>
-
-  </defs>
-</svg>
-
-<div id="swagger-ui"></div>
-
-<script src="./swagger-ui-bundle.js"> </script>
-<script src="./swagger-ui-standalone-preset.js"> </script>
-<script>
-window.onload = function() {
-  
-  // Build a system
-  const ui = SwaggerUIBundle({
-    url: "http://petstore.swagger.io/v2/swagger.json",
-    dom_id: '#swagger-ui',
-    deepLinking: true,
-    presets: [
-      SwaggerUIBundle.presets.apis,
-      SwaggerUIStandalonePreset
-    ],
-    plugins: [
-      SwaggerUIBundle.plugins.DownloadUrl
-    ],
-    layout: "StandaloneLayout"
-  })
-
-  window.ui = ui
-}
-</script>
-</body>
-
+  </script>
+  </body>
 </html>
@@ -18,7 +18,7 @@ class OperationsLayout extends React.Component {
      getComponent
    } = this.props

-    const Operations = getComponent("Operations", true)
+    const Operations = getComponent("operations", true)

    return (
      <div>
@@ -1,6 +1,6 @@
 {
  "name": "swagger-ui",
-  "version": "3.13.3",
+  "version": "3.13.4",
  "main": "dist/swagger-ui.js",
  "repository": "git@github.com:swagger-api/swagger-ui.git",
  "contributors": [
@@ -52,6 +52,7 @@
    "getbase": "^2.8.2",
    "ieee754": "^1.1.8",
    "immutable": "^3.x.x",
+    "js-file-download": "^0.4.1",
    "js-yaml": "^3.5.5",
    "lodash": "4.17.5",
    "matcher": "^0.1.2",
@@ -83,7 +84,7 @@
    "scroll-to-element": "^2.0.0",
    "serialize-error": "2.0.0",
    "shallowequal": "0.2.2",
-    "swagger-client": "^3.6.0",
+    "swagger-client": "^3.7.0",
    "url-parse": "^1.1.8",
    "whatwg-fetch": "0.11.1",
    "worker-loader": "^0.7.1",
@@ -1,11 +1,13 @@
 import React, { Component } from "react"
 import PropTypes from "prop-types"
 import { highlight } from "core/utils"
+import saveAs from "js-file-download"

 export default class HighlightCode extends Component {
  static propTypes = {
    value: PropTypes.string.isRequired,
-    className: PropTypes.string
+    className: PropTypes.string,
+    downloadable: PropTypes.bool
  }

  componentDidMount() {
@@ -20,10 +22,46 @@ export default class HighlightCode extends Component {
    this.el = c
  }

+  downloadText = () => {
+    saveAs(this.props.value, "response.txt")
+  }
+
+  preventYScrollingBeyondElement = (e) => {
+    const target = e.target
+
+    var deltaY = e.nativeEvent.deltaY
+    var contentHeight = target.scrollHeight
+    var visibleHeight = target.offsetHeight
+    var scrollTop = target.scrollTop
+
+    const scrollOffset = visibleHeight + scrollTop
+
+    const isScrollingPastTop = scrollTop === 0 && deltaY < 0
+    const isScrollingPastBottom = scrollOffset >= contentHeight && deltaY > 0
+
+    if (isScrollingPastTop || isScrollingPastBottom) {
+      e.preventDefault()
+    }
+  }
+
  render () {
-    let { value, className } = this.props
+    let { value, className, downloadable } = this.props
    className = className || ""

-    return <pre ref={this.initializeComponent} className={className + " microlight"}>{ value }</pre>
+    return (
+      <div className="highlight-code">
+        { !downloadable ? null :
+          <div className="download-contents" onClick={this.downloadText}>
+            Download
+          </div>
+        }
+        <pre
+          ref={this.initializeComponent}
+          onWheel={this.preventYScrollingBeyondElement}
+          className={className + " microlight"}>
+          {value}
+        </pre>
+      </div>
+    )
  }
 }
@@ -39,6 +39,7 @@ export default class BaseLayout extends React.Component {
    let schemes = specSelectors.schemes()
    let servers = specSelectors.servers()

+    let SvgAssets = getComponent("SvgAssets")
    let Info = getComponent("info")
    let Operations = getComponent("operations", true)
    let Models = getComponent("Models", true)
@@ -78,6 +79,7 @@ export default class BaseLayout extends React.Component {
    return (

      <div className='swagger-ui'>
+          <SvgAssets />
          <div>
            <Errors/>
            <Row className="information-container">
@@ -197,7 +197,7 @@ export default class ParameterRow extends Component {
                                                getConfigs={ getConfigs }
                                                isExecute={ isExecute }
                                                specSelectors={ specSelectors }
-                                                schema={ schema }
+                                                schema={ param.get("schema") }
                                                example={ bodyParam }/>
              : null
          }
@@ -5,7 +5,10 @@ import lowerCase from "lodash/lowerCase"
 import { extractFileNameFromContentDispositionHeader } from "core/utils"
 import win from "core/window"

-export default class ResponseBody extends React.Component {
+export default class ResponseBody extends React.PureComponent {
+  state = {
+    parsedContent: null
+  }

  static propTypes = {
    content: PropTypes.any.isRequired,
@@ -15,8 +18,39 @@ export default class ResponseBody extends React.Component {
    url: PropTypes.string
  }

+  updateParsedContent = (prevContent) => {
+    const { content } = this.props
+
+    if(prevContent === content) {
+      return
+    }
+
+    if(content && content instanceof Blob) {
+      var reader = new FileReader()
+      reader.onload = () => {
+        this.setState({
+          parsedContent: reader.result
+        })
+      }
+      reader.readAsText(content)
+    } else {
+      this.setState({
+        parsedContent: content.toString()
+      })
+    }
+  }
+
+  componentDidMount() {
+    this.updateParsedContent(null)
+  }
+
+  componentDidUpdate(prevProps) {
+    this.updateParsedContent(prevProps.content)
+  }
+
  render() {
    let { content, contentType, url, headers={}, getComponent } = this.props
+    const { parsedContent } = this.state
    const HighlightCode = getComponent("highlightCode")
    let body, bodyEl
    url = url || ""
@@ -66,7 +100,7 @@ export default class ResponseBody extends React.Component {
        body = "can't parse JSON.  Raw result:\n\n" + content
      }

-      bodyEl = <HighlightCode value={ body } />
+      bodyEl = <HighlightCode downloadable value={ body } />

      // XML
    } else if (/xml/i.test(contentType)) {
@@ -74,11 +108,11 @@ export default class ResponseBody extends React.Component {
        textNodesOnSameLine: true,
        indentor: "  "
      })
-      bodyEl = <HighlightCode value={ body } />
+      bodyEl = <HighlightCode downloadable value={ body } />

      // HTML or Plain Text
    } else if (lowerCase(contentType) === "text/html" || /text\/plain/.test(contentType)) {
-      bodyEl = <HighlightCode value={ content } />
+      bodyEl = <HighlightCode downloadable value={ content } />

      // Image
    } else if (/^image\//i.test(contentType)) {
@@ -92,10 +126,25 @@ export default class ResponseBody extends React.Component {
    } else if (/^audio\//i.test(contentType)) {
      bodyEl = <pre><audio controls><source src={ url } type={ contentType } /></audio></pre>
    } else if (typeof content === "string") {
-      bodyEl = <HighlightCode value={ content } />
+      bodyEl = <HighlightCode downloadable value={ content } />
    } else if ( content.size > 0 ) {
      // We don't know the contentType, but there was some content returned
-      bodyEl = <div>Unknown response type</div>
+      if(parsedContent) {
+        // We were able to squeeze something out of content
+        // in `updateParsedContent`, so let's display it
+        bodyEl = <div>
+          <p className="i">
+            Unrecognized response type; displaying content as text.
+          </p>
+          <HighlightCode downloadable value={ parsedContent } />
+        </div>
+
+      } else {
+        // Give up
+        bodyEl = <p className="i">
+          Unrecognized response type; unable to display.
+        </p>
+      }
    } else {
      // We don't know the contentType and there was no content returned
      bodyEl = null
@@ -37,12 +37,12 @@ export default class Schemes extends React.Component {
  }

  render() {
-    let { schemes } = this.props
+    let { schemes, currentScheme } = this.props

    return (
      <label htmlFor="schemes">
        <span className="schemes-title">Schemes</span>
-        <select onChange={ this.onChange }>
+        <select onChange={ this.onChange } value={currentScheme}>
          { schemes.valueSeq().map(
            ( scheme ) => <option value={ scheme } key={ scheme }>{ scheme }</option>
          ).toArray()}
@@ -0,0 +1,43 @@
+import React from "react"
+const SvgAssets = () =>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink" style={{
+        position: "absolute",
+        width: 0,
+        height: 0
+      }}>
+      <defs>
+        <symbol viewBox="0 0 20 20" id="unlocked">
+          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="locked">
+          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="close">
+          <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="large-arrow">
+          <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="large-arrow-down">
+          <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+        </symbol>
+
+
+        <symbol viewBox="0 0 24 24" id="jump-to">
+          <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 24 24" id="expand">
+          <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+        </symbol>
+
+      </defs>
+    </svg>
+  </div>
+
+export default SvgAssets
@@ -81,8 +81,8 @@ export function getLineNumberForPath(yaml, path) {
 * YAML or JSON string
 * @param  {array}   path
 * an array of stings that constructs a
-* JSON Path similiar to JSON Pointers(RFC 6901). The difference is, each
-* component of path is an item of the array intead of beinf seperated with
+* JSON Path similar to JSON Pointers(RFC 6901). The difference is, each
+* component of path is an item of the array instead of being separated with
 * slash(/) in a string
 */
 export function positionRangeForPath(yaml, path) {
@@ -1,6 +1,6 @@
 import React from "react"

-// Nothing by default- component can be overriden by another plugin.
+// Nothing by default- component can be overridden by another plugin.

 export default class JumpToPath extends React.Component {
  render() {
@@ -33,7 +33,8 @@ export default class HttpAuth extends React.Component {
    let { onChange } = this.props
    let { value, name } = e.target

-    let newValue = this.state.value || {}
+    let newValue = Object.assign({}, this.state.value)
+
    if(name) {
      newValue[name] = value
    } else {
@@ -53,7 +54,7 @@ export default class HttpAuth extends React.Component {
    const Markdown = getComponent( "Markdown" )
    const JumpToPath = getComponent("JumpToPath", true)

-    const scheme = schema.get("scheme")
+    const scheme = (schema.get("scheme") || "").toLowerCase()
    let value = this.getValue()
    let errors = errSelectors.allErrors().filter( err => err.get("authId") === name)

@@ -125,7 +126,7 @@ export default class HttpAuth extends React.Component {
    )
    }
  return <div>
-    <em><b>{name}</b> HTTP authentication: unsupported or missing scheme</em>
+    <em><b>{name}</b> HTTP authentication: unsupported scheme {`'${scheme}'`}</em>
  </div>
  }
 }
@@ -67,6 +67,7 @@ import Property from "core/components/property"
 import TryItOutButton from "core/components/try-it-out-button"
 import VersionStamp from "core/components/version-stamp"
 import DeepLink from "core/components/deep-link"
+import SvgAssets from "core/components/svg-assets"

 import Markdown from "core/components/providers/markdown"

@@ -130,7 +131,8 @@ export default function() {
      OperationContainer,
      DeepLink,
      InfoUrl,
-      InfoBasePath
+      InfoBasePath,
+      SvgAssets
    }
  }

@@ -10,7 +10,7 @@ import { memoizedSampleFromSchema, memoizedCreateXMLExample } from "core/plugins
 import win from "./window"
 import cssEscape from "css.escape"

-const DEFAULT_REPONSE_KEY = "default"
+const DEFAULT_RESPONSE_KEY = "default"

 export const isImmutable = (maybe) => Im.Iterable.isIterable(maybe)

@@ -128,7 +128,7 @@ export function systemThunkMiddleware(getSystem) {

 export function defaultStatusCode ( responses ) {
  let codes = responses.keySeq()
-  return codes.contains(DEFAULT_REPONSE_KEY) ? DEFAULT_REPONSE_KEY : codes.filter( key => (key+"")[0] === "2").sort().first()
+  return codes.contains(DEFAULT_RESPONSE_KEY) ? DEFAULT_RESPONSE_KEY : codes.filter( key => (key+"")[0] === "2").sort().first()
 }


@@ -193,7 +193,7 @@ export function highlight (el) {
    // running through characters and highlighting
    while (prev2 = prev1,
      // escaping if needed (with except for comments)
-      // pervious character will not be therefore
+      // previous character will not be therefore
      // recognized as a token finalize condition
      prev1 = tokenType < 7 && prev1 == "\\" ? 1 : chr
      ) {
@@ -6,7 +6,7 @@ Plugins allow you to add
 - `statePlugins`
  - `selectors` - query the state
  - `reducers` - modify the state
-  - `actions` - fire and forget, that will eventually be handled by a reducer. You *can* rely on the result of async actions. But in general its not recommended
+  - `actions` - fire and forget, that will eventually be handled by a reducer. You *can* rely on the result of async actions. But in general it's not recommended
  - `wrapActions` - replace an action with a wrapped action (useful for hooking into existing `actions`)
 - `components` - React components
 - `fn` - commons functions
@@ -626,6 +626,33 @@
    }
 }

+.highlight-code {
+  position: relative;
+
+  > .microlight {
+    overflow-y: auto;
+    max-height: 400px;
+    min-height: 6em;
+  }
+}
+
+.download-contents {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+  cursor: pointer;
+  background: #7d8293;
+  text-align: center;
+  padding: 5px;
+  border-radius: 4px;
+  font-family: 'Titillium Web', sans-serif;
+  font-weight: 600;
+  color: white;
+  font-size: 14px;
+  height: 30px;
+  width: 75px;
+}
+
 .scheme-container
 {
    margin: 0 0 20px 0;
@@ -28,7 +28,7 @@ describe("oauth2", function () {
      expect(win.open.calls[0].arguments[0]).toMatch("https://testAuthorizationUrl?response_type=code&redirect_uri=&state=")
    })

-    it("should append query paramters to authorizeUrl with query parameters", function() {
+    it("should append query parameters to authorizeUrl with query parameters", function() {
      win.open = createSpy()
      mockSchema.authorizationUrl = "https://testAuthorizationUrl?param=1"
      oauth2Authorize(authConfig)
@@ -0,0 +1,44 @@
+describe("bug #4196: HTTP basic auth credential retention", function () {
+    let mainPage
+    beforeEach(function (client, done) {
+        mainPage = client
+            .url("localhost:3230")
+            .page.main()
+
+        client.waitForElementVisible(".download-url-input", 5000)
+            .pause(80)
+            .clearValue(".download-url-input")
+            .setValue(".download-url-input", "http://localhost:3230/test-specs/bugs/4196.yaml")
+            .click("button.download-url-button")
+            .pause(1000)
+
+        done()
+    })
+    afterEach(function (client, done) {
+        done()
+    })
+    it("should display the most recent auth data across modal close/opens", function (client) {
+        client.waitForElementVisible(".opblock-tag-section", 10000)
+            .click("button.btn.authorize") // Open modal
+            .waitForElementVisible("section>input", 5000)
+            .setValue("section>input", "aaa") // Set user
+            .waitForElementVisible(`section>input[type="password"]`, 5000)
+            .setValue(`section>input[type="password"]`, "aaa") // Set password
+            .click(".auth-btn-wrapper button:nth-child(1)") // Click Authorize
+            .assert.containsText("div.wrapper:nth-child(4)>code", "aaa")
+            .click(".auth-btn-wrapper button:nth-child(2)") // Close modal
+            .pause(50)
+            .click("button.btn.authorize") // Open modal
+            .pause(50)
+            .click(".auth-btn-wrapper button:nth-child(1)") // Logout
+            .waitForElementVisible("section>input", 5000)
+            .setValue("section>input", "bbb") // Set user
+            .waitForElementVisible(`section>input[type="password"]`, 5000)
+            .setValue(`section>input[type="password"]`, "bbb") // Set password
+            .click(".auth-btn-wrapper button:nth-child(1)") // Click Authorize
+            .pause(5000)
+            .assert.containsText("div.wrapper:nth-child(4)>code", "bbb")
+
+        client.end()
+    })
+})
@@ -71,6 +71,16 @@ describe("render pet api container", function () {
        client.end()
    })

+    it("Testing post /pet api model values", function (client) {
+        apiWrapper.waitForElementVisible("@petOperationPostContainer", 5000)
+            .click("@petOperationPostCollpase")
+            .waitForElementVisible("@petOperationPostCollapseContainer", 5000)
+            .click("a.tablinks[data-name=model]")
+            .assert.containsText("span.model-title > .model-title__text", `Pet`)
+
+        client.end()
+    })
+
    it("render put /pet api container", function (client) {
        apiWrapper.waitForElementVisible("@petOperationPutContainer", 5000)
            .assert.containsText("@petOperationPutTitle", "/pet")
@@ -81,10 +91,10 @@ describe("render pet api container", function () {
            .waitForElementVisible("@petOperationPutExecuteBtn", 1000)
            .click("@petOperationPutTryBtn")
            .assert.cssClassNotPresent("@petOperationPutTryBtn", "cancel")
-            
+
        client.end()
    })
-    
+
    it("Testing put /pet api Mock data", function (client) {
        apiWrapper.waitForElementVisible("@petOperationPutContainer", 5000)
            .click("@petOperationPutCollpase")
@@ -115,7 +125,7 @@ describe("render pet api container", function () {
            .waitForElementVisible("@petOperationGetByTagExecuteBtn", 1000)
            .click("@petOperationGetByTagTryBtn")
            .assert.cssClassNotPresent("@petOperationGetByTagTryBtn", "cancel")
-            
+
        client.end()
    })

@@ -138,7 +148,7 @@ describe("render pet api container", function () {

        client.end()
    })
-    
+
    it("render get by ID /pet/{petId} api container", function (client) {
        apiWrapper.waitForElementVisible("@petOperationGetByIdContainer", 5000)
            .assert.containsText("@petOperationGetByIdTitle", "/pet/{petId}")
@@ -148,7 +158,7 @@ describe("render pet api container", function () {
            .waitForElementVisible("@petOperationGetByTagExecuteBtn", 1000)
            .click("@petOperationGetByTagTryBtn")
            .assert.cssClassNotPresent("@petOperationGetByTagTryBtn", "cancel")
-            
+
        client.end()
    })

@@ -167,7 +177,7 @@ describe("render pet api container", function () {
            .assert.attributeEquals("@petOperationGetByIdParameter", "title", "Value must be an integer")
            .click("@petOperationGetByTagTryBtn")
            .assert.cssClassNotPresent("@petOperationGetByTagTryBtn", "cancel")
-            
+
        client.end()
    })

@@ -180,10 +190,10 @@ describe("render pet api container", function () {
            .waitForElementVisible("@petOperationDeleteExecuteBtn", 1000)
            .click("@petOperationDeleteTryBtn")
            .assert.cssClassNotPresent("@petOperationDeleteTryBtn", "cancel")
-            
+
        client.end()
    })
-    
+
    it("Testing delete /pet api Mock data", function (client) {
        apiWrapper.waitForElementVisible("@petOperationDeleteContainer", 3000)
            .click("@petOperationDeleteCollpase")
@@ -203,4 +213,4 @@ describe("render pet api container", function () {

        client.end()
    })
-})
+})
@@ -19,7 +19,7 @@ describe("Remote $ref rendering", function () {
  })

  it("renders a remote $ref correctly", function (client) {
-    mainPage.expect.element("#model-TestResponse > span > div > span > span > span.inner-object > table > tbody > tr:nth-child(2) > td:nth-child(2) > span > span > div > div > p").text.to.equal("this is a api2prop")
+    mainPage.expect.element("#model-TestResponse > span > div > span > span > span.inner-object > table > tbody > tr:nth-child(2) > td:nth-child(2) > span > span > div > div > p").text.to.equal("this is an api2prop")

    client.end()
  })
@@ -0,0 +1,85 @@
+openapi: 3.0.0
+info:
+  title: Demo API
+  description: First test
+  termsOfService: 'http://demo.io/terms-of-service/'
+  contact:
+    name: Demo Support
+    email: support@demo.io
+  version: 1.0.0
+servers:
+  - url: '{server}/v1'
+    variables:
+      server:
+        default: https://api.demo.io
+        description: the API endpoint
+
+paths:
+  /session:
+    put:
+      summary: Returns a new authentication token
+      tags:
+        - session
+      security:
+        - basicAuth: []
+      responses:
+        '201':
+          description: A session object
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - type: object
+                    properties:
+                      user_id:
+                        type: string
+                        format: uuid
+                        readOnly: true
+                        example: 110e8400-e29b-11d4-a716-446655440000
+                  - $ref: '#/components/schemas/Session'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+
+components:
+  securitySchemes:
+    basicAuth:
+      type: http
+      scheme: basic
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+  schemas:
+    Session:
+      required:
+        - token
+      properties:
+        token:
+          type: string
+          readOnly: true
+          example: >-
+            eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.EkN-DOsnsuRjRO6BxXemmJDm3HbxrbRzXglbN2S4sOkopdU4IsDxTI8jO19W_A4K8ZPJijNLis4EZsHeY559a4DFOd50_OqgHGuERTqYZyuhtF39yxJPAjUESwxk2J5k_4zM3O-vtd1Ghyo4IbqKKSy6J9mTniYJPenn5-HIirE
+
+    Error:
+      required:
+        - message
+      properties:
+        message:
+          description: a human readable message explaining the error
+          type: string
+        reason:
+          description: a functionnal key about the error
+          type: string
+  responses:
+    Unauthorized:
+      description: Not authenticated
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Default:
+      description: unexpected error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
@@ -21,7 +21,7 @@ components:
  schemas:
    Api2Prop:
      type: string
-      description: this is a api2prop
+      description: this is an api2prop
      example: 'api1prop-value'

    TestResponse2:
Author	SHA1	Message	Date
Kyle Shockey	f23be7d8f5	use Object.assign to always ensure setState receives a new value object	2018-04-20 15:59:46 -07:00
Kyle Shockey	1be0a6df60	tests: add failing e2e test case	2018-04-20 15:59:32 -07:00
Helder Sepulveda	8a8aeeb119	Merge branch 'master' into patch-7	2018-04-15 17:28:08 -04:00
kyle	5f855e56bb	v3.13.4 (#4438 ) * v3.13.4 * rebuild dist	2018-04-13 18:38:21 -07:00
Ville Skyttä	3f6e21e3b1	improve: HTTP auth display logic and messaging (#4430 ) * http-auth: Include unsupported scheme name in error message * http-auth: Treat authentication scheme case insensitively The spec refers to RFC 7235 for scheme names, and the RFC says names are matched case insensitively. * linter fixes	2018-04-13 17:02:36 -07:00
Aleksey Ganzha	26d0ad7684	fix(regression): model rendering for Swagger 2.0 body parameters (#4424 ) * Fix model rendering for parameters * tests(e2e): add test confirming that Pet model is shown in operation	2018-04-13 16:57:32 -07:00
kyle	9a121ea445	fix: attempt to display Blob response bodies as text (#4437 ) * fix: attempt to display Blob response bodies as text ... if nothing else works. * correctly pass `prevProps.content` to updateParsedContent * remove debugger statement * caniuse `Blob` && `FileReader`? yes. Blob: https://caniuse.com/#search=Blob FileReader: https://caniuse.com/#search=filereader	2018-04-13 16:16:54 -07:00
kyle	c55f22575a	fix: make Schemes <select> a fully state-controlled input (#4436 )	2018-04-13 13:52:01 -07:00
Giancarlo Klemm Camilo	2795518340	enhance: scrollable + downloadable `HighlightCode` (#4397 ) * Auto hidding content that is longer than 600 characters long. * Added basic downloading Slightly broken * Better downloading now downloads file on button click * Fix the angry linter * Fix dist * Removed collapsing, added scrolling. * Code clean up. * CSS fix. * prevent HighlightCode from scrolling entire document * center "Download" text in button * `this.downloadJSON` -> `this.downloadText` we're always saving as `.txt`, so JSON is a misnomer * hide Download button behind option `downloadable` prop * `file-saver` -> `js-file-download`	2018-04-12 18:18:49 -07:00
Chris Ormerod	2bf2167a18	docs: fix typo (#4431 ) Operations is lowercase, without this fix the example doesn't work as a Copy/Paste	2018-04-12 16:53:10 -07:00
kyle	dc7d7054bf	fix: provide svg assets through React app instead of relying on HTML (#4429 ) * fix: provide svg assets through React app instead of relying on HTML * fix stylistic inconsistencies in HTML assets	2018-04-10 16:05:17 -07:00
Ville Skyttä	14473dd51d	fix: misc. spelling errors (#4421 )	2018-04-09 15:58:52 -07:00
Helder Sepulveda	abe17f92ef	Set the value if set is available	2018-03-31 23:38:14 -04:00