Skip to content

fix: Settings page sends user to settings/labels in new iox orgs #6543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2023
Merged

fix: Settings page sends user to settings/labels in new iox orgs #6543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
083b982
chore: dont default to variables page
wdoconnell Jan 30, 2023
71f29c7
chore: make labels default in iox
wdoconnell Jan 30, 2023
bbfb182
chore: all org settings users go to labels
wdoconnell Jan 30, 2023
cd841fc
chore: update test to account for user going to settings/labels by de…
wdoconnell Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cypress/e2e/shared/dashboardsIndex.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/pageLayout/containers/MainNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/shared/containers/SetOrg.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ const SetOrg: FC = () => {
<Route
exact
path={`${orgPath}/${SETTINGS}`}
component={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 && (
Expand Down