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

Merge pull request #4259 from AlexSCorey/4216-OrgGetRequestDuplication

Browse Source 
Removes duplicated GET request in Org.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-09 18:44:09 +00:00
committed by GitHub
parent 74d8fca673 7039f82d15
commit f47a37a96b
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui_next/src/screens/Organization/Organization.jsx
View File

@@ -41,8 +41,14 @@ class Organization extends Component {
} }
async componentDidUpdate(prevProps) { async componentDidUpdate(prevProps) {
const { location } = this.props; const { location, match } = this.props;
if (location !== prevProps.location) { const url = `/organizations/${match.params.id}/`;
if (
prevProps.location.pathname.startsWith(url) &&
prevProps.location !== location &&
location.pathname === `${url}details`
) {
await this.loadOrganization(); await this.loadOrganization();
} }
} }

4
awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.jsx
View File

@@ -38,7 +38,7 @@ class OrganizationEdit extends Component {
organization: { id }, organization: { id },
history, history,
} = this.props; } = this.props;
history.push(`/organizations/${id}`); history.push(`/organizations/${id}/details`);
} }
handleSuccess() { handleSuccess() {
@@ -46,7 +46,7 @@ class OrganizationEdit extends Component {
organization: { id }, organization: { id },
history, history,
} = this.props; } = this.props;
history.push(`/organizations/${id}`); history.push(`/organizations/${id}/details`);
} }
async submitInstanceGroups(groupsToAssociate, groupsToDisassociate) { async submitInstanceGroups(groupsToAssociate, groupsToDisassociate) {

2
awx/ui_next/src/screens/Organization/OrganizationEdit/OrganizationEdit.test.jsx
View File

@@ -76,6 +76,6 @@ describe('<OrganizationEdit />', () => {
expect(history.push).not.toHaveBeenCalled(); expect(history.push).not.toHaveBeenCalled();
wrapper.find('button[aria-label="Cancel"]').prop('onClick')(); wrapper.find('button[aria-label="Cancel"]').prop('onClick')();
expect(history.push).toHaveBeenCalledWith('/organizations/1'); expect(history.push).toHaveBeenCalledWith('/organizations/1/details');
}); });
}); });