Merge branch 'master' into bug/3299-integer-parameter-validation

src/core/components/operation.jsx

@@ -126,6 +126,7 @@ export default class Operation extends PureComponent {
     let schemes = operation.get("schemes")
     let parameters = getList(operation, ["parameters"])
     let operationId = operation.get("__originalOperationId")
+    let operationScheme = specSelectors.operationScheme(path, method)
 
     const Responses = getComponent("responses")
     const Parameters = getComponent( "parameters" )
@@ -211,7 +212,8 @@ export default class Operation extends PureComponent {
                     <Schemes schemes={ schemes }
                              path={ path }
                              method={ method }
-                             specActions={ specActions }/>
+                             specActions={ specActions }
+                             operationScheme={ operationScheme } />
                   </div> : null
               }
 

src/core/components/schemes.jsx

@@ -6,7 +6,8 @@ export default class Schemes extends React.Component {
     specActions: PropTypes.object.isRequired,
     schemes: PropTypes.object.isRequired,
     path: PropTypes.string,
-    method: PropTypes.string
+    method: PropTypes.string,
+    operationScheme: PropTypes.string
   }
 
   componentWillMount() {
@@ -16,16 +17,17 @@ export default class Schemes extends React.Component {
     this.setScheme(schemes.first())
   }
 
-  onChange =( e ) => {
-    this.setScheme( e.target.value )
-  }
-
   componentWillReceiveProps(nextProps) {
-    if(nextProps.schemes !== this.props.schemes) {
+    if ( this.props.operationScheme && !nextProps.schemes.has(this.props.operationScheme) ) {
+      //fire 'change' event if our selected scheme is no longer an option
       this.setScheme(nextProps.schemes.first())
     }
   }
 
+  onChange =( e ) => {
+    this.setScheme( e.target.value )
+  }
+
   setScheme = ( value ) => {
     let { path, method, specActions } = this.props