diff --git a/awx/ui_next/src/components/DetailList/Detail.jsx b/awx/ui_next/src/components/DetailList/Detail.jsx index 12b62480d1..53cb3d69a1 100644 --- a/awx/ui_next/src/components/DetailList/Detail.jsx +++ b/awx/ui_next/src/components/DetailList/Detail.jsx @@ -14,7 +14,7 @@ const DetailName = styled(({ fullWidth, ...props }) => ( `} `; -const DetailValue = styled(({ fullWidth, missingValue, ...props }) => ( +const DetailValue = styled(({ fullWidth, ...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 ( - - + <> + {label} {value} - + ); }; Detail.propTypes = { label: node.isRequired, value: node, fullWidth: bool, - missingValue: bool, }; Detail.defaultProps = { value: null, fullWidth: false, - missingValue: false, }; export default Detail; diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap index d864667a02..d404aaf693 100644 --- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap +++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap @@ -72,7 +72,6 @@ exports[` initially renders succesfully 1`] = ` @@ -84,7 +83,6 @@ exports[` initially renders succesfully 1`] = ` initially renders succesfully 1`] = ` @@ -140,7 +137,6 @@ exports[` initially renders succesfully 1`] = ` initially renders succesfully 1`] = ` @@ -219,7 +214,6 @@ exports[` initially renders succesfully 1`] = ` initially renders succesfully 1`] = ` initially renders succesfully 1`] = ` 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[` initially renders succesfully 1`] = ` } forwardedRef={null} fullWidth={false} - missingValue={false} >
jane brown @@ -554,7 +542,6 @@ exports[` initially renders succesfully 1`] = ` initially renders succesfully 1`] = ` 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[` initially renders succesfully 1`] = ` } forwardedRef={null} fullWidth={false} - missingValue={false} >
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx index c971104b7e..63a0970305 100644 --- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx +++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx @@ -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 => ( - + + ); 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 ? (