From d2646bb3f39a5300032e5fea0fc01add773a31e7 Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Tue, 3 May 2022 11:31:13 -0700
Subject: [PATCH 1/2] Allow `latest` version not to be the `current` version of
 the documentation

Signed-off-by: Miki <miki@amazon.com>
---
 _data/versions.json            |  9 ++++++---
 _layouts/default.html          |  1 -
 assets/js/_version-selector.js |  5 ++++-
 assets/js/version-selector.tpl | 13 +++++++++++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/_data/versions.json b/_data/versions.json
index 5881881e..dfced078 100644
--- a/_data/versions.json
+++ b/_data/versions.json
@@ -1,8 +1,11 @@
 {
   "current": "1.3",
-  "past": [
+  "all": [
+    "2.0",
+    "1.3",
     "1.2",
     "1.1",
     "1.0"
-  ]
-}
+  ],
+  "latest": "1.3"
+}
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 4ae7477a..13819568 100755
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -57,7 +57,6 @@ layout: table_wrappers
         </a>
       </div>
       <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
-        {% assign past_versions = site.data.versions.past | join: ";" %}
         <div class="version-wrapper">
           <version-selector selected="{{ site.data.versions.current }}"></version-selector>
         </div>
diff --git a/assets/js/_version-selector.js b/assets/js/_version-selector.js
index cee94959..dc438e04 100644
--- a/assets/js/_version-selector.js
+++ b/assets/js/_version-selector.js
@@ -1,6 +1,9 @@
 /* During build, DOC_VERSIONS is prefixed to convey all the versions available, informed by `_data/versions.json`
  * Example:
  *    const DOC_VERSIONS = ["1.1","1.0"];
+ *
+ * DOC_VERSION_LATEST will pick `latest`, or in its absence the `current` version.
+ *    const DOC_VERSION_LATEST = "2.0";
  */
 const PREFIX = "OpenSearch ";
 const tpl = `
@@ -155,7 +158,7 @@ class VersionSelector extends HTMLElement {
         frag.querySelector('#selected').textContent = `${PREFIX}${this.getAttribute('selected')}.x`;
 
         const pathName = location.pathname.replace(/\/docs(\/((latest|\d+\.\d+)\/?)?)?/, '');
-        const versionsDOMText = DOC_VERSIONS.map((v, idx) => `<a href="/docs/${v}/${pathName}"${idx === 0 ? ' class="latest"' : ''}>${PREFIX}${v}.x</a>`)
+        const versionsDOMText = DOC_VERSIONS.map((v, idx) => `<a href="/docs/${v}/${pathName}"${v === DOC_VERSION_LATEST ? ' class="latest"' : ''}>${PREFIX}${v}.x</a>`)
             .join('');
 
         frag.querySelector('#dropdown').appendChild(this._makeFragment(versionsDOMText));
diff --git a/assets/js/version-selector.tpl b/assets/js/version-selector.tpl
index d3ab6973..4d5454e5 100644
--- a/assets/js/version-selector.tpl
+++ b/assets/js/version-selector.tpl
@@ -2,8 +2,17 @@
 permalink: /assets/js/version-selector.js
 ---
 (() => {
-{% assign current_array = site.data.versions.current | split: '!' %}
-{% assign all_versions = current_array | concat: site.data.versions.past %}
+{% if site.data.versions.all contains site.data.versions.current %}
+{% assign all_versions = site.data.versions.all %}
+{% else %}
+{% assign current_array = site.data.versions.all | split: '!' %}
+{% assign all_versions = current_array | concat: site.data.versions.all %}
+{% endif %}
 const DOC_VERSIONS = {{ all_versions | jsonify }};
+{% if site.data.versions.latest %}
+const DOC_VERSION_LATEST = {{ site.data.versions.latest | jsonify }};
+{% else %}
+const DOC_VERSION_LATEST = {{ site.data.versions.current | jsonify }};
+{% endif %}
 {% include_relative _version-selector.js %}
 })();
\ No newline at end of file

From b390ddda8918153da0732cadb1e07425dfeb04b1 Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Tue, 3 May 2022 11:43:13 -0700
Subject: [PATCH 2/2] Remove 2.0 from version list

Signed-off-by: Miki <miki@amazon.com>
---
 _data/versions.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_data/versions.json b/_data/versions.json
index dfced078..a1f34b85 100644
--- a/_data/versions.json
+++ b/_data/versions.json
@@ -1,7 +1,6 @@
 {
   "current": "1.3",
   "all": [
-    "2.0",
     "1.3",
     "1.2",
     "1.1",