diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-07 17:41:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-07 17:41:01 +0000 |
| commit | 2593a396d9d880a3a16580de8af3e6a3845b21ce (patch) | |
| tree | 9cde483759d5ddc3bd052c17422406f84ac2a2a2 /web | |
| parent | 30c725ff6eeecdf7769ac28fee0e71da147fb47c (diff) | |
| parent | fb02578e77ee872cd147d87ba5711960925da1d3 (diff) | |
| download | zuul-2593a396d9d880a3a16580de8af3e6a3845b21ce.tar.gz | |
Merge "web: Simply task status results"
Diffstat (limited to 'web')
| -rw-r--r-- | web/src/containers/build/BuildOutput.jsx | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/web/src/containers/build/BuildOutput.jsx b/web/src/containers/build/BuildOutput.jsx index 4220bdd1a..1098ed2c7 100644 --- a/web/src/containers/build/BuildOutput.jsx +++ b/web/src/containers/build/BuildOutput.jsx @@ -26,6 +26,7 @@ import { DataListItemRow, DataListItemCells, DataListCell, + Divider, Label, Flex, FlexItem, @@ -34,11 +35,41 @@ import { import { CheckCircleIcon, ContainerNodeIcon, - InfoCircleIcon, TimesIcon, TimesCircleIcon, } from '@patternfly/react-icons' +class BuildOutputLabel extends React.Component { + static propTypes = { + ok: PropTypes.number, + changed: PropTypes.number, + failures: PropTypes.number, + } + + render() { + let color = this.props.failures ? 'red' : 'green' + let icon = this.props.failures ? <TimesCircleIcon /> : <CheckCircleIcon /> + let failures = this.props.failures ? ( + <> + <Divider orientation={{default: 'vertical'}} /> + <FlexItem><strong>{this.props.failures}</strong> Failure{this.props.failures > 1 ? 's' : ''}</FlexItem> + </> + ) : null + + return ( + <Label color={color} icon={icon}> + <Flex> + <FlexItem><strong>{this.props.ok}</strong> OK</FlexItem> + <Divider orientation={{default: 'vertical'}} /> + <FlexItem><strong>{this.props.changed}</strong> Changed</FlexItem> + { failures } + </Flex> + </Label> + ) + } +} + + class BuildOutput extends React.Component { static propTypes = { output: PropTypes.object, @@ -63,17 +94,7 @@ class BuildOutput extends React.Component { </Chip> </DataListCell>, <DataListCell key={host + '.data'} > - <Flex> - <FlexItem> - <Label color="green" icon={<CheckCircleIcon />}>{values.ok} OK</Label> - </FlexItem> - <FlexItem> - <Label color="orange" icon={<InfoCircleIcon />}>{values.changed} changed</Label> - </FlexItem> - <FlexItem> - <Label color="red" icon={<TimesCircleIcon />}>{values.failures} failed</Label> - </FlexItem> - </Flex> + <BuildOutputLabel ok={values.ok} changed={values.changed} failures={values.failures} /> </DataListCell> ]} /> |