[arvados-workbench2] updated: 2.4.0-324-g56c5b7de
git repository hosting
git at public.arvados.org
Fri Oct 28 14:59:23 UTC 2022
Summary of changes:
cypress/integration/process.spec.js | 27 ++++++++++++++++++----
.../process-panel/process-details-attributes.tsx | 6 ++---
2 files changed, 26 insertions(+), 7 deletions(-)
via 56c5b7de1410f21a91e18d1c8ff253935948e401 (commit)
from 7abad6fba6ffa8e88d40ace78a84fb2a99d5d44b (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 56c5b7de1410f21a91e18d1c8ff253935948e401
Author: Stephen Smith <stephen at curii.com>
Date: Fri Oct 28 10:58:05 2022 -0400
19315: Show modifiedby from containerRequest and test both equal and different modified/runtime uuids
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 838fa9da..90b52aa1 100644
--- a/cypress/integration/process.spec.js
+++ b/cypress/integration/process.spec.js
@@ -114,19 +114,38 @@ describe('Process tests', function() {
});
it('shows process details', function() {
- const crName = 'test_container_request';
createContainerRequest(
activeUser,
- crName,
+ `test_container_request ${Math.floor(Math.random() * 999999)}`,
'arvados/jobs',
['echo', 'hello world'],
false, 'Committed')
.then(function(containerRequest) {
cy.loginAs(activeUser);
cy.goToPath(`/processes/${containerRequest.uuid}`);
- cy.get('[data-cy=process-details]').should('contain', crName);
- cy.get('[data-cy=process-details-attributes-runtime-user]').contains(`Active User (${activeUser.user.uuid})`);
+ cy.get('[data-cy=process-details]').should('contain', containerRequest.name);
+ cy.get('[data-cy=process-details-attributes-modifiedby-user]').contains(`Active User (${activeUser.user.uuid})`);
+ });
+
+ // Fake submitted by another user
+ cy.intercept({method: 'GET', url: '**/arvados/v1/container_requests/*'}, (req) => {
+ req.reply((res) => {
+ res.body.modified_by_user_uuid = 'zzzzz-tpzed-000000000000000';
+ });
+ });
+
+ createContainerRequest(
+ activeUser,
+ `test_container_request ${Math.floor(Math.random() * 999999)}`,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Committed')
+ .then(function(containerRequest) {
+ cy.loginAs(activeUser);
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.get('[data-cy=process-details]').should('contain', containerRequest.name);
cy.get('[data-cy=process-details-attributes-modifiedby-user]').contains(`zzzzz-tpzed-000000000000000`);
+ cy.get('[data-cy=process-details-attributes-runtime-user]').contains(`Active User (${activeUser.user.uuid})`);
});
});
diff --git a/src/views/process-panel/process-details-attributes.tsx b/src/views/process-panel/process-details-attributes.tsx
index d3515fd5..6c20f967 100644
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@ -100,12 +100,12 @@ export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
<ContainerRunTime uuid={containerRequest.uuid} />
</DetailsAttribute>
</Grid>
- {(container && container.modifiedByUserUuid) && <Grid item xs={12} md={mdSize} data-cy="process-details-attributes-modifiedby-user">
+ {(containerRequest && containerRequest.modifiedByUserUuid) && <Grid item xs={12} md={mdSize} data-cy="process-details-attributes-modifiedby-user">
<DetailsAttribute
- label='Submitted by' linkToUuid={container.modifiedByUserUuid}
+ label='Submitted by' linkToUuid={containerRequest.modifiedByUserUuid}
uuidEnhancer={(uuid: string) => <ResourceWithName uuid={uuid} />} />
</Grid>}
- {(container && container.runtimeUserUuid && container.runtimeUserUuid !== container.modifiedByUserUuid) && <Grid item xs={12} md={mdSize} data-cy="process-details-attributes-runtime-user">
+ {(container && container.runtimeUserUuid && container.runtimeUserUuid !== containerRequest.modifiedByUserUuid) && <Grid item xs={12} md={mdSize} data-cy="process-details-attributes-runtime-user">
<DetailsAttribute
label='Run as' linkToUuid={container.runtimeUserUuid}
uuidEnhancer={(uuid: string) => <ResourceWithName uuid={uuid} />} />
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list