External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 01:34:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

update route group params

Browse Source
This commit is contained in:
Jake McDermott
2019-01-03 09:40:48 -05:00
parent 3e201d3ca0
commit dce50fe18b
6 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App.jsx
View File

@@ -126,10 +126,12 @@ class App extends Component {
nav={(
<Nav aria-label={navLabel}>
<NavList>
{routeGroups.map(params => (
{routeGroups.map(({ groupId, groupTitle, routes }) => (
<NavExpandableGroup
key={params.groupId}
{...params}
key={groupId}
groupId={groupId}
groupTitle={groupTitle}
routes={routes}
/>
))}
</NavList>

4
src/components/NavExpandableGroup.jsx
View File

@@ -25,7 +25,7 @@ class NavExpandableGroup extends Component {
};
render () {
const { routes, groupId, staticContext, ...rest } = this.props;
const { groupId, groupTitle, routes } = this.props;
const isActive = this.isActiveGroup();
return (
@@ -33,7 +33,7 @@ class NavExpandableGroup extends Component {
isActive={isActive}
isExpanded={isActive}
groupId={groupId}
{...rest}
title={groupTitle}
>
{routes.map(({ path, title }) => (
<NavItem

10
src/index.jsx
View File

@@ -111,7 +111,7 @@ export async function main (render, api) {
navLabel={i18n._(t`Primary Navigation`)}
routeGroups={[
{
title: i18n._(t`Views`),
groupTitle: i18n._(t`Views`),
groupId: 'views_group',
routes: [
{
@@ -137,7 +137,7 @@ export async function main (render, api) {
],
},
{
title: i18n._(t`Resources`),
groupTitle: i18n._(t`Resources`),
groupId: 'resources_group',
routes: [
{
@@ -168,7 +168,7 @@ export async function main (render, api) {
],
},
{
title: i18n._(t`Access`),
groupTitle: i18n._(t`Access`),
groupId: 'access_group',
routes: [
{
@@ -189,7 +189,7 @@ export async function main (render, api) {
],
},
{
title: i18n._(t`Administration`),
groupTitle: i18n._(t`Administration`),
groupId: 'administration_group',
routes: [
{
@@ -220,7 +220,7 @@ export async function main (render, api) {
],
},
{
title: i18n._(t`Settings`),
groupTitle: i18n._(t`Settings`),
groupId: 'settings_group',
routes: [
{

47
src/pages/Organizations/views/Organization.add.jsx
View File

@@ -1,5 +1,4 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom';
import { Trans } from '@lingui/macro';
import {
@@ -18,10 +17,8 @@ import {
CardBody,
} from '@patternfly/react-core';
import { ConfigContext } from '../../../context';
import { API_ORGANIZATIONS } from '../../../endpoints';
import api from '../../../api';
import AnsibleSelect from '../../../components/AnsibleSelect'
import AnsibleSelect from '../../../components/AnsibleSelect';
const { light } = PageSectionVariants;
class OrganizationAdd extends React.Component {
@@ -40,6 +37,8 @@ class OrganizationAdd extends React.Component {
description: '',
instanceGroups: '',
custom_virtualenv: '',
custom_virtualenvs: [],
hideAnsibleSelect: true,
error:'',
};
@@ -61,7 +60,8 @@ class OrganizationAdd extends React.Component {
async onSubmit() {
const data = Object.assign({}, { ...this.state });
await api.post(API_ORGANIZATIONS, data);
await api.createOrganization(data);
this.resetForm();
}
@@ -69,10 +69,22 @@ class OrganizationAdd extends React.Component {
this.props.history.push('/organizations');
}
async componentDidMount() {
try {
const { data } = await api.getConfig();
this.setState({ custom_virtualenvs: [...data.custom_virtualenvs] });
if (this.state.custom_virtualenvs.length > 1) {
// Show dropdown if we have more than one ansible environment
this.setState({ hideAnsibleSelect: !this.state.hideAnsibleSelect });
}
} catch (error) {
this.setState({ error })
}
}
render() {
const { name } = this.state;
const enabled = name.length > 0; // TODO: add better form validation
return (
<Fragment>
<PageSection variant={light} className="pf-m-condensed">
@@ -116,16 +128,13 @@ class OrganizationAdd extends React.Component {
onChange={this.handleChange}
/>
</FormGroup>
<ConfigContext.Consumer>
{({ custom_virtualenvs }) =>
<AnsibleSelect
labelName="Ansible Environment"
selected={this.state.custom_virtualenv}
selectChange={this.onSelectChange}
data={custom_virtualenvs}
/>
}
</ConfigContext.Consumer>
<AnsibleSelect
labelName="Ansible Environment"
selected={this.state.custom_virtualenv}
selectChange={this.onSelectChange}
data={this.state.custom_virtualenvs}
hidden={this.state.hideAnsibleSelect}
/>
</Gallery>
<ActionGroup className="at-align-right">
<Toolbar>
@@ -146,8 +155,4 @@ class OrganizationAdd extends React.Component {
}
}
OrganizationAdd.contextTypes = {
custom_virtualenvs: PropTypes.array,
};
export default withRouter(OrganizationAdd);