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

put FormGroup component in form instead of in AnsibleSelect component

Browse Source
This commit is contained in:
John Mitchell 2019-02-13 15:40:46 -05:00
parent f2ab7f62b9
commit b4007c7e04
No known key found for this signature in database
GPG Key ID: FE6A9B5BD4EB5C94
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/AnsibleSelect/AnsibleSelect.jsx
View File

@ -1,7 +1,6 @@
import React from 'react';
import {
FormGroup,
Select,
SelectOption,
} from '@patternfly/react-core';
@ -33,17 +32,15 @@ class AnsibleSelect extends React.Component {
render () {
const { count } = this.state;
const { labelName, value, data, fieldId } = this.props;
const { value, data } = this.props;
let elem;
if (count > 1) {
elem = (
<FormGroup label={labelName} fieldId={fieldId || 'ansible-select'}>
<Select value={value} id={`select-${fieldId}` || 'ansible-select-element'} onChange={this.onSelectChange} aria-label="Select Input">
{data.map((datum) => (
<SelectOption isDisabled={datum.disabled} key={datum} value={datum} label={datum} />
))}
</Select>
</FormGroup>
<Select value={value} onChange={this.onSelectChange} aria-label="Select Input">
{data.map((datum) => (
<SelectOption isDisabled={datum.disabled} key={datum} value={datum} label={datum} />
))}
</Select>
);
} else {
elem = null;

16
src/pages/Organizations/screens/OrganizationAdd.jsx
View File

@ -135,14 +135,14 @@ class OrganizationAdd extends React.Component {
</FormGroup>
<ConfigContext.Consumer>
{({ custom_virtualenvs }) => (
<AnsibleSelect
fieldId="add-org-form-virtual-env"
labelName="Ansible Environment"
name="custom_virtualenv"
value={custom_virtualenv}
onChange={this.onFieldChange}
data={custom_virtualenvs}
/>
<FormGroup label="Ansible Environment" fieldId="add-org-form-custom-virtualenv">
<AnsibleSelect
name="custom_virtualenv"
value={custom_virtualenv}
onChange={this.onFieldChange}
data={custom_virtualenvs}
/>
</FormGroup>
)}
</ConfigContext.Consumer>
</Gallery>