Skip to content
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

refactor(ui): settings navigation #14990

Merged
merged 5 commits into from
Sep 5, 2019
Merged

refactor(ui): settings navigation #14990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c8c2ec
refactor(ui): move tokens tab to load data page and update navbar
alexpaxton Sep 5, 2019
e71ca50
refactor(ui): prefix all settings page urls with "settings"
alexpaxton Sep 5, 2019
50119e3
refactor(ui): expose settings tabs in navbar as sub-items
alexpaxton Sep 5, 2019
92265f8
chore(ui): update changelog
alexpaxton Sep 5, 2019
63adc8c
refactor(ui): fix URLs in e2e tests
alexpaxton Sep 5, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
### Features

### UI Improvements
1. [14990](https://github.com/influxdata/influxdb/pull/14990): Move Tokens tab from Settings to Load Data page
1. [14990](https://github.com/influxdata/influxdb/pull/14990): Expose all Settings tabs in navigation menu

### Bug Fixes
1. [14931](https://github.com/influxdata/influxdb/pull/14931): Remove scrollbars blocking onboarding UI step.
Expand Down
2 changes: 1 addition & 1 deletion ui/cypress/e2e/collectors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('Collectors', () => {
cy.wrap(body.org).as('org')

cy.fixture('routes').then(({orgs}) => {
cy.visit(`${orgs}/${id}/telegrafs`)
cy.visit(`${orgs}/${id}/load-data/telegrafs`)
})
})
})
Expand Down
2 changes: 1 addition & 1 deletion ui/cypress/e2e/labels.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('labels', () => {
cy.wrap(body.org).as('org')

cy.fixture('routes').then(({orgs}) => {
cy.visit(`${orgs}/${id}/labels`)
cy.visit(`${orgs}/${id}/settings/labels`)
})
})
})
Expand Down
2 changes: 1 addition & 1 deletion ui/cypress/e2e/tokens.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('tokens', () => {
})

cy.fixture('routes').then(({orgs}) => {
cy.visit(`${orgs}/${id}/tokens`)
cy.visit(`${orgs}/${id}/load-data/tokens`)
})
})
})
Expand Down
2 changes: 1 addition & 1 deletion ui/cypress/e2e/variables.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('Variables', () => {

cy.signin().then(({body}) => {
cy.wrap(body.org).as('org')
cy.visit(`orgs/${body.org.id}/variables`)
cy.visit(`orgs/${body.org.id}/settings/variables`)
})
})

Expand Down
2 changes: 1 addition & 1 deletion ui/src/authorizations/components/AllAccessTokenOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class AllAccessTokenOverlay extends PureComponent<Props, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/tokens`)
router.push(`/orgs/${orgID}/load-data/tokens`)
}
}

Expand Down
2 changes: 1 addition & 1 deletion ui/src/authorizations/components/BucketsTokenOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/tokens`)
router.push(`/orgs/${orgID}/load-data/tokens`)
}
}

Expand Down
4 changes: 2 additions & 2 deletions ui/src/authorizations/components/TokensTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class TokensTab extends PureComponent<Props, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/tokens/generate/all-access`)
router.push(`/orgs/${orgID}/load-data/tokens/generate/all-access`)
}

private handleGenerateReadWrite = () => {
Expand All @@ -112,7 +112,7 @@ class TokensTab extends PureComponent<Props, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/tokens/generate/buckets`)
router.push(`/orgs/${orgID}/load-data/tokens/generate/buckets`)
}
}

Expand Down
12 changes: 6 additions & 6 deletions ui/src/authorizations/containers/TokensIndex.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {connect} from 'react-redux'
// Components
import {Page} from '@influxdata/clockface'
import {ErrorHandling} from 'src/shared/decorators/errors'
import SettingsTabbedPage from 'src/settings/components/SettingsTabbedPage'
import SettingsHeader from 'src/settings/components/SettingsHeader'
import LoadDataTabbedPage from 'src/settings/components/LoadDataTabbedPage'
import LoadDataHeader from 'src/settings/components/LoadDataHeader'
import GetResources, {ResourceTypes} from 'src/shared/components/GetResources'
import TokensTab from 'src/authorizations/components/TokensTab'

