[arvados-workbench2] updated: 2.6.3-81-g00f1d0ae

[git repository hosting]

Summary of changes:
 .../process-panel/process-details-attributes.tsx   | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

       via  00f1d0aecf676f50a27ed25dff974cfda23160c1 (commit)
       via  8dbd060cdc504973ca88a8bf806dc7eb3f8df31b (commit)
      from  ceb9037bd7da9d2c0352c09184e07096db982046 (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 00f1d0aecf676f50a27ed25dff974cfda23160c1
Merge: ceb9037b 8dbd060c
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Aug 21 16:17:33 2023 -0400

    Merge branch '20513-link-cwl-code' refs #20513
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --cc src/views/process-panel/process-details-attributes.tsx
index b0d8039f,4979e391..ffacd967
--- a/src/views/process-panel/process-details-attributes.tsx
+++ b/src/views/process-panel/process-details-attributes.tsx
@@@ -67,10 -96,10 +96,12 @@@ export const ProcessDetailsAttributes 
              const subprocesses = props.subprocesses;
              const classes = props.classes;
              const mdSize = props.twoCol ? 6 : 12;
+             const workflowCollection = props.workflowCollection;
+             const workflowPath = props.workflowPath;
              const filteredPropertyKeys = Object.keys(containerRequest.properties)
                  .filter(k => (typeof containerRequest.properties[k] !== 'object'));
 +            const hasTotalCost = containerRequest && containerRequest.cumulativeCost > 0;
 +            const totalCostNotReady = container && container.cost > 0 && container.state === "Running" && containerRequest && containerRequest.cumulativeCost === 0 && subprocesses.length > 0;
              return <Grid container>
                  <Grid item xs={12}>
                      <ProcessRuntimeStatus runtimeStatus={container?.runtimeStatus} containerCount={containerRequest.containerCount} />
@@@ -129,10 -158,16 +160,14 @@@
                          <CollectionName className={classes.link} uuid={containerRequest.outputUuid} />
                      </span>}
                  </Grid>
 -                {container && container.cost > 0 && <Grid item xs={12} md={mdSize}>
 -                    <DetailsAttribute label='Cost ' value={formatContainerCost(container.cost)} />
 -                </Grid>}
 -
 -            {container && workflowCollection && <Grid item xs={12} md={mdSize}>
 -                <DetailsAttribute label='Workflow code' link={getCollectionUrl(workflowCollection)} value={workflowPath} />
 -            </Grid>}
 +                {container && <Grid item xs={12} md={mdSize}>
 +                    <DetailsAttribute label='Cost' value={
 +                        `${hasTotalCost ? formatContainerCost(containerRequest.cumulativeCost) + ' total, ' : (totalCostNotReady ? 'total pending completion, ' : '')}${container.cost > 0 ? formatContainerCost(container.cost) : 'not available'} for this container`
 +                    } />
+ 
 -                {containerRequest && containerRequest.cumulativeCost > 0 && subprocesses.length > 0 && <Grid item xs={12} md={mdSize}>
 -                    <DetailsAttribute label='Container & subprocess cost' value={formatContainerCost(containerRequest.cumulativeCost)} />
++                    {container && workflowCollection && <Grid item xs={12} md={mdSize}>
++                        <DetailsAttribute label='Workflow code' link={getCollectionUrl(workflowCollection)} value={workflowPath} />
++                    </Grid>}
                  </Grid>}
                  {containerRequest.properties.template_uuid &&
                      <Grid item xs={12} md={mdSize}>

-----------------------------------------------------------------------


hooks/post-receive
--