[arvados-workbench2] created: 2.4.0-143-g103b02ca
git repository hosting
git at public.arvados.org
Thu Jun 23 03:15:28 UTC 2022
at 103b02cad3a181951a3872fa8f6a811a7125fdda (commit)
commit 103b02cad3a181951a3872fa8f6a811a7125fdda
Author: Stephen Smith <stephen at curii.com>
Date: Wed Jun 22 23:14:50 2022 -0400
19093: Add process details attriutes warning for container retry
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/views-components/process-runtime-status/process-runtime-status.tsx b/src/views-components/process-runtime-status/process-runtime-status.tsx
index 3858e49e..41a0ae05 100644
--- a/src/views-components/process-runtime-status/process-runtime-status.tsx
+++ b/src/views-components/process-runtime-status/process-runtime-status.tsx
@@ -26,7 +26,8 @@ type CssRules = 'root'
| 'error'
| 'errorColor'
| 'warning'
- | 'warningColor';
+ | 'warningColor'
+ | 'disabledPanelSummary';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
@@ -65,15 +66,20 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
warningColor: {
color: theme.customs.colors.yellow900,
},
+ disabledPanelSummary: {
+ cursor: 'default',
+ pointerEvents: 'none',
+ }
});
export interface ProcessRuntimeStatusDataProps {
runtimeStatus: RuntimeStatus | undefined;
+ containerCount: number;
}
type ProcessRuntimeStatusProps = ProcessRuntimeStatusDataProps & WithStyles<CssRules>;
export const ProcessRuntimeStatus = withStyles(styles)(
- ({ runtimeStatus, classes }: ProcessRuntimeStatusProps) => {
+ ({ runtimeStatus, containerCount, classes }: ProcessRuntimeStatusProps) => {
return <div className={classes.root}>
{ runtimeStatus?.error &&
<div data-cy='process-runtime-status-error'><ExpansionPanel className={classes.error} elevation={0}>
@@ -103,5 +109,14 @@ export const ProcessRuntimeStatus = withStyles(styles)(
</ExpansionPanelDetails>
</ExpansionPanel></div>
}
+ { containerCount > 1 &&
+ <div data-cy='process-runtime-status-warning' ><ExpansionPanel className={classes.warning} elevation={0} expanded={false}>
+ <ExpansionPanelSummary className={classNames(classes.summary, classes.detailsText, classes.disabledPanelSummary)}>
+ <Typography className={classNames(classes.heading, classes.warningColor)}>
+ {`Warning: Process retried ${containerCount - 1} time${containerCount > 2 ? 's' : ''} due to failure.`}
+ </Typography>
+ </ExpansionPanelSummary>
+ </ExpansionPanel></div>
+ }
</div>
-});
\ No newline at end of file
+});
diff --git a/src/views/process-panel/process-details-attributes.tsx b/src/views/process-panel/process-details-attributes.tsx
index 1e3e5591..4af2c9cd 100644
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@ -64,7 +64,7 @@ export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
const mdSize = props.twoCol ? 6 : 12;
return <Grid container>
<Grid item xs={12}>
- <ProcessRuntimeStatus runtimeStatus={container?.runtimeStatus} />
+ <ProcessRuntimeStatus runtimeStatus={container?.runtimeStatus} containerCount={containerRequest.containerCount} />
</Grid>
{!props.hideProcessPanelRedundantFields && <Grid item xs={12} md={mdSize}>
<DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROCESS)} />
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list