From 083b9825bf5162eb47badee064531722008ba3bd Mon Sep 17 00:00:00 2001
From: wdoconnell <91283923+wdoconnell@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:24:04 -0500
Subject: [PATCH 1/4] chore: dont default to variables page

---
 src/pageLayout/containers/MainNavigation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pageLayout/containers/MainNavigation.tsx b/src/pageLayout/containers/MainNavigation.tsx
index 1044852957..ebfd1c3468 100644
--- a/src/pageLayout/containers/MainNavigation.tsx
+++ b/src/pageLayout/containers/MainNavigation.tsx
@@ -180,7 +180,7 @@ const generateNavItems = (
       testID: 'nav-item-settings',
       icon: IconFont.CogOutline_New,
       label: 'Settings',
-      link: `/orgs/${orgID}/settings/variables`,
+      link: `/orgs/${orgID}/settings`,
       activeKeywords: ['settings'],
       menu: [
         {

From 71f29c7d6984b125af7c7f42ce43b1bf74bed27b Mon Sep 17 00:00:00 2001
From: wdoconnell <91283923+wdoconnell@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:39:31 -0500
Subject: [PATCH 2/4] chore: make labels default in iox

---
 src/shared/containers/SetOrg.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/containers/SetOrg.tsx b/src/shared/containers/SetOrg.tsx
index bd01562743..ba6f6d863e 100644
--- a/src/shared/containers/SetOrg.tsx
+++ b/src/shared/containers/SetOrg.tsx
@@ -313,7 +313,7 @@ const SetOrg: FC = () => {
           <Route
             exact
             path={`${orgPath}/${SETTINGS}`}
-            component={VariablesIndex}
+            component={isNewIOxOrg ? LabelsIndex : VariablesIndex}
           />
           {/* Users - route has multiple paths to ensure backwards compatibility while https://github.com/influxdata/ui/issues/5396 is being worked on*/}
           {CLOUD && (

From bbfb1828950970d4879d2d1a0765e74dd94c7218 Mon Sep 17 00:00:00 2001
From: wdoconnell <91283923+wdoconnell@users.noreply.github.com>
Date: Mon, 30 Jan 2023 14:30:17 -0500
Subject: [PATCH 3/4] chore: all org settings users go to labels

---
 src/shared/containers/SetOrg.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/containers/SetOrg.tsx b/src/shared/containers/SetOrg.tsx
index ba6f6d863e..4164c8c650 100644
--- a/src/shared/containers/SetOrg.tsx
+++ b/src/shared/containers/SetOrg.tsx
@@ -313,7 +313,7 @@ const SetOrg: FC = () => {
           <Route
             exact
             path={`${orgPath}/${SETTINGS}`}
-            component={isNewIOxOrg ? LabelsIndex : VariablesIndex}
+            component={LabelsIndex}
           />
           {/* Users - route has multiple paths to ensure backwards compatibility while https://github.com/influxdata/ui/issues/5396 is being worked on*/}
           {CLOUD && (

From cd841fc1d1c67839387a0763a2deee1857c0801a Mon Sep 17 00:00:00 2001
From: wdoconnell <91283923+wdoconnell@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:58:15 -0500
Subject: [PATCH 4/4] chore: update test to account for user going to
 settings/labels by default

---
 cypress/e2e/shared/dashboardsIndex.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress/e2e/shared/dashboardsIndex.test.ts b/cypress/e2e/shared/dashboardsIndex.test.ts
index 43f4942fb2..db7c28f214 100644
--- a/cypress/e2e/shared/dashboardsIndex.test.ts
+++ b/cypress/e2e/shared/dashboardsIndex.test.ts
@@ -315,6 +315,7 @@ describe('Dashboards', () => {
       // visit another page
       cy.getByTestID('tree-nav')
       cy.contains('Settings').click({force: true})
+      cy.getByTestID('variables--tab').click()
       cy.contains("Looks like there aren't any Variables, why not create one?")
       // return to dashboards page
       cy.contains('Dashboards').click()