From 1f06b034e5d8c0a21d2b587e00a20fe160f0d46d Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@influxdata.com>
Date: Thu, 20 Apr 2023 11:07:03 -0600
Subject: [PATCH] hotfix: fix product and version dropdown order

---
 assets/styles/layouts/_top-nav.scss           | 4 ++--
 layouts/index.html                            | 2 +-
 layouts/partials/topnav/product-selector.html | 2 +-
 layouts/partials/topnav/version-selector.html | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/styles/layouts/_top-nav.scss b/assets/styles/layouts/_top-nav.scss
index 7f0dceea6..ae9110d60 100644
--- a/assets/styles/layouts/_top-nav.scss
+++ b/assets/styles/layouts/_top-nav.scss
@@ -99,7 +99,7 @@
       margin: 0;
       list-style: none;
       display: flex;
-      flex-direction: column-reverse;
+      flex-direction: column;
 
       &.products{
         li {
@@ -113,7 +113,7 @@
             opacity: .65;
             mix-blend-mode: multiply;
           }
-          &:last-child:before {
+          &:first-child:before {
             content: "Products";
             margin: .3rem .75rem .15rem;
           }
diff --git a/layouts/index.html b/layouts/index.html
index 1885a6fd1..a92daf624 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,5 +1,5 @@
 {{ $influxdbVersionV2 := (index (first 1 (findRE `v2\.[0-9]{1,2}` (delimit .Site.Data.products.influxdb.versions " "))) 0) }}
-{{ $influxdbVersionV1 := (index (last 1 (findRE `v1\.[0-9]{1,2}` (delimit .Site.Data.products.influxdb.versions " "))) 0) }}
+{{ $influxdbVersionV1 := (index (first 1 (findRE `v1\.[0-9]{1,2}` (delimit .Site.Data.products.influxdb.versions " "))) 0) }}
 {{ $enterpriseVersion := .Site.Data.products.enterprise_influxdb.latest }}
 {{ $telegrafVersion := .Site.Data.products.telegraf.latest }}
 {{ $chronografVersion := .Site.Data.products.chronograf.latest }}
diff --git a/layouts/partials/topnav/product-selector.html b/layouts/partials/topnav/product-selector.html
index aeab746e0..c1cb4b48e 100644
--- a/layouts/partials/topnav/product-selector.html
+++ b/layouts/partials/topnav/product-selector.html
@@ -18,7 +18,7 @@
     <p class="selected">{{ if $productData.altname }}{{ $productData.altname }}{{ else }}{{ $productData.name }}{{ end }}</p>
   {{ end }}
   <ul class="item-list products">
-    {{ range sort .Site.Data.products "list_order" "desc" }}
+    {{ range sort .Site.Data.products "list_order" "asc" }}
       {{ $isCurrentProduct := and (eq .namespace $product) (in .versions $currentVersion) }}
       {{ $scratch.Set "link" (print "/" .namespace "/" .latest "/") }}
       {{ if $isCurrentProduct }}
diff --git a/layouts/partials/topnav/version-selector.html b/layouts/partials/topnav/version-selector.html
index 1d971f1b1..6a492aff7 100644
--- a/layouts/partials/topnav/version-selector.html
+++ b/layouts/partials/topnav/version-selector.html
@@ -8,9 +8,6 @@
 <div class="dropdown">
   <p class="selected">{{ cond (in $currentVersion "v") $currentVersion (title $currentVersion) }}</p>
   <ul class="item-list versions">
-    {{ if ne $product "flux" }}
-      <li><a href="https://archive.docs.influxdata.com/{{ $product }}/" class="legacy" target="_blank">older</a></li>
-    {{ end }}
     {{ range (index .Site.Data.products $product).versions }}
       {{ $scratch.Set "link" (print "/" $product "/" . "/") }}
       {{ $altVersionPage := $.GetPage ((replaceRE $currentVersion . $.Page.RelPermalink) | replaceRE `\/$` "") }}
@@ -24,6 +21,9 @@
         <a href="{{ $link }}" {{ if eq . $currentVersion }}class="active"{{ end }}>{{ cond (in . "v") . (title .) }}</a>
       </li>
     {{ end }}
+    {{ if ne $product "flux" }}
+      <li><a href="https://archive.docs.influxdata.com/{{ $product }}/" class="legacy" target="_blank">older</a></li>
+    {{ end }}
   </ul>
 </div>
 {{ end }}