put FormGroup component in form instead of in AnsibleSelect component

src/components/AnsibleSelect/AnsibleSelect.jsx

@@ -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} onChange={this.onSelectChange} aria-label="Select Input">
-          <Select value={value} id={`select-${fieldId}` || 'ansible-select-element'} onChange={this.onSelectChange} aria-label="Select Input">
+          {data.map((datum) => (
-            {data.map((datum) => (
+            <SelectOption isDisabled={datum.disabled} key={datum} value={datum} label={datum} />
-              <SelectOption isDisabled={datum.disabled} key={datum} value={datum} label={datum} />
+          ))}
-            ))}
+        </Select>
-          </Select>
-        </FormGroup>
       );
     } else {
       elem = null;

src/pages/Organizations/screens/OrganizationAdd.jsx

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