mirror of
https://github.com/ansible/awx.git
synced 2026-02-01 01:28:09 -03:30
Checks for modified and create in Inv Group Deets
Also includes refactoring for css over style prop and removed some unnecessary loading checks
This commit is contained in:
@@ -121,15 +121,13 @@ function InventoryGroups({ i18n, match, setBreadcrumb, inventory, history }) {
|
|||||||
path="*"
|
path="*"
|
||||||
render={() => {
|
render={() => {
|
||||||
return (
|
return (
|
||||||
!hasContentLoading && (
|
<ContentError>
|
||||||
<ContentError>
|
{inventory && (
|
||||||
{inventory && (
|
<Link to={`/inventories/inventory/${inventory.id}/details`}>
|
||||||
<Link to={`/inventories/inventory/${inventory.id}/details`}>
|
{i18n._(t`View Inventory Details`)}
|
||||||
{i18n._(t`View Inventory Details`)}
|
</Link>
|
||||||
</Link>
|
)}
|
||||||
)}
|
</ContentError>
|
||||||
</ContentError>
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ const ActionButtonWrapper = styled.div`
|
|||||||
function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) {
|
function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) {
|
||||||
const {
|
const {
|
||||||
summary_fields: { created_by, modified_by },
|
summary_fields: { created_by, modified_by },
|
||||||
|
created,
|
||||||
|
modified,
|
||||||
} = inventoryGroup;
|
} = inventoryGroup;
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
|
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
|
||||||
@@ -45,8 +47,36 @@ function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let createdBy = '';
|
||||||
|
if (created) {
|
||||||
|
if (created_by && created_by.username) {
|
||||||
|
createdBy = (
|
||||||
|
<span>
|
||||||
|
{i18n._(t`${formatDateString(inventoryGroup.created)} by`)}{' '}
|
||||||
|
<Link to={`/users/${created_by.id}`}>{created_by.username}</Link>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
createdBy = i18n._(t`${formatDateString(inventoryGroup.created)} by`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let modifiedBy = '';
|
||||||
|
if (modified) {
|
||||||
|
if (modified_by && modified_by.username) {
|
||||||
|
modifiedBy = (
|
||||||
|
<span>
|
||||||
|
{i18n._(t`${formatDateString(inventoryGroup.modified)} by`)}{' '}
|
||||||
|
<Link to={`/users/${modified_by.id}`}>{modified_by.username}</Link>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
modifiedBy = i18n._(t`${formatDateString(inventoryGroup.modified)} by`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CardBody style={{ paddingTop: '20px' }}>
|
<CardBody css="padding-top: 20px">
|
||||||
<DetailList gutter="sm">
|
<DetailList gutter="sm">
|
||||||
<Detail label={i18n._(t`Name`)} value={inventoryGroup.name} />
|
<Detail label={i18n._(t`Name`)} value={inventoryGroup.name} />
|
||||||
<Detail
|
<Detail
|
||||||
@@ -62,31 +92,9 @@ function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) {
|
|||||||
label={i18n._(t`Variables`)}
|
label={i18n._(t`Variables`)}
|
||||||
/>
|
/>
|
||||||
<DetailList>
|
<DetailList>
|
||||||
{created_by && created_by.username && (
|
{createdBy && <Detail label={i18n._(t`Created`)} value={createdBy} />}
|
||||||
<Detail
|
{modifiedBy && (
|
||||||
label={i18n._(t`Created`)}
|
<Detail label={i18n._(t`Modified`)} value={modifiedBy} />
|
||||||
value={
|
|
||||||
<span>
|
|
||||||
{i18n._(t`${formatDateString(inventoryGroup.created)} by`)}{' '}
|
|
||||||
<Link to={`/users/${created_by.id}`}>
|
|
||||||
{created_by.username}
|
|
||||||
</Link>
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{modified_by && modified_by.username && (
|
|
||||||
<Detail
|
|
||||||
label={i18n._(t`Modified`)}
|
|
||||||
value={
|
|
||||||
<span>
|
|
||||||
{i18n._(t`${formatDateString(inventoryGroup.modified)} by`)}{' '}
|
|
||||||
<Link to={`/users/${modified_by.id}`}>
|
|
||||||
{modified_by.username}
|
|
||||||
</Link>
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
)}
|
||||||
</DetailList>
|
</DetailList>
|
||||||
<ActionButtonWrapper>
|
<ActionButtonWrapper>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import styled from 'styled-components';
|
|||||||
import InventoryGroupItem from './InventoryGroupItem';
|
import InventoryGroupItem from './InventoryGroupItem';
|
||||||
import InventoryGroupsDeleteModal from '../shared/InventoryGroupsDeleteModal';
|
import InventoryGroupsDeleteModal from '../shared/InventoryGroupsDeleteModal';
|
||||||
|
|
||||||
const QS_CONFIG = getQSConfig('host', {
|
const QS_CONFIG = getQSConfig('group', {
|
||||||
page: 1,
|
page: 1,
|
||||||
page_size: 20,
|
page_size: 20,
|
||||||
order_by: 'name',
|
order_by: 'name',
|
||||||
|
|||||||
Reference in New Issue
Block a user