From 655ef9e662146d1d6c9d4098197e2655ece6ab82 Mon Sep 17 00:00:00 2001
From: kyle <shockey@users.noreply.github.com>
Date: Fri, 21 Dec 2018 23:51:58 -0600
Subject: [PATCH] fix: `urls.primaryName` functionality regression (via #5097)

* add tests

* compute index before triggering URL load

* bonus: improve urls topbar label
---
 src/plugins/topbar/topbar.jsx                 |  7 +++-
 src/style/_topbar.scss                        |  1 +
 .../static/configs/urls-primary-name.yaml     |  6 +++
 test/e2e-cypress/static/configs/urls.yaml     |  5 +++
 .../static/documents/features/urls/1.yaml     | 12 ++++++
 .../static/documents/features/urls/2.yaml     | 12 ++++++
 test/e2e-cypress/tests/features/urls.js       | 38 +++++++++++++++++++
 7 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e-cypress/static/configs/urls-primary-name.yaml
 create mode 100644 test/e2e-cypress/static/configs/urls.yaml
 create mode 100644 test/e2e-cypress/static/documents/features/urls/1.yaml
 create mode 100644 test/e2e-cypress/static/documents/features/urls/2.yaml
 create mode 100644 test/e2e-cypress/tests/features/urls.js

diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx
index ca43a3a8..1b2dd619 100644
--- a/src/plugins/topbar/topbar.jsx
+++ b/src/plugins/topbar/topbar.jsx
@@ -74,7 +74,7 @@ export default class Topbar extends React.Component {
     const urls = configs.urls || []
 
     if(urls && urls.length) {
-      this.loadSpec(urls[this.state.selectedIndex].url)
+      var targetIndex = this.state.selectedIndex
       let primaryName = configs["urls.primaryName"]
       if(primaryName)
       {
@@ -82,9 +82,12 @@ export default class Topbar extends React.Component {
           if(spec.name === primaryName)
             {
               this.setState({selectedIndex: i})
+              targetIndex = i
             }
         })
       }
+
+      this.loadSpec(urls[targetIndex].url)
     }
   }
 
@@ -116,7 +119,7 @@ export default class Topbar extends React.Component {
       })
 
       control.push(
-        <label className="select-label" htmlFor="select"><span>Select a spec</span>
+        <label className="select-label" htmlFor="select"><span>Select a definition</span>
           <select id="select" disabled={isLoading} onChange={ this.onUrlSelect } value={urls[this.state.selectedIndex].url}>
             {rows}
           </select>
diff --git a/src/style/_topbar.scss b/src/style/_topbar.scss
index c4b0fe9f..f6c037a0 100644
--- a/src/style/_topbar.scss
+++ b/src/style/_topbar.scss
@@ -54,6 +54,7 @@
             width: 100%;
             max-width: 600px;
             margin: 0;
+            color: #f0f0f0;
             span
             {
                 font-size: 16px;
diff --git a/test/e2e-cypress/static/configs/urls-primary-name.yaml b/test/e2e-cypress/static/configs/urls-primary-name.yaml
new file mode 100644
index 00000000..520c8c73
--- /dev/null
+++ b/test/e2e-cypress/static/configs/urls-primary-name.yaml
@@ -0,0 +1,6 @@
+urls:
+- name: One
+  url: /documents/features/urls/1.yaml
+- name: Two
+  url: /documents/features/urls/2.yaml
+urls.primaryName: Two
\ No newline at end of file
diff --git a/test/e2e-cypress/static/configs/urls.yaml b/test/e2e-cypress/static/configs/urls.yaml
new file mode 100644
index 00000000..7a7b6012
--- /dev/null
+++ b/test/e2e-cypress/static/configs/urls.yaml
@@ -0,0 +1,5 @@
+urls:
+- name: One
+  url: /documents/features/urls/1.yaml
+- name: Two
+  url: /documents/features/urls/2.yaml
\ No newline at end of file
diff --git a/test/e2e-cypress/static/documents/features/urls/1.yaml b/test/e2e-cypress/static/documents/features/urls/1.yaml
new file mode 100644
index 00000000..38f01c3b
--- /dev/null
+++ b/test/e2e-cypress/static/documents/features/urls/1.yaml
@@ -0,0 +1,12 @@
+swagger: "2.0"
+
+info:
+  title: One
+
+paths:
+  /:
+    get:
+      summary: an operation
+      responses:
+        "200":
+          description: OK
\ No newline at end of file
diff --git a/test/e2e-cypress/static/documents/features/urls/2.yaml b/test/e2e-cypress/static/documents/features/urls/2.yaml
new file mode 100644
index 00000000..77b0ab68
--- /dev/null
+++ b/test/e2e-cypress/static/documents/features/urls/2.yaml
@@ -0,0 +1,12 @@
+openapi: "3.0.0"
+
+info:
+  title: Two
+
+paths:
+  /:
+    get:
+      summary: an operation
+      responses:
+        "200":
+          description: OK
\ No newline at end of file
diff --git a/test/e2e-cypress/tests/features/urls.js b/test/e2e-cypress/tests/features/urls.js
new file mode 100644
index 00000000..7fd15897
--- /dev/null
+++ b/test/e2e-cypress/tests/features/urls.js
@@ -0,0 +1,38 @@
+describe("configuration options: `urls` and `urls.primaryName`", () => {
+  describe("`urls` only", () => {
+    it("should render a list of URLs correctly", () => {
+      cy.visit("/?configUrl=/configs/urls.yaml")
+        .get("select")
+        .children()
+        .should("have.length", 2)
+        .get("select > option")
+        .eq(0)
+        .should("have.text", "One")
+        .should("have.attr", "value", "/documents/features/urls/1.yaml")
+        .get("select > option")
+        .eq(1)
+        .should("have.text", "Two")
+        .should("have.attr", "value", "/documents/features/urls/2.yaml")
+    })
+
+    it("should render the first URL in the list", () => {
+      cy.visit("/?configUrl=/configs/urls.yaml")
+        .get("h2.title")
+        .should("have.text", "One")
+        .window()
+        .then(win => win.ui.specSelectors.url())
+        .should("equal", "/documents/features/urls/1.yaml")
+    })
+  })
+
+  it("should respect a `urls.primaryName`", () => {
+    cy.visit("/?configUrl=/configs/urls-primary-name.yaml")
+      .get("select")
+      .should("have.value", "/documents/features/urls/2.yaml")
+      .get("h2.title")
+      .should("have.text", "Two")
+      .window()
+      .then(win => win.ui.specSelectors.url())
+      .should("equal", "/documents/features/urls/2.yaml")
+  })
+})