mirror of
https://github.com/ansible/awx.git
synced 2026-03-02 17:28:51 -03:30
Address review feedback.
This commit is contained in:
@@ -74,13 +74,8 @@ class APIClient {
|
|||||||
return this.http.get(API_INSTANCE_GROUPS);
|
return this.http.get(API_INSTANCE_GROUPS);
|
||||||
}
|
}
|
||||||
|
|
||||||
createInstanceGroups (url, selected) {
|
createInstanceGroups (url, id) {
|
||||||
if (selected.length > 0) {
|
return this.http.post(url, { id });
|
||||||
selected.forEach(select => {
|
|
||||||
this.http.post(url, { id: select.id });
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { I18n } from '@lingui/react';
|
import { I18n } from '@lingui/react';
|
||||||
import { Trans, t } from '@lingui/macro';
|
import { Trans, t } from '@lingui/macro';
|
||||||
import {
|
import {
|
||||||
@@ -87,9 +86,4 @@ class About extends React.Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
About.contextTypes = {
|
|
||||||
ansible_version: PropTypes.string,
|
|
||||||
version: PropTypes.string,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default About;
|
export default About;
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class Lookup extends React.Component {
|
|||||||
<div className="pf-c-form-control">{this.wrapTags(this.props.data)}</div>
|
<div className="pf-c-form-control">{this.wrapTags(this.props.data)}</div>
|
||||||
<Modal
|
<Modal
|
||||||
className="awx-c-modal"
|
className="awx-c-modal"
|
||||||
title={`Select ${this.props.lookup_header}`}
|
title={`Select ${this.props.lookupHeader}`}
|
||||||
isOpen={isModalOpen}
|
isOpen={isModalOpen}
|
||||||
onClose={this.handleModalToggle}
|
onClose={this.handleModalToggle}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -79,8 +79,12 @@ class OrganizationAdd extends React.Component {
|
|||||||
const url = response.related.instance_groups;
|
const url = response.related.instance_groups;
|
||||||
const selected = this.state.results.filter(group => group.isChecked);
|
const selected = this.state.results.filter(group => group.isChecked);
|
||||||
try {
|
try {
|
||||||
await api.createInstanceGroups(url, selected);
|
if (selected.length > 0) {
|
||||||
this.resetForm();
|
selected.forEach( async (select) => {
|
||||||
|
await api.createInstanceGroups(url, select.id);
|
||||||
|
});
|
||||||
|
this.resetForm();
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.setState({ createInstanceGroupsError: err })
|
this.setState({ createInstanceGroupsError: err })
|
||||||
} finally {
|
} finally {
|
||||||
@@ -112,7 +116,7 @@ class OrganizationAdd extends React.Component {
|
|||||||
const { api } = this.props;
|
const { api } = this.props;
|
||||||
try {
|
try {
|
||||||
const { data } = await api.getInstanceGroups();
|
const { data } = await api.getInstanceGroups();
|
||||||
this.format(data);
|
const results = this.format(data);
|
||||||
this.setState({ results });
|
this.setState({ results });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.setState({ getInstanceGroupsError: error })
|
this.setState({ getInstanceGroupsError: error })
|
||||||
@@ -159,7 +163,7 @@ class OrganizationAdd extends React.Component {
|
|||||||
</FormGroup>
|
</FormGroup>
|
||||||
<FormGroup label="Instance Groups" fieldId="simple-form-instance-groups">
|
<FormGroup label="Instance Groups" fieldId="simple-form-instance-groups">
|
||||||
<Lookup
|
<Lookup
|
||||||
lookup_header="Instance Groups"
|
lookupHeader="Instance Groups"
|
||||||
lookupChange={this.onLookupChange}
|
lookupChange={this.onLookupChange}
|
||||||
data={results}
|
data={results}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user