External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixes InvGroupForm submission bug.

Browse Source 
The inventory id now comes through useParams instead of through props.
Also updates tests to reflect those changes
This commit is contained in:
Alex Corey
2020-01-23 10:50:23 -05:00
parent 46e530ceeb
commit 0a8fe4d812
4 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx
View File

@@ -1,28 +1,28 @@
import React, { useState, useEffect } from 'react'; import React, { useState } from 'react';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { withRouter } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import { GroupsAPI } from '@api'; import { GroupsAPI } from '@api';
import { Card } from '@patternfly/react-core'; import { Card } from '@patternfly/react-core';
import InventoryGroupForm from '../shared/InventoryGroupForm'; import InventoryGroupForm from '../shared/InventoryGroupForm';
function InventoryGroupsAdd({ history, inventory, setBreadcrumb }) { function InventoryGroupsAdd() {
const [error, setError] = useState(null); const [error, setError] = useState(null);
const { id } = useParams();
useEffect(() => setBreadcrumb(inventory), [inventory, setBreadcrumb]); const history = useHistory();
const handleSubmit = async values => { const handleSubmit = async values => {
values.inventory = inventory.id; values.inventory = id;
try { try {
const { data } = await GroupsAPI.create(values); const { data } = await GroupsAPI.create(values);
history.push(`/inventories/inventory/${inventory.id}/groups/${data.id}`); history.push(`/inventories/inventory/${id}/groups/${data.id}`);
} catch (err) { } catch (err) {
setError(err); setError(err);
} }
}; };
const handleCancel = () => { const handleCancel = () => {
history.push(`/inventories/inventory/${inventory.id}/groups`); history.push(`/inventories/inventory/${id}/groups`);
}; };
return ( return (
@@ -35,5 +35,5 @@ function InventoryGroupsAdd({ history, inventory, setBreadcrumb }) {
</Card> </Card>
); );
} }
export default withI18n()(withRouter(InventoryGroupsAdd)); export default withI18n()(InventoryGroupsAdd);
export { InventoryGroupsAdd as _InventoryGroupsAdd }; export { InventoryGroupsAdd as _InventoryGroupsAdd };

4
awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.test.jsx
View File

@@ -21,9 +21,7 @@ describe('<InventoryGroupAdd />', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<Route <Route
path="/inventories/inventory/:id/groups/add" path="/inventories/inventory/:id/groups/add"
component={() => ( component={() => <InventoryGroupAdd />}
<InventoryGroupAdd setBreadcrumb={() => {}} inventory={{ id: 1 }} />
)}
/>, />,
{ {
context: { context: {

18
awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx
View File

@@ -1,28 +1,26 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { withRouter } from 'react-router-dom'; import { useParams, useHistory } from 'react-router-dom';
import { GroupsAPI } from '@api'; import { GroupsAPI } from '@api';
import InventoryGroupForm from '../shared/InventoryGroupForm'; import InventoryGroupForm from '../shared/InventoryGroupForm';
function InventoryGroupEdit({ history, inventoryGroup, inventory, match }) { function InventoryGroupEdit({ inventoryGroup }) {
const [error, setError] = useState(null); const [error, setError] = useState(null);
const { id, groupId } = useParams();
const history = useHistory();
const handleSubmit = async values => { const handleSubmit = async values => {
try { try {
await GroupsAPI.update(match.params.groupId, values); await GroupsAPI.update(groupId, values);
history.push( history.push(`/inventories/inventory/${id}/groups/${groupId}`);
`/inventories/inventory/${inventory.id}/groups/${inventoryGroup.id}`
);
} catch (err) { } catch (err) {
setError(err); setError(err);
} }
}; };
const handleCancel = () => { const handleCancel = () => {
history.push( history.push(`/inventories/inventory/${id}/groups/${groupId}`);
`/inventories/inventory/${inventory.id}/groups/${inventoryGroup.id}`
);
}; };
return ( return (
@@ -34,5 +32,5 @@ function InventoryGroupEdit({ history, inventoryGroup, inventory, match }) {
/> />
); );
} }
export default withI18n()(withRouter(InventoryGroupEdit)); export default withI18n()(InventoryGroupEdit);
export { InventoryGroupEdit as _InventoryGroupEdit }; export { InventoryGroupEdit as _InventoryGroupEdit };

14
awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.test.jsx
View File

@@ -26,24 +26,12 @@ describe('<InventoryGroupEdit />', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<Route <Route
path="/inventories/inventory/:id/groups/:groupId/edit" path="/inventories/inventory/:id/groups/:groupId/edit"
component={() => ( component={() => <InventoryGroupEdit inventoryGroup={{ id: 2 }} />}
<InventoryGroupEdit
setBreadcrumb={() => {}}
inventory={{ id: 1 }}
inventoryGroup={{ id: 2 }}
/>
)}
/>, />,
{ {
context: { context: {
router: { router: {
history, history,
route: {
match: {
params: { groupId: 13 },
},
location: history.location,
},
}, },
}, },
} }