Skip to content

Commit 0a046a1

Browse files
authored
fix: Settings page sends user to settings/labels in new iox orgs (#6543)
* chore: dont default to variables page * chore: make labels default in iox * chore: all org settings users go to labels * chore: update test to account for user going to settings/labels by default
1 parent e57f5fa commit 0a046a1

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

cypress/e2e/shared/dashboardsIndex.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ describe('Dashboards', () => {
315315
// visit another page
316316
cy.getByTestID('tree-nav')
317317
cy.contains('Settings').click({force: true})
318+
cy.getByTestID('variables--tab').click()
318319
cy.contains("Looks like there aren't any Variables, why not create one?")
319320
// return to dashboards page
320321
cy.contains('Dashboards').click()

src/pageLayout/containers/MainNavigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ const generateNavItems = (
180180
testID: 'nav-item-settings',
181181
icon: IconFont.CogOutline_New,
182182
label: 'Settings',
183-
link: `/orgs/${orgID}/settings/variables`,
183+
link: `/orgs/${orgID}/settings`,
184184
activeKeywords: ['settings'],
185185
menu: [
186186
{

src/shared/containers/SetOrg.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ const SetOrg: FC = () => {
313313
<Route
314314
exact
315315
path={`${orgPath}/${SETTINGS}`}
316-
component={VariablesIndex}
316+
component={LabelsIndex}
317317
/>
318318
{/* Users - route has multiple paths to ensure backwards compatibility while https://github.com/influxdata/ui/issues/5396 is being worked on*/}
319319
{CLOUD && (

0 commit comments

Comments
 (0)