From 25b9fb28dc89d0ee71f62867b6ed24a961e4fa12 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 13:50:39 -0800
Subject: [PATCH 01/17] Move `Server Variables` header to a more sensible
 location

---
 src/core/plugins/oas3/components/servers.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index 75b528f5..ee01c78b 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -109,13 +109,14 @@ export default class Servers extends React.Component {
         </label>
         { shouldShowVariableUI ?
           <div>
-          <h4>Server variables</h4>
+
             <div className={"computed-url"}>
               Computed URL:
               <code>
                 {getEffectiveServerValue(currentServer)}
               </code>
             </div>
+            <h4>Server variables</h4>
             <table>
               <tbody>
                 {

From 07a9410ee51b4e0aac8172e1951de492974a4d8e Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 14:07:42 -0800
Subject: [PATCH 02/17] Create `OperationServers` component

---
 src/core/components/operation.jsx                      | 7 +++++++
 src/core/plugins/oas3/components/index.js              | 2 ++
 src/core/plugins/oas3/components/operation-servers.jsx | 7 +++++++
 3 files changed, 16 insertions(+)
 create mode 100644 src/core/plugins/oas3/components/operation-servers.jsx

diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
index 8d4a2683..a7eeb6a2 100644
--- a/src/core/components/operation.jsx
+++ b/src/core/components/operation.jsx
@@ -96,6 +96,7 @@ export default class Operation extends PureComponent {
     const Collapse = getComponent( "Collapse" )
     const Markdown = getComponent( "Markdown" )
     const Schemes = getComponent( "schemes" )
+    const OperationServers = getComponent( "OperationServers" )
     const OperationExt = getComponent( "OperationExt" )
 
     const { showExtensions } = getConfigs()
@@ -165,6 +166,12 @@ export default class Operation extends PureComponent {
                 </div> : null
               }
 
+              { !tryItOutEnabled ? null :
+                <OperationServers
+                  operationServers={operation.get("servers")}
+                />
+              }
+
               <Parameters
                 parameters={parameters}
                 operation={operation}
diff --git a/src/core/plugins/oas3/components/index.js b/src/core/plugins/oas3/components/index.js
index edd409a1..b37817a8 100644
--- a/src/core/plugins/oas3/components/index.js
+++ b/src/core/plugins/oas3/components/index.js
@@ -4,6 +4,7 @@ import OperationLink from "./operation-link.jsx"
 import Servers from "./servers"
 import RequestBodyEditor from "./request-body-editor"
 import HttpAuth from "./http-auth"
+import OperationServers from "./operation-servers"
 
 export default {
   Callbacks,
@@ -11,5 +12,6 @@ export default {
   RequestBody,
   Servers,
   RequestBodyEditor,
+  OperationServers,
   operationLink: OperationLink
 }
diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
new file mode 100644
index 00000000..210b5cc3
--- /dev/null
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -0,0 +1,7 @@
+import React from "react"
+
+export default class OperationServers extends React.PureComponent {
+  render() {
+    return null
+  }
+}

From 21ff236e43357fefd3fb40f09d3f11f7911051b8 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 14:25:05 -0800
Subject: [PATCH 03/17] Basic OperationServers display

---
 src/core/components/operation.jsx             | 14 ++++++----
 .../oas3/components/operation-servers.jsx     | 28 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
index a7eeb6a2..f8d8095d 100644
--- a/src/core/components/operation.jsx
+++ b/src/core/components/operation.jsx
@@ -166,12 +166,6 @@ export default class Operation extends PureComponent {
                 </div> : null
               }
 
-              { !tryItOutEnabled ? null :
-                <OperationServers
-                  operationServers={operation.get("servers")}
-                />
-              }
-
               <Parameters
                 parameters={parameters}
                 operation={operation}
@@ -189,6 +183,14 @@ export default class Operation extends PureComponent {
                 getConfigs={ getConfigs }
               />
 
+              { !tryItOutEnabled ? null :
+                <OperationServers
+                  getComponent={getComponent}
+                  operationServers={operation.get("servers")}
+                  pathServers={specSelectors.paths().getIn([path, "servers"])}
+                />
+              }
+
               {!tryItOutEnabled || !allowTryItOut ? null : schemes && schemes.size ? <div className="opblock-schemes">
                     <Schemes schemes={ schemes }
                              path={ path }
diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index 210b5cc3..08431120 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -1,7 +1,33 @@
 import React from "react"
+import PropTypes from "prop-types"
+import ImPropTypes from "react-immutable-proptypes"
 
 export default class OperationServers extends React.PureComponent {
+  static propTypes = {
+    operationServers: ImPropTypes.list,
+    pathServers: ImPropTypes.list,
+    getComponent: PropTypes.func.isRequired
+  }
+
   render() {
-    return null
+    const { getComponent, pathServers, operationServers } = this.props
+    const Servers = getComponent("Servers")
+
+    const serversToDisplay = operationServers || pathServers
+    const displaying = operationServers ? "operation" : "path"
+
+    return <div className="opblock-section">
+      <div className="opblock-section-header">
+        <div className="tab-header">
+          <h4 className="opblock-title">Servers ({displaying})</h4>
+        </div>
+      </div>
+      <div className="opblock-description-wrapper">
+        <h4>These options override the global server settings.</h4>
+        <Servers
+          servers={serversToDisplay}
+          />
+      </div>
+    </div>
   }
 }

From 0997c5e5d4887ad13cea00d4a858056cbbdc07e4 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 14:34:01 -0800
Subject: [PATCH 04/17] Remove hardwired "Server" header, make global one
 prettier

---
 src/core/components/layouts/base.jsx         |  1 +
 src/core/plugins/oas3/components/servers.jsx |  1 -
 src/style/_layout.scss                       | 10 ++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx
index 6cd909bb..dea681a7 100644
--- a/src/core/components/layouts/base.jsx
+++ b/src/core/components/layouts/base.jsx
@@ -95,6 +95,7 @@ export default class BaseLayout extends React.Component {
 
             { servers && servers.size ? (
               <div className="server-container">
+                <span className="servers-title">Server</span>
                 <Col className="servers wrapper" mobile={12}>
                   <Servers
                     servers={servers}
diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index ee01c78b..5ebfcf5a 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -95,7 +95,6 @@ export default class Servers extends React.Component {
     return (
       <div>
         <label htmlFor="servers">
-          <span className="servers-title">Servers</span>
           <select onChange={ this.onServerChange }>
             { servers.valueSeq().map(
               ( server ) =>
diff --git a/src/style/_layout.scss b/src/style/_layout.scss
index 0427b276..e5fac6e2 100644
--- a/src/style/_layout.scss
+++ b/src/style/_layout.scss
@@ -671,15 +671,17 @@
       }
     }
 
+    .servers-title {
+      margin: 20px;
+      line-height: 2em;
+      font-weight: bold;
+    }
+
     .servers
     {
         display: flex;
         align-items: center;
 
-        .servers-title {
-          margin-right: 1em;
-        }
-
          > label
         {
             font-size: 12px;

From 5d3efbb5f7877402b41d4e147c0c60d802b18091 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 14:37:26 -0800
Subject: [PATCH 05/17] Display option level information in message, not header

---
 src/core/plugins/oas3/components/operation-servers.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index 08431120..3162ad9b 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -19,11 +19,11 @@ export default class OperationServers extends React.PureComponent {
     return <div className="opblock-section">
       <div className="opblock-section-header">
         <div className="tab-header">
-          <h4 className="opblock-title">Servers ({displaying})</h4>
+          <h4 className="opblock-title">Servers</h4>
         </div>
       </div>
       <div className="opblock-description-wrapper">
-        <h4>These options override the global server settings.</h4>
+        <h4>These {displaying}-level options override the global server options.</h4>
         <Servers
           servers={serversToDisplay}
           />

From ab7af75ab463645f044a4dd7ca2a0ae4b44127cd Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 15:30:37 -0800
Subject: [PATCH 06/17] Add OAS3 state tests

---
 test/core/plugins/oas3/state-integration.js | 359 ++++++++++++++++++++
 1 file changed, 359 insertions(+)
 create mode 100644 test/core/plugins/oas3/state-integration.js

diff --git a/test/core/plugins/oas3/state-integration.js b/test/core/plugins/oas3/state-integration.js
new file mode 100644
index 00000000..3f2a7b0a
--- /dev/null
+++ b/test/core/plugins/oas3/state-integration.js
@@ -0,0 +1,359 @@
+import expect from "expect"
+import { fromJS, OrderedMap } from "immutable"
+
+import {
+  selectedServer,
+  serverVariableValue,
+  serverVariables,
+  serverEffectiveValue
+} from "corePlugins/oas3/selectors"
+
+import reducers from "corePlugins/oas3/reducers"
+
+import {
+  setSelectedServer,
+  setServerVariableValue,
+} from "corePlugins/oas3/actions"
+
+describe("OAS3 plugin - state", function() {
+  describe("action + reducer + selector integration", function() {
+    describe.only("selectedServer", function() {
+      it("should set and get a global selectedServer", function() {
+        const state = new OrderedMap()
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setSelectedServer("http://google.com")
+
+        // Collect the new state
+        const newState = reducers["oas3_set_servers"](state, action)
+
+        // Get the value with the selector
+        const res = selectedServer(newState)(system)
+
+        expect(res).toEqual("http://google.com")
+      })
+
+      it("should set and get a namespaced selectedServer", function() {
+        const state = fromJS({
+          selectedServer: "http://yahoo.com"
+        })
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setSelectedServer("http://google.com", "myOperation")
+
+        // Collect the new state
+        const newState = reducers["oas3_set_servers"](state, action)
+
+        // Get the value with the selector
+        const res = selectedServer(newState, "myOperation")(system)
+
+        // Get the global selected server
+        const globalRes = selectedServer(newState)(system)
+
+        expect(res).toEqual("http://google.com")
+        expect(globalRes).toEqual("http://yahoo.com")
+      })
+    })
+
+    describe("serverVariableValue", function() {
+      it("should set and get a global serverVariableValue", function() {
+        const state = new OrderedMap()
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setServerVariableValue({
+          server: "google.com",
+          key: "foo",
+          val: "bar"
+        })
+
+        // Collect the new state
+        const newState = reducers["oas3_set_server_variable_value"](state, action)
+
+        // Get the value with the selector
+        const res = serverVariableValue(newState, "google.com", "foo")(system)
+
+        expect(res).toEqual("bar")
+      })
+      it("should set and get a namespaced serverVariableValue", function() {
+        const state = fromJS({
+          serverVariableValues: {
+            "google.com": {
+              foo: "123"
+            }
+          }
+        })
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setServerVariableValue({
+          namespace: "myOperation",
+          server: "google.com",
+          key: "foo",
+          val: "bar"
+        })
+
+        // Collect the new state
+        const newState = reducers["oas3_set_server_variable_value"](state, action)
+
+        // Get the value with the selector
+        const res = serverVariableValue(newState, {
+          namespace: "myOperation",
+          server: "google.com"
+        }, "foo")(system)
+
+        // Get the global value, to cross-check
+        const globalRes = serverVariableValue(newState, {
+          server: "google.com"
+        }, "foo")(system)
+
+        expect(res).toEqual("bar")
+        expect(globalRes).toEqual("123")
+      })
+    })
+
+    describe("serverVariables", function() {
+      it("should set and get global serverVariables", function() {
+        const state = new OrderedMap()
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setServerVariableValue({
+          server: "google.com",
+          key: "foo",
+          val: "bar"
+        })
+
+        // Collect the new state
+        const newState = reducers["oas3_set_server_variable_value"](state, action)
+
+        // Get the value with the selector
+        const res = serverVariables(newState, "google.com", "foo")(system)
+
+        expect(res.toJS()).toEqual({
+          foo: "bar"
+        })
+      })
+
+      it("should set and get namespaced serverVariables", function() {
+        const state = fromJS({
+          serverVariableValues: {
+            "google.com": {
+              foo: "123"
+            }
+          }
+        })
+
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Create the action
+        const action = setServerVariableValue({
+          namespace: "myOperation",
+          server: "google.com",
+          key: "foo",
+          val: "bar"
+        })
+
+        // Collect the new state
+        const newState = reducers["oas3_set_server_variable_value"](state, action)
+
+        // Get the value with the selector
+        const res = serverVariables(newState, {
+          namespace: "myOperation",
+          server: "google.com"
+        }, "foo")(system)
+
+        // Get the global value, to cross-check
+        const globalRes = serverVariables(newState, {
+          server: "google.com"
+        }, "foo")(system)
+
+        expect(res.toJS()).toEqual({
+          foo: "bar"
+        })
+
+        expect(globalRes.toJS()).toEqual({
+          foo: "bar"
+        })
+      })
+    })
+    describe("serverEffectiveValue", function() {
+        it("should set variable values and compute a URL for a namespaced server", function() {
+          const state = fromJS({
+            serverVariableValues: {
+              "google.com/{foo}": {
+                foo: "123"
+              }
+            }
+          })
+
+          const system = {
+            // needed to handle `onlyOAS3` wrapper
+            getSystem() {
+              return {
+                specSelectors: {
+                  specJson: () => {
+                    return fromJS({ openapi: "3.0.0" })
+                  }
+                }
+              }
+            }
+          }
+
+          // Create the action
+          const action = setServerVariableValue({
+            namespace: "myOperation",
+            server: "google.com/{foo}",
+            key: "foo",
+            val: "bar"
+          })
+
+          // Collect the new state
+          const newState = reducers["oas3_set_server_variable_value"](state, action)
+
+          // Get the value with the selector
+          const res = serverEffectiveValue(newState, {
+            namespace: "myOperation",
+            server: "google.com/{foo}"
+          })(system)
+
+          // Get the global value, to cross-check
+          const globalRes = serverEffectiveValue(newState, {
+            server: "google.com/{foo}"
+          })(system)
+
+          expect(res).toEqual("google.com/bar")
+
+          expect(globalRes).toEqual("google.com/123")
+        })
+      })
+
+  })
+  describe("selectors", function() {
+    describe("serverEffectiveValue", function() {
+      it("should compute global serverEffectiveValues", function() {
+        const state = fromJS({
+          serverVariableValues: {
+            "google.com/{foo}/{bar}": {
+              foo: "123",
+              bar: "456"
+            }
+          }
+        })
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Get the value with the selector
+        const res = serverEffectiveValue(state, "google.com/{foo}/{bar}")(system)
+
+        expect(res).toEqual("google.com/123/456")
+      })
+
+      it("should handle multiple variable instances", function() {
+        const state = fromJS({
+          serverVariableValues: {
+            "google.com/{foo}/{foo}/{bar}": {
+              foo: "123",
+              bar: "456"
+            }
+          }
+        })
+        const system = {
+          // needed to handle `onlyOAS3` wrapper
+          getSystem() {
+            return {
+              specSelectors: {
+                specJson: () => {
+                  return fromJS({ openapi: "3.0.0" })
+                }
+              }
+            }
+          }
+        }
+
+        // Get the value with the selector
+        const res = serverEffectiveValue(state, "google.com/{foo}/{foo}/{bar}")(system)
+
+        expect(res).toEqual("google.com/123/123/456")
+      })
+    })
+  })
+})

From 7e9d8f0b374d0c71676ab2441626b715a1d9169f Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 15:30:46 -0800
Subject: [PATCH 07/17] Wire up OperationServers passthrough

---
 .../oas3/components/operation-servers.jsx     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index 3162ad9b..f59e1fac 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -4,13 +4,40 @@ import ImPropTypes from "react-immutable-proptypes"
 
 export default class OperationServers extends React.PureComponent {
   static propTypes = {
+    // for self
     operationServers: ImPropTypes.list,
     pathServers: ImPropTypes.list,
+
+    // for Servers
+    currentServer: PropTypes.string.isRequired,
+    setSelectedServer: PropTypes.func.isRequired,
+    setServerVariableValue: PropTypes.func.isRequired,
+    getServerVariable: PropTypes.func.isRequired,
+    getEffectiveServerValue: PropTypes.func.isRequired,
+
+    // utils
     getComponent: PropTypes.func.isRequired
   }
 
   render() {
-    const { getComponent, pathServers, operationServers } = this.props
+    const {
+      // for self
+      operationServers,
+      pathServers,
+
+      // for Servers
+      currentServer,
+      setSelectedServer,
+      setServerVariableValue,
+      getServerVariable,
+      getEffectiveServerValue,
+
+      // util
+      getComponent
+    } = this.props
+
+    const serverPassthroughProps = { currentServer, setSelectedServer, setServerVariableValue, getServerVariable, getEffectiveServerValue }
+
     const Servers = getComponent("Servers")
 
     const serversToDisplay = operationServers || pathServers
@@ -25,6 +52,7 @@ export default class OperationServers extends React.PureComponent {
       <div className="opblock-description-wrapper">
         <h4>These {displaying}-level options override the global server options.</h4>
         <Servers
+          {...serverPassthroughProps}
           servers={serversToDisplay}
           />
       </div>

From efd02106a2d86bd8de3e842bec8b9711865e55e4 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 15:57:37 -0800
Subject: [PATCH 08/17] Support namespaces in OAS3 server state

---
 src/core/plugins/oas3/actions.js            |  8 +--
 src/core/plugins/oas3/reducers.js           | 10 +--
 src/core/plugins/oas3/selectors.js          | 68 ++++++++++++++++++---
 test/core/plugins/oas3/state-integration.js |  6 +-
 4 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/src/core/plugins/oas3/actions.js b/src/core/plugins/oas3/actions.js
index c9abc855..ac6f244a 100644
--- a/src/core/plugins/oas3/actions.js
+++ b/src/core/plugins/oas3/actions.js
@@ -7,10 +7,10 @@ export const UPDATE_REQUEST_CONTENT_TYPE = "oas3_set_request_content_type"
 export const UPDATE_RESPONSE_CONTENT_TYPE = "oas3_set_response_content_type"
 export const UPDATE_SERVER_VARIABLE_VALUE = "oas3_set_server_variable_value"
 
-export function setSelectedServer (selectedServerUrl) {
+export function setSelectedServer (selectedServerUrl, namespace) {
   return {
     type: UPDATE_SELECTED_SERVER,
-    payload: selectedServerUrl
+    payload: {selectedServerUrl, namespace}
   }
 }
 
@@ -35,9 +35,9 @@ export function setResponseContentType ({ value, path, method }) {
   }
 }
 
-export function setServerVariableValue ({ server, key, val }) {
+export function setServerVariableValue ({ server, namespace, key, val }) {
   return {
     type: UPDATE_SERVER_VARIABLE_VALUE,
-    payload: { server, key, val }
+    payload: { server, namespace, key, val }
   }
 }
diff --git a/src/core/plugins/oas3/reducers.js b/src/core/plugins/oas3/reducers.js
index 8590284d..871aff89 100644
--- a/src/core/plugins/oas3/reducers.js
+++ b/src/core/plugins/oas3/reducers.js
@@ -7,8 +7,9 @@ import {
 } from "./actions"
 
 export default {
-  [UPDATE_SELECTED_SERVER]: (state, { payload: selectedServerUrl } ) =>{
-    return state.setIn( [ "selectedServer" ], selectedServerUrl)
+  [UPDATE_SELECTED_SERVER]: (state, { payload: { selectedServerUrl, namespace } } ) =>{
+    const path = namespace ? [ namespace, "selectedServer"] : [ "selectedServer"]
+    return state.setIn( path, selectedServerUrl)
   },
   [UPDATE_REQUEST_BODY_VALUE]: (state, { payload: { value, pathMethod } } ) =>{
     let [path, method] = pathMethod
@@ -21,7 +22,8 @@ export default {
   [UPDATE_RESPONSE_CONTENT_TYPE]: (state, { payload: { value, path, method } } ) =>{
     return state.setIn( [ "requestData", path, method, "responseContentType" ], value)
   },
-  [UPDATE_SERVER_VARIABLE_VALUE]: (state, { payload: { server, key, val } } ) =>{
-    return state.setIn( [ "serverVariableValues", server, key ], val)
+  [UPDATE_SERVER_VARIABLE_VALUE]: (state, { payload: { server, namespace, key, val } } ) =>{
+    const path = namespace ? [ namespace, "serverVariableValues", server, key ] : [ "serverVariableValues", server, key ]
+    return state.setIn(path, val)
   },
 }
diff --git a/src/core/plugins/oas3/selectors.js b/src/core/plugins/oas3/selectors.js
index 86fc617f..c65a6882 100644
--- a/src/core/plugins/oas3/selectors.js
+++ b/src/core/plugins/oas3/selectors.js
@@ -15,8 +15,9 @@ function onlyOAS3(selector) {
   }
 }
 
-export const selectedServer = onlyOAS3(state => {
-    return state.getIn(["selectedServer"]) || ""
+export const selectedServer = onlyOAS3((state, namespace) => {
+    const path = namespace ? [namespace, "selectedServer"] : ["selectedServer"]
+    return state.getIn(path) || ""
   }
 )
 
@@ -35,19 +36,68 @@ export const responseContentType = onlyOAS3((state, path, method) => {
   }
 )
 
-export const serverVariableValue = onlyOAS3((state, server, key) => {
-    return state.getIn(["serverVariableValues", server, key]) || null
+export const serverVariableValue = onlyOAS3((state, locationData, key) => {
+    let path
+
+    // locationData may take one of two forms, for backwards compatibility
+    // Object: ({server, namespace?}) or String:(server)
+    if(typeof locationData !== "string") {
+      const { server, namespace } = locationData
+      if(namespace) {
+        path = [namespace, "serverVariableValues", server, key]
+      } else {
+        path = ["serverVariableValues", server, key]
+      }
+    } else {
+      const server = locationData
+      path = ["serverVariableValues", server, key]
+    }
+
+    return state.getIn(path) || null
   }
 )
 
-export const serverVariables = onlyOAS3((state, server) => {
-    return state.getIn(["serverVariableValues", server]) || OrderedMap()
+export const serverVariables = onlyOAS3((state, locationData) => {
+    let path
+
+    // locationData may take one of two forms, for backwards compatibility
+    // Object: ({server, namespace?}) or String:(server)
+    if(typeof locationData !== "string") {
+      const { server, namespace } = locationData
+      if(namespace) {
+        path = [namespace, "serverVariableValues", server]
+      } else {
+        path = ["serverVariableValues", server]
+      }
+    } else {
+      const server = locationData
+      path = ["serverVariableValues", server]
+    }
+
+    return state.getIn(path) || OrderedMap()
   }
 )
 
-export const serverEffectiveValue = onlyOAS3((state, server) => {
-    let varValues = state.getIn(["serverVariableValues", server]) || OrderedMap()
-    let str = server
+export const serverEffectiveValue = onlyOAS3((state, locationData) => {
+    var varValues, serverValue
+
+    // locationData may take one of two forms, for backwards compatibility
+    // Object: ({server, namespace?}) or String:(server)
+    if(typeof locationData !== "string") {
+      const { server, namespace } = locationData
+      serverValue = server
+      if(namespace) {
+        varValues = state.getIn([namespace, "serverVariableValues", serverValue])
+      } else {
+        varValues = state.getIn(["serverVariableValues", serverValue])
+      }
+    } else {
+      serverValue = locationData
+      varValues = state.getIn(["serverVariableValues", serverValue])
+    }
+
+    varValues = varValues || OrderedMap()
+    let str = serverValue
 
     varValues.map((val, key) => {
       str = str.replace(new RegExp(`{${key}}`, "g"), val)
diff --git a/test/core/plugins/oas3/state-integration.js b/test/core/plugins/oas3/state-integration.js
index 3f2a7b0a..04f70907 100644
--- a/test/core/plugins/oas3/state-integration.js
+++ b/test/core/plugins/oas3/state-integration.js
@@ -15,9 +15,9 @@ import {
   setServerVariableValue,
 } from "corePlugins/oas3/actions"
 
-describe("OAS3 plugin - state", function() {
+describe.only("OAS3 plugin - state", function() {
   describe("action + reducer + selector integration", function() {
-    describe.only("selectedServer", function() {
+    describe("selectedServer", function() {
       it("should set and get a global selectedServer", function() {
         const state = new OrderedMap()
         const system = {
@@ -241,7 +241,7 @@ describe("OAS3 plugin - state", function() {
         })
 
         expect(globalRes.toJS()).toEqual({
-          foo: "bar"
+          foo: "123"
         })
       })
     })

From b3c549055d2c5996b27a962b3c418e8e642b191f Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 15:58:26 -0800
Subject: [PATCH 09/17] Remove `describe.only`

---
 test/core/plugins/oas3/state-integration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/core/plugins/oas3/state-integration.js b/test/core/plugins/oas3/state-integration.js
index 04f70907..6ce69da5 100644
--- a/test/core/plugins/oas3/state-integration.js
+++ b/test/core/plugins/oas3/state-integration.js
@@ -15,7 +15,7 @@ import {
   setServerVariableValue,
 } from "corePlugins/oas3/actions"
 
-describe.only("OAS3 plugin - state", function() {
+describe("OAS3 plugin - state", function() {
   describe("action + reducer + selector integration", function() {
     describe("selectedServer", function() {
       it("should set and get a global selectedServer", function() {

From 945d7a3a0fb20dc17662401ec613f0b1c9e0a45c Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 16:34:36 -0800
Subject: [PATCH 10/17] Basic OperationServers wireup

---
 src/core/components/operation.jsx             | 11 +++-
 src/core/containers/OperationContainer.jsx    |  3 +
 .../oas3/components/operation-servers.jsx     | 56 ++++++++++++++-----
 src/core/plugins/oas3/components/servers.jsx  |  1 +
 4 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx
index f8d8095d..ea1877f3 100644
--- a/src/core/components/operation.jsx
+++ b/src/core/components/operation.jsx
@@ -22,6 +22,7 @@ export default class Operation extends PureComponent {
     specActions: PropTypes.object.isRequired,
     specSelectors: PropTypes.object.isRequired,
     oas3Actions: PropTypes.object.isRequired,
+    oas3Selectors: PropTypes.object.isRequired,
     layoutActions: PropTypes.object.isRequired,
     layoutSelectors: PropTypes.object.isRequired,
     fn: PropTypes.object.isRequired
@@ -48,7 +49,8 @@ export default class Operation extends PureComponent {
       specSelectors,
       authActions,
       authSelectors,
-      oas3Actions
+      oas3Actions,
+      oas3Selectors
     } = this.props
     let operationProps = this.props.operation
 
@@ -186,8 +188,15 @@ export default class Operation extends PureComponent {
               { !tryItOutEnabled ? null :
                 <OperationServers
                   getComponent={getComponent}
+                  path={path}
+                  method={method}
                   operationServers={operation.get("servers")}
                   pathServers={specSelectors.paths().getIn([path, "servers"])}
+                  getSelectedServer={oas3Selectors.selectedServer}
+                  setSelectedServer={oas3Actions.setSelectedServer}
+                  setServerVariableValue={oas3Actions.setServerVariableValue}
+                  getServerVariable={oas3Selectors.serverVariableValue}
+                  getEffectiveServerValue={oas3Selectors.serverEffectiveValue}
                 />
               }
 
diff --git a/src/core/containers/OperationContainer.jsx b/src/core/containers/OperationContainer.jsx
index 74371db1..c939ef38 100644
--- a/src/core/containers/OperationContainer.jsx
+++ b/src/core/containers/OperationContainer.jsx
@@ -35,6 +35,7 @@ export default class OperationContainer extends PureComponent {
     getComponent: PropTypes.func.isRequired,
     authActions: PropTypes.object,
     oas3Actions: PropTypes.object,
+    oas3Selectors: PropTypes.object,
     authSelectors: PropTypes.object,
     specActions: PropTypes.object.isRequired,
     specSelectors: PropTypes.object.isRequired,
@@ -149,6 +150,7 @@ export default class OperationContainer extends PureComponent {
       authActions,
       authSelectors,
       oas3Actions,
+      oas3Selectors,
       fn
     } = this.props
 
@@ -189,6 +191,7 @@ export default class OperationContainer extends PureComponent {
         specActions={ specActions }
         specSelectors={ specSelectors }
         oas3Actions={oas3Actions}
+        oas3Selectors={oas3Selectors}
         layoutActions={ layoutActions }
         layoutSelectors={ layoutSelectors }
         authActions={ authActions }
diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index f59e1fac..5db8683a 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -5,13 +5,13 @@ import ImPropTypes from "react-immutable-proptypes"
 export default class OperationServers extends React.PureComponent {
   static propTypes = {
     // for self
+    path: PropTypes.string.isRequired,
+    method: PropTypes.string.isRequired,
     operationServers: ImPropTypes.list,
     pathServers: ImPropTypes.list,
-
-    // for Servers
-    currentServer: PropTypes.string.isRequired,
     setSelectedServer: PropTypes.func.isRequired,
     setServerVariableValue: PropTypes.func.isRequired,
+    getSelectedServer: PropTypes.func.isRequired,
     getServerVariable: PropTypes.func.isRequired,
     getEffectiveServerValue: PropTypes.func.isRequired,
 
@@ -19,25 +19,51 @@ export default class OperationServers extends React.PureComponent {
     getComponent: PropTypes.func.isRequired
   }
 
+  setSelectedServer = (server) => {
+    const { path, method } = this.props
+    return this.props.setSelectedServer(server, `${path}:${method}`)
+  }
+
+  setServerVariableValue = (obj) => {
+    const { path, method } = this.props
+    return this.props.setServerVariableValue({
+      ...obj,
+      namespace: `${path}:${method}`
+    })
+  }
+
+  getSelectedServer = () => {
+    const { path, method } = this.props
+    debugger
+    return this.props.getSelectedServer(`${path}:${method}`)
+  }
+
+  getServerVariable = (obj) => {
+    const { path, method } = this.props
+    return this.props.getServerVariable({
+      ...obj,
+      namespace: `${path}:${method}`
+    })
+  }
+
+  getEffectiveServerValue = (obj) => {
+    const { path, method } = this.props
+    return this.props.getEffectiveServerValue({
+      ...obj,
+      namespace: `${path}:${method}`
+    })
+  }
+
   render() {
     const {
       // for self
       operationServers,
       pathServers,
 
-      // for Servers
-      currentServer,
-      setSelectedServer,
-      setServerVariableValue,
-      getServerVariable,
-      getEffectiveServerValue,
-
       // util
       getComponent
     } = this.props
 
-    const serverPassthroughProps = { currentServer, setSelectedServer, setServerVariableValue, getServerVariable, getEffectiveServerValue }
-
     const Servers = getComponent("Servers")
 
     const serversToDisplay = operationServers || pathServers
@@ -52,8 +78,12 @@ export default class OperationServers extends React.PureComponent {
       <div className="opblock-description-wrapper">
         <h4>These {displaying}-level options override the global server options.</h4>
         <Servers
-          {...serverPassthroughProps}
           servers={serversToDisplay}
+          currentServer={this.getSelectedServer()}
+          setSelectedServer={this.setSelectedServer}
+          setServerVariableValue={this.setServerVariableValue}
+          getServerVariable={this.getServerVariable}
+          getEffectiveServerValue={this.getEffectiveServerValue}
           />
       </div>
     </div>
diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index 5ebfcf5a..dd073976 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -18,6 +18,7 @@ export default class Servers extends React.Component {
     let { servers } = this.props
 
     //fire 'change' event to set default 'value' of select
+    debugger
     this.setServer(servers.first().get("url"))
   }
 

From 0c0c9a65197ed82859e3fa43f3f1bc02f7340fac Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 16:49:26 -0800
Subject: [PATCH 11/17] LESS bugs

---
 .../oas3/components/operation-servers.jsx     | 21 ++++++++++++-------
 src/core/plugins/oas3/components/servers.jsx  |  1 -
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index 5db8683a..f5c27583 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -2,7 +2,7 @@ import React from "react"
 import PropTypes from "prop-types"
 import ImPropTypes from "react-immutable-proptypes"
 
-export default class OperationServers extends React.PureComponent {
+export default class OperationServers extends React.Component {
   static propTypes = {
     // for self
     path: PropTypes.string.isRequired,
@@ -21,11 +21,17 @@ export default class OperationServers extends React.PureComponent {
 
   setSelectedServer = (server) => {
     const { path, method } = this.props
+    // FIXME: we should be keeping up with this in props/state upstream of us
+    // instead of cheating™ with `forceUpdate`
+    this.forceUpdate()
     return this.props.setSelectedServer(server, `${path}:${method}`)
   }
 
   setServerVariableValue = (obj) => {
     const { path, method } = this.props
+    // FIXME: we should be keeping up with this in props/state upstream of us
+    // instead of cheating™ with `forceUpdate`
+    this.forceUpdate()
     return this.props.setServerVariableValue({
       ...obj,
       namespace: `${path}:${method}`
@@ -34,22 +40,21 @@ export default class OperationServers extends React.PureComponent {
 
   getSelectedServer = () => {
     const { path, method } = this.props
-    debugger
     return this.props.getSelectedServer(`${path}:${method}`)
   }
 
-  getServerVariable = (obj) => {
+  getServerVariable = (server, key) => {
     const { path, method } = this.props
     return this.props.getServerVariable({
-      ...obj,
-      namespace: `${path}:${method}`
-    })
+      namespace: `${path}:${method}`,
+      server
+    }, key)
   }
 
-  getEffectiveServerValue = (obj) => {
+  getEffectiveServerValue = (server) => {
     const { path, method } = this.props
     return this.props.getEffectiveServerValue({
-      ...obj,
+      server,
       namespace: `${path}:${method}`
     })
   }
diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index dd073976..5ebfcf5a 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -18,7 +18,6 @@ export default class Servers extends React.Component {
     let { servers } = this.props
 
     //fire 'change' event to set default 'value' of select
-    debugger
     this.setServer(servers.first().get("url"))
   }
 

From ef3ccd7a2317711da5a2ab40f7f0e4eb6c23211e Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:06:17 -0800
Subject: [PATCH 12/17] Move server styles into its own scss file; add a little
 polish

---
 src/core/components/layouts/base.jsx          |  2 +-
 .../oas3/components/operation-servers.jsx     |  6 +-
 src/core/plugins/oas3/components/servers.jsx  |  2 +-
 src/style/_layout.scss                        | 74 ------------------
 src/style/_servers.scss                       | 75 +++++++++++++++++++
 src/style/main.scss                           |  1 +
 6 files changed, 82 insertions(+), 78 deletions(-)
 create mode 100644 src/style/_servers.scss

diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx
index dea681a7..d944a3c8 100644
--- a/src/core/components/layouts/base.jsx
+++ b/src/core/components/layouts/base.jsx
@@ -94,7 +94,7 @@ export default class BaseLayout extends React.Component {
             ) : null }
 
             { servers && servers.size ? (
-              <div className="server-container">
+              <div className="global-server-container">
                 <span className="servers-title">Server</span>
                 <Col className="servers wrapper" mobile={12}>
                   <Servers
diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index f5c27583..e1e8d641 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -74,14 +74,16 @@ export default class OperationServers extends React.Component {
     const serversToDisplay = operationServers || pathServers
     const displaying = operationServers ? "operation" : "path"
 
-    return <div className="opblock-section">
+    return <div className="opblock-section operation-servers">
       <div className="opblock-section-header">
         <div className="tab-header">
           <h4 className="opblock-title">Servers</h4>
         </div>
       </div>
       <div className="opblock-description-wrapper">
-        <h4>These {displaying}-level options override the global server options.</h4>
+        <h4 className="message">
+          These {displaying}-level options override the global server options.
+        </h4>
         <Servers
           servers={serversToDisplay}
           currentServer={this.getSelectedServer()}
diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index 5ebfcf5a..1e941b38 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -93,7 +93,7 @@ export default class Servers extends React.Component {
     let shouldShowVariableUI = currentServerVariableDefs.size !== 0
 
     return (
-      <div>
+      <div className="servers">
         <label htmlFor="servers">
           <select onChange={ this.onServerChange }>
             { servers.valueSeq().map(
diff --git a/src/style/_layout.scss b/src/style/_layout.scss
index e5fac6e2..1d399f76 100644
--- a/src/style/_layout.scss
+++ b/src/style/_layout.scss
@@ -650,80 +650,6 @@
     }
 }
 
-.server-container
-{
-    margin: 0 0 20px 0;
-    padding: 30px 0;
-
-    background: $server-container-background-color;
-    box-shadow: 0 1px 2px 0 rgba($server-container-box-shadow-color,.15);
-
-    .computed-url {
-      margin: 2em 0;
-
-      code {
-        color: $server-container-computed-url-code-font-color;
-        display: inline-block;
-        padding: 4px;
-        font-size: 16px;
-        margin: 0 1em;
-        font-style: italic;
-      }
-    }
-
-    .servers-title {
-      margin: 20px;
-      line-height: 2em;
-      font-weight: bold;
-    }
-
-    .servers
-    {
-        display: flex;
-        align-items: center;
-
-         > label
-        {
-            font-size: 12px;
-
-            display: flex;
-            flex-direction: column;
-
-            margin: -20px 15px 0 0;
-
-            @include text_headline();
-
-            select
-            {
-                min-width: 130px;
-            }
-        }
-
-        table {
-            tr {
-                width: 30em;
-            }
-            td {
-                display: inline-block;
-                max-width: 15em;
-                vertical-align: middle;
-                padding-top: 10px;
-                padding-bottom: 10px;
-
-                &:first-of-type {
-                  padding-right: 2em;
-                }
-
-                input {
-                    width: 100%;
-                    height: 100%;
-                }
-            }
-        }
-    }
-}
-
-
 .loading-container
 {
     padding: 40px 0 60px;
diff --git a/src/style/_servers.scss b/src/style/_servers.scss
new file mode 100644
index 00000000..d23b4d41
--- /dev/null
+++ b/src/style/_servers.scss
@@ -0,0 +1,75 @@
+.servers
+{
+     > label
+    {
+        font-size: 12px;
+
+        margin: -20px 15px 0 0;
+
+        @include text_headline();
+
+        select
+        {
+            min-width: 130px;
+        }
+    }
+
+    h4.message {
+      padding-bottom: 2em;
+    }
+
+    table {
+        tr {
+            width: 30em;
+        }
+        td {
+            display: inline-block;
+            max-width: 15em;
+            vertical-align: middle;
+            padding-top: 10px;
+            padding-bottom: 10px;
+
+            &:first-of-type {
+              padding-right: 2em;
+            }
+
+            input {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+
+    .computed-url {
+      margin: 2em 0;
+
+      code {
+        display: inline-block;
+        padding: 4px;
+        font-size: 16px;
+        margin: 0 1em;
+      }
+    }
+}
+
+
+.global-server-container
+{
+    margin: 0 0 20px 0;
+    padding: 30px 0;
+
+    background: $server-container-background-color;
+    box-shadow: 0 1px 2px 0 rgba($server-container-box-shadow-color,.15);
+
+    .servers-title {
+      margin: 20px;
+      line-height: 2em;
+      font-weight: bold;
+    }
+}
+
+.operation-servers {
+  h4.message {
+    margin-bottom: 2em;
+  }
+}
diff --git a/src/style/main.scss b/src/style/main.scss
index edc7e4f3..23bf2585 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -9,6 +9,7 @@
     @import 'form';
     @import 'modal';
     @import 'models';
+    @import 'servers';
     @import 'table';
     @import 'topbar';
     @import 'information';

From ba90c70b343a8618a78ebd14b11dfb42a24d0946 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:10:25 -0800
Subject: [PATCH 13/17] LESS CSS BUGS

---
 src/core/components/layouts/base.jsx | 2 +-
 src/style/_servers.scss              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx
index d944a3c8..1f5a0788 100644
--- a/src/core/components/layouts/base.jsx
+++ b/src/core/components/layouts/base.jsx
@@ -95,8 +95,8 @@ export default class BaseLayout extends React.Component {
 
             { servers && servers.size ? (
               <div className="global-server-container">
-                <span className="servers-title">Server</span>
                 <Col className="servers wrapper" mobile={12}>
+                  <span className="servers-title">Server</span>
                   <Servers
                     servers={servers}
                     currentServer={oas3Selectors.selectedServer()}
diff --git a/src/style/_servers.scss b/src/style/_servers.scss
index d23b4d41..bf3ae39a 100644
--- a/src/style/_servers.scss
+++ b/src/style/_servers.scss
@@ -62,7 +62,6 @@
     box-shadow: 0 1px 2px 0 rgba($server-container-box-shadow-color,.15);
 
     .servers-title {
-      margin: 20px;
       line-height: 2em;
       font-weight: bold;
     }

From 0f86524514188442f3f3154303bdac3cbaacbc56 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:11:49 -0800
Subject: [PATCH 14/17] Don't render if there are no servers defined

---
 src/core/plugins/oas3/components/operation-servers.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/plugins/oas3/components/operation-servers.jsx b/src/core/plugins/oas3/components/operation-servers.jsx
index e1e8d641..293b346f 100644
--- a/src/core/plugins/oas3/components/operation-servers.jsx
+++ b/src/core/plugins/oas3/components/operation-servers.jsx
@@ -69,6 +69,10 @@ export default class OperationServers extends React.Component {
       getComponent
     } = this.props
 
+    if(!operationServers && !pathServers) {
+      return null
+    }
+
     const Servers = getComponent("Servers")
 
     const serversToDisplay = operationServers || pathServers

From d7d061b5af31743b3d0fe2fac59ab467b4f9ed70 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:26:49 -0800
Subject: [PATCH 15/17] Provide operation server data to Swagger-Client

---
 src/core/plugins/spec/actions.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index 75c2a6b4..f47b09ef 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -228,9 +228,18 @@ export const executeRequest = (req) =>
     }
 
     if(specSelectors.isOAS3()) {
-      // OAS3 request feature support
-      req.server = oas3Selectors.selectedServer()
-      req.serverVariables = oas3Selectors.serverVariables(req.server).toJS()
+      const namespace = `${pathName}:${method}`
+
+      req.server = oas3Selectors.selectedServer(namespace) || oas3Selectors.selectedServer()
+
+      const operationVariables = oas3Selectors.serverVariables({
+        server: req.server,
+        namespace
+      })
+      const globalVariables = oas3Selectors.serverVariables({ server: req.server })
+      
+      req.serverVariables = operationVariables.size ? operationVariables : globalVariables
+
       req.requestContentType = oas3Selectors.requestContentType(pathName, method)
       req.responseContentType = oas3Selectors.responseContentType(pathName, method) || "*/*"
       const requestBody = oas3Selectors.requestBodyValue(pathName, method)

From 6f5649c6ba89cd8d37d8439afe4386f7a859f719 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:28:35 -0800
Subject: [PATCH 16/17] Only set the first server as current if we...

...don't already have a currentServer.

This avoids having the selected server reset each time the
operation is expanded, or the Try-It-Out mode is entered.
---
 src/core/plugins/oas3/components/servers.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index 1e941b38..d6ed4a63 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -15,7 +15,11 @@ export default class Servers extends React.Component {
   }
 
   componentDidMount() {
-    let { servers } = this.props
+    let { servers, currentServer } = this.props
+
+    if(currentServer) {
+      return
+    }
 
     //fire 'change' event to set default 'value' of select
     this.setServer(servers.first().get("url"))

From bb57fd2406716fbffff418015f2ae2fa75599b0f Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 20:11:30 -0800
Subject: [PATCH 17/17] Send server variables to Client as JS objects

---
 src/core/plugins/spec/actions.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index f47b09ef..5e6f51fc 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -232,13 +232,13 @@ export const executeRequest = (req) =>
 
       req.server = oas3Selectors.selectedServer(namespace) || oas3Selectors.selectedServer()
 
-      const operationVariables = oas3Selectors.serverVariables({
+      const namespaceVariables = oas3Selectors.serverVariables({
         server: req.server,
         namespace
-      })
-      const globalVariables = oas3Selectors.serverVariables({ server: req.server })
-      
-      req.serverVariables = operationVariables.size ? operationVariables : globalVariables
+      }).toJS()
+      const globalVariables = oas3Selectors.serverVariables({ server: req.server }).toJS()
+
+      req.serverVariables = Object.keys(namespaceVariables).length ? namespaceVariables : globalVariables
 
       req.requestContentType = oas3Selectors.requestContentType(pathName, method)
       req.responseContentType = oas3Selectors.responseContentType(pathName, method) || "*/*"