[arvados-workbench2] updated: 2.4.0-146-g25d64433
git repository hosting
git at public.arvados.org
Thu Jun 23 21:19:24 UTC 2022
Summary of changes:
cypress/integration/process.spec.js | 22 ++++++++++++++++++++++
.../process-runtime-status.tsx | 22 ++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
via 25d64433dff3ffcf083c2cedd8d849de49a691d1 (commit)
via 053625d3e7d95abc91edf4346d5db3aad440c412 (commit)
from 3ebe70ccec47fe17491415736701e6e1ce1956c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 25d64433dff3ffcf083c2cedd8d849de49a691d1
Author: Stephen Smith <stephen at curii.com>
Date: Thu Jun 23 17:19:05 2022 -0400
19093: Add cypress test for container_count warning
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/cypress/integration/process.spec.js b/cypress/integration/process.spec.js
index 48b936cf..faf70c49 100644
--- a/cypress/integration/process.spec.js
+++ b/cypress/integration/process.spec.js
@@ -244,5 +244,27 @@ describe('Process tests', function() {
.should('contain', 'Free disk space is low')
.and('contain', 'No additional warning details available');
});
+
+
+ // Force container_count for testing
+ let containerCount = 2;
+ cy.intercept({method: 'GET', url: '**/arvados/v1/container_requests/*'}, (req) => {
+ req.reply((res) => {
+ res.body.container_count = containerCount;
+ });
+ });
+
+ cy.getAll('@containerRequest').then(function([containerRequest]) {
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.get('[data-cy=process-runtime-status-retry-warning]')
+ .should('contain', 'Process retried 1 time');
+ });
+
+ cy.getAll('@containerRequest').then(function([containerRequest]) {
+ containerCount = 3;
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.get('[data-cy=process-runtime-status-retry-warning]')
+ .should('contain', 'Process retried 2 times');
+ });
});
});
commit 053625d3e7d95abc91edf4346d5db3aad440c412
Author: Stephen Smith <stephen at curii.com>
Date: Thu Jun 23 14:39:16 2022 -0400
19093: Use paper instead of expansionpanel for process retry warning
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 41a0ae05..3b5fae36 100644
--- a/src/views-components/process-runtime-status/process-runtime-status.tsx
+++ b/src/views-components/process-runtime-status/process-runtime-status.tsx
@@ -7,6 +7,7 @@ import {
ExpansionPanel,
ExpansionPanelDetails,
ExpansionPanelSummary,
+ Paper,
StyleRulesCallback,
Typography,
withStyles,
@@ -27,7 +28,7 @@ type CssRules = 'root'
| 'errorColor'
| 'warning'
| 'warningColor'
- | 'disabledPanelSummary';
+ | 'paperRoot';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
@@ -66,10 +67,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
warningColor: {
color: theme.customs.colors.yellow900,
},
- disabledPanelSummary: {
- cursor: 'default',
- pointerEvents: 'none',
- }
+ paperRoot: {
+ minHeight: theme.spacing.unit * 6,
+ display: 'flex',
+ alignItems: 'center',
+ },
});
export interface ProcessRuntimeStatusDataProps {
runtimeStatus: RuntimeStatus | undefined;
@@ -110,13 +112,13 @@ export const ProcessRuntimeStatus = withStyles(styles)(
</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)}>
+ <div data-cy='process-runtime-status-retry-warning' >
+ <Paper className={classNames(classes.warning, classes.paperRoot)} elevation={0}>
+ <Typography className={classNames(classes.heading, classes.summary, classes.warningColor)}>
{`Warning: Process retried ${containerCount - 1} time${containerCount > 2 ? 's' : ''} due to failure.`}
</Typography>
- </ExpansionPanelSummary>
- </ExpansionPanel></div>
+ </Paper>
+ </div>
}
</div>
});
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list