Expand All @@ -27,13 +27,13 @@ class TokensIndex extends Component<StateProps> {

return (
<>
<Page titleTag={pageTitleSuffixer(['Tokens', 'Settings'])}>
<SettingsHeader />
<SettingsTabbedPage activeTab="tokens" orgID={org.id}>
<Page titleTag={pageTitleSuffixer(['Tokens', 'Load Data'])}>
<LoadDataHeader />
<LoadDataTabbedPage activeTab="tokens" orgID={org.id}>
<GetResources resource={ResourceTypes.Authorizations}>
<TokensTab />
</GetResources>
</SettingsTabbedPage>
</LoadDataTabbedPage>
</Page>
{children}
</>
Expand Down
126 changes: 59 additions & 67 deletions ui/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,20 @@ class Root extends PureComponent {
</Route>
</Route>
<Route path="me" component={MePage} />
<Route path="settings">
<IndexRoute component={MembersIndex} />
</Route>
<Route path="load-data">
<IndexRoute component={BucketsIndex} />
<Route path="tokens" component={TokensIndex}>
<Route path="generate">
<Route
path="all-access"
component={AllAccessTokenOverlay}
/>
<Route
path="buckets"
component={BucketsTokenOverlay}
/>
</Route>
</Route>
<Route path="buckets" component={BucketsIndex}>
<Route path=":bucketID">
<Route
Expand Down Expand Up @@ -272,73 +281,59 @@ class Root extends PureComponent {
/>
</FeatureFlag>
</Route>
<Route path="tokens" component={TokensIndex}>
<Route path="generate">
<Route path="settings">
<IndexRoute component={MembersIndex} />
<Route path="members" component={MembersIndex}>
<Route path="new" component={AddMembersOverlay} />
</Route>
<Route path="templates" component={TemplatesIndex}>
<Route
path="import"
component={TemplateImportOverlay}
/>
<Route
path=":id/export"
component={TemplateExportOverlay}
/>
<Route
path="all-access"
component={AllAccessTokenOverlay}
path=":id/view"
component={TemplateViewOverlay}
/>
<Route
path="buckets"
component={BucketsTokenOverlay}
path=":id/static/view"
component={StaticTemplateViewOverlay}
/>
</Route>
<Route path="variables" component={VariablesIndex}>
<Route
path="import"
component={VariableImportOverlay}
/>
<Route
path=":id/export"
component={VariableExportOverlay}
/>
<Route
path="new"
component={CreateVariableOverlay}
/>
<Route
path=":id/rename"
component={RenameVariableOverlay}
/>
<Route
path=":id/edit"
component={UpdateVariableOverlay}
/>
</Route>
<Route path="labels" component={LabelsIndex} />
<Route path="profile" component={OrgProfilePage}>
<Route
path="rename"
component={RenameOrgOverlay}
/>
</Route>
</Route>
<Route path="members" component={MembersIndex}>
<Route path="new" component={AddMembersOverlay} />
</Route>
<Route path="telegrafs" component={TelegrafsPage}>
<Route
path=":id/view"
component={TelegrafConfigOverlay}
/>
<Route
path=":id/instructions"
component={TelegrafInstructionsOverlay}
/>
<Route path="new" component={CollectorsWizard} />
</Route>
<Route path="templates" component={TemplatesIndex}>
<Route
path="import"
component={TemplateImportOverlay}
/>
<Route
path=":id/export"
component={TemplateExportOverlay}
/>
<Route
path=":id/view"
component={TemplateViewOverlay}
/>
<Route
path=":id/static/view"
component={StaticTemplateViewOverlay}
/>
</Route>
<Route path="variables" component={VariablesIndex}>
<Route
path="import"
component={VariableImportOverlay}
/>
<Route
path=":id/export"
component={VariableExportOverlay}
/>
<Route
path="new"
component={CreateVariableOverlay}
/>
<Route
path=":id/rename"
component={RenameVariableOverlay}
/>
<Route
path=":id/edit"
component={UpdateVariableOverlay}
/>
</Route>
<Route path="labels" component={LabelsIndex} />
<FeatureFlag name="alerting">
<Route path="alerting" component={AlertingIndex}>
<Route path="checks/new" component={NewCheckEO} />
Expand Down Expand Up @@ -368,9 +363,6 @@ class Root extends PureComponent {
component={AlertHistoryIndex}
/>
</FeatureFlag>
<Route path="profile" component={OrgProfilePage}>
<Route path="rename" component={RenameOrgOverlay} />
</Route>
</Route>
</Route>
</Route>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/members/components/AddMembersOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class AddMembersOverlay extends PureComponent<Props, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/members`)
router.push(`/orgs/${orgID}/settings/members`)
}

private handleSave = () => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/members/components/Members.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class Members extends PureComponent<Props & WithRouterProps, State> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/members/new`)
router.push(`/orgs/${orgID}/settings/members/new`)
}

private handleFilterChange = (searchTerm: string): void => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/organizations/components/OrgProfileTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class OrgProfileTab extends PureComponent<Props> {
router,
} = this.props

router.push(`/orgs/${orgID}/profile/rename`)
router.push(`/orgs/${orgID}/settings/profile/rename`)
}
}

Expand Down
2 changes: 1 addition & 1 deletion ui/src/organizations/components/RenameOrgForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class RenameOrgForm extends PureComponent<Props, State> {
}

private handleGoBack = () => {
this.props.router.push(`/orgs/${this.props.startOrg.id}/profile`)
this.props.router.push(`/orgs/${this.props.startOrg.id}/settings/profile`)
}

private handleValidation = (orgName: string): string | null => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/organizations/components/RenameOrgOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class RenameOrgOverlay extends PureComponent<WithRouterProps> {
params: {orgID},
} = this.props

router.push(`/orgs/${orgID}/profile`)
router.push(`/orgs/${orgID}/settings/profile`)
}
}

Expand Down
Loading