mirror of
https://github.com/ansible/awx.git
synced 2026-02-25 15:06:02 -03:30
Addresses Console Errors related to functions and test data
Also Adds speecificity to link URLs by add /details for urls that should redireect to details pages instead of them ending in /:id
This commit is contained in:
@@ -14,16 +14,6 @@ import DeleteButton from '@components/DeleteButton';
|
|||||||
import Switch from '@components/Switch';
|
import Switch from '@components/Switch';
|
||||||
import { HostsAPI } from '@api';
|
import { HostsAPI } from '@api';
|
||||||
|
|
||||||
function HostDetail({ host, i18n }) {
|
|
||||||
const ActionButtonWrapper = styled.div`
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
margin-top: 20px;
|
|
||||||
& > :not(:first-child) {
|
|
||||||
margin-left: 20px;
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
function HostDetail({ host, history, match, i18n, onUpdateHost }) {
|
function HostDetail({ host, history, match, i18n, onUpdateHost }) {
|
||||||
const { created, description, id, modified, name, summary_fields } = host;
|
const { created, description, id, modified, name, summary_fields } = host;
|
||||||
|
|
||||||
@@ -150,7 +140,6 @@ function HostDetail({ host, history, match, i18n, onUpdateHost }) {
|
|||||||
{i18n._(t`Edit`)}
|
{i18n._(t`Edit`)}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</CardActionsRow>
|
|
||||||
{summary_fields.user_capabilities &&
|
{summary_fields.user_capabilities &&
|
||||||
summary_fields.user_capabilities.delete && (
|
summary_fields.user_capabilities.delete && (
|
||||||
<DeleteButton
|
<DeleteButton
|
||||||
@@ -159,6 +148,7 @@ function HostDetail({ host, history, match, i18n, onUpdateHost }) {
|
|||||||
name={host.name}
|
name={host.name}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
</CardActionsRow>
|
||||||
</CardBody>
|
</CardBody>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -167,4 +157,4 @@ HostDetail.propTypes = {
|
|||||||
host: Host.isRequired,
|
host: Host.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default withI18n()(HostDetail);
|
export default withI18n()(withRouter(HostDetail));
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ class HostsList extends Component {
|
|||||||
<HostListItem
|
<HostListItem
|
||||||
key={o.id}
|
key={o.id}
|
||||||
host={o}
|
host={o}
|
||||||
detailUrl={`${match.url}/${o.id}`}
|
detailUrl={`${match.url}/${o.id}/details`}
|
||||||
isSelected={selected.some(row => row.id === o.id)}
|
isSelected={selected.some(row => row.id === o.id)}
|
||||||
onSelect={() => this.handleSelect(o)}
|
onSelect={() => this.handleSelect(o)}
|
||||||
onToggleHost={this.handleHostToggle}
|
onToggleHost={this.handleHostToggle}
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ function InventoryGroups({ i18n, match, setBreadcrumb, inventory, history }) {
|
|||||||
),
|
),
|
||||||
link: `/inventories/inventory/${inventory.id}/groups`,
|
link: `/inventories/inventory/${inventory.id}/groups`,
|
||||||
id: 99,
|
id: 99,
|
||||||
isNestedTab: true,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: i18n._(t`Details`),
|
name: i18n._(t`Details`),
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ GroupsAPI.readDetail.mockResolvedValue({
|
|||||||
name: 'Foo',
|
name: 'Foo',
|
||||||
description: 'Bar',
|
description: 'Bar',
|
||||||
variables: 'bizz: buzz',
|
variables: 'bizz: buzz',
|
||||||
created: '1/12/2019',
|
|
||||||
modified: '1/13/2019',
|
|
||||||
summary_fields: {
|
summary_fields: {
|
||||||
inventory: { id: 1 },
|
inventory: { id: 1 },
|
||||||
created_by: { id: 1, username: 'Athena' },
|
created_by: { id: 1, username: 'Athena' },
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ describe('<JobTemplateDetail />', () => {
|
|||||||
playbook: '',
|
playbook: '',
|
||||||
id: 1,
|
id: 1,
|
||||||
verbosity: 1,
|
verbosity: 1,
|
||||||
created: '1/12/2019',
|
|
||||||
modified: '1/13/2019',
|
|
||||||
summary_fields: {
|
summary_fields: {
|
||||||
user_capabilities: { edit: true },
|
user_capabilities: { edit: true },
|
||||||
created_by: { id: 1, username: 'Joe' },
|
created_by: { id: 1, username: 'Joe' },
|
||||||
|
|||||||
Reference in New Issue
Block a user