[arvados-workbench2] updated: 2.4.0-342-ge8f5f15c
git repository hosting
git at public.arvados.org
Mon Oct 31 22:41:15 UTC 2022
Summary of changes:
src/common/formatters.ts | 2 +-
src/store/processes/processes-actions.ts | 1 +
src/views/process-panel/process-details-attributes.tsx | 16 ++++++++--------
3 files changed, 10 insertions(+), 9 deletions(-)
via e8f5f15c798460b3622dcd5dd1a1ced197ee1729 (commit)
via 96cec0234e579d3be8a1c9f3426b726537383707 (commit)
via 03731a3886079e7056c84b963602a6a57ad1d7ce (commit)
from d63d24c2ac7a88a83939e9fbaaf589540848ef7a (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 e8f5f15c798460b3622dcd5dd1a1ced197ee1729
Author: Stephen Smith <stephen at curii.com>
Date: Mon Oct 31 18:40:29 2022 -0400
19319: Lowercase non-first words in process details attribute labels
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/views/process-panel/process-details-attributes.tsx b/src/views/process-panel/process-details-attributes.tsx
index 226a775b..7bdf8897 100644
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@ -77,10 +77,10 @@ export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
<DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROCESS)} />
</Grid>}
<Grid item xs={12} md={mdSize}>
- <DetailsAttribute label='Container Request UUID' linkToUuid={containerRequest.uuid} value={containerRequest.uuid} />
+ <DetailsAttribute label='Container request UUID' linkToUuid={containerRequest.uuid} value={containerRequest.uuid} />
</Grid>
<Grid item xs={12} md={mdSize}>
- <DetailsAttribute label='Docker Image locator'
+ <DetailsAttribute label='Docker image locator'
linkToUuid={containerRequest.containerImage} value={containerRequest.containerImage} />
</Grid>
<Grid item xs={12} md={mdSize}>
@@ -119,19 +119,19 @@ export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
uuidEnhancer={(uuid: string) => <ResourceWithName uuid={uuid} />} />
</Grid>}
<Grid item xs={12} md={mdSize}>
- <DetailsAttribute label='Requesting Container UUID' value={containerRequest.requestingContainerUuid || "(none)"} />
+ <DetailsAttribute label='Requesting container UUID' value={containerRequest.requestingContainerUuid || "(none)"} />
</Grid>
<Grid item xs={6}>
- <DetailsAttribute label='Output Collection' />
+ <DetailsAttribute label='Output collection' />
{containerRequest.outputUuid && <span onClick={() => props.navigateToOutput(containerRequest.outputUuid!)}>
<CollectionName className={classes.link} uuid={containerRequest.outputUuid} />
</span>}
</Grid>
{container && container.cost > 0 && <Grid item xs={12} md={mdSize}>
- <DetailsAttribute label='Container Cost ' value={formatContainerCost(container.cost)} />
+ <DetailsAttribute label='Cost ' value={formatContainerCost(container.cost)} />
</Grid>}
{containerRequest && containerRequest.cumulativeCost > 0 && subprocesses.length > 0 && <Grid item xs={12} md={mdSize}>
- <DetailsAttribute label='Container & Subprocess Cost' value={formatContainerCost(containerRequest.cumulativeCost)} />
+ <DetailsAttribute label='Container & subprocess cost' value={formatContainerCost(containerRequest.cumulativeCost)} />
</Grid>}
{containerRequest.properties.template_uuid &&
<Grid item xs={12} md={mdSize}>
commit 96cec0234e579d3be8a1c9f3426b726537383707
Author: Stephen Smith <stephen at curii.com>
Date: Mon Oct 31 18:38:12 2022 -0400
19319: Improve checks for showing cost attributes
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/views/process-panel/process-details-attributes.tsx b/src/views/process-panel/process-details-attributes.tsx
index 01dafb3e..226a775b 100644
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@ -127,10 +127,10 @@ export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
<CollectionName className={classes.link} uuid={containerRequest.outputUuid} />
</span>}
</Grid>
- {container && container.cost && <Grid item xs={12} md={mdSize}>
+ {container && container.cost > 0 && <Grid item xs={12} md={mdSize}>
<DetailsAttribute label='Container Cost ' value={formatContainerCost(container.cost)} />
</Grid>}
- {containerRequest && containerRequest.cumulativeCost && subprocesses.length > 0 && <Grid item xs={12} md={mdSize}>
+ {containerRequest && containerRequest.cumulativeCost > 0 && subprocesses.length > 0 && <Grid item xs={12} md={mdSize}>
<DetailsAttribute label='Container & Subprocess Cost' value={formatContainerCost(containerRequest.cumulativeCost)} />
</Grid>}
{containerRequest.properties.template_uuid &&
commit 03731a3886079e7056c84b963602a6a57ad1d7ce
Author: Stephen Smith <stephen at curii.com>
Date: Mon Oct 31 18:35:42 2022 -0400
19319: Add cost field to loadContainers select query to prevent clearing cost race condition
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index b1646512..1fbf1710 100644
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -100,7 +100,7 @@ export const formatPropertyValue = (pv: PropertyValue, vocabulary?: Vocabulary)
return "";
};
-export const formatContainerCost = (cost: number) => {
+export const formatContainerCost = (cost: number): string => {
const decimalPlaces = 3;
const factor = Math.pow(10, decimalPlaces);
diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts
index 8a94d8cf..f7822e06 100644
--- a/src/store/processes/processes-actions.ts
+++ b/src/store/processes/processes-actions.ts
@@ -60,6 +60,7 @@ const containerFieldsNoMounts = [
"auth_uuid",
"command",
"container_image",
+ "cost",
"created_at",
"cwd",
"environment",
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list