mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 09:25:10 +03:00
Removes missingDetail prop and addresses a typo.
This removes `missingDetail` prop in favor of using styledComponent's className prop.
This commit is contained in:
parent
e5b76c6427
commit
9170aa184a
@ -14,7 +14,7 @@ const DetailName = styled(({ fullWidth, ...props }) => (
|
||||
`}
|
||||
`;
|
||||
|
||||
const DetailValue = styled(({ fullWidth, missingValue, ...props }) => (
|
||||
const DetailValue = styled(({ fullWidth, ...props }) => (
|
||||
<TextListItem {...props} />
|
||||
))`
|
||||
word-break: break-all;
|
||||
@ -23,42 +23,36 @@ const DetailValue = styled(({ fullWidth, missingValue, ...props }) => (
|
||||
`
|
||||
grid-column: 2 / -1;
|
||||
`}
|
||||
${props =>
|
||||
props.missingValue &&
|
||||
`
|
||||
color: #c9190b;
|
||||
`}
|
||||
`;
|
||||
|
||||
const Detail = ({ label, value, fullWidth, missingValue }) => {
|
||||
const Detail = ({ label, value, fullWidth, className}) => {
|
||||
if (!value && typeof value !== 'number') {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<DetailName component={TextListItemVariants.dt} fullWidth={fullWidth}>
|
||||
<>
|
||||
<DetailName className={className} component={TextListItemVariants.dt} fullWidth={fullWidth}>
|
||||
{label}
|
||||
</DetailName>
|
||||
<DetailValue
|
||||
missingValue={missingValue}
|
||||
className={className}
|
||||
component={TextListItemVariants.dd}
|
||||
fullWidth={fullWidth}
|
||||
>
|
||||
{value}
|
||||
</DetailValue>
|
||||
</Fragment>
|
||||
</>
|
||||
);
|
||||
};
|
||||
Detail.propTypes = {
|
||||
label: node.isRequired,
|
||||
value: node,
|
||||
fullWidth: bool,
|
||||
missingValue: bool,
|
||||
};
|
||||
Detail.defaultProps = {
|
||||
value: null,
|
||||
fullWidth: false,
|
||||
missingValue: false,
|
||||
};
|
||||
|
||||
export default Detail;
|
||||
|
@ -72,7 +72,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Name"
|
||||
missingValue={false}
|
||||
value="jane brown"
|
||||
/>
|
||||
</ForwardRef>
|
||||
@ -84,7 +83,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Team Roles"
|
||||
missingValue={false}
|
||||
value={
|
||||
<ForwardRef>
|
||||
<ForwardRef
|
||||
@ -128,7 +126,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Name"
|
||||
missingValue={false}
|
||||
value="jane brown"
|
||||
/>
|
||||
</ForwardRef>
|
||||
@ -140,7 +137,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Team Roles"
|
||||
missingValue={false}
|
||||
value={
|
||||
<ForwardRef>
|
||||
<ForwardRef
|
||||
@ -207,7 +203,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Name"
|
||||
missingValue={false}
|
||||
value="jane brown"
|
||||
/>
|
||||
</ForwardRef>
|
||||
@ -219,7 +214,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Team Roles"
|
||||
missingValue={false}
|
||||
value={
|
||||
<ForwardRef>
|
||||
<ForwardRef
|
||||
@ -385,7 +379,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Name"
|
||||
missingValue={false}
|
||||
value="jane brown"
|
||||
>
|
||||
<Detail__DetailName
|
||||
@ -442,7 +435,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail__DetailValue
|
||||
component="dd"
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<StyledComponent
|
||||
component="dd"
|
||||
@ -453,12 +445,10 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
"componentStyle": ComponentStyle {
|
||||
"componentId": "Detail__DetailValue-sc-16ypsyv-1",
|
||||
"isStatic": false,
|
||||
"lastClassName": "kCDjmZ",
|
||||
"lastClassName": "yHlYM",
|
||||
"rules": Array [
|
||||
"word-break:break-all;",
|
||||
[Function],
|
||||
" ",
|
||||
[Function],
|
||||
],
|
||||
},
|
||||
"displayName": "Detail__DetailValue",
|
||||
@ -473,20 +463,18 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
}
|
||||
forwardedRef={null}
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<Component
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
component="dd"
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<TextListItem
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
component="dd"
|
||||
>
|
||||
<dd
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
data-pf-content={true}
|
||||
>
|
||||
jane brown
|
||||
@ -554,7 +542,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail
|
||||
fullWidth={false}
|
||||
label="Team Roles"
|
||||
missingValue={false}
|
||||
value={
|
||||
<ForwardRef>
|
||||
<ForwardRef
|
||||
@ -620,7 +607,6 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
<Detail__DetailValue
|
||||
component="dd"
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<StyledComponent
|
||||
component="dd"
|
||||
@ -631,12 +617,10 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
"componentStyle": ComponentStyle {
|
||||
"componentId": "Detail__DetailValue-sc-16ypsyv-1",
|
||||
"isStatic": false,
|
||||
"lastClassName": "kCDjmZ",
|
||||
"lastClassName": "yHlYM",
|
||||
"rules": Array [
|
||||
"word-break:break-all;",
|
||||
[Function],
|
||||
" ",
|
||||
[Function],
|
||||
],
|
||||
},
|
||||
"displayName": "Detail__DetailValue",
|
||||
@ -651,20 +635,18 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
|
||||
}
|
||||
forwardedRef={null}
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<Component
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
component="dd"
|
||||
fullWidth={false}
|
||||
missingValue={false}
|
||||
>
|
||||
<TextListItem
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
component="dd"
|
||||
>
|
||||
<dd
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 kCDjmZ"
|
||||
className="Detail__DetailValue-sc-16ypsyv-1 yHlYM"
|
||||
data-pf-content={true}
|
||||
>
|
||||
<ChipGroup>
|
||||
|
@ -28,6 +28,12 @@ const ButtonGroup = styled.div`
|
||||
margin-left: 20px;
|
||||
}
|
||||
`;
|
||||
|
||||
const MissingDetail = styled(Detail)`
|
||||
dd& {
|
||||
color: red;
|
||||
}
|
||||
`;
|
||||
class JobTemplateDetail extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@ -158,12 +164,13 @@ class JobTemplateDetail extends Component {
|
||||
);
|
||||
|
||||
const renderMissingDataDetail = value => (
|
||||
<Detail missingValue label={value} value={i18n._(t`Deleted`)} />
|
||||
|
||||
<MissingDetail label={value} value={i18n._(t`Deleted`)} />
|
||||
);
|
||||
|
||||
const inventoryValue = (kind, id) => {
|
||||
const inventorykind =
|
||||
kind === 'smart' ? (kind = 'smary_inventory') : (kind = 'inventory');
|
||||
kind === 'smart' ? (kind = 'smart_inventory') : (kind = 'inventory');
|
||||
|
||||
return ask_inventory_on_launch ? (
|
||||
<Fragment>
|
||||
|
Loading…
Reference in New Issue
Block a user