projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14206-icons-descriptions-are-not-displayed-when-using-TAB
[arvados.git]
/
src
/
views
/
process-panel
/
process-information-card.tsx
diff --git
a/src/views/process-panel/process-information-card.tsx
b/src/views/process-panel/process-information-card.tsx
index 01bb3ae79e0713f7014cb988269c04e63117a7c7..40fd8b229681ff38abd14125450e812e1767d564 100644
(file)
--- a/
src/views/process-panel/process-information-card.tsx
+++ b/
src/views/process-panel/process-information-card.tsx
@@
-19,7
+19,7
@@
type CssRules = 'card' | 'iconHeader' | 'label' | 'value' | 'chip' | 'link' | 'c
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
- marginBottom: theme.spacing.unit * 2
+ height: '100%'
},
iconHeader: {
fontSize: '1.875rem',
},
iconHeader: {
fontSize: '1.875rem',
@@
-57,7
+57,6
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
content: {
'&:last-child': {
paddingBottom: theme.spacing.unit * 2,
content: {
'&:last-child': {
paddingBottom: theme.spacing.unit * 2,
- paddingTop: '0px'
}
},
title: {
}
},
title: {
@@
-87,11
+86,13
@@
export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
<Chip label={getProcessStatus(process)}
className={classes.chip}
style={{ backgroundColor: getProcessStatusColor(getProcessStatus(process), theme as ArvadosTheme) }} />
<Chip label={getProcessStatus(process)}
className={classes.chip}
style={{ backgroundColor: getProcessStatusColor(getProcessStatus(process), theme as ArvadosTheme) }} />
- <IconButton
- aria-label="More options"
- onClick={event => onContextMenu(event)}>
- <MoreOptionsIcon />
- </IconButton>
+ <Tooltip title="More options">
+ <IconButton
+ aria-label="More options"
+ onClick={event => onContextMenu(event)}>
+ <MoreOptionsIcon />
+ </IconButton>
+ </Tooltip>
</div>
}
title={
</div>
}
title={
@@
-102,9
+103,9
@@
export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
</Tooltip>
}
subheader={
</Tooltip>
}
subheader={
- <Tooltip title={
process.containerRequest.description || '(no-description)'
} placement="bottom-start">
+ <Tooltip title={
getDescription(process)
} placement="bottom-start">
<Typography noWrap variant="body2" color='inherit'>
<Typography noWrap variant="body2" color='inherit'>
- {
process.containerRequest.description || '(no-description)'
}
+ {
getDescription(process)
}
</Typography>
</Tooltip>} />
<CardContent className={classes.content}>
</Typography>
</Tooltip>} />
<CardContent className={classes.content}>
@@
-124,4
+125,7
@@
export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
</Grid>
</CardContent>
</Card>
</Grid>
</CardContent>
</Card>
-);
\ No newline at end of file
+);
+
+const getDescription = (process: Process) =>
+ process.containerRequest.description || '(no-description)';