From ddfa9426a1ab8b9caae742c7bcb2407a15ffea48 Mon Sep 17 00:00:00 2001
From: Ofer Levi <20116361+OferLevi85@users.noreply.github.com>
Date: Wed, 7 Jul 2021 18:20:42 +0300
Subject: [PATCH] UI: Fix tab order (settings before history) (#1535)

Signed-off-by: Ofer Levi <ofer.levi@verizonmedia.com>
---
 .../header/__snapshots__/Tabs.test.js.snap           | 12 ++++++------
 .../pages/__snapshots__/domain-settings.test.js.snap | 12 ++++++------
 .../pages/__snapshots__/policy.test.js.snap          |  4 ++--
 .../__tests__/pages/__snapshots__/role.test.js.snap  |  4 ++--
 .../pages/__snapshots__/service.test.js.snap         |  4 ++--
 .../__tests__/pages/__snapshots__/tags.test.js.snap  |  4 ++--
 .../pages/__snapshots__/template.test.js.snap        |  4 ++--
 ui/src/components/header/Tabs.js                     |  8 ++++----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ui/src/__tests__/components/header/__snapshots__/Tabs.test.js.snap b/ui/src/__tests__/components/header/__snapshots__/Tabs.test.js.snap
index 9416af099c4..032394e2ab0 100644
--- a/ui/src/__tests__/components/header/__snapshots__/Tabs.test.js.snap
+++ b/ui/src/__tests__/components/header/__snapshots__/Tabs.test.js.snap
@@ -134,17 +134,17 @@ exports[`Tabs should render 1`] = `
   >
     Templates
   </div>
-  <div
-    class="emotion-1 denali-tab active"
-    data-active="true"
-  >
-    History
-  </div>
   <div
     class="emotion-1 denali-tab"
     data-active="false"
   >
     Settings
   </div>
+  <div
+    class="emotion-1 denali-tab active"
+    data-active="true"
+  >
+    History
+  </div>
 </div>
 `;
diff --git a/ui/src/__tests__/pages/__snapshots__/domain-settings.test.js.snap b/ui/src/__tests__/pages/__snapshots__/domain-settings.test.js.snap
index 2732de80103..046086c2d0a 100644
--- a/ui/src/__tests__/pages/__snapshots__/domain-settings.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/domain-settings.test.js.snap
@@ -1358,18 +1358,18 @@ exports[`DomainSettingsPage should render 1`] = `
               >
                 Templates
               </div>
-              <div
-                class="emotion-74 denali-tab"
-                data-active="false"
-              >
-                History
-              </div>
               <div
                 class="emotion-74 denali-tab active"
                 data-active="true"
               >
                 Settings
               </div>
+              <div
+                class="emotion-74 denali-tab"
+                data-active="false"
+              >
+                History
+              </div>
             </div>
           </div>
           <div
diff --git a/ui/src/__tests__/pages/__snapshots__/policy.test.js.snap b/ui/src/__tests__/pages/__snapshots__/policy.test.js.snap
index 87588cbaaaf..73c51f39dd7 100644
--- a/ui/src/__tests__/pages/__snapshots__/policy.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/policy.test.js.snap
@@ -1271,13 +1271,13 @@ exports[`PolicyPage should render 1`] = `
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                History
+                Settings
               </div>
               <div
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                Settings
+                History
               </div>
             </div>
           </div>
diff --git a/ui/src/__tests__/pages/__snapshots__/role.test.js.snap b/ui/src/__tests__/pages/__snapshots__/role.test.js.snap
index faff178724e..a227b2c3e54 100644
--- a/ui/src/__tests__/pages/__snapshots__/role.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/role.test.js.snap
@@ -1479,13 +1479,13 @@ exports[`RolePage should render 1`] = `
                 class="emotion-74 denali-tab"
                 data-active="false"
               >
-                History
+                Settings
               </div>
               <div
                 class="emotion-74 denali-tab"
                 data-active="false"
               >
-                Settings
+                History
               </div>
             </div>
           </div>
diff --git a/ui/src/__tests__/pages/__snapshots__/service.test.js.snap b/ui/src/__tests__/pages/__snapshots__/service.test.js.snap
index b15b105c26c..2d0b4a87a5d 100644
--- a/ui/src/__tests__/pages/__snapshots__/service.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/service.test.js.snap
@@ -1307,13 +1307,13 @@ exports[`ServicePage should render 1`] = `
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                History
+                Settings
               </div>
               <div
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                Settings
+                History
               </div>
             </div>
           </div>
diff --git a/ui/src/__tests__/pages/__snapshots__/tags.test.js.snap b/ui/src/__tests__/pages/__snapshots__/tags.test.js.snap
index 159bc4b1981..60dd764d592 100644
--- a/ui/src/__tests__/pages/__snapshots__/tags.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/tags.test.js.snap
@@ -1237,13 +1237,13 @@ exports[`Tag Page should render 1`] = `
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                History
+                Settings
               </div>
               <div
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                Settings
+                History
               </div>
             </div>
           </div>
diff --git a/ui/src/__tests__/pages/__snapshots__/template.test.js.snap b/ui/src/__tests__/pages/__snapshots__/template.test.js.snap
index d521a161860..62214b79577 100644
--- a/ui/src/__tests__/pages/__snapshots__/template.test.js.snap
+++ b/ui/src/__tests__/pages/__snapshots__/template.test.js.snap
@@ -1257,13 +1257,13 @@ exports[`Template Page should render 1`] = `
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                History
+                Settings
               </div>
               <div
                 class="emotion-77 denali-tab"
                 data-active="false"
               >
-                Settings
+                History
               </div>
             </div>
           </div>
diff --git a/ui/src/components/header/Tabs.js b/ui/src/components/header/Tabs.js
index 9419c5a932f..c0c6d34c538 100644
--- a/ui/src/components/header/Tabs.js
+++ b/ui/src/components/header/Tabs.js
@@ -47,14 +47,14 @@ class Tabs extends React.Component {
             label: 'Templates',
             name: 'templates',
         },
-        {
-            label: 'History',
-            name: 'history',
-        },
         {
             label: 'Settings',
             name: 'domain-settings',
         },
+        {
+            label: 'History',
+            name: 'history',
+        },
     ];
 
     tabClicked(tab) {